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

Fix custom endpoint bug #21657

Merged
merged 7 commits into from
Nov 5, 2021
Merged

Fix custom endpoint bug #21657

merged 7 commits into from
Nov 5, 2021

Conversation

YakDriver
Copy link
Member

@YakDriver YakDriver commented Nov 5, 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 #21646
Relates #21641

Output from acceptance testing (GovCloud):

% TF_ACC=1 go test ./internal/acctest -v -count 1 -parallel 20 -run='TestAcc' -timeout=10m
--- PASS: TestAccAcctestProvider_Region_awsSC2S (18.46s)
--- PASS: TestAccAcctestProvider_Region_awsChina (18.81s)
--- PASS: TestAccAcctestProvider_Region_awsCommercial (19.01s)
--- PASS: TestAccAcctestProvider_Region_awsC2S (19.29s)
--- PASS: TestAccAcctestProvider_Region_awsGovCloudUs (20.07s)
--- PASS: TestAccAcctestProvider_DefaultTagsTags_none (23.53s)
--- PASS: TestAccAcctestProvider_IgnoreTagsKeys_one (23.93s)
--- PASS: TestAccAcctestProvider_DefaultTagsTags_multiple (23.96s)
--- PASS: TestAccAcctestProvider_DefaultAndIgnoreTags_emptyBlocks (24.16s)
--- PASS: TestAccAcctestProvider_IgnoreTags_emptyBlock (24.17s)
--- PASS: TestAccAcctestProvider_IgnoreTagsKeys_multiple (24.24s)
--- PASS: TestAccAcctestProvider_IgnoreTagsKeys_none (24.39s)
--- PASS: TestAccAcctestProvider_DefaultTags_emptyBlock (24.47s)
--- PASS: TestAccAcctestProvider_IgnoreTagsKeyPrefixes_none (24.47s)
--- PASS: TestAccAcctestProvider_IgnoreTagsKeyPrefixes_one (24.47s)
--- PASS: TestAccAcctestProvider_IgnoreTagsKeyPrefixes_multiple (24.49s)
--- PASS: TestAccAcctestProvider_DefaultTagsTags_one (24.84s)
--- PASS: TestAccAcctestProvider_unusualEndpoints (24.91s)
--- PASS: TestAccAcctestProvider_endpoints (24.91s)
--- PASS: TestAccAcctestProvider_AssumeRole_empty (28.63s)
--- PASS: TestAccAcctestProvider_fipsEndpoint (28.61s)

Output from acceptance testing (us-west-2):

% TF_ACC=1 go test ./internal/acctest -v -count 1 -parallel 20 -run='TestAcc' -timeout=10m
--- PASS: TestAccAcctestProvider_Region_awsSC2S (19.85s)
--- PASS: TestAccAcctestProvider_Region_awsCommercial (20.22s)
--- PASS: TestAccAcctestProvider_Region_awsC2S (20.30s)
--- PASS: TestAccAcctestProvider_Region_awsGovCloudUs (20.36s)
--- PASS: TestAccAcctestProvider_Region_awsChina (20.79s)
--- PASS: TestAccAcctestProvider_DefaultTagsTags_multiple (25.41s)
--- PASS: TestAccAcctestProvider_IgnoreTagsKeys_multiple (25.48s)
--- PASS: TestAccAcctestProvider_IgnoreTagsKeyPrefixes_one (25.63s)
--- PASS: TestAccAcctestProvider_DefaultAndIgnoreTags_emptyBlocks (25.76s)
--- PASS: TestAccAcctestProvider_IgnoreTagsKeyPrefixes_multiple (25.88s)
--- PASS: TestAccAcctestProvider_DefaultTags_emptyBlock (25.97s)
--- PASS: TestAccAcctestProvider_DefaultTagsTags_one (25.96s)
--- PASS: TestAccAcctestProvider_IgnoreTags_emptyBlock (25.97s)
--- PASS: TestAccAcctestProvider_IgnoreTagsKeyPrefixes_none (25.97s)
--- PASS: TestAccAcctestProvider_DefaultTagsTags_none (25.98s)
--- PASS: TestAccAcctestProvider_IgnoreTagsKeys_one (26.16s)
--- PASS: TestAccAcctestProvider_IgnoreTagsKeys_none (26.28s)
--- PASS: TestAccAcctestProvider_endpoints (26.44s)
--- PASS: TestAccAcctestProvider_AssumeRole_empty (32.33s)
--- PASS: TestAccAcctestProvider_unusualEndpoints (14.39s)
--- PASS: TestAccAcctestProvider_fipsEndpoint (37.42s)

