Return complete Organization data for Delegated Administrator accounts #32056

bodgit · 2023-06-16T10:05:01Z

Description

The PR allows AWS accounts within an Organization that are Delegated Administrators for any service to return the full set of data with the aws_organizations_organization data source, just like it does when used in the master account for the Organization.

Relations

Closes #32055.
Closes #31265.
Closes #18590.
Closes #20762.
Closes #14968.
Closes #28929.
Closes #31791.

References

Output from Acceptance Testing

I've tested the changes with a local build of the provider with the following code:

provider "aws" {}

data "aws_organizations_organization" "current" {}

output "test" {
  value = data.aws_organizations_organization.current
}

Running this in an existing Organization in a master account, an account that is a delegated administrator and a regular account that is neither works correctly, the full output is returned in all but the last account.

I'm struggling slightly with adding some tests, not necessarily with how to write them, but I'm not sure what my test environment should look like. Looking at some of the existing Organizations tests, such as TestAccOrganizationsDelegatedAdministratorsDataSource_basic, I don't see an Organization being created so it suggests I should already have two accounts that are already set up as an Organization. But then some of the other tests create an Organization (and presumably destroy it) so I'm not sure what I should have to begin with.

$ make testacc TESTS=TestAccXXX PKG=organizations

...

Move into separate function so it can be called from elsewhere.

Check if current account is a delegated administrator for the Organization. If so, it can also read the roots, account list, etc. If the ListDelegatedAdministrators call returns Access Denied, ignore the error as it means the account is just a regular child account. If it wasn't in the Organization at all, the previous DescribeOrganization call would have failed anyway.

github-actions · 2023-06-16T10:05:16Z

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.

Acceptance test output: % make testacc TESTARGS='-run=TestAccOrganizations_serial/DelegatedAdministrator$$' PKG=organizations ==> Checking that code complies with gofmt requirements... TF_ACC=1 go test ./internal/service/organizations/... -v -count 1 -parallel 20 -run=TestAccOrganizations_serial/DelegatedAdministrator$ -timeout 180m === RUN TestAccOrganizations_serial === PAUSE TestAccOrganizations_serial === CONT TestAccOrganizations_serial === RUN TestAccOrganizations_serial/DelegatedAdministrator === RUN TestAccOrganizations_serial/DelegatedAdministrator/basic === RUN TestAccOrganizations_serial/DelegatedAdministrator/disappears --- PASS: TestAccOrganizations_serial (58.76s) --- PASS: TestAccOrganizations_serial/DelegatedAdministrator (58.76s) --- PASS: TestAccOrganizations_serial/DelegatedAdministrator/basic (32.92s) --- PASS: TestAccOrganizations_serial/DelegatedAdministrator/disappears (25.84s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/organizations 64.858s

# Conflicts: # internal/service/organizations/exports_test.go

…aws_organizations_delegated_administrator, aws_organizations_organization).

