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

Final retries after timeouts when creating organizations resources #9631

Merged
merged 1 commit into from
Aug 7, 2019
Merged

Final retries after timeouts when creating organizations resources #9631

merged 1 commit into from
Aug 7, 2019

Conversation

ryndaniels
Copy link
Contributor

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" comments, they generate extra noise for pull request followers and do not help prioritize the request

Relates #7873

Release note for CHANGELOG:

BUG FIXES
* resource/aws_organizations_organizational_unit: Final retry after timeout when creating organizational unit
* resource/aws_organizations_policy: Final retry after timeout creating policy
* resource/aws_organizations_policy_attachment: Final retry after timeout creating policy attachment

Output from acceptance testing:

NOTE these same skips all happen currently


$ make testacc TESTARGS="-run=TestAccAWSOrganizations/PolicyAttachment"  
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./... -v -parallel 20 -run=TestAccAWSOrganizations/PolicyAttachment -timeout 120m
?       github.com/terraform-providers/terraform-provider-aws   [no test files]
=== RUN   TestAccAWSOrganizations
=== RUN   TestAccAWSOrganizations/PolicyAttachment
=== RUN   TestAccAWSOrganizations/PolicyAttachment/Account
=== RUN   TestAccAWSOrganizations/PolicyAttachment/OrganizationalUnit
=== RUN   TestAccAWSOrganizations/PolicyAttachment/Root
--- PASS: TestAccAWSOrganizations (9.67s)
    --- PASS: TestAccAWSOrganizations/PolicyAttachment (9.67s)
        --- SKIP: TestAccAWSOrganizations/PolicyAttachment/Account (3.84s)
            provider_test.go:247: skipping tests; this AWS account must not be an existing member of an AWS Organization
        --- SKIP: TestAccAWSOrganizations/PolicyAttachment/OrganizationalUnit (3.22s)
            provider_test.go:247: skipping tests; this AWS account must not be an existing member of an AWS Organization
        --- SKIP: TestAccAWSOrganizations/PolicyAttachment/Root (2.60s)
            provider_test.go:247: skipping tests; this AWS account must not be an existing member of an AWS Organization
PASS
ok      github.com/terraform-providers/terraform-provider-aws/aws       11.041s

make testacc TESTARGS="-run=TestAccAWSOrganizations/OrganizationalUnit"
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./... -v -parallel 20 -run=TestAccAWSOrganizations/OrganizationalUnit -timeout 120m
?       github.com/terraform-providers/terraform-provider-aws   [no test files]
=== RUN   TestAccAWSOrganizations
=== RUN   TestAccAWSOrganizations/OrganizationalUnit
=== RUN   TestAccAWSOrganizations/OrganizationalUnit/basic
=== RUN   TestAccAWSOrganizations/OrganizationalUnit/Name
--- PASS: TestAccAWSOrganizations (6.42s)
    --- PASS: TestAccAWSOrganizations/OrganizationalUnit (6.42s)
        --- SKIP: TestAccAWSOrganizations/OrganizationalUnit/basic (3.55s)
            provider_test.go:247: skipping tests; this AWS account must not be an existing member of an AWS Organization
        --- SKIP: TestAccAWSOrganizations/OrganizationalUnit/Name (2.87s)
            provider_test.go:247: skipping tests; this AWS account must not be an existing member of an AWS Organization
PASS
ok      github.com/terraform-providers/terraform-provider-aws/aws       13.286s

