From 600408e43670fae92a5d84adc73b8ddb986ca59d Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Mon, 7 Oct 2024 16:29:50 -0700 Subject: [PATCH 1/9] `apigateway` --- internal/service/apigateway/api_key_test.go | 4 ++-- internal/service/apigateway/client_certificate_test.go | 4 ++-- internal/service/apigateway/domain_name_test.go | 8 ++++---- internal/service/apigateway/rest_api_test.go | 2 +- internal/service/apigateway/usage_plan_test.go | 2 +- internal/service/apigateway/vpc_link_test.go | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/internal/service/apigateway/api_key_test.go b/internal/service/apigateway/api_key_test.go index 96173cca1faf..a0e86a47592c 100644 --- a/internal/service/apigateway/api_key_test.go +++ b/internal/service/apigateway/api_key_test.go @@ -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"), @@ -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"), diff --git a/internal/service/apigateway/client_certificate_test.go b/internal/service/apigateway/client_certificate_test.go index 772aa9abaf53..d2b465714fc0 100644 --- a/internal/service/apigateway/client_certificate_test.go +++ b/internal/service/apigateway/client_certificate_test.go @@ -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"), ), }, @@ -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"), ), }, diff --git a/internal/service/apigateway/domain_name_test.go b/internal/service/apigateway/domain_name_test.go index 26d2acdb221f..640b4685ec27 100644 --- a/internal/service/apigateway/domain_name_test.go +++ b/internal/service/apigateway/domain_name_test.go @@ -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"), @@ -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)), @@ -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)), @@ -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), diff --git a/internal/service/apigateway/rest_api_test.go b/internal/service/apigateway/rest_api_test.go index fa551f77c136..2b2fc542b0b5 100644 --- a/internal/service/apigateway/rest_api_test.go +++ b/internal/service/apigateway/rest_api_test.go @@ -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), diff --git a/internal/service/apigateway/usage_plan_test.go b/internal/service/apigateway/usage_plan_test.go index 1ec29e339358..85ec503a02d2 100644 --- a/internal/service/apigateway/usage_plan_test.go +++ b/internal/service/apigateway/usage_plan_test.go @@ -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), diff --git a/internal/service/apigateway/vpc_link_test.go b/internal/service/apigateway/vpc_link_test.go index cf69c52892b4..4793a1b8e82a 100644 --- a/internal/service/apigateway/vpc_link_test.go +++ b/internal/service/apigateway/vpc_link_test.go @@ -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), @@ -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), From e449a71d8743f816fad984ea3c160e830b79036f Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Mon, 7 Oct 2024 17:06:36 -0700 Subject: [PATCH 2/9] `apigatewayv2` --- .../service/apigatewayv2/domain_name_test.go | 80 +++---------------- 1 file changed, 10 insertions(+), 70 deletions(-) diff --git a/internal/service/apigatewayv2/domain_name_test.go b/internal/service/apigatewayv2/domain_name_test.go index d97d9495143d..555ed7dbc1fd 100644 --- a/internal/service/apigatewayv2/domain_name_test.go +++ b/internal/service/apigatewayv2/domain_name_test.go @@ -8,7 +8,6 @@ import ( "fmt" "testing" - "github.com/YakDriver/regexache" "github.com/aws/aws-sdk-go-v2/service/apigatewayv2" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" @@ -40,7 +39,7 @@ func TestAccAPIGatewayV2DomainName_basic(t *testing.T) { Config: testAccDomainNameConfig_basic(rName, certificate, key, 1, 0), Check: resource.ComposeTestCheckFunc( testAccCheckDomainNameExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "apigateway", regexache.MustCompile(`/domainnames/.+`)), + acctest.CheckResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "apigateway", fmt.Sprintf("/domainnames/%s.example.com", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrDomainName, domainName), resource.TestCheckResourceAttr(resourceName, "domain_name_configuration.#", acctest.Ct1), resource.TestCheckResourceAttrPair(resourceName, "domain_name_configuration.0.certificate_arn", certResourceName, names.AttrARN), @@ -88,65 +87,6 @@ func TestAccAPIGatewayV2DomainName_disappears(t *testing.T) { }) } -// func TestAccAPIGatewayV2DomainName_tags(t *testing.T) { -// ctx := acctest.Context(t) -// var v apigatewayv2.GetDomainNameOutput -// resourceName := "aws_apigatewayv2_domain_name.test" -// certResourceName := "aws_acm_certificate.test.0" -// rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) -// key := acctest.TLSRSAPrivateKeyPEM(t, 2048) -// domainName := fmt.Sprintf("%s.example.com", rName) -// certificate := acctest.TLSRSAX509SelfSignedCertificatePEM(t, key, domainName) - -// resource.ParallelTest(t, resource.TestCase{ -// PreCheck: func() { acctest.PreCheck(ctx, t) }, -// ErrorCheck: acctest.ErrorCheck(t, names.APIGatewayV2ServiceID), -// ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, -// CheckDestroy: testAccCheckDomainNameDestroy(ctx), -// Steps: []resource.TestStep{ -// { -// Config: testAccDomainNameConfig_tags(rName, certificate, key, 1, 0), -// Check: resource.ComposeTestCheckFunc( -// testAccCheckDomainNameExists(ctx, resourceName, &v), -// acctest.MatchResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "apigateway", regexache.MustCompile(`/domainnames/.+`)), -// resource.TestCheckResourceAttr(resourceName, names.AttrDomainName, domainName), -// resource.TestCheckResourceAttr(resourceName, "domain_name_configuration.#", acctest.Ct1), -// resource.TestCheckResourceAttrPair(resourceName, "domain_name_configuration.0.certificate_arn", certResourceName, names.AttrARN), -// resource.TestCheckResourceAttr(resourceName, "domain_name_configuration.0.endpoint_type", "REGIONAL"), -// resource.TestCheckResourceAttrSet(resourceName, "domain_name_configuration.0.hosted_zone_id"), -// resource.TestCheckResourceAttr(resourceName, "domain_name_configuration.0.security_policy", "TLS_1_2"), -// resource.TestCheckResourceAttrSet(resourceName, "domain_name_configuration.0.target_domain_name"), -// resource.TestCheckResourceAttr(resourceName, "mutual_tls_authentication.#", acctest.Ct0), -// resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, acctest.Ct2), -// resource.TestCheckResourceAttr(resourceName, "tags.Key1", "Value1"), -// resource.TestCheckResourceAttr(resourceName, "tags.Key2", "Value2"), -// ), -// }, -// { -// ResourceName: resourceName, -// ImportState: true, -// ImportStateVerify: true, -// }, -// { -// Config: testAccDomainNameConfig_basic(rName, certificate, key, 1, 0), -// Check: resource.ComposeTestCheckFunc( -// testAccCheckDomainNameExists(ctx, resourceName, &v), -// acctest.MatchResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "apigateway", regexache.MustCompile(`/domainnames/.+`)), -// resource.TestCheckResourceAttr(resourceName, names.AttrDomainName, domainName), -// resource.TestCheckResourceAttr(resourceName, "domain_name_configuration.#", acctest.Ct1), -// resource.TestCheckResourceAttrPair(resourceName, "domain_name_configuration.0.certificate_arn", certResourceName, names.AttrARN), -// resource.TestCheckResourceAttr(resourceName, "domain_name_configuration.0.endpoint_type", "REGIONAL"), -// resource.TestCheckResourceAttrSet(resourceName, "domain_name_configuration.0.hosted_zone_id"), -// resource.TestCheckResourceAttr(resourceName, "domain_name_configuration.0.security_policy", "TLS_1_2"), -// resource.TestCheckResourceAttrSet(resourceName, "domain_name_configuration.0.target_domain_name"), -// resource.TestCheckResourceAttr(resourceName, "mutual_tls_authentication.#", acctest.Ct0), -// resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, acctest.Ct0), -// ), -// }, -// }, -// }) -// } - func TestAccAPIGatewayV2DomainName_updateCertificate(t *testing.T) { ctx := acctest.Context(t) var v apigatewayv2.GetDomainNameOutput @@ -168,7 +108,7 @@ func TestAccAPIGatewayV2DomainName_updateCertificate(t *testing.T) { Config: testAccDomainNameConfig_basic(rName, certificate, key, 2, 0), Check: resource.ComposeTestCheckFunc( testAccCheckDomainNameExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "apigateway", regexache.MustCompile(`/domainnames/.+`)), + acctest.CheckResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "apigateway", fmt.Sprintf("/domainnames/%s.example.com", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrDomainName, domainName), resource.TestCheckResourceAttr(resourceName, "domain_name_configuration.#", acctest.Ct1), resource.TestCheckResourceAttrPair(resourceName, "domain_name_configuration.0.certificate_arn", certResourceName0, names.AttrARN), @@ -184,7 +124,7 @@ func TestAccAPIGatewayV2DomainName_updateCertificate(t *testing.T) { Config: testAccDomainNameConfig_basic(rName, certificate, key, 2, 1), Check: resource.ComposeTestCheckFunc( testAccCheckDomainNameExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "apigateway", regexache.MustCompile(`/domainnames/.+`)), + acctest.CheckResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "apigateway", fmt.Sprintf("/domainnames/%s.example.com", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrDomainName, domainName), resource.TestCheckResourceAttr(resourceName, "domain_name_configuration.#", acctest.Ct1), resource.TestCheckResourceAttrPair(resourceName, "domain_name_configuration.0.certificate_arn", certResourceName1, names.AttrARN), @@ -200,7 +140,7 @@ func TestAccAPIGatewayV2DomainName_updateCertificate(t *testing.T) { Config: testAccDomainNameConfig_tags(rName, certificate, key, 2, 0), Check: resource.ComposeTestCheckFunc( testAccCheckDomainNameExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "apigateway", regexache.MustCompile(`/domainnames/.+`)), + acctest.CheckResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "apigateway", fmt.Sprintf("/domainnames/%s.example.com", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrDomainName, domainName), resource.TestCheckResourceAttr(resourceName, "domain_name_configuration.#", acctest.Ct1), resource.TestCheckResourceAttrPair(resourceName, "domain_name_configuration.0.certificate_arn", certResourceName0, names.AttrARN), @@ -243,7 +183,7 @@ func TestAccAPIGatewayV2DomainName_MutualTLSAuthentication_basic(t *testing.T) { Config: testAccDomainNameConfig_mutualTLSAuthenticationObjectVersion(rName, rootDomain, domain), Check: resource.ComposeTestCheckFunc( testAccCheckDomainNameExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "apigateway", regexache.MustCompile(`/domainnames/.+`)), + acctest.CheckResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "apigateway", fmt.Sprintf("/domainnames/%s.example.com", rName)), resource.TestCheckResourceAttrPair(resourceName, names.AttrDomainName, acmCertificateResourceName, names.AttrDomainName), resource.TestCheckResourceAttr(resourceName, "domain_name_configuration.#", acctest.Ct1), resource.TestCheckResourceAttrPair(resourceName, "domain_name_configuration.0.certificate_arn", acmCertificateResourceName, names.AttrARN), @@ -261,7 +201,7 @@ func TestAccAPIGatewayV2DomainName_MutualTLSAuthentication_basic(t *testing.T) { Config: testAccDomainNameConfig_mutualTLSAuthenticationObjectVersion(rName, rootDomain, domain), Check: resource.ComposeTestCheckFunc( testAccCheckDomainNameExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "apigateway", regexache.MustCompile(`/domainnames/.+`)), + acctest.CheckResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "apigateway", fmt.Sprintf("/domainnames/%s.example.com", rName)), resource.TestCheckResourceAttrPair(resourceName, names.AttrDomainName, acmCertificateResourceName, names.AttrDomainName), resource.TestCheckResourceAttr(resourceName, "domain_name_configuration.#", acctest.Ct1), resource.TestCheckResourceAttrPair(resourceName, "domain_name_configuration.0.certificate_arn", acmCertificateResourceName, names.AttrARN), @@ -285,7 +225,7 @@ func TestAccAPIGatewayV2DomainName_MutualTLSAuthentication_basic(t *testing.T) { Config: testAccDomainNameConfig_mutualTLSAuthenticationMissing(rootDomain, domain), Check: resource.ComposeTestCheckFunc( testAccCheckDomainNameExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "apigateway", regexache.MustCompile(`/domainnames/.+`)), + acctest.CheckResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "apigateway", fmt.Sprintf("/domainnames/%s.example.com", rName)), resource.TestCheckResourceAttrPair(resourceName, names.AttrDomainName, acmCertificateResourceName, names.AttrDomainName), resource.TestCheckResourceAttr(resourceName, "domain_name_configuration.#", acctest.Ct1), resource.TestCheckResourceAttrPair(resourceName, "domain_name_configuration.0.certificate_arn", acmCertificateResourceName, names.AttrARN), @@ -301,7 +241,7 @@ func TestAccAPIGatewayV2DomainName_MutualTLSAuthentication_basic(t *testing.T) { Config: testAccDomainNameConfig_mutualTLSAuthenticationObjectVersion(rName, rootDomain, domain), Check: resource.ComposeTestCheckFunc( testAccCheckDomainNameExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "apigateway", regexache.MustCompile(`/domainnames/.+`)), + acctest.CheckResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "apigateway", fmt.Sprintf("/domainnames/%s.example.com", rName)), resource.TestCheckResourceAttrPair(resourceName, names.AttrDomainName, acmCertificateResourceName, names.AttrDomainName), resource.TestCheckResourceAttr(resourceName, "domain_name_configuration.#", acctest.Ct1), resource.TestCheckResourceAttrPair(resourceName, "domain_name_configuration.0.certificate_arn", acmCertificateResourceName, names.AttrARN), @@ -338,7 +278,7 @@ func TestAccAPIGatewayV2DomainName_MutualTLSAuthentication_noVersion(t *testing. Config: testAccDomainNameConfig_mutualTLSAuthenticationNoObjectVersion(rName, rootDomain, domain), Check: resource.ComposeTestCheckFunc( testAccCheckDomainNameExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "apigateway", regexache.MustCompile(`/domainnames/.+`)), + acctest.CheckResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "apigateway", fmt.Sprintf("/domainnames/%s.example.com", rName)), resource.TestCheckResourceAttrPair(resourceName, names.AttrDomainName, acmCertificateResourceName, names.AttrDomainName), resource.TestCheckResourceAttr(resourceName, "domain_name_configuration.#", acctest.Ct1), resource.TestCheckResourceAttrPair(resourceName, "domain_name_configuration.0.certificate_arn", acmCertificateResourceName, names.AttrARN), @@ -379,7 +319,7 @@ func TestAccAPIGatewayV2DomainName_MutualTLSAuthentication_ownership(t *testing. Config: testAccDomainNameConfig_mutualTLSAuthenticationOwnershipVerificationCert(rName, rootDomain, domain, certificate, key), Check: resource.ComposeTestCheckFunc( testAccCheckDomainNameExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "apigateway", regexache.MustCompile(`/domainnames/+.`)), + acctest.CheckResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "apigateway", fmt.Sprintf("/domainnames/%s.example.com", rName)), resource.TestCheckResourceAttrPair(resourceName, names.AttrDomainName, publicAcmCertificateResourceName, names.AttrDomainName), resource.TestCheckResourceAttr(resourceName, "domain_name_configuration.#", acctest.Ct1), resource.TestCheckResourceAttrPair(resourceName, "domain_name_configuration.0.certificate_arn", importedAcmCertificateResourceName, names.AttrARN), From f20e6a429c65b8f27855835ceb1768f3a5fb8401 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Mon, 7 Oct 2024 17:11:31 -0700 Subject: [PATCH 3/9] `appconfig` --- .../service/appconfig/configuration_profile_data_source_test.go | 2 +- internal/service/appconfig/environment_data_source_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/appconfig/configuration_profile_data_source_test.go b/internal/service/appconfig/configuration_profile_data_source_test.go index fc9809f00ecd..dbfe22cc059d 100644 --- a/internal/service/appconfig/configuration_profile_data_source_test.go +++ b/internal/service/appconfig/configuration_profile_data_source_test.go @@ -38,7 +38,7 @@ func TestAccAppConfigConfigurationProfileDataSource_basic(t *testing.T) { Config: testAccConfigurationProfileDataSourceConfig_basic(appName, rName), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrPair(dataSourceName, names.AttrApplicationID, appResourceName, names.AttrID), - acctest.MatchResourceAttrRegionalARN(dataSourceName, names.AttrARN, "appconfig", regexache.MustCompile(`application/([a-z\d]{4,7})/configurationprofile/+.`)), + resource.TestCheckResourceAttrPair(dataSourceName, names.AttrARN, "aws_appconfig_configuration_profile.test", names.AttrARN), resource.TestMatchResourceAttr(dataSourceName, "configuration_profile_id", regexache.MustCompile(`[a-z\d]{4,7}`)), resource.TestCheckResourceAttr(dataSourceName, "kms_key_identifier", "alias/"+rName), resource.TestCheckResourceAttr(dataSourceName, "location_uri", "hosted"), diff --git a/internal/service/appconfig/environment_data_source_test.go b/internal/service/appconfig/environment_data_source_test.go index b34070b79449..079072b70a01 100644 --- a/internal/service/appconfig/environment_data_source_test.go +++ b/internal/service/appconfig/environment_data_source_test.go @@ -36,7 +36,7 @@ func TestAccAppConfigEnvironmentDataSource_basic(t *testing.T) { { Config: testAccEnvironmentDataSourceConfig_basic(appName, rName), Check: resource.ComposeTestCheckFunc( - acctest.MatchResourceAttrRegionalARN(dataSourceName, names.AttrARN, "appconfig", regexache.MustCompile(`application/([a-z\d]{4,7})/environment/+.`)), + resource.TestCheckResourceAttrPair(dataSourceName, names.AttrARN, "aws_appconfig_environment.test", names.AttrARN), resource.TestCheckResourceAttrPair(dataSourceName, names.AttrApplicationID, appResourceName, names.AttrID), resource.TestCheckResourceAttr(dataSourceName, names.AttrDescription, "Example AppConfig Environment"), resource.TestMatchResourceAttr(dataSourceName, "environment_id", regexache.MustCompile(`[a-z\d]{4,7}`)), From ed0aaf4803a2b501165abb06985bff8a7c8c878c Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Mon, 7 Oct 2024 18:04:28 -0700 Subject: [PATCH 4/9] `dynamodb` --- internal/service/dynamodb/table_export_test.go | 12 ++++++------ internal/service/dynamodb/table_test.go | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/service/dynamodb/table_export_test.go b/internal/service/dynamodb/table_export_test.go index 310d9ca30eb0..6c3f81d1c898 100644 --- a/internal/service/dynamodb/table_export_test.go +++ b/internal/service/dynamodb/table_export_test.go @@ -39,7 +39,7 @@ func TestAccDynamoDBTableExport_basic(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccTableExportConfig_basic(rName), - Check: resource.ComposeTestCheckFunc( + Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTableExportExists(ctx, resourceName, &tableexport), resource.TestCheckResourceAttr(resourceName, "export_format", "DYNAMODB_JSON"), resource.TestCheckResourceAttr(resourceName, "export_status", "COMPLETED"), @@ -54,7 +54,7 @@ func TestAccDynamoDBTableExport_basic(t *testing.T) { resource.TestCheckResourceAttrSet(resourceName, names.AttrStartTime), resource.TestCheckResourceAttrSet(resourceName, "end_time"), acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "dynamodb", regexache.MustCompile( - fmt.Sprintf("table\\/%s\\/export\\/+.", rName), + fmt.Sprintf(`table/%s/export/.+$`, rName), )), acctest.CheckResourceAttrRegionalARN(resourceName, "table_arn", "dynamodb", fmt.Sprintf("table/%s", rName)), ), @@ -92,7 +92,7 @@ func TestAccDynamoDBTableExport_kms(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccTableExportConfig_kms(rName), - Check: resource.ComposeTestCheckFunc( + Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTableExportExists(ctx, resourceName, &tableexport), resource.TestCheckResourceAttr(resourceName, "export_format", "DYNAMODB_JSON"), resource.TestCheckResourceAttr(resourceName, "export_status", "COMPLETED"), @@ -107,7 +107,7 @@ func TestAccDynamoDBTableExport_kms(t *testing.T) { resource.TestCheckResourceAttrSet(resourceName, names.AttrStartTime), resource.TestCheckResourceAttrSet(resourceName, "end_time"), acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "dynamodb", regexache.MustCompile( - fmt.Sprintf("table\\/%s\\/export\\/+.", rName), + fmt.Sprintf(`table/%s/export/.+$`, rName), )), acctest.CheckResourceAttrRegionalARN(resourceName, "table_arn", "dynamodb", fmt.Sprintf("table/%s", rName)), ), @@ -144,7 +144,7 @@ func TestAccDynamoDBTableExport_s3Prefix(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccTableExportConfig_s3Prefix(rName, "test"), - Check: resource.ComposeTestCheckFunc( + Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTableExportExists(ctx, resourceName, &tableexport), resource.TestCheckResourceAttr(resourceName, "export_format", "DYNAMODB_JSON"), resource.TestCheckResourceAttr(resourceName, "export_status", "COMPLETED"), @@ -159,7 +159,7 @@ func TestAccDynamoDBTableExport_s3Prefix(t *testing.T) { resource.TestCheckResourceAttrSet(resourceName, names.AttrStartTime), resource.TestCheckResourceAttrSet(resourceName, "end_time"), acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "dynamodb", regexache.MustCompile( - fmt.Sprintf("table\\/%s\\/export\\/+.", rName), + fmt.Sprintf(`table/%s/export/.+$`, rName), )), acctest.CheckResourceAttrRegionalARN(resourceName, "table_arn", "dynamodb", fmt.Sprintf("table/%s", rName)), ), diff --git a/internal/service/dynamodb/table_test.go b/internal/service/dynamodb/table_test.go index 830690873782..2765aea4cb49 100644 --- a/internal/service/dynamodb/table_test.go +++ b/internal/service/dynamodb/table_test.go @@ -1676,8 +1676,8 @@ func TestAccDynamoDBTable_restoreCrossRegion(t *testing.T) { testAccCheckInitialTableExists(ctx, resourceName, &conf), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceNameRestore, names.AttrName, rNameRestore), - acctest.MatchResourceAttrRegionalARNRegion(resourceName, names.AttrARN, "dynamodb", acctest.Region(), regexache.MustCompile(`table/+.`)), - acctest.MatchResourceAttrRegionalARNRegion(resourceNameRestore, names.AttrARN, "dynamodb", acctest.AlternateRegion(), regexache.MustCompile(`table/+.`)), + acctest.MatchResourceAttrRegionalARNRegion(resourceName, names.AttrARN, "dynamodb", acctest.Region(), regexache.MustCompile(`table/XXX`)), + acctest.MatchResourceAttrRegionalARNRegion(resourceNameRestore, names.AttrARN, "dynamodb", acctest.AlternateRegion(), regexache.MustCompile(`table/YYY`)), ), }, { From 327e6cc17aea6216c46e98e650c28e147815a560 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Tue, 8 Oct 2024 16:31:54 -0700 Subject: [PATCH 5/9] `auditmanager` --- internal/service/auditmanager/assessment_test.go | 2 +- internal/service/auditmanager/control_test.go | 2 +- internal/service/auditmanager/framework_test.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/service/auditmanager/assessment_test.go b/internal/service/auditmanager/assessment_test.go index a1ce39e1e67c..861a5ddc7bb8 100644 --- a/internal/service/auditmanager/assessment_test.go +++ b/internal/service/auditmanager/assessment_test.go @@ -47,7 +47,7 @@ func TestAccAuditManagerAssessment_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "scope.#", acctest.Ct1), resource.TestCheckResourceAttr(resourceName, "scope.0.aws_accounts.#", acctest.Ct1), resource.TestCheckResourceAttr(resourceName, "scope.0.aws_services.#", acctest.Ct1), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "auditmanager", regexache.MustCompile(`assessment/+.`)), + acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "auditmanager", regexache.MustCompile(`assessment/.+$`)), ), }, { diff --git a/internal/service/auditmanager/control_test.go b/internal/service/auditmanager/control_test.go index cad339ac48f3..5bbbf6684720 100644 --- a/internal/service/auditmanager/control_test.go +++ b/internal/service/auditmanager/control_test.go @@ -45,7 +45,7 @@ func TestAccAuditManagerControl_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "control_mapping_sources.0.source_name", rName), resource.TestCheckResourceAttr(resourceName, "control_mapping_sources.0.source_set_up_option", string(types.SourceSetUpOptionProceduralControlsMapping)), resource.TestCheckResourceAttr(resourceName, "control_mapping_sources.0.source_type", string(types.SourceTypeManual)), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "auditmanager", regexache.MustCompile(`control/+.`)), + acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "auditmanager", regexache.MustCompile(`control/.+$`)), ), }, { diff --git a/internal/service/auditmanager/framework_test.go b/internal/service/auditmanager/framework_test.go index 7996a5c437a1..25a0ab796e53 100644 --- a/internal/service/auditmanager/framework_test.go +++ b/internal/service/auditmanager/framework_test.go @@ -44,7 +44,7 @@ func TestAccAuditManagerFramework_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "control_sets.#", acctest.Ct1), resource.TestCheckResourceAttr(resourceName, "control_sets.0.name", rName), resource.TestCheckResourceAttr(resourceName, "control_sets.0.controls.#", acctest.Ct1), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "auditmanager", regexache.MustCompile(`assessmentFramework/+.`)), + acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "auditmanager", regexache.MustCompile(`assessmentFramework/.+$`)), ), }, { From acac613eb1faff78d4709cce15f28a4201c63050 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Tue, 8 Oct 2024 16:56:47 -0700 Subject: [PATCH 6/9] `chimesdkmediapipelines` --- .../media_insights_pipeline_configuration_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/service/chimesdkmediapipelines/media_insights_pipeline_configuration_test.go b/internal/service/chimesdkmediapipelines/media_insights_pipeline_configuration_test.go index 18ead56ee76a..cb5fa79faacb 100644 --- a/internal/service/chimesdkmediapipelines/media_insights_pipeline_configuration_test.go +++ b/internal/service/chimesdkmediapipelines/media_insights_pipeline_configuration_test.go @@ -52,7 +52,7 @@ func TestAccChimeSDKMediaPipelinesMediaInsightsPipelineConfiguration_basic(t *te resource.TestCheckResourceAttr(resourceName, "elements.#", acctest.Ct2), resource.TestCheckResourceAttr(resourceName, "elements.0.type", "AmazonTranscribeCallAnalyticsProcessor"), resource.TestCheckResourceAttr(resourceName, "elements.1.type", "KinesisDataStreamSink"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "chime", regexache.MustCompile(`media-insights-pipeline-configuration/+.`)), + acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "chime", fmt.Sprintf(`media-insights-pipeline-configuration/%s`, rName)), ), }, { @@ -139,7 +139,7 @@ func TestAccChimeSDKMediaPipelinesMediaInsightsPipelineConfiguration_updateAllPr resource.TestCheckResourceAttrSet(resourceName, "real_time_alert_configuration.0.rules.1.keyword_match_configuration.0.%"), resource.TestCheckResourceAttr(resourceName, "real_time_alert_configuration.0.rules.2.type", "Sentiment"), resource.TestCheckResourceAttrSet(resourceName, "real_time_alert_configuration.0.rules.2.sentiment_configuration.0.%"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "chime", regexache.MustCompile(`media-insights-pipeline-configuration/+.`)), + acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "chime", fmt.Sprintf(`media-insights-pipeline-configuration/%s`, rName)), ), }, { @@ -150,7 +150,7 @@ func TestAccChimeSDKMediaPipelinesMediaInsightsPipelineConfiguration_updateAllPr resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttrSet(resourceName, names.AttrID), acctest.CheckResourceAttrGlobalARN(resourceName, "resource_access_role_arn", "iam", fmt.Sprintf(`role/%s`, roleName1)), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "chime", regexache.MustCompile(`media-insights-pipeline-configuration/+.`)), + acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "chime", fmt.Sprintf(`media-insights-pipeline-configuration/%s`, rName)), resource.TestCheckResourceAttr(resourceName, "elements.#", acctest.Ct2), resource.TestCheckResourceAttr(resourceName, "elements.0.type", "AmazonTranscribeProcessor"), resource.TestCheckResourceAttr(resourceName, "elements.1.type", "KinesisDataStreamSink"), @@ -166,7 +166,7 @@ func TestAccChimeSDKMediaPipelinesMediaInsightsPipelineConfiguration_updateAllPr resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttrSet(resourceName, names.AttrID), acctest.CheckResourceAttrGlobalARN(resourceName, "resource_access_role_arn", "iam", fmt.Sprintf(`role/%s`, roleName2)), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "chime", regexache.MustCompile(`media-insights-pipeline-configuration/+.`)), + acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "chime", fmt.Sprintf(`media-insights-pipeline-configuration/%s`, rName)), resource.TestCheckResourceAttr(resourceName, "elements.#", acctest.Ct1), resource.TestCheckResourceAttr(resourceName, "elements.0.type", "S3RecordingSink"), ), @@ -179,7 +179,7 @@ func TestAccChimeSDKMediaPipelinesMediaInsightsPipelineConfiguration_updateAllPr resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttrSet(resourceName, names.AttrID), acctest.CheckResourceAttrGlobalARN(resourceName, "resource_access_role_arn", "iam", fmt.Sprintf(`role/%s`, roleName2)), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "chime", regexache.MustCompile(`media-insights-pipeline-configuration/+.`)), + acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "chime", fmt.Sprintf(`media-insights-pipeline-configuration/%s`, rName)), resource.TestCheckResourceAttr(resourceName, "elements.#", "5"), resource.TestCheckResourceAttr(resourceName, "elements.0.type", "VoiceAnalyticsProcessor"), resource.TestCheckResourceAttr(resourceName, "elements.1.type", "LambdaFunctionSink"), From d7d72ca0261a269a52a057198ab055023f38458f Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Wed, 9 Oct 2024 15:13:52 -0700 Subject: [PATCH 7/9] `chimesdkvoice` --- internal/service/chimesdkvoice/voice_profile_domain_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/service/chimesdkvoice/voice_profile_domain_test.go b/internal/service/chimesdkvoice/voice_profile_domain_test.go index eeeb54b0e505..8d9c5644df98 100644 --- a/internal/service/chimesdkvoice/voice_profile_domain_test.go +++ b/internal/service/chimesdkvoice/voice_profile_domain_test.go @@ -61,7 +61,7 @@ func testAccVoiceProfileDomain_basic(t *testing.T) { testAccCheckVoiceProfileDomainExists(ctx, resourceName, &voiceprofiledomain), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttrSet(resourceName, "server_side_encryption_configuration.0.kms_key_arn"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "chime", regexache.MustCompile(`voice-profile-domain/+.`)), + acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "chime", regexache.MustCompile(`voice-profile-domain/.+$`)), ), }, { @@ -126,7 +126,7 @@ func testAccVoiceProfileDomain_update(t *testing.T) { testAccCheckVoiceProfileDomainExists(ctx, resourceName, &v1), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName1), resource.TestCheckResourceAttrSet(resourceName, "server_side_encryption_configuration.0.kms_key_arn"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "chime", regexache.MustCompile(`voice-profile-domain/+.`)), + acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "chime", regexache.MustCompile(`voice-profile-domain/.+$`)), ), }, { @@ -137,7 +137,7 @@ func testAccVoiceProfileDomain_update(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrName, rName2), resource.TestCheckResourceAttrSet(resourceName, "server_side_encryption_configuration.0.kms_key_arn"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, description), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "chime", regexache.MustCompile(`voice-profile-domain/+.`)), + acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "chime", regexache.MustCompile(`voice-profile-domain/.+$`)), ), }, }, From 42a5cf87bad66b6b373bb747180ddbac0bb7a158 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Wed, 9 Oct 2024 16:11:15 -0700 Subject: [PATCH 8/9] `m2` --- internal/service/m2/environment_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/m2/environment_test.go b/internal/service/m2/environment_test.go index 9012fc03a4b8..a4eac6e76767 100644 --- a/internal/service/m2/environment_test.go +++ b/internal/service/m2/environment_test.go @@ -47,7 +47,7 @@ func TestAccM2Environment_basic(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckEnvironmentExists(ctx, resourceName, &environment), resource.TestCheckNoResourceAttr(resourceName, "apply_changes_during_maintenance_window"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "m2", regexache.MustCompile(`env/+.`)), + acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "m2", regexache.MustCompile(`env/.+$`)), resource.TestCheckNoResourceAttr(resourceName, names.AttrDescription), resource.TestCheckResourceAttr(resourceName, "engine_type", "bluage"), resource.TestCheckResourceAttrSet(resourceName, names.AttrEngineVersion), @@ -128,7 +128,7 @@ func TestAccM2Environment_full(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckEnvironmentExists(ctx, resourceName, &environment), resource.TestCheckNoResourceAttr(resourceName, "apply_changes_during_maintenance_window"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "m2", regexache.MustCompile(`env/+.`)), + acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "m2", regexache.MustCompile(`env/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Test-1"), resource.TestCheckResourceAttr(resourceName, "engine_type", "microfocus"), resource.TestCheckResourceAttr(resourceName, names.AttrEngineVersion, "8.0.10"), From d49d064392b0e1d647a00765a050af5ef519d884 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Wed, 9 Oct 2024 16:16:49 -0700 Subject: [PATCH 9/9] Remainder of regexes --- .../tls_inspection_configuration_test.go | 8 +++--- internal/service/oam/link_data_source_test.go | 6 ++--- internal/service/oam/link_test.go | 6 ++--- .../service/oam/links_data_source_test.go | 2 +- internal/service/oam/sink_data_source_test.go | 2 +- internal/service/oam/sink_policy_test.go | 4 +-- internal/service/oam/sink_test.go | 2 +- .../service/oam/sinks_data_source_test.go | 2 +- .../redshift/data_share_authorization_test.go | 2 +- .../data_share_consumer_association_test.go | 4 +-- .../redshift/data_shares_data_source_test.go | 2 +- .../producer_data_shares_data_source_test.go | 2 +- .../service/resourceexplorer2/index_test.go | 2 +- .../service/resourceexplorer2/view_test.go | 6 ++--- .../application_data_source_test.go | 2 +- .../application_test.go | 2 +- .../shield/protection_data_source_test.go | 4 +-- internal/service/ssmcontacts/contact_test.go | 2 +- internal/service/ssmcontacts/rotation_test.go | 2 +- .../replication_set_data_source_test.go | 2 +- .../ssmincidents/replication_set_test.go | 26 +++++++++---------- .../response_plan_data_source_test.go | 2 +- internal/service/ssoadmin/application_test.go | 2 +- .../timestreaminfluxdb/db_instance_test.go | 2 +- .../verifiedpermissions/policy_store_test.go | 2 +- 25 files changed, 49 insertions(+), 49 deletions(-) diff --git a/internal/service/networkfirewall/tls_inspection_configuration_test.go b/internal/service/networkfirewall/tls_inspection_configuration_test.go index 3e18c7d0bd6c..ccc6194d824d 100644 --- a/internal/service/networkfirewall/tls_inspection_configuration_test.go +++ b/internal/service/networkfirewall/tls_inspection_configuration_test.go @@ -38,7 +38,7 @@ func TestAccNetworkFirewallTLSInspectionConfiguration_basic(t *testing.T) { Config: testAccTLSInspectionConfigurationConfig_basic(rName, commonName.String(), certificateDomainName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTLSInspectionConfigurationExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "network-firewall", regexache.MustCompile(`tls-configuration/+.`)), + acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "network-firewall", regexache.MustCompile(`tls-configuration/.+$`)), resource.TestCheckNoResourceAttr(resourceName, "certificate_authority"), resource.TestCheckResourceAttr(resourceName, "certificates.#", acctest.Ct1), resource.TestCheckNoResourceAttr(resourceName, names.AttrDescription), @@ -170,7 +170,7 @@ func TestAccNetworkFirewallTLSInspectionConfiguration_encryptionConfiguration(t Config: testAccTLSInspectionConfigurationConfig_encryptionConfiguration(rName, commonName.String(), certificateDomainName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTLSInspectionConfigurationExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "network-firewall", regexache.MustCompile(`tls-configuration/+.`)), + acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "network-firewall", regexache.MustCompile(`tls-configuration/.+$`)), resource.TestCheckNoResourceAttr(resourceName, "certificate_authority"), resource.TestCheckResourceAttr(resourceName, "certificates.#", acctest.Ct1), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "test"), @@ -238,7 +238,7 @@ func TestAccNetworkFirewallTLSInspectionConfiguration_checkCertificateRevocation Config: testAccTLSInspectionConfigurationConfig_checkCertificateRevocationStatus(rName, commonName.String(), certificateDomainName, "REJECT", "PASS"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTLSInspectionConfigurationExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "network-firewall", regexache.MustCompile(`tls-configuration/+.`)), + acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "network-firewall", regexache.MustCompile(`tls-configuration/.+$`)), resource.TestCheckNoResourceAttr(resourceName, "certificates"), resource.TestCheckResourceAttr(resourceName, "certificate_authority.#", acctest.Ct1), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "test"), @@ -282,7 +282,7 @@ func TestAccNetworkFirewallTLSInspectionConfiguration_checkCertificateRevocation Config: testAccTLSInspectionConfigurationConfig_checkCertificateRevocationStatus(rName, commonName.String(), certificateDomainName, "DROP", "PASS"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTLSInspectionConfigurationExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "network-firewall", regexache.MustCompile(`tls-configuration/+.`)), + acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "network-firewall", regexache.MustCompile(`tls-configuration/.+$`)), resource.TestCheckNoResourceAttr(resourceName, "certificates"), resource.TestCheckResourceAttr(resourceName, "certificate_authority.#", acctest.Ct1), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "test"), diff --git a/internal/service/oam/link_data_source_test.go b/internal/service/oam/link_data_source_test.go index 779424fcad3a..d0dc2acf1eb2 100644 --- a/internal/service/oam/link_data_source_test.go +++ b/internal/service/oam/link_data_source_test.go @@ -36,7 +36,7 @@ func testAccObservabilityAccessManagerLinkDataSource_basic(t *testing.T) { { Config: testAccLinkDataSourceConfig_basic(rName), Check: resource.ComposeTestCheckFunc( - acctest.MatchResourceAttrRegionalARN(dataSourceName, names.AttrARN, "oam", regexache.MustCompile(`link/+.`)), + acctest.MatchResourceAttrRegionalARN(dataSourceName, names.AttrARN, "oam", regexache.MustCompile(`link/.+$`)), resource.TestCheckResourceAttrSet(dataSourceName, "label"), resource.TestCheckResourceAttr(dataSourceName, "label_template", "$AccountName"), resource.TestCheckResourceAttrSet(dataSourceName, "link_id"), @@ -74,7 +74,7 @@ func testAccObservabilityAccessManagerLinkDataSource_logGroupConfiguration(t *te { Config: testAccLinkDataSourceConfig_logGroupConfiguration(rName, filter), Check: resource.ComposeTestCheckFunc( - acctest.MatchResourceAttrRegionalARN(dataSourceName, names.AttrARN, "oam", regexache.MustCompile(`link/+.`)), + acctest.MatchResourceAttrRegionalARN(dataSourceName, names.AttrARN, "oam", regexache.MustCompile(`link/.+$`)), resource.TestCheckResourceAttrSet(dataSourceName, "label"), resource.TestCheckResourceAttr(dataSourceName, "label_template", "$AccountName"), resource.TestCheckResourceAttr(dataSourceName, "link_configuration.#", acctest.Ct1), @@ -116,7 +116,7 @@ func testAccObservabilityAccessManagerLinkDataSource_metricConfiguration(t *test { Config: testAccLinkDataSourceConfig_metricConfiguration(rName, filter), Check: resource.ComposeTestCheckFunc( - acctest.MatchResourceAttrRegionalARN(dataSourceName, names.AttrARN, "oam", regexache.MustCompile(`link/+.`)), + acctest.MatchResourceAttrRegionalARN(dataSourceName, names.AttrARN, "oam", regexache.MustCompile(`link/.+$`)), resource.TestCheckResourceAttrSet(dataSourceName, "label"), resource.TestCheckResourceAttr(dataSourceName, "label_template", "$AccountName"), resource.TestCheckResourceAttr(dataSourceName, "link_configuration.#", acctest.Ct1), diff --git a/internal/service/oam/link_test.go b/internal/service/oam/link_test.go index 673748efb997..046be6dab6d4 100644 --- a/internal/service/oam/link_test.go +++ b/internal/service/oam/link_test.go @@ -48,7 +48,7 @@ func testAccObservabilityAccessManagerLink_basic(t *testing.T) { Config: testAccLinkConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckLinkExists(ctx, resourceName, &link), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "oam", regexache.MustCompile(`link/+.`)), + acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "oam", regexache.MustCompile(`link/.+$`)), resource.TestCheckResourceAttrSet(resourceName, "label"), resource.TestCheckResourceAttr(resourceName, "label_template", "$AccountName"), resource.TestCheckResourceAttrSet(resourceName, "link_id"), @@ -125,7 +125,7 @@ func testAccObservabilityAccessManagerLink_update(t *testing.T) { Config: testAccLinkConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckLinkExists(ctx, resourceName, &link), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "oam", regexache.MustCompile(`link/+.`)), + acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "oam", regexache.MustCompile(`link/.+$`)), resource.TestCheckResourceAttrSet(resourceName, "label"), resource.TestCheckResourceAttr(resourceName, "label_template", "$AccountName"), resource.TestCheckResourceAttrSet(resourceName, "link_id"), @@ -139,7 +139,7 @@ func testAccObservabilityAccessManagerLink_update(t *testing.T) { Config: testAccLinkConfig_update(rName), Check: resource.ComposeTestCheckFunc( testAccCheckLinkExists(ctx, resourceName, &link), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "oam", regexache.MustCompile(`link/+.`)), + acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "oam", regexache.MustCompile(`link/.+$`)), resource.TestCheckResourceAttrSet(resourceName, "label"), resource.TestCheckResourceAttr(resourceName, "label_template", "$AccountName"), resource.TestCheckResourceAttrSet(resourceName, "link_id"), diff --git a/internal/service/oam/links_data_source_test.go b/internal/service/oam/links_data_source_test.go index 8381ed465128..3be1c2aa61c5 100644 --- a/internal/service/oam/links_data_source_test.go +++ b/internal/service/oam/links_data_source_test.go @@ -37,7 +37,7 @@ func testAccObservabilityAccessManagerLinksDataSource_basic(t *testing.T) { Config: testAccLinksDataSourceConfig_basic(rName), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr(dataSourceName, "arns.#", acctest.Ct1), - acctest.MatchResourceAttrRegionalARN(dataSourceName, "arns.0", "oam", regexache.MustCompile(`link/+.`)), + acctest.MatchResourceAttrRegionalARN(dataSourceName, "arns.0", "oam", regexache.MustCompile(`link/.+$`)), ), }, }, diff --git a/internal/service/oam/sink_data_source_test.go b/internal/service/oam/sink_data_source_test.go index 870eaaa01e1b..91c82a69bd32 100644 --- a/internal/service/oam/sink_data_source_test.go +++ b/internal/service/oam/sink_data_source_test.go @@ -44,7 +44,7 @@ func testAccObservabilityAccessManagerSinkDataSource_basic(t *testing.T) { resource.TestCheckResourceAttrSet(dataSourceName, "sink_identifier"), resource.TestCheckResourceAttr(dataSourceName, acctest.CtTagsPercent, acctest.Ct1), resource.TestCheckResourceAttr(dataSourceName, acctest.CtTagsKey1, acctest.CtValue1), - acctest.MatchResourceAttrRegionalARN(dataSourceName, names.AttrARN, "oam", regexache.MustCompile(`sink/+.`)), + acctest.MatchResourceAttrRegionalARN(dataSourceName, names.AttrARN, "oam", regexache.MustCompile(`sink/.+$`)), ), }, }, diff --git a/internal/service/oam/sink_policy_test.go b/internal/service/oam/sink_policy_test.go index eb4136cc23c8..791359f14529 100644 --- a/internal/service/oam/sink_policy_test.go +++ b/internal/service/oam/sink_policy_test.go @@ -47,7 +47,7 @@ func testAccObservabilityAccessManagerSinkPolicy_basic(t *testing.T) { Config: testAccSinkPolicyConfigBasic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckSinkPolicyExists(ctx, resourceName, &sinkPolicy), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "oam", regexache.MustCompile(`sink/+.`)), + acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "oam", regexache.MustCompile(`sink/.+$`)), resource.TestCheckResourceAttrWith(resourceName, names.AttrPolicy, func(value string) error { _, err := awspolicy.PoliciesAreEquivalent(value, fmt.Sprintf(` { @@ -106,7 +106,7 @@ func testAccObservabilityAccessManagerSinkPolicy_update(t *testing.T) { Config: testAccSinkPolicyConfigBasic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckSinkPolicyExists(ctx, resourceName, &sinkPolicy), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "oam", regexache.MustCompile(`sink/+.`)), + acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "oam", regexache.MustCompile(`sink/.+$`)), resource.TestCheckResourceAttrWith(resourceName, names.AttrPolicy, func(value string) error { _, err := awspolicy.PoliciesAreEquivalent(value, fmt.Sprintf(` { diff --git a/internal/service/oam/sink_test.go b/internal/service/oam/sink_test.go index 7d0ce3854bfe..c188fb4dcd91 100644 --- a/internal/service/oam/sink_test.go +++ b/internal/service/oam/sink_test.go @@ -47,7 +47,7 @@ func testAccObservabilityAccessManagerSink_basic(t *testing.T) { Config: testAccSinkConfigBasic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckSinkExists(ctx, resourceName, &sink), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "oam", regexache.MustCompile(`sink/+.`)), + acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "oam", regexache.MustCompile(`sink/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttrSet(resourceName, "sink_id"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, acctest.Ct0), diff --git a/internal/service/oam/sinks_data_source_test.go b/internal/service/oam/sinks_data_source_test.go index 48fb57256529..d5356d282701 100644 --- a/internal/service/oam/sinks_data_source_test.go +++ b/internal/service/oam/sinks_data_source_test.go @@ -36,7 +36,7 @@ func testAccObservabilityAccessManagerSinksDataSource_basic(t *testing.T) { Config: testAccSinksDataSourceConfig_basic(rName), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr(dataSourceName, "arns.#", acctest.Ct1), - acctest.MatchResourceAttrRegionalARN(dataSourceName, "arns.0", "oam", regexache.MustCompile(`sink/+.`)), + acctest.MatchResourceAttrRegionalARN(dataSourceName, "arns.0", "oam", regexache.MustCompile(`sink/.+$`)), ), }, }, diff --git a/internal/service/redshift/data_share_authorization_test.go b/internal/service/redshift/data_share_authorization_test.go index 1252b0c81a28..80d441b5c601 100644 --- a/internal/service/redshift/data_share_authorization_test.go +++ b/internal/service/redshift/data_share_authorization_test.go @@ -43,7 +43,7 @@ func TestAccRedshiftDataShareAuthorization_basic(t *testing.T) { testAccCheckDataShareAuthorizationExists(ctx, resourceName), resource.TestCheckResourceAttrPair(resourceName, "consumer_identifier", callerIdentityDataSourceName, names.AttrAccountID), acctest.MatchResourceAttrRegionalARN(resourceName, "data_share_arn", "redshift", regexache.MustCompile(`datashare:+.`)), - acctest.MatchResourceAttrRegionalARN(resourceName, "producer_arn", "redshift-serverless", regexache.MustCompile(`namespace/+.`)), + acctest.MatchResourceAttrRegionalARN(resourceName, "producer_arn", "redshift-serverless", regexache.MustCompile(`namespace/.+$`)), ), }, { diff --git a/internal/service/redshift/data_share_consumer_association_test.go b/internal/service/redshift/data_share_consumer_association_test.go index b5b7fe9ceb25..ff16db4ee424 100644 --- a/internal/service/redshift/data_share_consumer_association_test.go +++ b/internal/service/redshift/data_share_consumer_association_test.go @@ -43,7 +43,7 @@ func TestAccRedshiftDataShareConsumerAssociation_basic(t *testing.T) { testAccCheckDataShareConsumerAssociationExists(ctx, resourceName), resource.TestCheckResourceAttrPair(resourceName, "consumer_region", regionDataSourceName, names.AttrName), acctest.MatchResourceAttrRegionalARN(resourceName, "data_share_arn", "redshift", regexache.MustCompile(`datashare:+.`)), - acctest.MatchResourceAttrRegionalARN(resourceName, "producer_arn", "redshift-serverless", regexache.MustCompile(`namespace/+.`)), + acctest.MatchResourceAttrRegionalARN(resourceName, "producer_arn", "redshift-serverless", regexache.MustCompile(`namespace/.+$`)), ), }, { @@ -101,7 +101,7 @@ func TestAccRedshiftDataShareConsumerAssociation_associateEntireAccount(t *testi testAccCheckDataShareConsumerAssociationExists(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, "associate_entire_account", acctest.CtTrue), acctest.MatchResourceAttrRegionalARN(resourceName, "data_share_arn", "redshift", regexache.MustCompile(`datashare:+.`)), - acctest.MatchResourceAttrRegionalARN(resourceName, "producer_arn", "redshift-serverless", regexache.MustCompile(`namespace/+.`)), + acctest.MatchResourceAttrRegionalARN(resourceName, "producer_arn", "redshift-serverless", regexache.MustCompile(`namespace/.+$`)), ), }, { diff --git a/internal/service/redshift/data_shares_data_source_test.go b/internal/service/redshift/data_shares_data_source_test.go index 5f141a217432..e2446601e89c 100644 --- a/internal/service/redshift/data_shares_data_source_test.go +++ b/internal/service/redshift/data_shares_data_source_test.go @@ -39,7 +39,7 @@ func TestAccRedshiftDataSharesDataSource_basic(t *testing.T) { resource.TestCheckResourceAttrSet(dataSourceName, "data_shares.#"), resource.TestMatchTypeSetElemNestedAttrs(dataSourceName, "data_shares.*", map[string]*regexp.Regexp{ "data_share_arn": regexache.MustCompile(`datashare:+.`), - "producer_arn": regexache.MustCompile(`namespace/+.`), + "producer_arn": regexache.MustCompile(`namespace/.+$`), }), ), }, diff --git a/internal/service/redshift/producer_data_shares_data_source_test.go b/internal/service/redshift/producer_data_shares_data_source_test.go index 21e1a869a4ca..e95404bc4e40 100644 --- a/internal/service/redshift/producer_data_shares_data_source_test.go +++ b/internal/service/redshift/producer_data_shares_data_source_test.go @@ -41,7 +41,7 @@ func TestAccRedshiftProducerDataSharesDataSource_basic(t *testing.T) { resource.TestCheckResourceAttrSet(dataSourceName, "data_shares.#"), resource.TestMatchTypeSetElemNestedAttrs(dataSourceName, "data_shares.*", map[string]*regexp.Regexp{ "data_share_arn": regexache.MustCompile(`datashare:+.`), - "producer_arn": regexache.MustCompile(`namespace/+.`), + "producer_arn": regexache.MustCompile(`namespace/.+$`), }), ), }, diff --git a/internal/service/resourceexplorer2/index_test.go b/internal/service/resourceexplorer2/index_test.go index 39fe25c4aa30..ecee8f5bb1ff 100644 --- a/internal/service/resourceexplorer2/index_test.go +++ b/internal/service/resourceexplorer2/index_test.go @@ -35,7 +35,7 @@ func testAccIndex_basic(t *testing.T) { Config: testAccIndexConfig_basic, Check: resource.ComposeTestCheckFunc( testAccCheckIndexExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "resource-explorer-2", regexache.MustCompile(`index/+.`)), + acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "resource-explorer-2", regexache.MustCompile(`index/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrType, "LOCAL"), ), }, diff --git a/internal/service/resourceexplorer2/view_test.go b/internal/service/resourceexplorer2/view_test.go index 8eb01e7015a8..cd45698fcce6 100644 --- a/internal/service/resourceexplorer2/view_test.go +++ b/internal/service/resourceexplorer2/view_test.go @@ -39,7 +39,7 @@ func testAccView_basic(t *testing.T) { Config: testAccViewConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckViewExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "resource-explorer-2", regexache.MustCompile(`view/+.`)), + acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "resource-explorer-2", regexache.MustCompile(`view/.+$`)), resource.TestCheckResourceAttr(resourceName, "default_view", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "filters.#", acctest.Ct0), resource.TestCheckResourceAttr(resourceName, "included_property.#", acctest.Ct0), @@ -147,7 +147,7 @@ func testAccView_filter(t *testing.T) { Config: testAccViewConfig_filter(rName, "resourcetype:ec2:instance"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckViewExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "resource-explorer-2", regexache.MustCompile(`view/+.`)), + acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "resource-explorer-2", regexache.MustCompile(`view/.+$`)), resource.TestCheckResourceAttr(resourceName, "default_view", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "filters.#", acctest.Ct1), resource.TestCheckResourceAttr(resourceName, "filters.0.filter_string", "resourcetype:ec2:instance"), @@ -166,7 +166,7 @@ func testAccView_filter(t *testing.T) { Config: testAccViewConfig_filter(rName, "region:global"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckViewExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "resource-explorer-2", regexache.MustCompile(`view/+.`)), + acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "resource-explorer-2", regexache.MustCompile(`view/.+$`)), resource.TestCheckResourceAttr(resourceName, "default_view", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "filters.#", acctest.Ct1), resource.TestCheckResourceAttr(resourceName, "filters.0.filter_string", "region:global"), diff --git a/internal/service/servicecatalogappregistry/application_data_source_test.go b/internal/service/servicecatalogappregistry/application_data_source_test.go index f46fecebeb2d..9b987b6f2b2e 100644 --- a/internal/service/servicecatalogappregistry/application_data_source_test.go +++ b/internal/service/servicecatalogappregistry/application_data_source_test.go @@ -34,7 +34,7 @@ func TestAccServiceCatalogAppRegistryApplicationDataSource_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrPair(dataSourceName, names.AttrID, applicationResourceName, names.AttrID), resource.TestCheckResourceAttr(dataSourceName, names.AttrName, rName), - acctest.MatchResourceAttrRegionalARN(dataSourceName, names.AttrARN, "servicecatalog", regexache.MustCompile(`/applications/+.`)), + acctest.MatchResourceAttrRegionalARN(dataSourceName, names.AttrARN, "servicecatalog", regexache.MustCompile(`/applications/.+$`)), ), }, }, diff --git a/internal/service/servicecatalogappregistry/application_test.go b/internal/service/servicecatalogappregistry/application_test.go index eac8c21fba8b..e71b201cd894 100644 --- a/internal/service/servicecatalogappregistry/application_test.go +++ b/internal/service/servicecatalogappregistry/application_test.go @@ -40,7 +40,7 @@ func TestAccServiceCatalogAppRegistryApplication_basic(t *testing.T) { Config: testAccApplicationConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "servicecatalog", regexache.MustCompile(`/applications/+.`)), + acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "servicecatalog", regexache.MustCompile(`/applications/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), ), }, diff --git a/internal/service/shield/protection_data_source_test.go b/internal/service/shield/protection_data_source_test.go index c8b2d679b124..ec50cf9e937d 100644 --- a/internal/service/shield/protection_data_source_test.go +++ b/internal/service/shield/protection_data_source_test.go @@ -37,7 +37,7 @@ func TestAccShieldProtectionDataSource_basic(t *testing.T) { resource.TestCheckResourceAttrPair(dataSourceName, names.AttrName, protectionResourceName, names.AttrName), resource.TestCheckResourceAttrPair(dataSourceName, "protection_id", protectionResourceName, names.AttrID), resource.TestCheckResourceAttrPair(dataSourceName, names.AttrResourceARN, protectionResourceName, names.AttrResourceARN), - acctest.MatchResourceAttrGlobalARN(dataSourceName, "protection_arn", "shield", regexache.MustCompile(`protection/+.`)), + acctest.MatchResourceAttrGlobalARN(dataSourceName, "protection_arn", "shield", regexache.MustCompile(`protection/.+$`)), ), }, { @@ -46,7 +46,7 @@ func TestAccShieldProtectionDataSource_basic(t *testing.T) { resource.TestCheckResourceAttrPair(dataSourceName, names.AttrName, protectionResourceName, names.AttrName), resource.TestCheckResourceAttrPair(dataSourceName, "protection_id", protectionResourceName, names.AttrID), resource.TestCheckResourceAttrPair(dataSourceName, names.AttrResourceARN, protectionResourceName, names.AttrResourceARN), - acctest.MatchResourceAttrGlobalARN(dataSourceName, "protection_arn", "shield", regexache.MustCompile(`protection/+.`)), + acctest.MatchResourceAttrGlobalARN(dataSourceName, "protection_arn", "shield", regexache.MustCompile(`protection/.+$`)), ), }, }, diff --git a/internal/service/ssmcontacts/contact_test.go b/internal/service/ssmcontacts/contact_test.go index dd848f699d1d..9d894d7740dd 100644 --- a/internal/service/ssmcontacts/contact_test.go +++ b/internal/service/ssmcontacts/contact_test.go @@ -47,7 +47,7 @@ func testAccContact_basic(t *testing.T) { testAccCheckContactExists(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, names.AttrAlias, rName), resource.TestCheckResourceAttr(resourceName, names.AttrType, "PERSONAL"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ssm-contacts", regexache.MustCompile(`contact/+.`)), + acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ssm-contacts", regexache.MustCompile(`contact/.+$`)), ), }, { diff --git a/internal/service/ssmcontacts/rotation_test.go b/internal/service/ssmcontacts/rotation_test.go index 4bd96238dc89..1d645b84ed6c 100644 --- a/internal/service/ssmcontacts/rotation_test.go +++ b/internal/service/ssmcontacts/rotation_test.go @@ -57,7 +57,7 @@ func testAccRotation_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "recurrence.0.daily_settings.0.hour_of_day", acctest.Ct1), resource.TestCheckResourceAttr(resourceName, "recurrence.0.daily_settings.0.minute_of_hour", acctest.Ct0), resource.TestCheckResourceAttr(resourceName, "contact_ids.#", acctest.Ct1), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ssm-contacts", regexache.MustCompile(`rotation\/+.`)), + acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ssm-contacts", regexache.MustCompile(`rotation/.+$`)), ), }, { diff --git a/internal/service/ssmincidents/replication_set_data_source_test.go b/internal/service/ssmincidents/replication_set_data_source_test.go index bfc5ce24866e..f33bb20bfbd2 100644 --- a/internal/service/ssmincidents/replication_set_data_source_test.go +++ b/internal/service/ssmincidents/replication_set_data_source_test.go @@ -46,7 +46,7 @@ func testAccReplicationSetDataSource_basic(t *testing.T) { resource.TestCheckTypeSetElemAttrPair(resourceName, "region.0.status", dataSourceName, "region.0.status"), resource.TestCheckTypeSetElemAttrPair(resourceName, "region.0.status_message", dataSourceName, "region.0.status_message"), - acctest.MatchResourceAttrGlobalARN(dataSourceName, names.AttrARN, "ssm-incidents", regexache.MustCompile(`replication-set\/+.`)), + acctest.MatchResourceAttrGlobalARN(dataSourceName, names.AttrARN, "ssm-incidents", regexache.MustCompile(`replication-set/.+$`)), ), }, }, diff --git a/internal/service/ssmincidents/replication_set_test.go b/internal/service/ssmincidents/replication_set_test.go index 0caba3e2c064..03c0093e3385 100644 --- a/internal/service/ssmincidents/replication_set_test.go +++ b/internal/service/ssmincidents/replication_set_test.go @@ -55,7 +55,7 @@ func testAccReplicationSet_basic(t *testing.T) { names.AttrName: region2, names.AttrKMSKeyARN: "DefaultKey", }), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "ssm-incidents", regexache.MustCompile(`replication-set\/+.`)), + acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "ssm-incidents", regexache.MustCompile(`replication-set/.+$`)), ), }, { @@ -97,7 +97,7 @@ func testAccReplicationSet_updateRegionsWithoutCMK(t *testing.T) { names.AttrKMSKeyARN: "DefaultKey", }), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "ssm-incidents", regexache.MustCompile(`replication-set\/+.`)), + acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "ssm-incidents", regexache.MustCompile(`replication-set/.+$`)), ), }, { @@ -120,7 +120,7 @@ func testAccReplicationSet_updateRegionsWithoutCMK(t *testing.T) { names.AttrKMSKeyARN: "DefaultKey", }), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "ssm-incidents", regexache.MustCompile(`replication-set\/+.`)), + acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "ssm-incidents", regexache.MustCompile(`replication-set/.+$`)), ), }, { @@ -139,7 +139,7 @@ func testAccReplicationSet_updateRegionsWithoutCMK(t *testing.T) { names.AttrKMSKeyARN: "DefaultKey", }), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "ssm-incidents", regexache.MustCompile(`replication-set\/+.`)), + acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "ssm-incidents", regexache.MustCompile(`replication-set/.+$`)), ), }, { @@ -178,7 +178,7 @@ func testAccReplicationSet_updateRegionsWithCMK(t *testing.T) { resource.TestCheckTypeSetElemNestedAttrs(resourceName, "region.*", map[string]string{ names.AttrName: acctest.Region(), }), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "ssm-incidents", regexache.MustCompile(`replication-set\/+.`)), + acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "ssm-incidents", regexache.MustCompile(`replication-set/.+$`)), ), }, { @@ -198,7 +198,7 @@ func testAccReplicationSet_updateRegionsWithCMK(t *testing.T) { resource.TestCheckTypeSetElemNestedAttrs(resourceName, "region.*", map[string]string{ names.AttrName: acctest.AlternateRegion(), }), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "ssm-incidents", regexache.MustCompile(`replication-set\/+.`)), + acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "ssm-incidents", regexache.MustCompile(`replication-set/.+$`)), ), }, { @@ -215,7 +215,7 @@ func testAccReplicationSet_updateRegionsWithCMK(t *testing.T) { resource.TestCheckTypeSetElemNestedAttrs(resourceName, "region.*", map[string]string{ names.AttrName: acctest.Region(), }), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "ssm-incidents", regexache.MustCompile(`replication-set\/+.`)), + acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "ssm-incidents", regexache.MustCompile(`replication-set/.+$`)), ), }, { @@ -272,7 +272,7 @@ func testAccReplicationSet_updateTags(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "tags."+rKey1, rVal1Ini), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsAllPercent, acctest.Ct2), resource.TestCheckResourceAttr(resourceName, "tags_all."+rProviderKey1, rProviderVal1Ini), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "ssm-incidents", regexache.MustCompile(`replication-set\/+.`)), + acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "ssm-incidents", regexache.MustCompile(`replication-set/.+$`)), ), }, { @@ -291,7 +291,7 @@ func testAccReplicationSet_updateTags(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "tags."+rKey1, rVal1Updated), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsAllPercent, acctest.Ct2), resource.TestCheckResourceAttr(resourceName, "tags_all."+rProviderKey1, rProviderVal1Upd), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "ssm-incidents", regexache.MustCompile(`replication-set\/+.`)), + acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "ssm-incidents", regexache.MustCompile(`replication-set/.+$`)), ), }, { @@ -312,7 +312,7 @@ func testAccReplicationSet_updateTags(t *testing.T) { resource.TestCheckResourceAttr(resourceName, acctest.CtTagsAllPercent, acctest.Ct4), resource.TestCheckResourceAttr(resourceName, "tags_all."+rProviderKey2, rProviderVal2), resource.TestCheckResourceAttr(resourceName, "tags_all."+rProviderKey3, rProviderVal3), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "ssm-incidents", regexache.MustCompile(`replication-set\/+.`)), + acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "ssm-incidents", regexache.MustCompile(`replication-set/.+$`)), ), }, { @@ -350,7 +350,7 @@ func testAccReplicationSet_updateEmptyTags(t *testing.T) { testAccCheckReplicationSetExists(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, acctest.Ct1), resource.TestCheckResourceAttr(resourceName, "tags."+rKey1, ""), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "ssm-incidents", regexache.MustCompile(`replication-set\/+.`)), + acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "ssm-incidents", regexache.MustCompile(`replication-set/.+$`)), ), }, { @@ -365,7 +365,7 @@ func testAccReplicationSet_updateEmptyTags(t *testing.T) { resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, acctest.Ct2), resource.TestCheckResourceAttr(resourceName, "tags."+rKey1, ""), resource.TestCheckResourceAttr(resourceName, "tags."+rKey2, ""), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "ssm-incidents", regexache.MustCompile(`replication-set\/+.`)), + acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "ssm-incidents", regexache.MustCompile(`replication-set/.+$`)), ), }, { @@ -379,7 +379,7 @@ func testAccReplicationSet_updateEmptyTags(t *testing.T) { testAccCheckReplicationSetExists(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, acctest.Ct1), resource.TestCheckResourceAttr(resourceName, "tags."+rKey1, ""), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "ssm-incidents", regexache.MustCompile(`replication-set\/+.`)), + acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "ssm-incidents", regexache.MustCompile(`replication-set/.+$`)), ), }, }, diff --git a/internal/service/ssmincidents/response_plan_data_source_test.go b/internal/service/ssmincidents/response_plan_data_source_test.go index eeece216508c..341d23824061 100644 --- a/internal/service/ssmincidents/response_plan_data_source_test.go +++ b/internal/service/ssmincidents/response_plan_data_source_test.go @@ -175,7 +175,7 @@ func testAccResponsePlanDataSource_basic(t *testing.T) { resource.TestCheckResourceAttrPair(resourceName, "tags.a", dataSourceName, "tags.a"), resource.TestCheckResourceAttrPair(resourceName, "tags.b", dataSourceName, "tags.b"), - acctest.MatchResourceAttrGlobalARN(dataSourceName, names.AttrARN, "ssm-incidents", regexache.MustCompile(`response-plan/+.`)), + acctest.MatchResourceAttrGlobalARN(dataSourceName, names.AttrARN, "ssm-incidents", regexache.MustCompile(`response-plan/.+$`)), ), }, }, diff --git a/internal/service/ssoadmin/application_test.go b/internal/service/ssoadmin/application_test.go index ad18e092e71e..eb22c1932867 100644 --- a/internal/service/ssoadmin/application_test.go +++ b/internal/service/ssoadmin/application_test.go @@ -49,7 +49,7 @@ func TestAccSSOAdminApplication_basic(t *testing.T) { testAccCheckApplicationExists(ctx, resourceName, &application), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "application_provider_arn", testAccApplicationProviderARN), - acctest.MatchResourceAttrGlobalARN(resourceName, "application_arn", "sso", regexache.MustCompile(`application/+.`)), + acctest.MatchResourceAttrGlobalARN(resourceName, "application_arn", "sso", regexache.MustCompile(`application/.+$`)), ), }, { diff --git a/internal/service/timestreaminfluxdb/db_instance_test.go b/internal/service/timestreaminfluxdb/db_instance_test.go index a99bb2203ca0..53db60544d2f 100644 --- a/internal/service/timestreaminfluxdb/db_instance_test.go +++ b/internal/service/timestreaminfluxdb/db_instance_test.go @@ -47,7 +47,7 @@ func TestAccTimestreamInfluxDBDBInstance_basic(t *testing.T) { Config: testAccDBInstanceConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckDBInstanceExists(ctx, resourceName, &dbInstance), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "timestream-influxdb", regexache.MustCompile(`db-instance/+.`)), + acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "timestream-influxdb", regexache.MustCompile(`db-instance/.+$`)), resource.TestCheckResourceAttrSet(resourceName, names.AttrAvailabilityZone), resource.TestCheckResourceAttr(resourceName, "db_storage_type", string(awstypes.DbStorageTypeInfluxIoIncludedT1)), resource.TestCheckResourceAttr(resourceName, "deployment_type", string(awstypes.DeploymentTypeSingleAz)), diff --git a/internal/service/verifiedpermissions/policy_store_test.go b/internal/service/verifiedpermissions/policy_store_test.go index 822367aa7f0c..239125e3f6b8 100644 --- a/internal/service/verifiedpermissions/policy_store_test.go +++ b/internal/service/verifiedpermissions/policy_store_test.go @@ -46,7 +46,7 @@ func TestAccVerifiedPermissionsPolicyStore_basic(t *testing.T) { testAccCheckPolicyStoreExists(ctx, resourceName, &policystore), resource.TestCheckResourceAttr(resourceName, "validation_settings.0.mode", "OFF"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Terraform acceptance test"), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "verifiedpermissions", regexache.MustCompile(`policy-store/+.`)), + acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "verifiedpermissions", regexache.MustCompile(`policy-store/.+$`)), ), }, {