Acceptance test output: % make testacc TESTARGS='-run=TestAccOrganizations_serial/DelegatedAdministrator$$' PKG=organizations ==> Checking that code complies with gofmt requirements... TF_ACC=1 go test ./internal/service/organizations/... -v -count 1 -parallel 20 -run=TestAccOrganizations_serial/DelegatedAdministrator$ -timeout 180m === RUN TestAccOrganizations_serial === PAUSE TestAccOrganizations_serial === CONT TestAccOrganizations_serial === RUN TestAccOrganizations_serial/DelegatedAdministrator === RUN TestAccOrganizations_serial/DelegatedAdministrator/basic === RUN TestAccOrganizations_serial/DelegatedAdministrator/disappears --- PASS: TestAccOrganizations_serial (52.87s) --- PASS: TestAccOrganizations_serial/DelegatedAdministrator (52.87s) --- PASS: TestAccOrganizations_serial/DelegatedAdministrator/basic (27.39s) --- PASS: TestAccOrganizations_serial/DelegatedAdministrator/disappears (25.48s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/organizations 58.158s

…dAdministratorsDataSource_multiple'. Acceptance test output: % make testacc TESTARGS='-run=TestAccOrganizations_serial/DelegatedAdministrators$$' PKG=organizations ==> Checking that code complies with gofmt requirements... TF_ACC=1 go test ./internal/service/organizations/... -v -count 1 -parallel 20 -run=TestAccOrganizations_serial/DelegatedAdministrators$ -timeout 180m === RUN TestAccOrganizations_serial === PAUSE TestAccOrganizations_serial === CONT TestAccOrganizations_serial === RUN TestAccOrganizations_serial/DelegatedAdministrators === RUN TestAccOrganizations_serial/DelegatedAdministrators/basic --- PASS: TestAccOrganizations_serial (26.64s) --- PASS: TestAccOrganizations_serial/DelegatedAdministrators (26.64s) --- PASS: TestAccOrganizations_serial/DelegatedAdministrators/basic (26.64s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/organizations 31.952s

Acceptance test output: % make testacc TESTARGS='-run=TestAccOrganizations_serial/DelegatedServices$$' PKG=organizations ==> Checking that code complies with gofmt requirements... TF_ACC=1 go test ./internal/service/organizations/... -v -count 1 -parallel 20 -run=TestAccOrganizations_serial/DelegatedServices$ -timeout 180m === RUN TestAccOrganizations_serial === PAUSE TestAccOrganizations_serial === CONT TestAccOrganizations_serial === RUN TestAccOrganizations_serial/DelegatedServices === RUN TestAccOrganizations_serial/DelegatedServices/basic === RUN TestAccOrganizations_serial/DelegatedServices/multiple --- PASS: TestAccOrganizations_serial (57.12s) --- PASS: TestAccOrganizations_serial/DelegatedServices (57.12s) --- PASS: TestAccOrganizations_serial/DelegatedServices/basic (26.82s) --- PASS: TestAccOrganizations_serial/DelegatedServices/multiple (30.30s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/organizations 62.446s

…rce_basic'. Acceptance test output: % make testacc TESTARGS='-run=TestAccOrganizations_serial/Organization$$/DataSource_basic' PKG=organizations ==> Checking that code complies with gofmt requirements... TF_ACC=1 go test ./internal/service/organizations/... -v -count 1 -parallel 20 -run=TestAccOrganizations_serial/Organization$/DataSource_basic -timeout 180m === RUN TestAccOrganizations_serial === PAUSE TestAccOrganizations_serial === CONT TestAccOrganizations_serial === RUN TestAccOrganizations_serial/Organization === RUN TestAccOrganizations_serial/Organization/DataSource_basic --- PASS: TestAccOrganizations_serial (20.70s) --- PASS: TestAccOrganizations_serial/Organization (20.70s) --- PASS: TestAccOrganizations_serial/Organization/DataSource_basic (20.70s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/organizations 26.023s

…memberAccount'. Acceptance test output: % make testacc TESTARGS='-run=TestAccOrganizations_serial/Organization$$/DataSource_memberAccount' PKG=organizations ==> Checking that code complies with gofmt requirements... TF_ACC=1 go test ./internal/service/organizations/... -v -count 1 -parallel 20 -run=TestAccOrganizations_serial/Organization$/DataSource_memberAccount -timeout 180m === RUN TestAccOrganizations_serial === PAUSE TestAccOrganizations_serial === CONT TestAccOrganizations_serial === RUN TestAccOrganizations_serial/Organization === RUN TestAccOrganizations_serial/Organization/DataSource_memberAccount --- PASS: TestAccOrganizations_serial (15.18s) --- PASS: TestAccOrganizations_serial/Organization (15.18s) --- PASS: TestAccOrganizations_serial/Organization/DataSource_memberAccount (15.18s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/organizations 20.563s

Acceptance test output: % make testacc TESTARGS='-run=TestAccOrganizations_serial/ResourcePolicy$$' PKG=organizations ==> Checking that code complies with gofmt requirements... TF_ACC=1 go test ./internal/service/organizations/... -v -count 1 -parallel 20 -run=TestAccOrganizations_serial/ResourcePolicy$ -timeout 180m === RUN TestAccOrganizations_serial === PAUSE TestAccOrganizations_serial === CONT TestAccOrganizations_serial === RUN TestAccOrganizations_serial/ResourcePolicy === RUN TestAccOrganizations_serial/ResourcePolicy/basic --- PASS: TestAccOrganizations_serial (31.95s) --- PASS: TestAccOrganizations_serial/ResourcePolicy (31.95s) --- PASS: TestAccOrganizations_serial/ResourcePolicy/basic (31.95s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/organizations 37.207s

Acceptance test output: % make testacc TESTARGS='-run=TestAccOrganizations_serial/ResourcePolicy$$' PKG=organizations ==> Checking that code complies with gofmt requirements... TF_ACC=1 go test ./internal/service/organizations/... -v -count 1 -parallel 20 -run=TestAccOrganizations_serial/ResourcePolicy$ -timeout 180m === RUN TestAccOrganizations_serial === PAUSE TestAccOrganizations_serial === CONT TestAccOrganizations_serial === RUN TestAccOrganizations_serial/ResourcePolicy === RUN TestAccOrganizations_serial/ResourcePolicy/basic === RUN TestAccOrganizations_serial/ResourcePolicy/disappears === RUN TestAccOrganizations_serial/ResourcePolicy/tags --- PASS: TestAccOrganizations_serial (130.74s) --- PASS: TestAccOrganizations_serial/ResourcePolicy (130.74s) --- PASS: TestAccOrganizations_serial/ResourcePolicy/basic (32.07s) --- PASS: TestAccOrganizations_serial/ResourcePolicy/disappears (25.42s) --- PASS: TestAccOrganizations_serial/ResourcePolicy/tags (73.25s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/organizations 136.099s

…delegatedAdministrator' working. Acceptance test output: % make testacc TESTARGS='-run=TestAccOrganizations_serial/Organization$$/DataSource_delegatedAdministrator' PKG=organizations ==> Checking that code complies with gofmt requirements... TF_ACC=1 go test ./internal/service/organizations/... -v -count 1 -parallel 20 -run=TestAccOrganizations_serial/Organization$/DataSource_delegatedAdministrator -timeout 180m === RUN TestAccOrganizations_serial === PAUSE TestAccOrganizations_serial === CONT TestAccOrganizations_serial === RUN TestAccOrganizations_serial/Organization === RUN TestAccOrganizations_serial/Organization/DataSource_delegatedAdministrator --- PASS: TestAccOrganizations_serial (29.33s) --- PASS: TestAccOrganizations_serial/Organization (29.33s) --- PASS: TestAccOrganizations_serial/Organization/DataSource_delegatedAdministrator (29.33s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/organizations 34.680s

ewbankkit

LGTM 🚀.

% make testacc TESTARGS='-run=TestAccOrganizations_serial/DelegatedAdministrator$$' PKG=organizations
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/organizations/... -v -count 1 -parallel 20  -run=TestAccOrganizations_serial/DelegatedAdministrator$ -timeout 180m
=== RUN   TestAccOrganizations_serial
=== PAUSE TestAccOrganizations_serial
=== CONT  TestAccOrganizations_serial
=== RUN   TestAccOrganizations_serial/DelegatedAdministrator
=== RUN   TestAccOrganizations_serial/DelegatedAdministrator/basic
=== RUN   TestAccOrganizations_serial/DelegatedAdministrator/disappears
--- PASS: TestAccOrganizations_serial (52.87s)
    --- PASS: TestAccOrganizations_serial/DelegatedAdministrator (52.87s)
        --- PASS: TestAccOrganizations_serial/DelegatedAdministrator/basic (27.39s)
        --- PASS: TestAccOrganizations_serial/DelegatedAdministrator/disappears (25.48s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/organizations	58.158s

% make testacc TESTARGS='-run=TestAccOrganizations_serial/DelegatedAdministrators$$' PKG=organizations
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/organizations/... -v -count 1 -parallel 20  -run=TestAccOrganizations_serial/DelegatedAdministrators$ -timeout 180m
=== RUN   TestAccOrganizations_serial
=== PAUSE TestAccOrganizations_serial
=== CONT  TestAccOrganizations_serial
=== RUN   TestAccOrganizations_serial/DelegatedAdministrators
=== RUN   TestAccOrganizations_serial/DelegatedAdministrators/basic
--- PASS: TestAccOrganizations_serial (26.64s)
    --- PASS: TestAccOrganizations_serial/DelegatedAdministrators (26.64s)
        --- PASS: TestAccOrganizations_serial/DelegatedAdministrators/basic (26.64s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/organizations	31.952s

% make testacc TESTARGS='-run=TestAccOrganizations_serial/DelegatedServices$$' PKG=organizations
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/organizations/... -v -count 1 -parallel 20  -run=TestAccOrganizations_serial/DelegatedServices$ -timeout 180m
=== RUN   TestAccOrganizations_serial
=== PAUSE TestAccOrganizations_serial
=== CONT  TestAccOrganizations_serial
=== RUN   TestAccOrganizations_serial/DelegatedServices
=== RUN   TestAccOrganizations_serial/DelegatedServices/basic
=== RUN   TestAccOrganizations_serial/DelegatedServices/multiple
--- PASS: TestAccOrganizations_serial (57.12s)
    --- PASS: TestAccOrganizations_serial/DelegatedServices (57.12s)
        --- PASS: TestAccOrganizations_serial/DelegatedServices/basic (26.82s)
        --- PASS: TestAccOrganizations_serial/DelegatedServices/multiple (30.30s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/organizations	62.446s

% make testacc TESTARGS='-run=TestAccOrganizations_serial/Organization$$/DataSource_basic' PKG=organizations
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/organizations/... -v -count 1 -parallel 20  -run=TestAccOrganizations_serial/Organization$/DataSource_basic -timeout 180m
=== RUN   TestAccOrganizations_serial
=== PAUSE TestAccOrganizations_serial
=== CONT  TestAccOrganizations_serial
=== RUN   TestAccOrganizations_serial/Organization
=== RUN   TestAccOrganizations_serial/Organization/DataSource_basic
--- PASS: TestAccOrganizations_serial (20.70s)
    --- PASS: TestAccOrganizations_serial/Organization (20.70s)
        --- PASS: TestAccOrganizations_serial/Organization/DataSource_basic (20.70s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/organizations	26.023s
% make testacc TESTARGS='-run=TestAccOrganizations_serial/Organization$$/DataSource_memberAccount' PKG=organizations
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/organizations/... -v -count 1 -parallel 20  -run=TestAccOrganizations_serial/Organization$/DataSource_memberAccount -timeout 180m
=== RUN   TestAccOrganizations_serial
=== PAUSE TestAccOrganizations_serial
=== CONT  TestAccOrganizations_serial
=== RUN   TestAccOrganizations_serial/Organization
=== RUN   TestAccOrganizations_serial/Organization/DataSource_memberAccount
--- PASS: TestAccOrganizations_serial (15.18s)
    --- PASS: TestAccOrganizations_serial/Organization (15.18s)
        --- PASS: TestAccOrganizations_serial/Organization/DataSource_memberAccount (15.18s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/organizations	20.563s

% make testacc TESTARGS='-run=TestAccOrganizations_serial/ResourcePolicy$$' PKG=organizations
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/organizations/... -v -count 1 -parallel 20  -run=TestAccOrganizations_serial/ResourcePolicy$ -timeout 180m
=== RUN   TestAccOrganizations_serial
=== PAUSE TestAccOrganizations_serial
=== CONT  TestAccOrganizations_serial
=== RUN   TestAccOrganizations_serial/ResourcePolicy
=== RUN   TestAccOrganizations_serial/ResourcePolicy/basic
=== RUN   TestAccOrganizations_serial/ResourcePolicy/disappears
=== RUN   TestAccOrganizations_serial/ResourcePolicy/tags
--- PASS: TestAccOrganizations_serial (130.74s)
    --- PASS: TestAccOrganizations_serial/ResourcePolicy (130.74s)
        --- PASS: TestAccOrganizations_serial/ResourcePolicy/basic (32.07s)
        --- PASS: TestAccOrganizations_serial/ResourcePolicy/disappears (25.42s)
        --- PASS: TestAccOrganizations_serial/ResourcePolicy/tags (73.25s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/organizations	136.099s

% make testacc TESTARGS='-run=TestAccOrganizations_serial/Organization$$/DataSource_delegatedAdministrator' PKG=organizations
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/organizations/... -v -count 1 -parallel 20  -run=TestAccOrganizations_serial/Organization$/DataSource_delegatedAdministrator -timeout 180m
=== RUN   TestAccOrganizations_serial
=== PAUSE TestAccOrganizations_serial
=== CONT  TestAccOrganizations_serial
=== RUN   TestAccOrganizations_serial/Organization
=== RUN   TestAccOrganizations_serial/Organization/DataSource_delegatedAdministrator
--- PASS: TestAccOrganizations_serial (29.33s)
    --- PASS: TestAccOrganizations_serial/Organization (29.33s)
        --- PASS: TestAccOrganizations_serial/Organization/DataSource_delegatedAdministrator (29.33s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/organizations	34.680s

ewbankkit · 2023-06-17T19:50:54Z

@bodgit Thanks for the contribution 🎉 👏.
To test the new functionality I ended up having to add the aws_organizations_resource_policy resource 😄.

…ons_resource_policy'.

github-actions · 2023-06-23T01:02:15Z

This functionality has been released in v5.5.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-07-24T02:12:49Z

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.

bodgit added 2 commits June 15, 2023 18:41

Refactor ListDelegatedAdministrators call

fe5442b

Move into separate function so it can be called from elsewhere.

ewbankkit added 2 commits June 16, 2023 15:19

Merge branch 'main' into HEAD

b1533ff

# Conflicts: # internal/service/organizations/exports_test.go

ewbankkit removed the needs-triage Waiting for first response or review from a maintainer. label Jun 16, 2023

ewbankkit added 12 commits June 16, 2023 17:47

organizations: Save WIP (aws_organizations_delegated_administrators, …

4f8c487

…aws_organizations_delegated_administrator, aws_organizations_organization).

Merge branch 'main' into HEAD

425c9f6

Add 'testAccOrganizationDataSource_delegatedAdministrator'.

f02a082

Add CHANGELOG entry.

e645929

ewbankkit approved these changes Jun 17, 2023

View reviewed changes

Fix tfproviderdocs 'missing title section: # Resource: aws_organizati…

d78d5a6

…ons_resource_policy'.

ewbankkit added the new-resource Introduces a new resource. label Jun 18, 2023

ewbankkit merged commit a65fd77 into hashicorp:main Jun 20, 2023

github-actions bot added this to the v5.5.0 milestone Jun 20, 2023

bodgit deleted the delegated-administrators branch June 23, 2023 15:30

github-actions bot locked as resolved and limited conversation to collaborators Jul 24, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Return complete Organization data for Delegated Administrator accounts #32056

Return complete Organization data for Delegated Administrator accounts #32056

bodgit commented Jun 16, 2023 •

edited by ewbankkit

Loading

github-actions bot commented Jun 16, 2023

ewbankkit left a comment

ewbankkit commented Jun 17, 2023

github-actions bot commented Jun 23, 2023

github-actions bot commented Jul 24, 2023

Return complete Organization data for Delegated Administrator accounts #32056

Return complete Organization data for Delegated Administrator accounts #32056

Conversation

bodgit commented Jun 16, 2023 • edited by ewbankkit Loading

Description

Relations

References

Output from Acceptance Testing

github-actions bot commented Jun 16, 2023

Community Note

ewbankkit left a comment

Choose a reason for hiding this comment

ewbankkit commented Jun 17, 2023

github-actions bot commented Jun 23, 2023

github-actions bot commented Jul 24, 2023

bodgit commented Jun 16, 2023 •

edited by ewbankkit

Loading