New Resource: aws_imagebuilder_distribution_configuration #16180

bflad · 2020-11-13T14:57:03Z

Community Note

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

Reference: #11084
Closes #13316
Reference: #13485

Release note for CHANGELOG:

* **New Data Source:** `aws_imagebuilder_distribution_configuration`
* **New Resource:** `aws_imagebuilder_distribution_configuration`

Output from acceptance testing in AWS Commercial:

--- PASS: TestAccAwsImageBuilderDistributionConfiguration_basic (23.95s)
--- PASS: TestAccAwsImageBuilderDistributionConfiguration_Description (39.52s)
--- PASS: TestAccAwsImageBuilderDistributionConfiguration_disappears (18.57s)
--- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution (42.99s)
--- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution_AmiDistributionConfiguration_AmiTags (40.02s)
--- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution_AmiDistributionConfiguration_Description (39.36s)
--- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution_AmiDistributionConfiguration_KmsKeyId (46.31s)
--- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution_AmiDistributionConfiguration_LaunchPermission_UserGroups (23.66s)
--- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution_AmiDistributionConfiguration_LaunchPermission_UserIds (40.12s)
--- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution_AmiDistributionConfiguration_Name (39.12s)
--- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution_AmiDistributionConfiguration_TargetAccountIds (40.12s)
--- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution_LicenseConfigurationArns (40.75s)
--- PASS: TestAccAwsImageBuilderDistributionConfiguration_Tags (49.75s)

--- PASS: TestAccAwsImageBuilderDistributionConfigurationDataSource_Arn (18.52s)

