Add support for organizations and organizational units for EC2 image builder distribution configuration #22104

lvthillo · 2021-12-08T08:23:26Z

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

Closes #21929

Output from acceptance testing:

$ make testacc TESTS=TestAccImageBuilderDistributionConfiguration_DistributionAMIDistribution PKG=imagebuilder
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/imagebuilder/... -v -count 1 -parallel 20 -run='TestAccImageBuilderDistributionConfiguration_DistributionAMIDistribution' -timeout 180m
=== 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
--- PASS: TestAccImageBuilderDistributionConfiguration_DistributionAMIDistributionLaunchPermission_organizationArns (28.94s)
=== RUN   TestAccImageBuilderDistributionConfiguration_DistributionAMIDistributionLaunchPermission_organizationalUnitArns
--- PASS: TestAccImageBuilderDistributionConfiguration_DistributionAMIDistributionLaunchPermission_organizationalUnitArns (32.56s)
=== RUN   TestAccImageBuilderDistributionConfiguration_DistributionAMIDistribution_name
=== PAUSE TestAccImageBuilderDistributionConfiguration_DistributionAMIDistribution_name
=== RUN   TestAccImageBuilderDistributionConfiguration_DistributionAMIDistribution_targetAccountIDs
=== PAUSE TestAccImageBuilderDistributionConfiguration_DistributionAMIDistribution_targetAccountIDs
=== CONT  TestAccImageBuilderDistributionConfiguration_DistributionAMIDistribution_amiTags
=== CONT  TestAccImageBuilderDistributionConfiguration_DistributionAMIDistribution_name
=== CONT  TestAccImageBuilderDistributionConfiguration_DistributionAMIDistributionLaunchPermission_userGroups
=== CONT  TestAccImageBuilderDistributionConfiguration_DistributionAMIDistribution_kmsKeyID
=== CONT  TestAccImageBuilderDistributionConfiguration_DistributionAMIDistribution_targetAccountIDs
=== CONT  TestAccImageBuilderDistributionConfiguration_DistributionAMIDistributionLaunchPermission_userIDs
=== CONT  TestAccImageBuilderDistributionConfiguration_DistributionAMIDistribution_description
--- PASS: TestAccImageBuilderDistributionConfiguration_DistributionAMIDistributionLaunchPermission_userGroups (27.73s)
--- PASS: TestAccImageBuilderDistributionConfiguration_DistributionAMIDistributionLaunchPermission_userIDs (45.55s)
--- PASS: TestAccImageBuilderDistributionConfiguration_DistributionAMIDistribution_name (45.58s)
--- PASS: TestAccImageBuilderDistributionConfiguration_DistributionAMIDistribution_amiTags (45.64s)
--- PASS: TestAccImageBuilderDistributionConfiguration_DistributionAMIDistribution_targetAccountIDs (45.72s)
--- PASS: TestAccImageBuilderDistributionConfiguration_DistributionAMIDistribution_description (45.87s)
--- PASS: TestAccImageBuilderDistributionConfiguration_DistributionAMIDistribution_kmsKeyID (46.70s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/imagebuilder       110.438s

...

Example usage:

resource "aws_imagebuilder_distribution_configuration" "example" {
  name = "example"

  distribution {
    ami_distribution_configuration {
      ami_tags = {
        CostCenter = "IT"
      }

      name = "example-{{ imagebuilder:buildDate }}"

      launch_permission {
        organization_arns = ["arn:aws:organizations::111111111111:organization/o-aze123rty456"]
      }
    }

    region = "eu-west-1"
  }
}

…builder distribution configuration

github-actions

Welcome @lvthillo 👋

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 CONTRIBUTING 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! 😃

sethbacon · 2021-12-09T02:52:06Z

Would love to see this make a release soon!

tolidano · 2022-01-14T05:56:10Z

Keeping this alive - would like to see this merged ASAP - support for organizations is critical for our use case.

sabrinaz-orion · 2022-02-09T20:14:53Z

This would be really good to have!

viebrock · 2022-02-17T17:28:56Z

+1

drew3251 · 2022-02-17T17:53:01Z

+1

tmseesz · 2022-02-17T17:54:50Z

would love to see this

bassjompi · 2022-02-21T21:28:55Z

+1 organization support

kamilturek

I believe we need to update the documentation and provide a changelog. Besides that, looks good! Let me know if you need any help with it.

internal/service/imagebuilder/distribution_configuration_test.go

…stribution-org-ou-support

github-actions · 2022-03-22T07:24:13Z

Thank you for your contribution! 🚀

Please note that the CHANGELOG.md file contents are handled by the maintainers during merge. This is to prevent pull request merge conflicts, especially for contributions which may not be merged immediately. Please see the Contributing Guide for additional pull request review items.

Remove any changes to the CHANGELOG.md file and commit them in this pull request to prevent delays with reviewing and potentially merging this pull request.

lvthillo · 2022-03-22T14:58:39Z

I believe we need to update the documentation and provide a changelog. Besides that, looks good! Let me know if you need any help with it.

I added the changelog entry but got some automated reply that I should remove it. Should I?

…d 'organizational_unit_arns' are in 'distribution.ami_distribution_configuration.launch_permission'.

…ense configuration: ResourceLimitExceededException: You have reached the maximum allowed number of license configurations created in one day.'.

…tion: AccessDeniedException: Service role not found. Consult setup procedures in License Manager User Guide and create the required role for the service.'.

ewbankkit

LGTM 🚀.

% make testacc TESTS=TestAccImageBuilderDistributionConfigurationDataSource_ PKG=imagebuilder ACCTEST_PARALLELISM=2
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/imagebuilder/... -v -count 1 -parallel 2 -run='TestAccImageBuilderDistributionConfigurationDataSource_'  -timeout 180m
=== RUN   TestAccImageBuilderDistributionConfigurationDataSource_arn
=== PAUSE TestAccImageBuilderDistributionConfigurationDataSource_arn
=== CONT  TestAccImageBuilderDistributionConfigurationDataSource_arn
--- PASS: TestAccImageBuilderDistributionConfigurationDataSource_arn (20.25s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/imagebuilder	23.885s
% make testacc TESTS=TestAccImageBuilderDistributionConfiguration_ PKG=imagebuilder ACCTEST_PARALLELISM=2
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/imagebuilder/... -v -count 1 -parallel 2 -run='TestAccImageBuilderDistributionConfiguration_'  -timeout 180m
=== 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
--- PASS: TestAccImageBuilderDistributionConfiguration_DistributionAMIDistributionLaunchPermission_organizationArns (21.91s)
=== RUN   TestAccImageBuilderDistributionConfiguration_DistributionAMIDistributionLaunchPermission_organizationalUnitArns
--- PASS: TestAccImageBuilderDistributionConfiguration_DistributionAMIDistributionLaunchPermission_organizationalUnitArns (21.93s)
=== 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_Distribution_launchTemplateConfiguration
=== PAUSE TestAccImageBuilderDistributionConfiguration_Distribution_launchTemplateConfiguration
=== RUN   TestAccImageBuilderDistributionConfiguration_Distribution_licenseARNs
=== PAUSE TestAccImageBuilderDistributionConfiguration_Distribution_licenseARNs
=== RUN   TestAccImageBuilderDistributionConfiguration_tags
=== PAUSE TestAccImageBuilderDistributionConfiguration_tags
=== CONT  TestAccImageBuilderDistributionConfiguration_basic
=== CONT  TestAccImageBuilderDistributionConfiguration_DistributionAMIDistribution_name
--- PASS: TestAccImageBuilderDistributionConfiguration_basic (17.67s)
=== CONT  TestAccImageBuilderDistributionConfiguration_DistributionContainerDistribution_targetRepository
--- PASS: TestAccImageBuilderDistributionConfiguration_DistributionAMIDistribution_name (29.77s)
=== CONT  TestAccImageBuilderDistributionConfiguration_tags
--- PASS: TestAccImageBuilderDistributionConfiguration_DistributionContainerDistribution_targetRepository (29.04s)
=== CONT  TestAccImageBuilderDistributionConfiguration_Distribution_licenseARNs
    acctest.go:788: skipping tests; missing IAM service-linked role /aws-service-role/license-manager.amazonaws.com. Please create the role and retry
--- SKIP: TestAccImageBuilderDistributionConfiguration_Distribution_licenseARNs (0.20s)
=== CONT  TestAccImageBuilderDistributionConfiguration_Distribution_launchTemplateConfiguration
--- PASS: TestAccImageBuilderDistributionConfiguration_tags (40.87s)
=== CONT  TestAccImageBuilderDistributionConfiguration_DistributionAMIDistribution_description
--- PASS: TestAccImageBuilderDistributionConfiguration_Distribution_launchTemplateConfiguration (31.10s)
=== CONT  TestAccImageBuilderDistributionConfiguration_DistributionAMIDistributionLaunchPermission_userIDs
--- PASS: TestAccImageBuilderDistributionConfiguration_DistributionAMIDistribution_description (29.16s)
=== CONT  TestAccImageBuilderDistributionConfiguration_DistributionAMIDistributionLaunchPermission_userGroups
--- PASS: TestAccImageBuilderDistributionConfiguration_DistributionAMIDistributionLaunchPermission_userIDs (28.99s)
=== CONT  TestAccImageBuilderDistributionConfiguration_DistributionAMIDistribution_kmsKeyID
--- PASS: TestAccImageBuilderDistributionConfiguration_DistributionAMIDistributionLaunchPermission_userGroups (17.73s)
=== CONT  TestAccImageBuilderDistributionConfiguration_DistributionContainerDistribution_containerTags
--- PASS: TestAccImageBuilderDistributionConfiguration_DistributionAMIDistribution_kmsKeyID (32.80s)
=== CONT  TestAccImageBuilderDistributionConfiguration_DistributionAMIDistribution_targetAccountIDs
--- PASS: TestAccImageBuilderDistributionConfiguration_DistributionContainerDistribution_containerTags (29.76s)
=== CONT  TestAccImageBuilderDistributionConfiguration_DistributionContainerDistribution_description
--- PASS: TestAccImageBuilderDistributionConfiguration_DistributionAMIDistribution_targetAccountIDs (29.54s)
=== CONT  TestAccImageBuilderDistributionConfiguration_DistributionAMIDistribution_amiTags
--- PASS: TestAccImageBuilderDistributionConfiguration_DistributionContainerDistribution_description (29.45s)
=== CONT  TestAccImageBuilderDistributionConfiguration_description
--- PASS: TestAccImageBuilderDistributionConfiguration_DistributionAMIDistribution_amiTags (32.50s)
=== CONT  TestAccImageBuilderDistributionConfiguration_distribution
--- PASS: TestAccImageBuilderDistributionConfiguration_description (30.73s)
=== CONT  TestAccImageBuilderDistributionConfiguration_disappears
--- PASS: TestAccImageBuilderDistributionConfiguration_disappears (13.02s)
--- PASS: TestAccImageBuilderDistributionConfiguration_distribution (20.25s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/imagebuilder	269.422s

ewbankkit · 2022-03-23T13:08:50Z

@lvthillo Thanks for the contribution 🎉 👏.

tiendungitd · 2022-03-24T05:17:54Z

I found issue #21929 released share AMI to organization, but have to use awscc provider
Does it the same with this pull request? I just want to ensure that this function also available in AWS provider.

lvthillo · 2022-03-25T08:13:51Z

@tiendungitd Yes it does the same. It's now released in provider version v4.7.0

github-actions · 2022-05-05T02:31:27Z

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.

Add support for organizations and organizational units for EC2 image …

db546bd

…builder distribution configuration

github-actions bot reviewed Dec 8, 2021

View reviewed changes

Fix Acc tests

7502898

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 Dec 9, 2021

mantoine96 mentioned this pull request Mar 16, 2022

Add organizations_arn and organizational_unit_arns arguments in launch_permission for imagebuilder_distribution_configuration #23709

Closed

kamilturek suggested changes Mar 19, 2022

View reviewed changes

internal/service/imagebuilder/distribution_configuration_test.go Outdated Show resolved Hide resolved

lvthillo added 2 commits March 22, 2022 08:05

Merge remote-tracking branch 'origin2/main' into ec2-image-builder-di…

b9c6055

…stribution-org-ou-support

Add docs + add CHANGELOG entry + fix terrafmt formatting.

80b413c

github-actions bot added documentation Introduces or discusses updates to documentation. provider Pertains to the provider itself, rather than any interaction with AWS. labels Mar 22, 2022

ewbankkit added 3 commits March 23, 2022 08:32

Add CHANGELOG entry file.

593afca

d/aws_imagebuilder_distribution_configuration: 'organization_arns' an…

63ceaca

…d 'organizational_unit_arns' are in 'distribution.ami_distribution_configuration.launch_permission'.

r/aws_imagebuilder_distribution_configuration: Alphabetical order.

da1c9ff

github-actions bot removed the provider Pertains to the provider itself, rather than any interaction with AWS. label Mar 23, 2022

ewbankkit added 2 commits March 23, 2022 08:45

Skip acceptance tests errors like 'Error creating License Manager lic…

983c7ae

…ense configuration: ResourceLimitExceededException: You have reached the maximum allowed number of license configurations created in one day.'.

Prevent errors like 'Error creating License Manager license configura…

bed61da

…tion: AccessDeniedException: Service role not found. Consult setup procedures in License Manager User Guide and create the required role for the service.'.

ewbankkit approved these changes Mar 23, 2022

View reviewed changes

ewbankkit merged commit 7fc82c0 into hashicorp:main Mar 23, 2022

lvthillo deleted the ec2-image-builder-distribution-org-ou-support branch March 25, 2022 08:10

dmccaffery mentioned this pull request Apr 8, 2022

aws_ami_launch_permission: Support for OrganizationalUnitArn.N and OrganizationArn.N #21617

Closed

github-actions bot locked as resolved and limited conversation to collaborators May 5, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for organizations and organizational units for EC2 image builder distribution configuration #22104

Add support for organizations and organizational units for EC2 image builder distribution configuration #22104

lvthillo commented Dec 8, 2021 •

edited by justinretzolk

Loading

github-actions bot left a comment

sethbacon commented Dec 9, 2021

tolidano commented Jan 14, 2022

sabrinaz-orion commented Feb 9, 2022

viebrock commented Feb 17, 2022

drew3251 commented Feb 17, 2022

tmseesz commented Feb 17, 2022

bassjompi commented Feb 21, 2022

kamilturek left a comment

github-actions bot commented Mar 22, 2022

lvthillo commented Mar 22, 2022 •

edited

Loading

ewbankkit left a comment

ewbankkit commented Mar 23, 2022

tiendungitd commented Mar 24, 2022

lvthillo commented Mar 25, 2022

github-actions bot commented May 5, 2022

Add support for organizations and organizational units for EC2 image builder distribution configuration #22104

Add support for organizations and organizational units for EC2 image builder distribution configuration #22104

Conversation

lvthillo commented Dec 8, 2021 • edited by justinretzolk Loading

Community Note

github-actions bot left a comment

Choose a reason for hiding this comment

sethbacon commented Dec 9, 2021

tolidano commented Jan 14, 2022

sabrinaz-orion commented Feb 9, 2022

viebrock commented Feb 17, 2022

drew3251 commented Feb 17, 2022

tmseesz commented Feb 17, 2022

bassjompi commented Feb 21, 2022

kamilturek left a comment

Choose a reason for hiding this comment

github-actions bot commented Mar 22, 2022

lvthillo commented Mar 22, 2022 • edited Loading

ewbankkit left a comment

Choose a reason for hiding this comment

ewbankkit commented Mar 23, 2022

tiendungitd commented Mar 24, 2022

lvthillo commented Mar 25, 2022

github-actions bot commented May 5, 2022

lvthillo commented Dec 8, 2021 •

edited by justinretzolk

Loading

lvthillo commented Mar 22, 2022 •

edited

Loading