@github-actions github-actions bot added client-connections Pertains to the AWS Client and service connections. documentation Introduces or discusses updates to documentation. provider Pertains to the provider itself, rather than any interaction with AWS. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. size/L Managed by automation to categorize the size of a PR. labels Nov 5, 2021
@ewbankkit ewbankkit self-assigned this Nov 5, 2021
ewbankkit
ewbankkit approved these changes Nov 5, 2021
View reviewed changes
Copy link
Contributor

@ewbankkit ewbankkit left a comment

Choose a reason for hiding this comment

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

LGTM 🚀.

% go test -v ./internal/acctest 
=== RUN   TestProvider
--- PASS: TestProvider (0.12s)
=== RUN   TestProvider_impl
--- PASS: TestProvider_impl (0.02s)
=== RUN   TestReverseDNS
=== RUN   TestReverseDNS/empty
=== RUN   TestReverseDNS/amazonaws.com
=== RUN   TestReverseDNS/amazonaws.com.cn
=== RUN   TestReverseDNS/sc2s.sgov.gov
=== RUN   TestReverseDNS/c2s.ic.gov
--- PASS: TestReverseDNS (0.00s)
    --- PASS: TestReverseDNS/empty (0.00s)
    --- PASS: TestReverseDNS/amazonaws.com (0.00s)
    --- PASS: TestReverseDNS/amazonaws.com.cn (0.00s)
    --- PASS: TestReverseDNS/sc2s.sgov.gov (0.00s)
    --- PASS: TestReverseDNS/c2s.ic.gov (0.00s)
=== RUN   TestAccAcctestProvider_DefaultTags_emptyBlock
=== PAUSE TestAccAcctestProvider_DefaultTags_emptyBlock
=== RUN   TestAccAcctestProvider_DefaultTagsTags_none
=== PAUSE TestAccAcctestProvider_DefaultTagsTags_none
=== RUN   TestAccAcctestProvider_DefaultTagsTags_one
=== PAUSE TestAccAcctestProvider_DefaultTagsTags_one
=== RUN   TestAccAcctestProvider_DefaultTagsTags_multiple
=== PAUSE TestAccAcctestProvider_DefaultTagsTags_multiple
=== RUN   TestAccAcctestProvider_DefaultAndIgnoreTags_emptyBlocks
=== PAUSE TestAccAcctestProvider_DefaultAndIgnoreTags_emptyBlocks
=== RUN   TestAccAcctestProvider_endpoints
=== PAUSE TestAccAcctestProvider_endpoints
=== RUN   TestAccAcctestProvider_fipsEndpoint
=== PAUSE TestAccAcctestProvider_fipsEndpoint
=== RUN   TestAccAcctestProvider_unusualEndpoints
=== PAUSE TestAccAcctestProvider_unusualEndpoints
=== RUN   TestAccAcctestProvider_IgnoreTags_emptyBlock
=== PAUSE TestAccAcctestProvider_IgnoreTags_emptyBlock
=== RUN   TestAccAcctestProvider_IgnoreTagsKeyPrefixes_none
=== PAUSE TestAccAcctestProvider_IgnoreTagsKeyPrefixes_none
=== RUN   TestAccAcctestProvider_IgnoreTagsKeyPrefixes_one
=== PAUSE TestAccAcctestProvider_IgnoreTagsKeyPrefixes_one
=== RUN   TestAccAcctestProvider_IgnoreTagsKeyPrefixes_multiple
=== PAUSE TestAccAcctestProvider_IgnoreTagsKeyPrefixes_multiple
=== RUN   TestAccAcctestProvider_IgnoreTagsKeys_none
=== PAUSE TestAccAcctestProvider_IgnoreTagsKeys_none
=== RUN   TestAccAcctestProvider_IgnoreTagsKeys_one
=== PAUSE TestAccAcctestProvider_IgnoreTagsKeys_one
=== RUN   TestAccAcctestProvider_IgnoreTagsKeys_multiple
=== PAUSE TestAccAcctestProvider_IgnoreTagsKeys_multiple
=== RUN   TestAccAcctestProvider_Region_awsC2S
=== PAUSE TestAccAcctestProvider_Region_awsC2S
=== RUN   TestAccAcctestProvider_Region_awsChina
=== PAUSE TestAccAcctestProvider_Region_awsChina
=== RUN   TestAccAcctestProvider_Region_awsCommercial
=== PAUSE TestAccAcctestProvider_Region_awsCommercial
=== RUN   TestAccAcctestProvider_Region_awsGovCloudUs
=== PAUSE TestAccAcctestProvider_Region_awsGovCloudUs
=== RUN   TestAccAcctestProvider_Region_awsSC2S
=== PAUSE TestAccAcctestProvider_Region_awsSC2S
=== RUN   TestAccAcctestProvider_AssumeRole_empty
=== PAUSE TestAccAcctestProvider_AssumeRole_empty
=== RUN   TestTlsRsaPrivateKeyPem
--- PASS: TestTlsRsaPrivateKeyPem (0.23s)
=== RUN   TestTlsRsaPublicKeyPem
--- PASS: TestTlsRsaPublicKeyPem (0.11s)
=== RUN   TestTlsRsaX509LocallySignedCertificatePem
--- PASS: TestTlsRsaX509LocallySignedCertificatePem (0.22s)
=== RUN   TestTlsRsaX509SelfSignedCaCertificatePem
--- PASS: TestTlsRsaX509SelfSignedCaCertificatePem (0.05s)
=== RUN   TestTlsRsaX509SelfSignedCertificatePem
--- PASS: TestTlsRsaX509SelfSignedCertificatePem (0.08s)
=== RUN   TestTlsRsaX509CertificateRequestPem
--- PASS: TestTlsRsaX509CertificateRequestPem (0.12s)
=== CONT  TestAccAcctestProvider_DefaultTags_emptyBlock
    acctest_test.go:74: Acceptance tests skipped unless env 'TF_ACC' set
