tests/resource/aws_api_gateway_domain_name: Remove hardcoded environment variable handling, create public ACM certificate, improve state value checks #16139

bflad · 2020-11-11T12:30:46Z

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

Reference: #8316
Closes #14664
Reference: #15737

Release note for CHANGELOG:

NONE

Output from acceptance testing in AWS Commercial:

--- PASS: TestAccAWSAPIGatewayDomainName_disappears (20.54s)
--- PASS: TestAccAWSAPIGatewayDomainName_RegionalCertificateArn (81.84s)
--- PASS: TestAccAWSAPIGatewayDomainName_SecurityPolicy (139.42s)
--- PASS: TestAccAWSAPIGatewayDomainName_Tags (203.73s)
--- SKIP: TestAccAWSAPIGatewayDomainName_CertificateName (0.00s)
--- SKIP: TestAccAWSAPIGatewayDomainName_RegionalCertificateName (0.00s)

Output from acceptance testing in AWS GovCloud (US) (other tests failing with ACM quota limits):

--- SKIP: TestAccAWSAPIGatewayDomainName_CertificateArn (1.58s)

…ent variable handling, create public ACM certificate, improve state value checks Reference: #8316 Reference: #14664 Reference: #15737 Output from acceptance testing in AWS Commercial: ``` --- PASS: TestAccAWSAPIGatewayDomainName_disappears (20.54s) --- PASS: TestAccAWSAPIGatewayDomainName_RegionalCertificateArn (81.84s) --- PASS: TestAccAWSAPIGatewayDomainName_SecurityPolicy (139.42s) --- PASS: TestAccAWSAPIGatewayDomainName_Tags (203.73s) --- SKIP: TestAccAWSAPIGatewayDomainName_CertificateName (0.00s) --- SKIP: TestAccAWSAPIGatewayDomainName_RegionalCertificateName (0.00s) ``` Output from acceptance testing in AWS GovCloud (US) (other tests failing with ACM quota limits): ``` --- SKIP: TestAccAWSAPIGatewayDomainName_CertificateArn (1.58s) ```

