Add image scanning to imagebuilder image pipeline resource #33005

stromp · 2023-08-14T14:20:06Z

Description

Adds the image scanning configuration options to:

The image_pipeline resource
The image_pipeline datasource
Updates the documentation

Relations

Output from Acceptance Testing

❯ make testacc TESTS=ImageBuilderImagePipeline_ImageScanning_imageScanning PKG=imagebuilder
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/imagebuilder/... -v -count 1 -parallel 20 -run='ImageBuilderImagePipeline_ImageScanning_imageScanning'  -timeout 180m
=== RUN   TestAccImageBuilderImagePipeline_ImageScanning_imageScanningEnabled
=== PAUSE TestAccImageBuilderImagePipeline_ImageScanning_imageScanningEnabled
=== RUN   TestAccImageBuilderImagePipeline_ImageScanning_imageScanningEnabledAdvanced
=== PAUSE TestAccImageBuilderImagePipeline_ImageScanning_imageScanningEnabledAdvanced
=== CONT  TestAccImageBuilderImagePipeline_ImageScanning_imageScanningEnabled
=== CONT  TestAccImageBuilderImagePipeline_ImageScanning_imageScanningEnabledAdvanced
--- PASS: TestAccImageBuilderImagePipeline_ImageScanning_imageScanningEnabledAdvanced (61.09s)
--- PASS: TestAccImageBuilderImagePipeline_ImageScanning_imageScanningEnabled (62.60s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/imagebuilder       62.731s

❯ make testacc TESTS=TestAccImageBuilderImagePipelineDataSource PKG=imagebuilder
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/imagebuilder/... -v -count 1 -parallel 20 -run='TestAccImageBuilderImagePipelineDataSource'  -timeout 180m
=== RUN   TestAccImageBuilderImagePipelineDataSource_arn
=== PAUSE TestAccImageBuilderImagePipelineDataSource_arn
=== RUN   TestAccImageBuilderImagePipelineDataSource_containerRecipeARN
=== PAUSE TestAccImageBuilderImagePipelineDataSource_containerRecipeARN
=== CONT  TestAccImageBuilderImagePipelineDataSource_arn
=== CONT  TestAccImageBuilderImagePipelineDataSource_containerRecipeARN
--- PASS: TestAccImageBuilderImagePipelineDataSource_arn (37.06s)
--- PASS: TestAccImageBuilderImagePipelineDataSource_containerRecipeARN (37.51s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/imagebuilder       37.607s...

Adding basic test

- add tests - fixed bugs with retrieving and setting the data

github-actions · 2023-08-14T14:20:22Z

Community Note

Voting for Prioritization

Please vote on this pull request by adding a 👍 reaction to the original post to help the community and maintainers prioritize this pull request.
Please see our prioritization guide for information on how we prioritize.
Please do not leave "+1" or other comments that do not add relevant new information or questions, they generate extra noise for issue followers and do not help prioritize the request.

For Submitters

Review the contribution guide relating to the type of change you are making to ensure all of the necessary steps have been taken.
For new resources and data sources, use skaff to generate scaffolding with comments detailing common expectations.
Whether or not the branch has been rebased will not impact prioritization, but doing so is always a welcome surprise.

github-actions

Welcome @stromp 👋

It looks like this is your first Pull Request submission to the Terraform AWS Provider! If you haven’t already done so please make sure you have checked out our CONTRIBUTOR guide and FAQ to make sure your contribution is adhering to best practice and has all the necessary elements in place for a successful approval.

Also take a look at our FAQ which details how we prioritize Pull Requests for inclusion.

Thanks again, and welcome to the community! 😃

Error: InternalValidate with provider["registry.terraform.io/hashicorp/aws"], on <empty> line 0: (source code not available) Internal validation of the provider failed! This is always a bug with the provider itself, and not a user issue. Please report this bug: 1 error occurred: * data source aws_imagebuilder_image_pipeline: image_scanning_configuration: MaxItems is for configurable attributes,there's nothing to configure on computed-only field

…der Image Pipeline: ResourceDependencyException: Resource dependency error: Amazon Inspector is not enabled for 'ecr' resources in account '123456789012'.'

…nchConfiguration_maxParallelLaunches'.

ewbankkit

LGTM 🚀.

% make testacc TESTARGS='-run=TestAccImageBuilderImagePipelineDataSource_\|TestAccImageBuilderImagePipeline_' PKG=imagebuilder ACCTEST_PARALLELISM=3
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/imagebuilder/... -v -count 1 -parallel 3  -run=TestAccImageBuilderImagePipelineDataSource_\|TestAccImageBuilderImagePipeline_ -timeout 180m
=== RUN   TestAccImageBuilderImagePipelineDataSource_arn
=== PAUSE TestAccImageBuilderImagePipelineDataSource_arn
=== RUN   TestAccImageBuilderImagePipelineDataSource_containerRecipeARN
=== PAUSE TestAccImageBuilderImagePipelineDataSource_containerRecipeARN
=== RUN   TestAccImageBuilderImagePipeline_basic
=== PAUSE TestAccImageBuilderImagePipeline_basic
=== RUN   TestAccImageBuilderImagePipeline_disappears
=== PAUSE TestAccImageBuilderImagePipeline_disappears
=== RUN   TestAccImageBuilderImagePipeline_description
=== PAUSE TestAccImageBuilderImagePipeline_description
=== RUN   TestAccImageBuilderImagePipeline_distributionARN
=== PAUSE TestAccImageBuilderImagePipeline_distributionARN
=== RUN   TestAccImageBuilderImagePipeline_enhancedImageMetadataEnabled
=== PAUSE TestAccImageBuilderImagePipeline_enhancedImageMetadataEnabled
=== RUN   TestAccImageBuilderImagePipeline_imageRecipeARN
=== PAUSE TestAccImageBuilderImagePipeline_imageRecipeARN
=== RUN   TestAccImageBuilderImagePipeline_containerRecipeARN
=== PAUSE TestAccImageBuilderImagePipeline_containerRecipeARN
=== RUN   TestAccImageBuilderImagePipeline_ImageScanning_imageScanningEnabled
=== PAUSE TestAccImageBuilderImagePipeline_ImageScanning_imageScanningEnabled
=== RUN   TestAccImageBuilderImagePipeline_ImageScanning_imageScanningEnabledAdvanced
=== PAUSE TestAccImageBuilderImagePipeline_ImageScanning_imageScanningEnabledAdvanced
=== RUN   TestAccImageBuilderImagePipeline_ImageTests_imageTestsEnabled
=== PAUSE TestAccImageBuilderImagePipeline_ImageTests_imageTestsEnabled
=== RUN   TestAccImageBuilderImagePipeline_ImageTests_timeoutMinutes
=== PAUSE TestAccImageBuilderImagePipeline_ImageTests_timeoutMinutes
=== RUN   TestAccImageBuilderImagePipeline_infrastructureARN
=== PAUSE TestAccImageBuilderImagePipeline_infrastructureARN
=== RUN   TestAccImageBuilderImagePipeline_Schedule_pipelineExecutionStartCondition
=== PAUSE TestAccImageBuilderImagePipeline_Schedule_pipelineExecutionStartCondition
=== RUN   TestAccImageBuilderImagePipeline_Schedule_scheduleExpression
=== PAUSE TestAccImageBuilderImagePipeline_Schedule_scheduleExpression
=== RUN   TestAccImageBuilderImagePipeline_Schedule_timezone
=== PAUSE TestAccImageBuilderImagePipeline_Schedule_timezone
=== RUN   TestAccImageBuilderImagePipeline_status
=== PAUSE TestAccImageBuilderImagePipeline_status
=== RUN   TestAccImageBuilderImagePipeline_tags
=== PAUSE TestAccImageBuilderImagePipeline_tags
=== CONT  TestAccImageBuilderImagePipelineDataSource_arn
=== CONT  TestAccImageBuilderImagePipeline_ImageScanning_imageScanningEnabledAdvanced
=== CONT  TestAccImageBuilderImagePipeline_Schedule_pipelineExecutionStartCondition
=== NAME  TestAccImageBuilderImagePipeline_ImageScanning_imageScanningEnabledAdvanced
    acctest.go:1415: skipping test for aws/us-west-2: Error running apply: exit status 1
        
        Error: creating Image Builder Image Pipeline: ResourceDependencyException: Resource dependency error: Amazon Inspector is not enabled for 'ecr' resources in account '123456789012'.
        
          with aws_imagebuilder_image_pipeline.test,
          on terraform_plugin_test.tf line 93, in resource "aws_imagebuilder_image_pipeline" "test":
          93: resource "aws_imagebuilder_image_pipeline" "test" {
        
--- SKIP: TestAccImageBuilderImagePipeline_ImageScanning_imageScanningEnabledAdvanced (26.29s)
=== CONT  TestAccImageBuilderImagePipeline_Schedule_scheduleExpression
--- PASS: TestAccImageBuilderImagePipelineDataSource_arn (39.94s)
=== CONT  TestAccImageBuilderImagePipeline_tags
--- PASS: TestAccImageBuilderImagePipeline_Schedule_pipelineExecutionStartCondition (62.63s)
=== CONT  TestAccImageBuilderImagePipeline_status
--- PASS: TestAccImageBuilderImagePipeline_Schedule_scheduleExpression (61.69s)
=== CONT  TestAccImageBuilderImagePipeline_Schedule_timezone
--- PASS: TestAccImageBuilderImagePipeline_tags (93.28s)
=== CONT  TestAccImageBuilderImagePipeline_ImageTests_timeoutMinutes
--- PASS: TestAccImageBuilderImagePipeline_status (74.48s)
=== CONT  TestAccImageBuilderImagePipeline_infrastructureARN
--- PASS: TestAccImageBuilderImagePipeline_Schedule_timezone (69.59s)
=== CONT  TestAccImageBuilderImagePipeline_distributionARN
--- PASS: TestAccImageBuilderImagePipeline_ImageTests_timeoutMinutes (62.60s)
=== CONT  TestAccImageBuilderImagePipeline_ImageScanning_imageScanningEnabled
--- PASS: TestAccImageBuilderImagePipeline_infrastructureARN (61.54s)
=== CONT  TestAccImageBuilderImagePipeline_containerRecipeARN
--- PASS: TestAccImageBuilderImagePipeline_distributionARN (62.48s)
=== CONT  TestAccImageBuilderImagePipeline_imageRecipeARN
=== NAME  TestAccImageBuilderImagePipeline_ImageScanning_imageScanningEnabled
    acctest.go:1415: skipping test for aws/us-west-2: Error running apply: exit status 1
        
        Error: updating Image Builder Image Pipeline (arn:aws:imagebuilder:us-west-2:123456789012:image-pipeline/tf-acc-test-468777412585694857): ResourceDependencyException: Resource dependency error: Amazon Inspector is not enabled for 'ec2' resources in account '123456789012'.
        
          with aws_imagebuilder_image_pipeline.test,
          on terraform_plugin_test.tf line 93, in resource "aws_imagebuilder_image_pipeline" "test":
          93: resource "aws_imagebuilder_image_pipeline" "test" {
        
--- SKIP: TestAccImageBuilderImagePipeline_ImageScanning_imageScanningEnabled (51.74s)
=== CONT  TestAccImageBuilderImagePipeline_enhancedImageMetadataEnabled
--- PASS: TestAccImageBuilderImagePipeline_containerRecipeARN (68.22s)
=== CONT  TestAccImageBuilderImagePipeline_disappears
--- PASS: TestAccImageBuilderImagePipeline_imageRecipeARN (64.99s)
=== CONT  TestAccImageBuilderImagePipeline_description
--- PASS: TestAccImageBuilderImagePipeline_enhancedImageMetadataEnabled (60.78s)
=== CONT  TestAccImageBuilderImagePipeline_basic
--- PASS: TestAccImageBuilderImagePipeline_disappears (45.60s)
=== CONT  TestAccImageBuilderImagePipelineDataSource_containerRecipeARN
    acctest.go:1415: skipping test for aws/us-west-2: Error running apply: exit status 1
        
        Error: creating Image Builder Image Pipeline: ResourceDependencyException: Resource dependency error: Amazon Inspector is not enabled for 'ecr' resources in account '123456789012'.
        
          with aws_imagebuilder_image_pipeline.test,
          on terraform_plugin_test.tf line 77, in resource "aws_imagebuilder_image_pipeline" "test":
          77: resource "aws_imagebuilder_image_pipeline" "test" {
        
--- SKIP: TestAccImageBuilderImagePipelineDataSource_containerRecipeARN (24.48s)
=== CONT  TestAccImageBuilderImagePipeline_ImageTests_imageTestsEnabled
--- PASS: TestAccImageBuilderImagePipeline_description (62.37s)
--- PASS: TestAccImageBuilderImagePipeline_basic (42.94s)
--- PASS: TestAccImageBuilderImagePipeline_ImageTests_imageTestsEnabled (57.90s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/imagebuilder	399.741s

% make testacc TESTARGS='-run=TestAccImageBuilderDistributionConfiguration_DistributionFastLaunchConfiguration_maxParallelLaunches\|TestAccImageBuilderDistributionConfigurationDataSource_arn' PKG=imagebuilder ACCTEST_PARALLELISM=3
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/imagebuilder/... -v -count 1 -parallel 3  -run=TestAccImageBuilderDistributionConfiguration_DistributionFastLaunchConfiguration_maxParallelLaunches\|TestAccImageBuilderDistributionConfigurationDataSource_arn -timeout 180m
=== RUN   TestAccImageBuilderDistributionConfigurationDataSource_arn
=== PAUSE TestAccImageBuilderDistributionConfigurationDataSource_arn
=== RUN   TestAccImageBuilderDistributionConfiguration_DistributionFastLaunchConfiguration_maxParallelLaunches
=== PAUSE TestAccImageBuilderDistributionConfiguration_DistributionFastLaunchConfiguration_maxParallelLaunches
=== CONT  TestAccImageBuilderDistributionConfigurationDataSource_arn
=== CONT  TestAccImageBuilderDistributionConfiguration_DistributionFastLaunchConfiguration_maxParallelLaunches
--- PASS: TestAccImageBuilderDistributionConfigurationDataSource_arn (28.19s)
--- PASS: TestAccImageBuilderDistributionConfiguration_DistributionFastLaunchConfiguration_maxParallelLaunches (45.62s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/imagebuilder	50.981s

% make testacc TESTARGS='-run=TestAccImageBuilderImageRecipesDataSource_owner' PKG=imagebuilder ACCTEST_PARALLELISM=3
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/imagebuilder/... -v -count 1 -parallel 3  -run=TestAccImageBuilderImageRecipesDataSource_owner -timeout 180m
=== RUN   TestAccImageBuilderImageRecipesDataSource_owner
=== PAUSE TestAccImageBuilderImageRecipesDataSource_owner
=== CONT  TestAccImageBuilderImageRecipesDataSource_owner
--- PASS: TestAccImageBuilderImageRecipesDataSource_owner (25.62s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/imagebuilder	30.508s

ewbankkit · 2023-08-16T18:45:10Z

@stromp Thanks for the contribution 🎉 👏.

github-actions · 2023-08-18T12:11:00Z

This functionality has been released in v5.13.0 of the Terraform AWS Provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading.

For further feature requests or bug reports with this functionality, please create a new GitHub issue following the template. Thank you!

github-actions · 2023-09-18T02:06:11Z

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

stromp added 6 commits August 8, 2023 14:07

Adding image scanning option to resource

cb3dd92

Adding basic test

changing test to correct value

df0c412

added advanced test, still need to fix assertions

43abfe3

- add image scanning attributes to the data resource

ed91a6a

- add tests - fixed bugs with retrieving and setting the data

Update documentation

84d3246

fix formatting

156c150

terraform-aws-provider bot added the needs-triage Waiting for first response or review from a maintainer. label Aug 14, 2023

github-actions bot reviewed Aug 14, 2023

View reviewed changes

justinretzolk added enhancement Requests to existing resources that expand the functionality or scope. and removed needs-triage Waiting for first response or review from a maintainer. labels Aug 14, 2023

fix formatting

4d62eca

stromp changed the title ~~[WIP] F add image scanning to imagebuilder image pipeline resource~~ [WIP] add image scanning to imagebuilder image pipeline resource Aug 15, 2023

add changelog

3eb8c74

stromp changed the title ~~[WIP] add image scanning to imagebuilder image pipeline resource~~ Add image scanning to imagebuilder image pipeline resource Aug 15, 2023

stromp marked this pull request as ready for review August 15, 2023 13:58

ewbankkit added 10 commits August 16, 2023 13:29

Merge branch 'main' into HEAD

856a017

Correct CHANGELOG entries.

a73a21b

Fix terrafmt errors in acceptance test configurations.

d8216b8

Fix semgrep 'ci.caps3-in-func-name '.

fad9420

r/aws_imagebuilder_image_pipeline: Alphabetize attributes.

90d4832

d/aws_imagebuilder_image_pipeline: Alphabetize attributes.

3e1e5f8

d/aws_imagebuilder_image_pipeline: Tidy up acceptance tests.

d96c986

r/aws_imagebuilder_image_pipeline: Tidy up acceptance tests.

f883b24

Fix terrafmt error.

32188bd

ewbankkit added 6 commits August 16, 2023 14:16

imagebuilder: Ignore acceptance test errors like 'creating Image Buil…

28f55a2

…der Image Pipeline: ResourceDependencyException: Resource dependency error: Amazon Inspector is not enabled for 'ecr' resources in account '123456789012'.'

Fix 'TestAccImageBuilderImagePipeline_containerRecipeARN'.

cd317c0

Ignore 'date_next_run' for import tests.

3f9ff8f

Fix 'TestAccImageBuilderDistributionConfigurationDataSource_arn'.

52ea7c4

Fix 'TestAccImageBuilderDistributionConfiguration_DistributionFastLau…

0ef43f8

…nchConfiguration_maxParallelLaunches'.

Fix 'TestAccImageBuilderImageRecipesDataSource_owner'.

67c93c6

ewbankkit approved these changes Aug 16, 2023

View reviewed changes

ewbankkit merged commit 8f7e5b4 into hashicorp:main Aug 16, 2023
41 checks passed

github-actions bot added this to the v5.13.0 milestone Aug 16, 2023

github-actions bot locked as resolved and limited conversation to collaborators Sep 18, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add image scanning to imagebuilder image pipeline resource #33005

Add image scanning to imagebuilder image pipeline resource #33005

stromp commented Aug 14, 2023 •

edited

Loading

github-actions bot commented Aug 14, 2023

github-actions bot left a comment

ewbankkit left a comment •

edited

Loading

ewbankkit commented Aug 16, 2023

github-actions bot commented Aug 18, 2023

github-actions bot commented Sep 18, 2023

Add image scanning to imagebuilder image pipeline resource #33005

Add image scanning to imagebuilder image pipeline resource #33005

Conversation

stromp commented Aug 14, 2023 • edited Loading

Description

Relations

Output from Acceptance Testing

github-actions bot commented Aug 14, 2023

Community Note

github-actions bot left a comment

Choose a reason for hiding this comment

ewbankkit left a comment • edited Loading

Choose a reason for hiding this comment

ewbankkit commented Aug 16, 2023

github-actions bot commented Aug 18, 2023

github-actions bot commented Sep 18, 2023

stromp commented Aug 14, 2023 •

edited

Loading

ewbankkit left a comment •

edited

Loading