--- SKIP: TestAccAcctestProvider_DefaultTags_emptyBlock (0.02s)
=== CONT  TestAccAcctestProvider_AssumeRole_empty
    acctest_test.go:486: Acceptance tests skipped unless env 'TF_ACC' set
--- SKIP: TestAccAcctestProvider_AssumeRole_empty (0.02s)
=== CONT  TestAccAcctestProvider_IgnoreTagsKeyPrefixes_none
=== CONT  TestAccAcctestProvider_IgnoreTagsKeyPrefixes_one
=== CONT  TestAccAcctestProvider_IgnoreTagsKeyPrefixes_none
    acctest_test.go:262: Acceptance tests skipped unless env 'TF_ACC' set
=== CONT  TestAccAcctestProvider_IgnoreTagsKeyPrefixes_one
    acctest_test.go:281: Acceptance tests skipped unless env 'TF_ACC' set
=== CONT  TestAccAcctestProvider_DefaultTagsTags_none
=== CONT  TestAccAcctestProvider_Region_awsC2S
--- SKIP: TestAccAcctestProvider_IgnoreTagsKeyPrefixes_none (0.02s)
=== CONT  TestAccAcctestProvider_DefaultTagsTags_none
    acctest_test.go:93: Acceptance tests skipped unless env 'TF_ACC' set
--- SKIP: TestAccAcctestProvider_IgnoreTagsKeyPrefixes_one (0.02s)
=== CONT  TestAccAcctestProvider_fipsEndpoint
=== CONT  TestAccAcctestProvider_Region_awsSC2S
    acctest_test.go:464: Acceptance tests skipped unless env 'TF_ACC' set
=== CONT  TestAccAcctestProvider_Region_awsGovCloudUs
=== CONT  TestAccAcctestProvider_endpoints
=== CONT  TestAccAcctestProvider_fipsEndpoint
    acctest_test.go:200: Acceptance tests skipped unless env 'TF_ACC' set
=== CONT  TestAccAcctestProvider_Region_awsCommercial
=== CONT  TestAccAcctestProvider_endpoints
    acctest_test.go:180: Acceptance tests skipped unless env 'TF_ACC' set
=== CONT  TestAccAcctestProvider_Region_awsCommercial
    acctest_test.go:420: Acceptance tests skipped unless env 'TF_ACC' set
=== CONT  TestAccAcctestProvider_DefaultTagsTags_one
=== CONT  TestAccAcctestProvider_DefaultTagsTags_multiple
=== CONT  TestAccAcctestProvider_DefaultTagsTags_one
    acctest_test.go:112: Acceptance tests skipped unless env 'TF_ACC' set
=== CONT  TestAccAcctestProvider_Region_awsChina
=== CONT  TestAccAcctestProvider_DefaultTagsTags_multiple
    acctest_test.go:131: Acceptance tests skipped unless env 'TF_ACC' set
=== CONT  TestAccAcctestProvider_IgnoreTags_emptyBlock
=== CONT  TestAccAcctestProvider_IgnoreTagsKeys_one
=== CONT  TestAccAcctestProvider_IgnoreTagsKeys_multiple
=== CONT  TestAccAcctestProvider_IgnoreTags_emptyBlock
    acctest_test.go:242: Acceptance tests skipped unless env 'TF_ACC' set
