Skip to content

Commit

Permalink
Merge pull request #39656 from hashicorp/td-incorrect-acctest-regex
Browse files Browse the repository at this point in the history 
Corrects regex pattern `/+.` in various acceptance tests
  • Loading branch information
@gdavison
gdavison authored Oct 10, 2024
2 parents a2aa1ff + d49d064 commit c6b0c29
Show file tree
Hide file tree
Showing 42 changed files with 94 additions and 154 deletions.
4 changes: 2 additions & 2 deletions internal/service/apigateway/api_key_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func TestAccAPIGatewayAPIKey_basic(t *testing.T) {
Config: testAccAPIKeyConfig_basic(rName),
Check: resource.ComposeTestCheckFunc(
testAccCheckAPIKeyExists(ctx, resourceName, &apiKey1),
acctest.MatchResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "apigateway", regexache.MustCompile(`/apikeys/+.`)),
acctest.MatchResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "apigateway", regexache.MustCompile(`/apikeys/.+$`)),
resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate),
resource.TestCheckResourceAttr(resourceName, "customer_id", ""),
resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Managed by Terraform"),
Expand All @@ -57,7 +57,7 @@ func TestAccAPIGatewayAPIKey_basic(t *testing.T) {
Config: testAccAPIKeyConfig_basic(rNameUpdated),
Check: resource.ComposeTestCheckFunc(
testAccCheckAPIKeyExists(ctx, resourceName, &apiKey2),
acctest.MatchResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "apigateway", regexache.MustCompile(`/apikeys/+.`)),
acctest.MatchResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "apigateway", regexache.MustCompile(`/apikeys/.+$`)),
resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate),
resource.TestCheckResourceAttr(resourceName, "customer_id", ""),
resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Managed by Terraform"),
Expand Down
4 changes: 2 additions & 2 deletions internal/service/apigateway/client_certificate_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func TestAccAPIGatewayClientCertificate_basic(t *testing.T) {
Config: testAccClientCertificateConfig_basic,
Check: resource.ComposeTestCheckFunc(
testAccCheckClientCertificateExists(ctx, resourceName, &conf),
acctest.MatchResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "apigateway", regexache.MustCompile(`/clientcertificates/+.`)),
acctest.MatchResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "apigateway", regexache.MustCompile(`/clientcertificates/.+$`)),
resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Hello from TF acceptance test"),
),
},
Expand All @@ -47,7 +47,7 @@ func TestAccAPIGatewayClientCertificate_basic(t *testing.T) {
Config: testAccClientCertificateConfig_basicUpdated,
Check: resource.ComposeTestCheckFunc(
testAccCheckClientCertificateExists(ctx, resourceName, &conf),
acctest.MatchResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "apigateway", regexache.MustCompile(`/clientcertificates/+.`)),
acctest.MatchResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "apigateway", regexache.MustCompile(`/clientcertificates/.+$`)),
resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Hello from TF acceptance test - updated"),
),
},
Expand Down
8 changes: 4 additions & 4 deletions internal/service/apigateway/domain_name_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ func TestAccAPIGatewayDomainName_certificateName(t *testing.T) {
Config: testAccDomainNameConfig_certificate(domainName, certificatePrivateKey, certificateBody, certificateChain),
Check: resource.ComposeTestCheckFunc(
testAccCheckDomainNameExists(ctx, resourceName, &conf),
acctest.MatchResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "apigateway", regexache.MustCompile(`/domainnames/+.`)),
acctest.MatchResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "apigateway", regexache.MustCompile(`/domainnames/.+$`)),
resource.TestCheckResourceAttr(resourceName, "certificate_name", "tf-acc-apigateway-domain-name"),
resource.TestCheckResourceAttrSet(resourceName, "cloudfront_domain_name"),
resource.TestCheckResourceAttr(resourceName, "cloudfront_zone_id", "Z2FDTNDATAQYW2"),
Expand Down Expand Up @@ -274,7 +274,7 @@ func TestAccAPIGatewayDomainName_MutualTLSAuthentication_basic(t *testing.T) {
Config: testAccDomainNameConfig_mutualTLSAuthentication(rName, rootDomain, domain),
Check: resource.ComposeTestCheckFunc(
testAccCheckDomainNameExists(ctx, resourceName, &v),
acctest.MatchResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "apigateway", regexache.MustCompile(`/domainnames/+.`)),
acctest.MatchResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "apigateway", regexache.MustCompile(`/domainnames/.+$`)),
resource.TestCheckResourceAttrPair(resourceName, names.AttrDomainName, acmCertificateResourceName, names.AttrDomainName),
resource.TestCheckResourceAttr(resourceName, "mutual_tls_authentication.#", acctest.Ct1),
resource.TestCheckResourceAttr(resourceName, "mutual_tls_authentication.0.truststore_uri", fmt.Sprintf("s3://%s/%s", rName, rName)),
Expand All @@ -299,7 +299,7 @@ func TestAccAPIGatewayDomainName_MutualTLSAuthentication_basic(t *testing.T) {
Config: testAccDomainNameConfig_mutualTLSAuthentication(rName, rootDomain, domain),
Check: resource.ComposeTestCheckFunc(
testAccCheckDomainNameExists(ctx, resourceName, &v),
acctest.MatchResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "apigateway", regexache.MustCompile(`/domainnames/+.`)),
acctest.MatchResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "apigateway", regexache.MustCompile(`/domainnames/.+$`)),
resource.TestCheckResourceAttrPair(resourceName, names.AttrDomainName, acmCertificateResourceName, names.AttrDomainName),
resource.TestCheckResourceAttr(resourceName, "mutual_tls_authentication.#", acctest.Ct1),
resource.TestCheckResourceAttr(resourceName, "mutual_tls_authentication.0.truststore_uri", fmt.Sprintf("s3://%s/%s", rName, rName)),
Expand Down Expand Up @@ -332,7 +332,7 @@ func TestAccAPIGatewayDomainName_MutualTLSAuthentication_ownership(t *testing.T)
Config: testAccDomainNameConfig_mutualTLSOwnership(rName, rootDomain, domain, certificate, key),
Check: resource.ComposeTestCheckFunc(
testAccCheckDomainNameExists(ctx, resourceName, &v),
acctest.MatchResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "apigateway", regexache.MustCompile(`/domainnames/+.`)),
acctest.MatchResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "apigateway", regexache.MustCompile(`/domainnames/.+$`)),
resource.TestCheckResourceAttrPair(resourceName, names.AttrDomainName, publicAcmCertificateResourceName, names.AttrDomainName),
resource.TestCheckResourceAttrPair(resourceName, "ownership_verification_certificate_arn", publicAcmCertificateResourceName, names.AttrARN),
resource.TestCheckResourceAttr(resourceName, "mutual_tls_authentication.#", acctest.Ct1),
Expand Down
2 changes: 1 addition & 1 deletion internal/service/apigateway/rest_api_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func TestAccAPIGatewayRestAPI_basic(t *testing.T) {
Check: resource.ComposeTestCheckFunc(
testAccCheckRESTAPIExists(ctx, resourceName, &conf),
resource.TestCheckResourceAttr(resourceName, "api_key_source", "HEADER"),
acctest.MatchResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "apigateway", regexache.MustCompile(`/restapis/+.`)),
acctest.MatchResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "apigateway", regexache.MustCompile(`/restapis/.+$`)),
resource.TestCheckResourceAttr(resourceName, "binary_media_types.#", acctest.Ct0),
resource.TestCheckNoResourceAttr(resourceName, "body"),
acctest.CheckResourceAttrRFC3339(resourceName, names.AttrCreatedDate),
Expand Down
2 changes: 1 addition & 1 deletion internal/service/apigateway/usage_plan_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func TestAccAPIGatewayUsagePlan_basic(t *testing.T) {
Check: resource.ComposeTestCheckFunc(
testAccCheckUsagePlanExists(ctx, resourceName, &conf),
resource.TestCheckResourceAttr(resourceName, names.AttrName, rName),
acctest.MatchResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "apigateway", regexache.MustCompile(`/usageplans/+.`)),
acctest.MatchResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "apigateway", regexache.MustCompile(`/usageplans/.+$`)),
resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""),
resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, acctest.Ct0),
resource.TestCheckResourceAttr(resourceName, "api_stages.%", acctest.Ct0),
Expand Down
4 changes: 2 additions & 2 deletions internal/service/apigateway/vpc_link_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func TestAccAPIGatewayVPCLink_basic(t *testing.T) {
Config: testAccVPCLinkConfig_basic(rName, "test"),
Check: resource.ComposeAggregateTestCheckFunc(
testAccCheckVPCLinkExists(ctx, resourceName),
acctest.MatchResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "apigateway", regexache.MustCompile(`/vpclinks/.+`)),
acctest.MatchResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "apigateway", regexache.MustCompile(`/vpclinks/.+$`)),
resource.TestCheckResourceAttr(resourceName, names.AttrName, rName),
resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "test"),
resource.TestCheckResourceAttr(resourceName, "target_arns.#", acctest.Ct1),
Expand All @@ -49,7 +49,7 @@ func TestAccAPIGatewayVPCLink_basic(t *testing.T) {
Config: testAccVPCLinkConfig_basic(rName, "test update"),
Check: resource.ComposeAggregateTestCheckFunc(
testAccCheckVPCLinkExists(ctx, resourceName),
acctest.MatchResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "apigateway", regexache.MustCompile(`/vpclinks/.+`)),
acctest.MatchResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "apigateway", regexache.MustCompile(`/vpclinks/.+$`)),
resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "test update"),
resource.TestCheckResourceAttr(resourceName, names.AttrName, rName),
resource.TestCheckResourceAttr(resourceName, "target_arns.#", acctest.Ct1),
Expand Down
Loading

0 comments on commit c6b0c29

Please sign in to comment.