Output from acceptance testing in AWS GovCloud (US) (failure information: #16178):

--- FAIL: TestAccAwsImageBuilderDistributionConfiguration_Distribution_LicenseConfigurationArns (10.88s)
--- PASS: TestAccAwsImageBuilderDistributionConfiguration_basic (27.00s)
--- PASS: TestAccAwsImageBuilderDistributionConfiguration_Description (40.22s)
--- PASS: TestAccAwsImageBuilderDistributionConfiguration_disappears (21.76s)
--- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution_AmiDistributionConfiguration_AmiTags (42.09s)
--- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution_AmiDistributionConfiguration_Description (42.89s)
--- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution_AmiDistributionConfiguration_KmsKeyId (51.80s)
--- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution_AmiDistributionConfiguration_LaunchPermission_UserGroups (26.70s)
--- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution_AmiDistributionConfiguration_LaunchPermission_UserIds (41.44s)
--- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution_AmiDistributionConfiguration_Name (42.32s)
--- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution_AmiDistributionConfiguration_TargetAccountIds (42.42s)
--- PASS: TestAccAwsImageBuilderDistributionConfiguration_Tags (55.37s)

--- PASS: TestAccAwsImageBuilderDistributionConfigurationDataSource_Arn (25.62s)

Output from sweeper in AWS Commercial:

2020/11/13 09:11:34 [DEBUG] Running Sweepers for region (us-west-2):
2020/11/13 09:11:34 [DEBUG] Running Sweeper (aws_imagebuilder_distribution_configuration) in region (us-west-2)
2020/11/13 09:11:37 Sweeper Tests ran successfully:
  - aws_imagebuilder_distribution_configuration
2020/11/13 09:11:37 [DEBUG] Running Sweepers for region (us-east-1):
2020/11/13 09:11:37 [DEBUG] Running Sweeper (aws_imagebuilder_distribution_configuration) in region (us-east-1)
2020/11/13 09:11:39 Sweeper Tests ran successfully:
  - aws_imagebuilder_distribution_configuration
ok    github.com/terraform-providers/terraform-provider-aws/aws 7.724s

Output from sweeper in AWS GovCloud (US):

2020/11/13 09:30:11 [DEBUG] Running Sweepers for region (us-gov-west-1):
2020/11/13 09:30:11 [DEBUG] Running Sweeper (aws_imagebuilder_distribution_configuration) in region (us-gov-west-1)
2020/11/13 09:30:14 Sweeper Tests ran successfully:
  - aws_imagebuilder_distribution_configuration
ok    github.com/terraform-providers/terraform-provider-aws/aws 4.971s

# Conflicts: # aws/provider.go

…ing set on create

fixed lint issues and terminate_instance_on_failure

…vider-aws into Dogers-image-builder

…uration files

Reference: #11084 Reference: #13316 Reference: #13485 Changes: ``` * **New Data Source:** `aws_imagebuilder_distribution_configuration` * **New Resource:** `aws_imagebuilder_distribution_configuration` ``` Output from acceptance testing in AWS Commercial: ``` --- PASS: TestAccAwsImageBuilderDistributionConfiguration_basic (23.95s) --- PASS: TestAccAwsImageBuilderDistributionConfiguration_Description (39.52s) --- PASS: TestAccAwsImageBuilderDistributionConfiguration_disappears (18.57s) --- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution (42.99s) --- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution_AmiDistributionConfiguration_AmiTags (40.02s) --- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution_AmiDistributionConfiguration_Description (39.36s) --- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution_AmiDistributionConfiguration_KmsKeyId (46.31s) --- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution_AmiDistributionConfiguration_LaunchPermission_UserGroups (23.66s) --- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution_AmiDistributionConfiguration_LaunchPermission_UserIds (40.12s) --- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution_AmiDistributionConfiguration_Name (39.12s) --- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution_AmiDistributionConfiguration_TargetAccountIds (40.12s) --- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution_LicenseConfigurationArns (40.75s) --- PASS: TestAccAwsImageBuilderDistributionConfiguration_Tags (49.75s) --- PASS: TestAccAwsImageBuilderDistributionConfigurationDataSource_Arn (18.52s) ``` Output from acceptance testing in AWS GovCloud (US) (failure information: #16178): ``` --- FAIL: TestAccAwsImageBuilderDistributionConfiguration_Distribution_LicenseConfigurationArns (10.88s) --- PASS: TestAccAwsImageBuilderDistributionConfiguration_basic (27.00s) --- PASS: TestAccAwsImageBuilderDistributionConfiguration_Description (40.22s) --- PASS: TestAccAwsImageBuilderDistributionConfiguration_disappears (21.76s) --- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution_AmiDistributionConfiguration_AmiTags (42.09s) --- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution_AmiDistributionConfiguration_Description (42.89s) --- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution_AmiDistributionConfiguration_KmsKeyId (51.80s) --- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution_AmiDistributionConfiguration_LaunchPermission_UserGroups (26.70s) --- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution_AmiDistributionConfiguration_LaunchPermission_UserIds (41.44s) --- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution_AmiDistributionConfiguration_Name (42.32s) --- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution_AmiDistributionConfiguration_TargetAccountIds (42.42s) --- PASS: TestAccAwsImageBuilderDistributionConfiguration_Tags (55.37s) --- PASS: TestAccAwsImageBuilderDistributionConfigurationDataSource_Arn (25.62s) ``` Output from sweeper in AWS Commercial: ``` 2020/11/13 09:11:34 [DEBUG] Running Sweepers for region (us-west-2): 2020/11/13 09:11:34 [DEBUG] Running Sweeper (aws_imagebuilder_distribution_configuration) in region (us-west-2) 2020/11/13 09:11:37 Sweeper Tests ran successfully: - aws_imagebuilder_distribution_configuration 2020/11/13 09:11:37 [DEBUG] Running Sweepers for region (us-east-1): 2020/11/13 09:11:37 [DEBUG] Running Sweeper (aws_imagebuilder_distribution_configuration) in region (us-east-1) 2020/11/13 09:11:39 Sweeper Tests ran successfully: - aws_imagebuilder_distribution_configuration ok github.com/terraform-providers/terraform-provider-aws/aws 7.724s ``` Output from sweeper in AWS GovCloud (US): ``` 2020/11/13 09:30:11 [DEBUG] Running Sweepers for region (us-gov-west-1): 2020/11/13 09:30:11 [DEBUG] Running Sweeper (aws_imagebuilder_distribution_configuration) in region (us-gov-west-1) 2020/11/13 09:30:14 Sweeper Tests ran successfully: - aws_imagebuilder_distribution_configuration ok github.com/terraform-providers/terraform-provider-aws/aws 4.971s ```

gdavison

LGTM 🚀

A couple cases of fmt.Errorf("...%s", ..., err) and one suggestion about documentation

Commercial partition:

--- PASS: TestAccAwsImageBuilderDistributionConfiguration_disappears (63.45s)
--- PASS: TestAccAwsImageBuilderDistributionConfigurationDataSource_Arn (70.07s)
--- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution_AmiDistributionConfiguration_LaunchPermission_UserGroups (72.58s)
--- PASS: TestAccAwsImageBuilderDistributionConfiguration_basic (80.07s)
--- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution (92.29s)
--- PASS: TestAccAwsImageBuilderDistributionConfiguration_Description (113.19s)
--- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution_AmiDistributionConfiguration_Description (113.97s)
--- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution_AmiDistributionConfiguration_AmiTags (114.52s)
--- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution_AmiDistributionConfiguration_KmsKeyId (116.19s)
--- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution_AmiDistributionConfiguration_Name (116.45s)
--- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution_AmiDistributionConfiguration_LaunchPermission_UserIds (116.49s)
--- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution_AmiDistributionConfiguration_TargetAccountIds (116.82s)
--- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution_LicenseConfigurationArns (116.91s)
--- PASS: TestAccAwsImageBuilderDistributionConfiguration_Tags (127.77s)

GovCloud partition:

--- FAIL: TestAccAwsImageBuilderDistributionConfiguration_Distribution_LicenseConfigurationArns (14.72s)
--- PASS: TestAccAwsImageBuilderDistributionConfiguration_disappears (35.22s)
--- PASS: TestAccAwsImageBuilderDistributionConfigurationDataSource_Arn (39.57s)
--- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution_AmiDistributionConfiguration_LaunchPermission_UserGroups (41.72s)
--- PASS: TestAccAwsImageBuilderDistributionConfiguration_basic (43.41s)
--- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution (55.15s)
--- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution_AmiDistributionConfiguration_Description (62.69s)
--- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution_AmiDistributionConfiguration_LaunchPermission_UserIds (62.76s)
--- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution_AmiDistributionConfiguration_KmsKeyId (62.74s)
--- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution_AmiDistributionConfiguration_AmiTags (62.78s)
--- PASS: TestAccAwsImageBuilderDistributionConfiguration_Description (63.22s)
--- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution_AmiDistributionConfiguration_TargetAccountIds (63.05s)
--- PASS: TestAccAwsImageBuilderDistributionConfiguration_Distribution_AmiDistributionConfiguration_Name (63.45s)
--- PASS: TestAccAwsImageBuilderDistributionConfiguration_Tags (68.12s)

Failure addressed by #16178

gdavison · 2020-11-16T20:35:32Z

aws/data_source_aws_imagebuilder_distribution_configuration.go

+ if v, ok := d.GetOk("arn"); ok {
+ input.DistributionConfigurationArn = aws.String(v.(string))
+ }


Do we need this check, since arn is required?

Treating all the fields as potentially "optional" in the Create/Update function logic will allow us to reduce code churn in the future should the APIs support other fields and gets us closer towards code generation since it can be agnostic to how the data is coming in. It is just a little awkward right now because we do (or at least should) treat everything as "optional" in the expand functions but the root attribute handling is different with ResourceData instead of a raw state map.

I'm hoping later this week to submit more definitive documentation on ideal object/"structure" handling in the provider codebase, with an eye towards that sort of code generation in the future, so we can have clear standards where possible. 😄

gdavison · 2020-11-16T20:45:13Z

website/docs/r/imagebuilder_distribution_configuration.html.markdown

+The following arguments are required:
+
+* `name` - (Required) Name of the distribution configuration.
+* `distribution` - (Required) One or more configuration blocks with distribution settings. Detailed below.


The "Detailed below" here and elsewhere should be links to the corresponding sections of the document.

Can certainly add this here, but we will want a tracking issue for the rest of the codebase.

Do you know what the expected anchor link is for these since they are secondary with the same link? #distribution-1?

Ah looking at https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/lex_bot, the anchors all overlap so the header anchor and attribute anchor for #message are not distinguished. I'd say create an issue but we'll need the registry updated first to not generate overlapping anchors.

ghost · 2020-11-18T19:50:14Z

This has been released in version 3.16.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 for triage. Thanks!

ghost · 2020-12-18T17:11:37Z

I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.

If you feel this issue should be reopened, we encourage creating a new issue linking back to this one for added context. Thanks!

Dogers and others added 25 commits May 6, 2020 23:24

Add aws_imagebuilder_component

96b4232

Add test for data_source_aws_imagebuilder_component

2d588c2

Add aws_imagebuilder_infrastructureconfiguration

a5d9f8f

Add aws_imagebuilder_recipe

6414616

Rename to aws_imagebuilder_infrastructure_configuration

c29b5da

Fix issue with infraconfig logging

8b53767

Fix incorrect MaxItems on res

8ce7b6b

Fix S024

fbe7510

Fix AWSR002

28dfb17

Fix linting

507fe42

[#11084] Fix the imagebuilder resource, add test and docs

ca89e2b

# Conflicts: # aws/provider.go

Merge remote-tracking branch 'source/master' into image-builder

195ba8a

# Conflicts: # aws/provider.go

Merge branch 'master' into image-builder

0d050cd

# Conflicts: # aws/provider.go

Fix incorrect import on error handling

26e1bb9

Update to v2 SDK

df7016f

Fix R004 lint issue

89e7bdd

Remove changes to aws.erb

18dd1b0

Add imagebuilder_distribution_configuration

1b85e94

Add imagebuilder_image_pipeline

eb8e1ed

fixed some lint issues and fixed terminate_instance_on_failure not be…

0402fe7

…ing set on create

description can be updated in place

a20d120

Merge pull request #1 from wrschneider/image-builder

10c55b6

fixed lint issues and terminate_instance_on_failure

Merge branch 'image-builder' of ssh://github.com/Dogers/terraform-pro…

7cfe977

…vider-aws into Dogers-image-builder

service/imagebuilder: Remove non-aws_imagebuilder_distribution_config…

09e672e

…uration files

bflad added new-resource Introduces a new resource. new-data-source Introduces a new data source. labels Nov 13, 2020

bflad added this to the v3.16.0 milestone Nov 13, 2020

bflad requested a review from a team as a code owner November 13, 2020 14:57

ghost added the size/XXL Managed by automation to categorize the size of a PR. label Nov 13, 2020

docs/resource/aws_imagebuilder_distribution_configuration: Fix typo

8649bc0

gdavison self-assigned this Nov 16, 2020

gdavison approved these changes Nov 17, 2020

View reviewed changes

Merge branch 'master' into f-aws_imagebuilder_distribution_configuration

30b5f3a

bflad merged commit ad0c7de into master Nov 17, 2020

bflad deleted the f-aws_imagebuilder_distribution_configuration branch November 17, 2020 20:20

bflad added a commit that referenced this pull request Nov 17, 2020

Update CHANGELOG for #16180

2bbc718

bflad mentioned this pull request Nov 24, 2020

New Resource: aws_imagebuilder_image_recipe #16218

Merged

ghost locked as resolved and limited conversation to collaborators Dec 18, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

New Resource: aws_imagebuilder_distribution_configuration #16180

New Resource: aws_imagebuilder_distribution_configuration #16180

bflad commented Nov 13, 2020

gdavison left a comment

gdavison Nov 16, 2020

bflad Nov 17, 2020

gdavison Nov 16, 2020

bflad Nov 17, 2020

bflad Nov 17, 2020 •

edited

Loading

bflad Nov 17, 2020

ghost commented Nov 18, 2020

ghost commented Dec 18, 2020

New Resource: aws_imagebuilder_distribution_configuration #16180

New Resource: aws_imagebuilder_distribution_configuration #16180

Conversation

bflad commented Nov 13, 2020

Community Note

gdavison left a comment

Choose a reason for hiding this comment

gdavison Nov 16, 2020

Choose a reason for hiding this comment

bflad Nov 17, 2020

Choose a reason for hiding this comment

gdavison Nov 16, 2020

Choose a reason for hiding this comment

bflad Nov 17, 2020

Choose a reason for hiding this comment

bflad Nov 17, 2020 • edited Loading

Choose a reason for hiding this comment

bflad Nov 17, 2020

Choose a reason for hiding this comment

ghost commented Nov 18, 2020

ghost commented Dec 18, 2020

bflad Nov 17, 2020 •

edited

Loading