=== CONT  TestAccAcctestProvider_IgnoreTagsKeys_one
    acctest_test.go:338: Acceptance tests skipped unless env 'TF_ACC' set
=== CONT  TestAccAcctestProvider_IgnoreTagsKeys_none
=== CONT  TestAccAcctestProvider_IgnoreTagsKeyPrefixes_multiple
    acctest_test.go:300: Acceptance tests skipped unless env 'TF_ACC' set
=== CONT  TestAccAcctestProvider_IgnoreTagsKeys_none
    acctest_test.go:319: Acceptance tests skipped unless env 'TF_ACC' set
--- SKIP: TestAccAcctestProvider_DefaultTagsTags_none (0.02s)
=== CONT  TestAccAcctestProvider_Region_awsGovCloudUs
    acctest_test.go:442: Acceptance tests skipped unless env 'TF_ACC' set
--- SKIP: TestAccAcctestProvider_Region_awsSC2S (0.02s)
=== CONT  TestAccAcctestProvider_DefaultAndIgnoreTags_emptyBlocks
--- SKIP: TestAccAcctestProvider_fipsEndpoint (0.00s)
--- SKIP: TestAccAcctestProvider_Region_awsCommercial (0.02s)
=== CONT  TestAccAcctestProvider_DefaultAndIgnoreTags_emptyBlocks
    acctest_test.go:153: Acceptance tests skipped unless env 'TF_ACC' set
--- SKIP: TestAccAcctestProvider_endpoints (0.02s)
--- SKIP: TestAccAcctestProvider_DefaultTagsTags_one (0.01s)
--- SKIP: TestAccAcctestProvider_DefaultTagsTags_multiple (0.03s)
=== CONT  TestAccAcctestProvider_Region_awsC2S
    acctest_test.go:376: Acceptance tests skipped unless env 'TF_ACC' set
--- SKIP: TestAccAcctestProvider_IgnoreTags_emptyBlock (0.03s)
--- SKIP: TestAccAcctestProvider_IgnoreTagsKeys_one (0.02s)
--- SKIP: TestAccAcctestProvider_Region_awsC2S (0.04s)
=== CONT  TestAccAcctestProvider_IgnoreTagsKeys_multiple
    acctest_test.go:357: Acceptance tests skipped unless env 'TF_ACC' set
--- SKIP: TestAccAcctestProvider_IgnoreTagsKeyPrefixes_multiple (0.02s)
--- SKIP: TestAccAcctestProvider_IgnoreTagsKeys_none (0.02s)
--- SKIP: TestAccAcctestProvider_Region_awsGovCloudUs (0.02s)
--- SKIP: TestAccAcctestProvider_DefaultAndIgnoreTags_emptyBlocks (0.02s)
=== CONT  TestAccAcctestProvider_unusualEndpoints
    acctest_test.go:223: Acceptance tests skipped unless env 'TF_ACC' set
=== CONT  TestAccAcctestProvider_Region_awsChina
    acctest_test.go:398: Acceptance tests skipped unless env 'TF_ACC' set
--- SKIP: TestAccAcctestProvider_IgnoreTagsKeys_multiple (0.02s)
--- SKIP: TestAccAcctestProvider_Region_awsChina (0.01s)
--- SKIP: TestAccAcctestProvider_unusualEndpoints (0.02s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/acctest	4.808s

@ewbankkit ewbankkit removed their assignment Nov 5, 2021
@YakDriver YakDriver merged commit 145641b into main Nov 5, 2021
@YakDriver YakDriver deleted the b-custom-endpoints-redux branch November 5, 2021 18:23
@github-actions github-actions bot added this to the v3.65.0 milestone Nov 5, 2021
@YakDriver YakDriver modified the milestones: v3.65.0, v3.64.2 Nov 5, 2021
@github-actions
Copy link

github-actions bot commented Nov 5, 2021

This functionality has been released in v3.64.2 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
Copy link

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.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jun 10, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@ewbankkit ewbankkit ewbankkit approved these changes

Assignees
No one assigned
Labels
client-connections Pertains to the AWS Client and service connections. documentation Introduces or discusses updates to documentation. provider Pertains to the provider itself, rather than any interaction with AWS. size/L 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.64.2
Development

Successfully merging this pull request may close these issues.

AWS Provider Endpoints not working on 3.64.1
2 participants
@YakDriver @ewbankkit