make testacc TESTARGS="-run=TestAccAWSOrganizations/Policy"
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./... -v -parallel 20 -run=TestAccAWSOrganizations/Policy -timeout 120m
?       github.com/terraform-providers/terraform-provider-aws   [no test files]
=== RUN   TestAccAWSOrganizations
=== RUN   TestAccAWSOrganizations/Policy
=== RUN   TestAccAWSOrganizations/Policy/basic
=== RUN   TestAccAWSOrganizations/Policy/concurrent
=== RUN   TestAccAWSOrganizations/Policy/Description
=== RUN   TestAccAWSOrganizations/PolicyAttachment
=== RUN   TestAccAWSOrganizations/PolicyAttachment/Account
=== RUN   TestAccAWSOrganizations/PolicyAttachment/OrganizationalUnit
=== RUN   TestAccAWSOrganizations/PolicyAttachment/Root
--- PASS: TestAccAWSOrganizations (17.23s)
    --- PASS: TestAccAWSOrganizations/Policy (8.85s)
        --- SKIP: TestAccAWSOrganizations/Policy/basic (3.14s)
            provider_test.go:247: skipping tests; this AWS account must not be an existing member of an AWS Organization
        --- SKIP: TestAccAWSOrganizations/Policy/concurrent (2.99s)
            provider_test.go:247: skipping tests; this AWS account must not be an existing member of an AWS Organization
        --- SKIP: TestAccAWSOrganizations/Policy/Description (2.72s)
            provider_test.go:247: skipping tests; this AWS account must not be an existing member of an AWS Organization
    --- PASS: TestAccAWSOrganizations/PolicyAttachment (8.38s)
        --- SKIP: TestAccAWSOrganizations/PolicyAttachment/Account (3.30s)
            provider_test.go:247: skipping tests; this AWS account must not be an existing member of an AWS Organization
        --- SKIP: TestAccAWSOrganizations/PolicyAttachment/OrganizationalUnit (2.53s)
            provider_test.go:247: skipping tests; this AWS account must not be an existing member of an AWS Organization
        --- SKIP: TestAccAWSOrganizations/PolicyAttachment/Root (2.55s)
            provider_test.go:247: skipping tests; this AWS account must not be an existing member of an AWS Organization
PASS
ok      github.com/terraform-providers/terraform-provider-aws/aws       18.054s

@ryndaniels ryndaniels requested a review from a team August 5, 2019 15:23
@ghost ghost added size/XS Managed by automation to categorize the size of a PR. service/organizations Issues and PRs that pertain to the organizations service. labels Aug 5, 2019
@ryndaniels ryndaniels added the bug Addresses a defect in current functionality. label Aug 5, 2019
@bflad bflad added this to the v2.23.0 milestone Aug 6, 2019
bflad
bflad approved these changes Aug 6, 2019
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.

LGTM 🚀

--- PASS: TestAccAWSOrganizations (395.04s)
    --- PASS: TestAccAWSOrganizations/Organization (155.13s)
        --- PASS: TestAccAWSOrganizations/Organization/FeatureSet (16.69s)
        --- PASS: TestAccAWSOrganizations/Organization/DataSource (31.81s)
        --- PASS: TestAccAWSOrganizations/Organization/basic (18.22s)
        --- PASS: TestAccAWSOrganizations/Organization/AwsServiceAccessPrincipals (41.36s)
        --- PASS: TestAccAWSOrganizations/Organization/EnabledPolicyTypes (47.05s)
    --- PASS: TestAccAWSOrganizations/Account (0.00s)
        --- SKIP: TestAccAWSOrganizations/Account/basic (0.00s)
        --- SKIP: TestAccAWSOrganizations/Account/ParentId (0.00s)
        --- SKIP: TestAccAWSOrganizations/Account/Tags (0.00s)
    --- PASS: TestAccAWSOrganizations/OrganizationalUnit (61.34s)
        --- PASS: TestAccAWSOrganizations/OrganizationalUnit/basic (25.30s)
        --- PASS: TestAccAWSOrganizations/OrganizationalUnit/Name (36.04s)
    --- PASS: TestAccAWSOrganizations/Policy (94.52s)
        --- PASS: TestAccAWSOrganizations/Policy/basic (32.06s)
        --- PASS: TestAccAWSOrganizations/Policy/concurrent (29.88s)
        --- PASS: TestAccAWSOrganizations/Policy/Description (32.58s)
    --- PASS: TestAccAWSOrganizations/PolicyAttachment (84.05s)
        --- PASS: TestAccAWSOrganizations/PolicyAttachment/OrganizationalUnit (30.29s)
        --- PASS: TestAccAWSOrganizations/PolicyAttachment/Root (28.06s)
        --- PASS: TestAccAWSOrganizations/PolicyAttachment/Account (25.70s)

@ryndaniels ryndaniels merged commit e889bf7 into master Aug 7, 2019
@ryndaniels ryndaniels deleted the rfd-retry-orgs branch August 7, 2019 12:07
@ghost
Copy link

ghost commented Aug 7, 2019

This has been released in version 2.23.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 Nov 2, 2019

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 and limited conversation to collaborators Nov 2, 2019
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
bug Addresses a defect in current functionality. service/organizations Issues and PRs that pertain to the organizations service. size/XS Managed by automation to categorize the size of a PR.
Projects
None yet
Milestone
v2.23.0
Development

Successfully merging this pull request may close these issues.
2 participants
@ryndaniels @bflad