…ting mutual TLS (relates: hashicorp#16139). Acceptance test output: $ ACM_CERTIFICATE_ROOT_DOMAIN=<domain name> make testacc TEST=./aws TESTARGS='-run=TestAccAWSAPIGatewayV2DomainName_' ==> Checking that code complies with gofmt requirements... TF_ACC=1 go test ./aws -v -count 1 -parallel 20 -run=TestAccAWSAPIGatewayV2DomainName_ -timeout 120m === RUN TestAccAWSAPIGatewayV2DomainName_basic === PAUSE TestAccAWSAPIGatewayV2DomainName_basic === RUN TestAccAWSAPIGatewayV2DomainName_disappears === PAUSE TestAccAWSAPIGatewayV2DomainName_disappears === RUN TestAccAWSAPIGatewayV2DomainName_Tags === PAUSE TestAccAWSAPIGatewayV2DomainName_Tags === RUN TestAccAWSAPIGatewayV2DomainName_UpdateCertificate === PAUSE TestAccAWSAPIGatewayV2DomainName_UpdateCertificate === RUN TestAccAWSAPIGatewayV2DomainName_MutualTlsAuthentication === PAUSE TestAccAWSAPIGatewayV2DomainName_MutualTlsAuthentication === CONT TestAccAWSAPIGatewayV2DomainName_basic === CONT TestAccAWSAPIGatewayV2DomainName_UpdateCertificate === CONT TestAccAWSAPIGatewayV2DomainName_MutualTlsAuthentication === CONT TestAccAWSAPIGatewayV2DomainName_Tags === CONT TestAccAWSAPIGatewayV2DomainName_disappears --- PASS: TestAccAWSAPIGatewayV2DomainName_disappears (22.46s) --- PASS: TestAccAWSAPIGatewayV2DomainName_Tags (83.52s) --- PASS: TestAccAWSAPIGatewayV2DomainName_MutualTlsAuthentication (207.72s) --- PASS: TestAccAWSAPIGatewayV2DomainName_basic (240.48s) --- PASS: TestAccAWSAPIGatewayV2DomainName_UpdateCertificate (758.06s) PASS ok github.com/terraform-providers/terraform-provider-aws/aws 758.484s

ewbankkit · 2020-11-11T23:15:51Z

aws/resource_aws_api_gateway_domain_name_test.go

+data "aws_route53_zone" "test" {
+  name         = %[1]q
+  private_zone = false
+}
+
+resource "aws_acm_certificate" "test" {
+  domain_name       = %[2]q
+  validation_method = "DNS"
+}
+
+#
+# for_each acceptance testing requires:
+# https://github.com/hashicorp/terraform-plugin-sdk/issues/536
+#
+# resource "aws_route53_record" "test" {
+#   for_each = {
+#     for dvo in aws_acm_certificate.test.domain_validation_options: dvo.domain_name => {
+#       name   = dvo.resource_record_name
+#       record = dvo.resource_record_value
+#       type   = dvo.resource_record_type
+#     }
+#   }
+
+#   allow_overwrite = true
+#   name            = each.value.name
+#   records         = [each.value.record]
+#   ttl             = 60
+#   type            = each.value.type
+#   zone_id         = data.aws_route53_zone.test.zone_id
+# }
+
+resource "aws_route53_record" "test" {
+  allow_overwrite = true
+  name            = tolist(aws_acm_certificate.test.domain_validation_options)[0].resource_record_name
+  records         = [tolist(aws_acm_certificate.test.domain_validation_options)[0].resource_record_value]
+  ttl             = 60
+  type            = tolist(aws_acm_certificate.test.domain_validation_options)[0].resource_record_type
+  zone_id         = data.aws_route53_zone.test.zone_id
+}
+
+resource "aws_acm_certificate_validation" "test" {
+  certificate_arn         = aws_acm_certificate.test.arn
+  validation_record_fqdns = [aws_route53_record.test.fqdn]
+}


FYI, in #15258 I have pulled this into a separate function as I will use it in a couple of places: 4a7197b#diff-de07b61dfd6679fbda71d2c219efc2356d9a0757a6366304a5361ee09f86803bR395-R441.
If this PR is merged first I'll refactor testAccAWSAPIGatewayDomainNameConfig_CertificateArn to use this new function.

Okay cool -- feel free to add it to the contributing guide and create a followup technical debt issue. 👍

Done: #16171.

ewbankkit

LGTM.

$ ACM_CERTIFICATE_ROOT_DOMAIN=<domain name> make testacc TEST=./aws TESTARGS='-run=TestAccAWSAPIGatewayDomainName_CertificateArn'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -count 1 -parallel 20 -run=TestAccAWSAPIGatewayDomainName_CertificateArn -timeout 120m
=== RUN   TestAccAWSAPIGatewayDomainName_CertificateArn
=== PAUSE TestAccAWSAPIGatewayDomainName_CertificateArn
=== CONT  TestAccAWSAPIGatewayDomainName_CertificateArn
--- PASS: TestAccAWSAPIGatewayDomainName_CertificateArn (963.01s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	963.079s

ghost · 2020-11-12T23:37:16Z

This has been released in version 3.15.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!

…ing mutual TLS (relates: hashicorp#16139). Acceptance test output: $ ACM_CERTIFICATE_ROOT_DOMAIN=<domain name> make testacc TEST=./aws TESTARGS='-run=TestAccAWSAPIGatewayDomainName_MutualTlsAuthentication' ==> Checking that code complies with gofmt requirements... TF_ACC=1 go test ./aws -v -count 1 -parallel 20 -run=TestAccAWSAPIGatewayDomainName_MutualTlsAuthentication -timeout 120m === RUN TestAccAWSAPIGatewayDomainName_MutualTlsAuthentication === PAUSE TestAccAWSAPIGatewayDomainName_MutualTlsAuthentication === CONT TestAccAWSAPIGatewayDomainName_MutualTlsAuthentication --- PASS: TestAccAWSAPIGatewayDomainName_MutualTlsAuthentication (151.06s) PASS ok github.com/terraform-providers/terraform-provider-aws/aws 151.102s

ghost · 2020-12-12T17:10:07Z

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!

bflad added tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. service/apigateway Issues and PRs that pertain to the apigateway service. technical-debt Addresses areas of the codebase that need refactoring or redesign. labels Nov 11, 2020

bflad requested a review from a team as a code owner November 11, 2020 12:30

ghost added size/L 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. labels Nov 11, 2020

bflad added the partition/aws-us-gov Pertains to the aws-us-gov partition. label Nov 11, 2020

This was referenced Nov 11, 2020

r/aws_apigatewayv2_domain_name: Support mutual TLS authentication #15249

Merged

r/aws_api_gateway_domain_name: Support mutual TLS authentication #15258

Merged

ewbankkit reviewed Nov 11, 2020

View reviewed changes

ewbankkit approved these changes Nov 12, 2020

View reviewed changes

bflad added this to the v3.15.0 milestone Nov 12, 2020

bflad merged commit 94161a5 into master Nov 12, 2020

bflad deleted the t-aws_api_gateway_domain_name-hardcoded-region branch November 12, 2020 15:29

ewbankkit mentioned this pull request Nov 13, 2020

Add common test configuration for ACM public certificate #16171

Closed

ghost locked as resolved and limited conversation to collaborators Dec 12, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

tests/resource/aws_api_gateway_domain_name: Remove hardcoded environment variable handling, create public ACM certificate, improve state value checks #16139

tests/resource/aws_api_gateway_domain_name: Remove hardcoded environment variable handling, create public ACM certificate, improve state value checks #16139

bflad commented Nov 11, 2020

ewbankkit Nov 11, 2020

bflad Nov 12, 2020

ewbankkit Nov 13, 2020

ewbankkit left a comment

ghost commented Nov 12, 2020

ghost commented Dec 12, 2020

tests/resource/aws_api_gateway_domain_name: Remove hardcoded environment variable handling, create public ACM certificate, improve state value checks #16139

tests/resource/aws_api_gateway_domain_name: Remove hardcoded environment variable handling, create public ACM certificate, improve state value checks #16139

Conversation

bflad commented Nov 11, 2020

Community Note

ewbankkit Nov 11, 2020

Choose a reason for hiding this comment

bflad Nov 12, 2020

Choose a reason for hiding this comment

ewbankkit Nov 13, 2020

Choose a reason for hiding this comment

ewbankkit left a comment

Choose a reason for hiding this comment

ghost commented Nov 12, 2020

ghost commented Dec 12, 2020