Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

aws_imagebuilder_distribution_configuration: Add s3_export_configuration #35492

Merged
merged 3 commits into from
Oct 29, 2024
Merged

aws_imagebuilder_distribution_configuration: Add s3_export_configuration #35492

merged 3 commits into from
Oct 29, 2024
+513 −0

Conversation

Szasza
Copy link
Contributor

@Szasza Szasza commented Jan 26, 2024

Description

This changeset adds s3_export_configuration to both the aws_imagebuilder_distribution_configuration data source and resource.

Relations

Closes #34870

References

Please see the corresponding issue for references.

Output from Acceptance Testing

% make testacc TESTARGS='-run=TestAccImageBuilderDistributionConfigurationDataSource_\|TestAccImageBuilderDistributionConfiguration_DistributionS3Export_' 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=TestAccImageBuilderDistributionConfigurationDataSource_\|TestAccImageBuilderDistributionConfiguration_DistributionS3Export_ -timeout 360m
=== RUN   TestAccImageBuilderDistributionConfigurationDataSource_arn
=== PAUSE TestAccImageBuilderDistributionConfigurationDataSource_arn
=== RUN   TestAccImageBuilderDistributionConfiguration_DistributionS3Export_diskImageFormatRaw
=== PAUSE TestAccImageBuilderDistributionConfiguration_DistributionS3Export_diskImageFormatRaw
=== RUN   TestAccImageBuilderDistributionConfiguration_DistributionS3Export_diskImageFormatVhd
=== PAUSE TestAccImageBuilderDistributionConfiguration_DistributionS3Export_diskImageFormatVhd
=== RUN   TestAccImageBuilderDistributionConfiguration_DistributionS3Export_diskImageFormatVmdk
=== PAUSE TestAccImageBuilderDistributionConfiguration_DistributionS3Export_diskImageFormatVmdk
=== RUN   TestAccImageBuilderDistributionConfiguration_DistributionS3Export_roleName
=== PAUSE TestAccImageBuilderDistributionConfiguration_DistributionS3Export_roleName
=== RUN   TestAccImageBuilderDistributionConfiguration_DistributionS3Export_s3Bucket
=== PAUSE TestAccImageBuilderDistributionConfiguration_DistributionS3Export_s3Bucket
=== RUN   TestAccImageBuilderDistributionConfiguration_DistributionS3Export_s3Prefix
=== PAUSE TestAccImageBuilderDistributionConfiguration_DistributionS3Export_s3Prefix
=== CONT  TestAccImageBuilderDistributionConfigurationDataSource_arn
=== CONT  TestAccImageBuilderDistributionConfiguration_DistributionS3Export_roleName
=== CONT  TestAccImageBuilderDistributionConfiguration_DistributionS3Export_s3Prefix
--- PASS: TestAccImageBuilderDistributionConfigurationDataSource_arn (37.61s)
=== CONT  TestAccImageBuilderDistributionConfiguration_DistributionS3Export_s3Bucket
--- PASS: TestAccImageBuilderDistributionConfiguration_DistributionS3Export_roleName (66.27s)
=== CONT  TestAccImageBuilderDistributionConfiguration_DistributionS3Export_diskImageFormatVhd
--- PASS: TestAccImageBuilderDistributionConfiguration_DistributionS3Export_s3Prefix (68.32s)
=== CONT  TestAccImageBuilderDistributionConfiguration_DistributionS3Export_diskImageFormatVmdk
--- PASS: TestAccImageBuilderDistributionConfiguration_DistributionS3Export_s3Bucket (70.54s)
=== CONT  TestAccImageBuilderDistributionConfiguration_DistributionS3Export_diskImageFormatRaw
--- PASS: TestAccImageBuilderDistributionConfiguration_DistributionS3Export_diskImageFormatVhd (60.83s)
--- PASS: TestAccImageBuilderDistributionConfiguration_DistributionS3Export_diskImageFormatVmdk (59.67s)
--- PASS: TestAccImageBuilderDistributionConfiguration_DistributionS3Export_diskImageFormatRaw (63.24s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/imagebuilder       171.481s
...

@github-actions GitHub Actions
Copy link

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 github-actions bot added size/XL Managed by automation to categorize the size of a PR. documentation Introduces or discusses updates to documentation. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. service/imagebuilder Issues and PRs that pertain to the imagebuilder service. labels Jan 26, 2024
@terraform-aws-provider terraform-aws-provider bot added the needs-triage Waiting for first response or review from a maintainer. label Jan 26, 2024
@justinretzolk 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 Jan 26, 2024
@ewbankkit
Merge branch 'main' into HEAD
364914a 
# Conflicts:
#	internal/service/imagebuilder/distribution_configuration.go
#	internal/service/imagebuilder/distribution_configuration_data_source_test.go
@ewbankkit ewbankkit requested a review from a team as a code owner October 29, 2024 16:07
@ewbankkit ewbankkit self-assigned this Oct 29, 2024
@github-actions github-actions bot added the prioritized Part of the maintainer teams immediate focus. To be addressed within the current quarter. label Oct 29, 2024
ewbankkit
ewbankkit approved these changes Oct 29, 2024
View reviewed changes
Copy link
Contributor

@ewbankkit ewbankkit left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🚀.

% make testacc TESTARGS='-run=TestAccImageBuilderDistributionConfiguration' PKG=imagebuilder ACCTEST_PARALLELISM=4
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.23.2 test ./internal/service/imagebuilder/... -v -count 1 -parallel 4  -run=TestAccImageBuilderDistributionConfiguration -timeout 360m
2024/10/29 12:12:25 Initializing Terraform AWS Provider...
=== RUN   TestAccImageBuilderDistributionConfigurationDataSource_arn
=== PAUSE TestAccImageBuilderDistributionConfigurationDataSource_arn
=== RUN   TestAccImageBuilderDistributionConfiguration_basic
=== PAUSE TestAccImageBuilderDistributionConfiguration_basic
=== RUN   TestAccImageBuilderDistributionConfiguration_disappears
=== PAUSE TestAccImageBuilderDistributionConfiguration_disappears
=== RUN   TestAccImageBuilderDistributionConfiguration_description
=== PAUSE TestAccImageBuilderDistributionConfiguration_description
=== RUN   TestAccImageBuilderDistributionConfiguration_distribution
=== PAUSE TestAccImageBuilderDistributionConfiguration_distribution
=== RUN   TestAccImageBuilderDistributionConfiguration_DistributionAMIDistribution_amiTags
=== PAUSE TestAccImageBuilderDistributionConfiguration_DistributionAMIDistribution_amiTags
=== RUN   TestAccImageBuilderDistributionConfiguration_DistributionAMIDistribution_description
=== PAUSE TestAccImageBuilderDistributionConfiguration_DistributionAMIDistribution_description
=== RUN   TestAccImageBuilderDistributionConfiguration_DistributionAMIDistribution_kmsKeyID
=== PAUSE TestAccImageBuilderDistributionConfiguration_DistributionAMIDistribution_kmsKeyID
=== RUN   TestAccImageBuilderDistributionConfiguration_DistributionAMIDistributionLaunchPermission_userGroups
=== PAUSE TestAccImageBuilderDistributionConfiguration_DistributionAMIDistributionLaunchPermission_userGroups
=== RUN   TestAccImageBuilderDistributionConfiguration_DistributionAMIDistributionLaunchPermission_userIDs
=== PAUSE TestAccImageBuilderDistributionConfiguration_DistributionAMIDistributionLaunchPermission_userIDs
=== RUN   TestAccImageBuilderDistributionConfiguration_DistributionAMIDistributionLaunchPermission_organizationARNs
    distribution_configuration_test.go:354: skipping tests; this AWS account must not be an existing member of an AWS Organization
--- SKIP: TestAccImageBuilderDistributionConfiguration_DistributionAMIDistributionLaunchPermission_organizationARNs (0.64s)
=== RUN   TestAccImageBuilderDistributionConfiguration_DistributionAMIDistributionLaunchPermission_ouARNs
    distribution_configuration_test.go:387: skipping tests; this AWS account must not be an existing member of an AWS Organization
--- SKIP: TestAccImageBuilderDistributionConfiguration_DistributionAMIDistributionLaunchPermission_ouARNs (0.13s)
=== RUN   TestAccImageBuilderDistributionConfiguration_DistributionAMIDistribution_name
=== PAUSE TestAccImageBuilderDistributionConfiguration_DistributionAMIDistribution_name
=== RUN   TestAccImageBuilderDistributionConfiguration_DistributionAMIDistribution_targetAccountIDs
=== PAUSE TestAccImageBuilderDistributionConfiguration_DistributionAMIDistribution_targetAccountIDs
=== RUN   TestAccImageBuilderDistributionConfiguration_DistributionContainerDistribution_containerTags
=== PAUSE TestAccImageBuilderDistributionConfiguration_DistributionContainerDistribution_containerTags
=== RUN   TestAccImageBuilderDistributionConfiguration_DistributionContainerDistribution_description
=== PAUSE TestAccImageBuilderDistributionConfiguration_DistributionContainerDistribution_description
=== RUN   TestAccImageBuilderDistributionConfiguration_DistributionContainerDistribution_targetRepository
=== PAUSE TestAccImageBuilderDistributionConfiguration_DistributionContainerDistribution_targetRepository
=== RUN   TestAccImageBuilderDistributionConfiguration_DistributionFastLaunchConfiguration_enabled
=== PAUSE TestAccImageBuilderDistributionConfiguration_DistributionFastLaunchConfiguration_enabled
=== RUN   TestAccImageBuilderDistributionConfiguration_DistributionFastLaunchConfiguration_launchTemplate
=== PAUSE TestAccImageBuilderDistributionConfiguration_DistributionFastLaunchConfiguration_launchTemplate
=== RUN   TestAccImageBuilderDistributionConfiguration_DistributionFastLaunchConfiguration_maxParallelLaunches
=== PAUSE TestAccImageBuilderDistributionConfiguration_DistributionFastLaunchConfiguration_maxParallelLaunches
=== RUN   TestAccImageBuilderDistributionConfiguration_DistributionFastLaunchConfiguration_snapshotConfiguration
=== PAUSE TestAccImageBuilderDistributionConfiguration_DistributionFastLaunchConfiguration_snapshotConfiguration
=== RUN   TestAccImageBuilderDistributionConfiguration_Distribution_launchTemplateConfiguration
=== PAUSE TestAccImageBuilderDistributionConfiguration_Distribution_launchTemplateConfiguration
=== RUN   TestAccImageBuilderDistributionConfiguration_Distribution_licenseARNs
=== PAUSE TestAccImageBuilderDistributionConfiguration_Distribution_licenseARNs
=== RUN   TestAccImageBuilderDistributionConfiguration_DistributionS3Export_diskImageFormatRaw
=== PAUSE TestAccImageBuilderDistributionConfiguration_DistributionS3Export_diskImageFormatRaw
=== RUN   TestAccImageBuilderDistributionConfiguration_DistributionS3Export_diskImageFormatVhd
=== PAUSE TestAccImageBuilderDistributionConfiguration_DistributionS3Export_diskImageFormatVhd
=== RUN   TestAccImageBuilderDistributionConfiguration_DistributionS3Export_diskImageFormatVmdk
=== PAUSE TestAccImageBuilderDistributionConfiguration_DistributionS3Export_diskImageFormatVmdk
=== RUN   TestAccImageBuilderDistributionConfiguration_DistributionS3Export_roleName
=== PAUSE TestAccImageBuilderDistributionConfiguration_DistributionS3Export_roleName
=== RUN   TestAccImageBuilderDistributionConfiguration_DistributionS3Export_s3Bucket
=== PAUSE TestAccImageBuilderDistributionConfiguration_DistributionS3Export_s3Bucket
=== RUN   TestAccImageBuilderDistributionConfiguration_DistributionS3Export_s3Prefix
=== PAUSE TestAccImageBuilderDistributionConfiguration_DistributionS3Export_s3Prefix
=== RUN   TestAccImageBuilderDistributionConfiguration_tags
=== PAUSE TestAccImageBuilderDistributionConfiguration_tags
=== RUN   TestAccImageBuilderDistributionConfigurationsDataSource_filter
=== PAUSE TestAccImageBuilderDistributionConfigurationsDataSource_filter
=== CONT  TestAccImageBuilderDistributionConfigurationDataSource_arn
=== CONT  TestAccImageBuilderDistributionConfiguration_DistributionFastLaunchConfiguration_enabled
=== CONT  TestAccImageBuilderDistributionConfiguration_DistributionAMIDistributionLaunchPermission_userGroups
=== CONT  TestAccImageBuilderDistributionConfiguration_DistributionContainerDistribution_containerTags
--- PASS: TestAccImageBuilderDistributionConfiguration_DistributionAMIDistributionLaunchPermission_userGroups (14.38s)
=== CONT  TestAccImageBuilderDistributionConfiguration_DistributionS3Export_diskImageFormatVhd
--- PASS: TestAccImageBuilderDistributionConfigurationDataSource_arn (18.06s)
=== CONT  TestAccImageBuilderDistributionConfigurationsDataSource_filter
--- PASS: TestAccImageBuilderDistributionConfiguration_DistributionContainerDistribution_containerTags (22.17s)
=== CONT  TestAccImageBuilderDistributionConfiguration_tags
--- PASS: TestAccImageBuilderDistributionConfiguration_DistributionFastLaunchConfiguration_enabled (22.39s)
=== CONT  TestAccImageBuilderDistributionConfiguration_DistributionS3Export_s3Prefix
--- PASS: TestAccImageBuilderDistributionConfigurationsDataSource_filter (12.10s)
=== CONT  TestAccImageBuilderDistributionConfiguration_DistributionS3Export_s3Bucket
--- PASS: TestAccImageBuilderDistributionConfiguration_DistributionS3Export_diskImageFormatVhd (27.57s)
=== CONT  TestAccImageBuilderDistributionConfiguration_DistributionS3Export_roleName
--- PASS: TestAccImageBuilderDistributionConfiguration_tags (28.08s)
=== CONT  TestAccImageBuilderDistributionConfiguration_DistributionS3Export_diskImageFormatVmdk
--- PASS: TestAccImageBuilderDistributionConfiguration_DistributionS3Export_s3Prefix (30.23s)
=== CONT  TestAccImageBuilderDistributionConfiguration_distribution
--- PASS: TestAccImageBuilderDistributionConfiguration_DistributionS3Export_s3Bucket (32.23s)
=== CONT  TestAccImageBuilderDistributionConfiguration_DistributionAMIDistribution_kmsKeyID
--- PASS: TestAccImageBuilderDistributionConfiguration_DistributionS3Export_roleName (29.95s)
=== CONT  TestAccImageBuilderDistributionConfiguration_DistributionAMIDistribution_description
--- PASS: TestAccImageBuilderDistributionConfiguration_distribution (19.68s)
=== CONT  TestAccImageBuilderDistributionConfiguration_DistributionAMIDistribution_amiTags
--- PASS: TestAccImageBuilderDistributionConfiguration_DistributionS3Export_diskImageFormatVmdk (26.97s)
=== CONT  TestAccImageBuilderDistributionConfiguration_disappears
--- PASS: TestAccImageBuilderDistributionConfiguration_DistributionAMIDistribution_kmsKeyID (24.06s)
=== CONT  TestAccImageBuilderDistributionConfiguration_description
--- PASS: TestAccImageBuilderDistributionConfiguration_disappears (12.25s)
=== CONT  TestAccImageBuilderDistributionConfiguration_Distribution_launchTemplateConfiguration
--- PASS: TestAccImageBuilderDistributionConfiguration_DistributionAMIDistribution_amiTags (20.89s)
=== CONT  TestAccImageBuilderDistributionConfiguration_DistributionS3Export_diskImageFormatRaw
--- PASS: TestAccImageBuilderDistributionConfiguration_DistributionAMIDistribution_description (21.33s)
=== CONT  TestAccImageBuilderDistributionConfiguration_Distribution_licenseARNs
--- PASS: TestAccImageBuilderDistributionConfiguration_description (20.78s)
=== CONT  TestAccImageBuilderDistributionConfiguration_DistributionAMIDistribution_name
--- PASS: TestAccImageBuilderDistributionConfiguration_Distribution_licenseARNs (24.39s)
=== CONT  TestAccImageBuilderDistributionConfiguration_DistributionAMIDistribution_targetAccountIDs
--- PASS: TestAccImageBuilderDistributionConfiguration_DistributionS3Export_diskImageFormatRaw (26.93s)
=== CONT  TestAccImageBuilderDistributionConfiguration_DistributionFastLaunchConfiguration_maxParallelLaunches
--- PASS: TestAccImageBuilderDistributionConfiguration_Distribution_launchTemplateConfiguration (35.36s)
=== CONT  TestAccImageBuilderDistributionConfiguration_DistributionFastLaunchConfiguration_snapshotConfiguration
--- PASS: TestAccImageBuilderDistributionConfiguration_DistributionAMIDistribution_name (29.03s)
=== CONT  TestAccImageBuilderDistributionConfiguration_basic
--- PASS: TestAccImageBuilderDistributionConfiguration_DistributionAMIDistribution_targetAccountIDs (20.85s)
=== CONT  TestAccImageBuilderDistributionConfiguration_DistributionAMIDistributionLaunchPermission_userIDs
--- PASS: TestAccImageBuilderDistributionConfiguration_DistributionFastLaunchConfiguration_maxParallelLaunches (21.50s)
=== CONT  TestAccImageBuilderDistributionConfiguration_DistributionFastLaunchConfiguration_launchTemplate
--- PASS: TestAccImageBuilderDistributionConfiguration_DistributionFastLaunchConfiguration_snapshotConfiguration (22.82s)
=== CONT  TestAccImageBuilderDistributionConfiguration_DistributionContainerDistribution_targetRepository
--- PASS: TestAccImageBuilderDistributionConfiguration_basic (13.52s)
=== CONT  TestAccImageBuilderDistributionConfiguration_DistributionContainerDistribution_description
--- PASS: TestAccImageBuilderDistributionConfiguration_DistributionAMIDistributionLaunchPermission_userIDs (20.82s)
--- PASS: TestAccImageBuilderDistributionConfiguration_DistributionFastLaunchConfiguration_launchTemplate (24.59s)
--- PASS: TestAccImageBuilderDistributionConfiguration_DistributionContainerDistribution_targetRepository (20.94s)
--- PASS: TestAccImageBuilderDistributionConfiguration_DistributionContainerDistribution_description (20.94s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/imagebuilder	176.615s

@ewbankkit
Copy link
Contributor

@Szasza Thanks for the contribution 🎉 👏.

@ewbankkit ewbankkit merged commit 92a0102 into hashicorp:main Oct 29, 2024
47 checks passed
@github-actions github-actions bot added this to the v5.74.0 milestone Oct 29, 2024
@github-actions github-actions bot removed the prioritized Part of the maintainer teams immediate focus. To be addressed within the current quarter. label Oct 31, 2024
@github-actions GitHub Actions
Copy link

This functionality has been released in v5.74.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!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ewbankkit ewbankkit ewbankkit approved these changes

Assignees

@ewbankkit ewbankkit

Labels
documentation Introduces or discusses updates to documentation. enhancement Requests to existing resources that expand the functionality or scope. service/imagebuilder Issues and PRs that pertain to the imagebuilder service. size/XL Managed by automation to categorize the size of a PR. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure.
Projects
None yet
Milestone
v5.74.0
Development

Successfully merging this pull request may close these issues.

[Enhancement]: Add S3 Export Configuration to Image Builder distribution configuration
3 participants
@Szasza @ewbankkit @justinretzolk