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

resource/securityhub_organization_admin_account: new resource #17501

Merged
merged 2 commits into from
Feb 11, 2021
Merged

resource/securityhub_organization_admin_account: new resource #17501

merged 2 commits into from
Feb 11, 2021

Conversation

anGie44
Copy link
Contributor

@anGie44 anGie44 commented Feb 8, 2021 •
edited
Loading

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 #17128
Relates #6674

Output from acceptance testing (Organizations-only account):

--- PASS: TestAccAWSSecurityHub_serial (193.88s)
    --- PASS: TestAccAWSSecurityHub_serial/StandardsSubscription (21.86s)
        --- PASS: TestAccAWSSecurityHub_serial/StandardsSubscription/basic (21.86s)
    --- PASS: TestAccAWSSecurityHub_serial/Account (12.16s)
        --- PASS: TestAccAWSSecurityHub_serial/Account/basic (12.16s)
    --- PASS: TestAccAWSSecurityHub_serial/Member (26.01s)
        --- PASS: TestAccAWSSecurityHub_serial/Member/basic (12.90s)
        --- PASS: TestAccAWSSecurityHub_serial/Member/invite (13.10s)
    --- PASS: TestAccAWSSecurityHub_serial/ActionTarget (64.41s)
        --- PASS: TestAccAWSSecurityHub_serial/ActionTarget/basic (12.79s)
        --- PASS: TestAccAWSSecurityHub_serial/ActionTarget/disappears (10.80s)
        --- PASS: TestAccAWSSecurityHub_serial/ActionTarget/Description (20.63s)
        --- PASS: TestAccAWSSecurityHub_serial/ActionTarget/Name (20.18s)
    --- PASS: TestAccAWSSecurityHub_serial/OrganizationAdminAccount (42.22s)
        --- PASS: TestAccAWSSecurityHub_serial/OrganizationAdminAccount/basic (22.28s)
        --- PASS: TestAccAWSSecurityHub_serial/OrganizationAdminAccount/disappears (19.94s)
    --- PASS: TestAccAWSSecurityHub_serial/ProductSubscription (27.23s)
        --- PASS: TestAccAWSSecurityHub_serial/ProductSubscription/basic (27.23s)

Output of acceptance testing (Commercial):

--- PASS: TestAccAWSSecurityHub_serial (159.33s)
    --- PASS: TestAccAWSSecurityHub_serial/Account (13.92s)
        --- PASS: TestAccAWSSecurityHub_serial/Account/basic (13.92s)
    --- PASS: TestAccAWSSecurityHub_serial/Member (26.54s)
        --- PASS: TestAccAWSSecurityHub_serial/Member/basic (13.24s)
        --- PASS: TestAccAWSSecurityHub_serial/Member/invite (13.30s)
    --- PASS: TestAccAWSSecurityHub_serial/ActionTarget (66.82s)
        --- PASS: TestAccAWSSecurityHub_serial/ActionTarget/Description (20.70s)
        --- PASS: TestAccAWSSecurityHub_serial/ActionTarget/Name (21.00s)
        --- PASS: TestAccAWSSecurityHub_serial/ActionTarget/basic (13.51s)
        --- PASS: TestAccAWSSecurityHub_serial/ActionTarget/disappears (11.60s)
    --- PASS: TestAccAWSSecurityHub_serial/OrganizationAdminAccount (0.66s)
        --- SKIP: TestAccAWSSecurityHub_serial/OrganizationAdminAccount/basic (0.35s)
        --- SKIP: TestAccAWSSecurityHub_serial/OrganizationAdminAccount/disappears (0.30s)
    --- PASS: TestAccAWSSecurityHub_serial/ProductSubscription (29.90s)
        --- PASS: TestAccAWSSecurityHub_serial/ProductSubscription/basic (29.90s)
    --- PASS: TestAccAWSSecurityHub_serial/StandardsSubscription (21.50s)
        --- PASS: TestAccAWSSecurityHub_serial/StandardsSubscription/basic (21.50s)

Output of acceptance testing (Us Gov):

--- PASS: TestAccAWSSecurityHub_serial (100.68s)
    --- PASS: TestAccAWSSecurityHub_serial/ActionTarget (44.06s)
        --- PASS: TestAccAWSSecurityHub_serial/ActionTarget/basic (8.99s)
        --- PASS: TestAccAWSSecurityHub_serial/ActionTarget/disappears (7.55s)
        --- PASS: TestAccAWSSecurityHub_serial/ActionTarget/Description (13.89s)
        --- PASS: TestAccAWSSecurityHub_serial/ActionTarget/Name (13.64s)
    --- PASS: TestAccAWSSecurityHub_serial/OrganizationAdminAccount (0.46s)
        --- SKIP: TestAccAWSSecurityHub_serial/OrganizationAdminAccount/basic (0.25s)
        --- SKIP: TestAccAWSSecurityHub_serial/OrganizationAdminAccount/disappears (0.20s)
    --- PASS: TestAccAWSSecurityHub_serial/ProductSubscription (18.61s)
        --- PASS: TestAccAWSSecurityHub_serial/ProductSubscription/basic (18.61s)
    --- PASS: TestAccAWSSecurityHub_serial/StandardsSubscription (13.02s)
        --- PASS: TestAccAWSSecurityHub_serial/StandardsSubscription/basic (13.02s)
    --- PASS: TestAccAWSSecurityHub_serial/Account (7.68s)
        --- PASS: TestAccAWSSecurityHub_serial/Account/basic (7.68s)
    --- PASS: TestAccAWSSecurityHub_serial/Member (16.84s)
        --- PASS: TestAccAWSSecurityHub_serial/Member/basic (8.41s)
        --- PASS: TestAccAWSSecurityHub_serial/Member/invite (8.43s)

