Add cloudfront_distribution_zone_id to aws_cognito_user_pool_domain

[larstobi]

Description

In order not to hardcode zone ID in the terraform code, then do like in the CloudFront resource, and put the zone ID in the go clode. Then, we can write this in terraform code:

resource "aws_route53_record" "auth-cognito-A" {
  name    = aws_cognito_user_pool_domain.main.domain
  type    = "A"
  zone_id = data.aws_route53_zone.example.zone_id
  alias {
    evaluate_target_health = false
    name    = aws_cognito_user_pool_domain.main.cloudfront_distribution_arn
    zone_id = aws_cognito_user_pool_domain.main.cloudfront_distribution_zone_id
  }
}

References

• https://github.com/hashicorp/terraform-provider-aws/blob/main/internal/service/cloudfront/distribution_configuration_structure.go#L25

Output from Acceptance Testing

$ make testacc TESTS=TestAccXXX PKG=ec2
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/ec2/... -v -count 1 -parallel 20 -run='TestAccXXX'  -timeout 180m
testing: warning: no tests to run
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/ec2	1.807s [no tests to run]

...

[github-actions]

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.

[github-actions]

Welcome @larstobi 👋

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

[github-actions]

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.

[ewbankkit]

LGTM 🚀.

% make testacc TESTARGS='-run=TestAccAPIGatewayDomainNameDataSource_' PKG=apigateway ACCTEST_PARALLELISM=3
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/apigateway/... -v -count 1 -parallel 3  -run=TestAccAPIGatewayDomainNameDataSource_ -timeout 180m
=== RUN   TestAccAPIGatewayDomainNameDataSource_basic
=== PAUSE TestAccAPIGatewayDomainNameDataSource_basic
=== CONT  TestAccAPIGatewayDomainNameDataSource_basic
--- PASS: TestAccAPIGatewayDomainNameDataSource_basic (20.95s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/apigateway	26.176s
% make testacc TESTARGS='-run=TestAccAPIGatewayDomainName_' PKG=apigateway ACCTEST_PARALLELISM=3
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/apigateway/... -v -count 1 -parallel 3  -run=TestAccAPIGatewayDomainName_ -timeout 180m
=== RUN   TestAccAPIGatewayDomainName_certificateARN
    acctest.go:1585: Environment variable ACM_CERTIFICATE_ROOT_DOMAIN is not set. For DNS validation requests, this domain must be publicly accessible and configurable via Route53 during the testing. For email validation requests, you must have access to one of the five standard email addresses used (admin|administrator|hostmaster|postmaster|webmaster)@domain or one of the WHOIS contact addresses.
--- SKIP: TestAccAPIGatewayDomainName_certificateARN (0.00s)
=== RUN   TestAccAPIGatewayDomainName_certificateName
    domain_name_test.go:60: Environment variable AWS_API_GATEWAY_DOMAIN_NAME_CERTIFICATE_BODY is not set. This environment variable must be set to any non-empty value with a publicly trusted certificate body to enable the test.
--- SKIP: TestAccAPIGatewayDomainName_certificateName (0.00s)
=== RUN   TestAccAPIGatewayDomainName_regionalCertificateARN
=== PAUSE TestAccAPIGatewayDomainName_regionalCertificateARN
=== RUN   TestAccAPIGatewayDomainName_regionalCertificateName
    domain_name_test.go:156: Environment variable AWS_API_GATEWAY_DOMAIN_NAME_REGIONAL_CERTIFICATE_NAME_ENABLED is not set. This environment variable must be set to any non-empty value in a region where uploading REGIONAL certificates is allowed to enable the test.
--- SKIP: TestAccAPIGatewayDomainName_regionalCertificateName (0.00s)
=== RUN   TestAccAPIGatewayDomainName_securityPolicy
=== PAUSE TestAccAPIGatewayDomainName_securityPolicy
=== RUN   TestAccAPIGatewayDomainName_tags
=== PAUSE TestAccAPIGatewayDomainName_tags
=== RUN   TestAccAPIGatewayDomainName_disappears
=== PAUSE TestAccAPIGatewayDomainName_disappears
=== RUN   TestAccAPIGatewayDomainName_MutualTLSAuthentication_basic
    acctest.go:1585: Environment variable ACM_CERTIFICATE_ROOT_DOMAIN is not set. For DNS validation requests, this domain must be publicly accessible and configurable via Route53 during the testing. For email validation requests, you must have access to one of the five standard email addresses used (admin|administrator|hostmaster|postmaster|webmaster)@domain or one of the WHOIS contact addresses.
--- SKIP: TestAccAPIGatewayDomainName_MutualTLSAuthentication_basic (0.00s)
=== RUN   TestAccAPIGatewayDomainName_MutualTLSAuthentication_ownership
    acctest.go:1585: Environment variable ACM_CERTIFICATE_ROOT_DOMAIN is not set. For DNS validation requests, this domain must be publicly accessible and configurable via Route53 during the testing. For email validation requests, you must have access to one of the five standard email addresses used (admin|administrator|hostmaster|postmaster|webmaster)@domain or one of the WHOIS contact addresses.
--- SKIP: TestAccAPIGatewayDomainName_MutualTLSAuthentication_ownership (0.00s)
=== CONT  TestAccAPIGatewayDomainName_regionalCertificateARN
=== CONT  TestAccAPIGatewayDomainName_tags
=== CONT  TestAccAPIGatewayDomainName_securityPolicy
=== CONT  TestAccAPIGatewayDomainName_disappears
--- PASS: TestAccAPIGatewayDomainName_regionalCertificateARN (21.13s)
--- PASS: TestAccAPIGatewayDomainName_disappears (101.96s)
--- PASS: TestAccAPIGatewayDomainName_tags (130.61s)
--- PASS: TestAccAPIGatewayDomainName_securityPolicy (179.21s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/apigateway	184.570s
% AWS_DEFAULT_REGION=us-east-1 ACM_CERTIFICATE_ROOT_DOMAIN=example.com make testacc TESTARGS='-run=TestAccAPIGatewayDomainName_certificateARN\|TestAccAPIGatewayDomainName_MutualTLSAuthentication_' PKG=apigateway ACCTEST_PARALLELISM=2
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/apigateway/... -v -count 1 -parallel 2  -run=TestAccAPIGatewayDomainName_certificateARN\|TestAccAPIGatewayDomainName_MutualTLSAuthentication_ -timeout 180m
=== RUN   TestAccAPIGatewayDomainName_certificateARN
=== PAUSE TestAccAPIGatewayDomainName_certificateARN
=== RUN   TestAccAPIGatewayDomainName_MutualTLSAuthentication_basic
=== PAUSE TestAccAPIGatewayDomainName_MutualTLSAuthentication_basic
=== RUN   TestAccAPIGatewayDomainName_MutualTLSAuthentication_ownership
=== PAUSE TestAccAPIGatewayDomainName_MutualTLSAuthentication_ownership
=== CONT  TestAccAPIGatewayDomainName_certificateARN
=== CONT  TestAccAPIGatewayDomainName_MutualTLSAuthentication_ownership
--- PASS: TestAccAPIGatewayDomainName_MutualTLSAuthentication_ownership (99.50s)
=== CONT  TestAccAPIGatewayDomainName_MutualTLSAuthentication_basic
--- PASS: TestAccAPIGatewayDomainName_MutualTLSAuthentication_basic (199.75s)
--- PASS: TestAccAPIGatewayDomainName_certificateARN (1018.74s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/apigateway	1023.818s
% make testacc TESTARGS='-run=TestAccCloudFrontDistributionDataSource_\|TestAccCloudFrontDistribution_disappears\|TestAccCloudFrontDistribution_enabled\|TestAccCloudFrontDistribution_retainOnDelete' PKG=cloudfront ACCTEST_PARALLELISM=3
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/cloudfront/... -v -count 1 -parallel 3  -run=TestAccCloudFrontDistributionDataSource_\|TestAccCloudFrontDistribution_disappears\|TestAccCloudFrontDistribution_enabled\|TestAccCloudFrontDistribution_retainOnDelete -timeout 180m
=== RUN   TestAccCloudFrontDistributionDataSource_basic
=== PAUSE TestAccCloudFrontDistributionDataSource_basic
=== RUN   TestAccCloudFrontDistribution_disappears
=== PAUSE TestAccCloudFrontDistribution_disappears
=== RUN   TestAccCloudFrontDistribution_enabled
=== PAUSE TestAccCloudFrontDistribution_enabled
=== RUN   TestAccCloudFrontDistribution_retainOnDelete
=== PAUSE TestAccCloudFrontDistribution_retainOnDelete
=== CONT  TestAccCloudFrontDistributionDataSource_basic
=== CONT  TestAccCloudFrontDistribution_enabled
=== CONT  TestAccCloudFrontDistribution_retainOnDelete
--- PASS: TestAccCloudFrontDistributionDataSource_basic (424.34s)
=== CONT  TestAccCloudFrontDistribution_disappears
--- PASS: TestAccCloudFrontDistribution_retainOnDelete (434.92s)
--- PASS: TestAccCloudFrontDistribution_enabled (650.99s)
--- PASS: TestAccCloudFrontDistribution_disappears (229.03s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/cloudfront	658.754s

% AWS_DEFAULT_REGION=us-east-1 ACM_CERTIFICATE_ROOT_DOMAIN=example.com make testacc TESTARGS='-run=TestAccCognitoIDPUserPoolDomain_custom' PKG=cognitoidp ACCTEST_PARALLELISM=3
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/cognitoidp/... -v -count 1 -parallel 3  -run=TestAccCognitoIDPUserPoolDomain_custom -timeout 180m
=== RUN   TestAccCognitoIDPUserPoolDomain_custom
=== PAUSE TestAccCognitoIDPUserPoolDomain_custom
=== CONT  TestAccCognitoIDPUserPoolDomain_custom
--- PASS: TestAccCognitoIDPUserPoolDomain_custom (1340.98s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/cognitoidp	1346.121s
% make testacc TESTARGS='-run=TestAccCognitoIDPUserPoolDomain_basic\|TestAccCognitoIDPUserPoolDomain_disappears' PKG=cognitoidp ACCTEST_PARALLELISM=3
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/cognitoidp/... -v -count 1 -parallel 3  -run=TestAccCognitoIDPUserPoolDomain_basic\|TestAccCognitoIDPUserPoolDomain_disappears -timeout 180m
=== RUN   TestAccCognitoIDPUserPoolDomain_basic
=== PAUSE TestAccCognitoIDPUserPoolDomain_basic
=== RUN   TestAccCognitoIDPUserPoolDomain_disappears
=== PAUSE TestAccCognitoIDPUserPoolDomain_disappears
=== CONT  TestAccCognitoIDPUserPoolDomain_basic
=== CONT  TestAccCognitoIDPUserPoolDomain_disappears
--- PASS: TestAccCognitoIDPUserPoolDomain_disappears (24.03s)
--- PASS: TestAccCognitoIDPUserPoolDomain_basic (27.20s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/cognitoidp	35.682s

[ewbankkit]

@larstobi Thanks for the contribution 🎉 👏.
I went ahead and moved the CloudFront Hosted Zone IDs into the global AWSClient object so that the logic could be shared in a number of other resources.

[github-actions]

This functionality has been released in v4.59.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]

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.