@anGie44 anGie44 requested a review from a team as a code owner February 8, 2021 01:41
@ghost ghost added size/XL Managed by automation to categorize the size of a PR. documentation Introduces or discusses updates to documentation. provider Pertains to the provider itself, rather than any interaction with AWS. service/securityhub Issues and PRs that pertain to the securityhub service. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. labels Feb 8, 2021
@anGie44 anGie44 added the new-resource Introduces a new resource. label Feb 8, 2021
@anGie44 anGie44 force-pushed the f-security-hub-org-admin-account branch 3 times, most recently from 734a3a4 to 231acd6 Compare February 8, 2021 02:18
anGie44
anGie44 commented Feb 8, 2021
View reviewed changes
aws/resource_aws_securityhub_account.go
err := resource.Retry(waiter.AdminAccountNotFoundTimeout, func() *resource.RetryError {
_, err := conn.DisableSecurityHub(&securityhub.DisableSecurityHubInput{})

if tfawserr.ErrMessageContains(err, securityhub.ErrCodeInvalidInputException, "Cannot disable Security Hub on the Security Hub administrator") {
Copy link
Contributor Author

@anGie44 anGie44 Feb 8, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

added to account for error when the resource isn't set as a dependency in a config

@anGie44 anGie44 force-pushed the f-security-hub-org-admin-account branch 2 times, most recently from 10672ae to 5063701 Compare February 8, 2021 02:48
@anGie44 anGie44 force-pushed the f-security-hub-org-admin-account branch from 5063701 to 9c4cfa4 Compare February 8, 2021 02:58
@bflad bflad self-assigned this Feb 10, 2021
bflad
bflad approved these changes Feb 11, 2021
View reviewed changes
Copy link
Contributor

@bflad bflad left a comment

Choose a reason for hiding this comment

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

Looks great 🚀

Output from acceptance testing:

--- PASS: TestAccAWSSecurityHub_serial (206.62s)
    --- PASS: TestAccAWSSecurityHub_serial/OrganizationAdminAccount (37.96s)
        --- PASS: TestAccAWSSecurityHub_serial/OrganizationAdminAccount/basic (21.01s)
        --- PASS: TestAccAWSSecurityHub_serial/OrganizationAdminAccount/disappears (16.95s)
    --- PASS: TestAccAWSSecurityHub_serial/ProductSubscription (29.71s)
        --- PASS: TestAccAWSSecurityHub_serial/ProductSubscription/basic (29.71s)
    --- PASS: TestAccAWSSecurityHub_serial/StandardsSubscription (21.40s)
        --- PASS: TestAccAWSSecurityHub_serial/StandardsSubscription/basic (21.40s)
    --- PASS: TestAccAWSSecurityHub_serial/Account (13.34s)
        --- PASS: TestAccAWSSecurityHub_serial/Account/basic (13.34s)
    --- PASS: TestAccAWSSecurityHub_serial/Member (28.75s)
        --- PASS: TestAccAWSSecurityHub_serial/Member/basic (14.25s)
        --- PASS: TestAccAWSSecurityHub_serial/Member/invite (14.50s)
    --- PASS: TestAccAWSSecurityHub_serial/ActionTarget (75.45s)
        --- PASS: TestAccAWSSecurityHub_serial/ActionTarget/basic (14.23s)
        --- PASS: TestAccAWSSecurityHub_serial/ActionTarget/disappears (12.20s)
        --- PASS: TestAccAWSSecurityHub_serial/ActionTarget/Description (26.78s)
        --- PASS: TestAccAWSSecurityHub_serial/ActionTarget/Name (22.25s)

@anGie44 anGie44 added this to the v3.28.0 milestone Feb 11, 2021
@anGie44 anGie44 merged commit 3510cc0 into main Feb 11, 2021
@anGie44 anGie44 deleted the f-security-hub-org-admin-account branch February 11, 2021 14:38
github-actions bot pushed a commit that referenced this pull request Feb 11, 2021
Update CHANGELOG.md for #17501
ed9364e
@ghost
Copy link

ghost commented Feb 12, 2021

This has been released in version 3.28.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
Copy link

ghost commented Mar 13, 2021

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!

@ghost ghost locked as resolved and limited conversation to collaborators Mar 13, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@bflad bflad bflad approved these changes

Assignees

@bflad bflad

Labels
documentation Introduces or discusses updates to documentation. new-resource Introduces a new resource. provider Pertains to the provider itself, rather than any interaction with AWS. service/securityhub Issues and PRs that pertain to the securityhub 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
v3.28.0
Development

Successfully merging this pull request may close these issues.

AWS SecurityHub Organizational admin
2 participants
@anGie44 @bflad