From fa813c54d1645bda3135794c67ec34ee59deb3f4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:22:34 -0500 Subject: [PATCH 001/304] Make 'AWSClient.AccountID' a getter. --- internal/acctest/acctest.go | 40 +++++++++++++------------- internal/acctest/known_value.go | 5 ++-- internal/conns/awsclient.go | 19 +++++++----- internal/conns/config.go | 2 +- internal/provider/provider_acc_test.go | 3 +- 5 files changed, 38 insertions(+), 31 deletions(-) diff --git a/internal/acctest/acctest.go b/internal/acctest/acctest.go index 231d50bbeb6..a0b08015ce8 100644 --- a/internal/acctest/acctest.go +++ b/internal/acctest/acctest.go @@ -321,7 +321,7 @@ func PreCheck(ctx context.Context, t *testing.T) { } // ProviderAccountID returns the account ID of an AWS provider -func ProviderAccountID(provider *schema.Provider) string { +func ProviderAccountID(ctx context.Context, provider *schema.Provider) string { if provider == nil { log.Print("[DEBUG] Unable to read account ID from test provider: empty provider") return "" @@ -335,7 +335,7 @@ func ProviderAccountID(provider *schema.Provider) string { log.Print("[DEBUG] Unable to read account ID from test provider: non-AWS or unconfigured AWS provider") return "" } - return client.AccountID + return client.AccountID(ctx) } // CheckDestroyNoop is a TestCheckFunc to be used as a TestCase's CheckDestroy when no such check can be made. @@ -355,17 +355,17 @@ func CheckSleep(t *testing.T, d time.Duration) resource.TestCheckFunc { } // CheckResourceAttrAccountID ensures the Terraform state exactly matches the account ID -func CheckResourceAttrAccountID(resourceName, attributeName string) resource.TestCheckFunc { +func CheckResourceAttrAccountID(ctx context.Context, resourceName, attributeName string) resource.TestCheckFunc { return func(s *terraform.State) error { - return resource.TestCheckResourceAttr(resourceName, attributeName, AccountID())(s) + return resource.TestCheckResourceAttr(resourceName, attributeName, AccountID(ctx))(s) } } // CheckResourceAttrRegionalARN ensures the Terraform state exactly matches a formatted ARN with region -func CheckResourceAttrRegionalARN(resourceName, attributeName, arnService, arnResource string) resource.TestCheckFunc { +func CheckResourceAttrRegionalARN(ctx context.Context, resourceName, attributeName, arnService, arnResource string) resource.TestCheckFunc { return func(s *terraform.State) error { attributeValue := arn.ARN{ - AccountID: AccountID(), + AccountID: AccountID(ctx), Partition: Partition(), Region: Region(), Resource: arnResource, @@ -458,10 +458,10 @@ func MatchResourceAttrAccountID(resourceName, attributeName string) resource.Tes } // MatchResourceAttrRegionalARN ensures the Terraform state regexp matches a formatted ARN with region -func MatchResourceAttrRegionalARN(resourceName, attributeName, arnService string, arnResourceRegexp *regexp.Regexp) resource.TestCheckFunc { +func MatchResourceAttrRegionalARN(ctx context.Context, resourceName, attributeName, arnService string, arnResourceRegexp *regexp.Regexp) resource.TestCheckFunc { return func(s *terraform.State) error { arnRegexp := arn.ARN{ - AccountID: AccountID(), + AccountID: AccountID(ctx), Partition: Partition(), Region: Region(), Resource: arnResourceRegexp.String(), @@ -479,10 +479,10 @@ func MatchResourceAttrRegionalARN(resourceName, attributeName, arnService string } // MatchResourceAttrRegionalARNRegion ensures the Terraform state regexp matches a formatted ARN with the specified region -func MatchResourceAttrRegionalARNRegion(resourceName, attributeName, arnService, region string, arnResourceRegexp *regexp.Regexp) resource.TestCheckFunc { +func MatchResourceAttrRegionalARNRegion(ctx context.Context, resourceName, attributeName, arnService, region string, arnResourceRegexp *regexp.Regexp) resource.TestCheckFunc { return func(s *terraform.State) error { arnRegexp := arn.ARN{ - AccountID: AccountID(), + AccountID: AccountID(ctx), Partition: Partition(), Region: region, Resource: arnResourceRegexp.String(), @@ -570,9 +570,9 @@ func MatchResourceAttrGlobalHostname(resourceName, attributeName, serviceName st } } -func globalARNValue(arnService, arnResource string) string { +func globalARNValue(ctx context.Context, arnService, arnResource string) string { return arn.ARN{ - AccountID: AccountID(), + AccountID: AccountID(ctx), Partition: Partition(), Resource: arnResource, Service: arnService, @@ -580,9 +580,9 @@ func globalARNValue(arnService, arnResource string) string { } // CheckResourceAttrGlobalARN ensures the Terraform state exactly matches a formatted ARN without region -func CheckResourceAttrGlobalARN(resourceName, attributeName, arnService, arnResource string) resource.TestCheckFunc { +func CheckResourceAttrGlobalARN(ctx context.Context, resourceName, attributeName, arnService, arnResource string) resource.TestCheckFunc { return func(s *terraform.State) error { - return resource.TestCheckResourceAttr(resourceName, attributeName, globalARNValue(arnService, arnResource))(s) + return resource.TestCheckResourceAttr(resourceName, attributeName, globalARNValue(ctx, arnService, arnResource))(s) } } @@ -612,10 +612,10 @@ func CheckResourceAttrGlobalARNAccountID(resourceName, attributeName, accountID, } // MatchResourceAttrGlobalARN ensures the Terraform state regexp matches a formatted ARN without region -func MatchResourceAttrGlobalARN(resourceName, attributeName, arnService string, arnResourceRegexp *regexp.Regexp) resource.TestCheckFunc { +func MatchResourceAttrGlobalARN(ctx context.Context, resourceName, attributeName, arnService string, arnResourceRegexp *regexp.Regexp) resource.TestCheckFunc { return func(s *terraform.State) error { arnRegexp := arn.ARN{ - AccountID: AccountID(), + AccountID: AccountID(ctx), Partition: Partition(), Resource: arnResourceRegexp.String(), Service: arnService, @@ -892,8 +892,8 @@ func PrimaryInstanceState(s *terraform.State, name string) (*terraform.InstanceS // AccountID returns the account ID of Provider // Must be used within a resource.TestCheckFunc -func AccountID() string { - return ProviderAccountID(Provider) +func AccountID(ctx context.Context) string { + return ProviderAccountID(ctx, Provider) } func Region() string { @@ -2624,14 +2624,14 @@ func CheckVPCExists(ctx context.Context, n string, v *ec2types.Vpc) resource.Tes } } -func CheckCallerIdentityAccountID(n string) resource.TestCheckFunc { +func CheckCallerIdentityAccountID(ctx context.Context, n string) resource.TestCheckFunc { return func(s *terraform.State) error { rs, ok := s.RootModule().Resources[n] if !ok { return fmt.Errorf("can't find AccountID resource: %s", n) } - expected := Provider.Meta().(*conns.AWSClient).AccountID + expected := Provider.Meta().(*conns.AWSClient).AccountID(ctx) if rs.Primary.Attributes["account_id"] != expected { return fmt.Errorf("incorrect Account ID: expected %q, got %q", expected, rs.Primary.Attributes["account_id"]) } diff --git a/internal/acctest/known_value.go b/internal/acctest/known_value.go index a93d0ba7c47..8bf590572d6 100644 --- a/internal/acctest/known_value.go +++ b/internal/acctest/known_value.go @@ -4,6 +4,7 @@ package acctest import ( + "context" "fmt" "github.com/hashicorp/terraform-plugin-testing/knownvalue" @@ -23,7 +24,7 @@ func (v globalARNCheck) CheckValue(other any) error { return fmt.Errorf("expected string value for GlobalARN check, got: %T", other) } - arnValue := globalARNValue(v.arnService, v.arnResource) + arnValue := globalARNValue(context.Background(), v.arnService, v.arnResource) if otherVal != arnValue { return fmt.Errorf("expected value %s for GlobalARN check, got: %s", arnValue, otherVal) @@ -34,7 +35,7 @@ func (v globalARNCheck) CheckValue(other any) error { // String returns the string representation of the value. func (v globalARNCheck) String() string { - return globalARNValue(v.arnService, v.arnResource) + return globalARNValue(context.Background(), v.arnService, v.arnResource) } func GlobalARN(arnService, arnResource string) globalARNCheck { diff --git a/internal/conns/awsclient.go b/internal/conns/awsclient.go index 8f0be787649..c11623b6dd1 100644 --- a/internal/conns/awsclient.go +++ b/internal/conns/awsclient.go @@ -26,17 +26,17 @@ import ( ) type AWSClient struct { - AccountID string - defaultTagsConfig *tftags.DefaultConfig - ignoreTagsConfig *tftags.IgnoreConfig - Region string - ServicePackages map[string]ServicePackage + Region string + ServicePackages map[string]ServicePackage + accountID string awsConfig *aws.Config clients map[string]any conns map[string]any + defaultTagsConfig *tftags.DefaultConfig endpoints map[string]string // From provider configuration. httpClient *http.Client + ignoreTagsConfig *tftags.IgnoreConfig lock sync.Mutex logger baselogging.Logger partition endpoints.Partition @@ -76,6 +76,11 @@ func (c *AWSClient) Endpoints(context.Context) map[string]string { return maps.Clone(c.endpoints) } +// AccountID returns the configured AWS account ID. +func (c *AWSClient) AccountID(context.Context) string { + return c.accountID +} + // Partition returns the ID of the configured AWS partition. func (c *AWSClient) Partition(context.Context) string { return c.partition.ID() @@ -94,7 +99,7 @@ func (c *AWSClient) RegionalARN(ctx context.Context, service, resource string) s Partition: c.Partition(ctx), Service: service, Region: c.Region, - AccountID: c.AccountID, + AccountID: c.AccountID(ctx), Resource: resource, }.String() } @@ -209,7 +214,7 @@ func (c *AWSClient) DefaultKMSKeyPolicy(ctx context.Context) string { } ] } -`, c.Partition(ctx), c.AccountID) +`, c.Partition(ctx), c.AccountID(ctx)) } // GlobalAcceleratorHostedZoneID returns the Route 53 hosted zone ID diff --git a/internal/conns/config.go b/internal/conns/config.go index 8ee7c6d6270..9abb8b7c12d 100644 --- a/internal/conns/config.go +++ b/internal/conns/config.go @@ -207,7 +207,7 @@ func (c *Config) ConfigureProvider(ctx context.Context, client *AWSClient) (*AWS } } - client.AccountID = accountID + client.accountID = accountID client.defaultTagsConfig = c.DefaultTagsConfig client.ignoreTagsConfig = c.IgnoreTagsConfig client.Region = c.Region diff --git a/internal/provider/provider_acc_test.go b/internal/provider/provider_acc_test.go index 6648afe21f2..928ce52a417 100644 --- a/internal/provider/provider_acc_test.go +++ b/internal/provider/provider_acc_test.go @@ -647,6 +647,7 @@ func TestAccProvider_Region_stsRegion(t *testing.T) { // For historical reasons, ignore a single empty `assume_role` block func TestAccProvider_AssumeRole_empty(t *testing.T) { ctx := acctest.Context(t) + resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t), @@ -656,7 +657,7 @@ func TestAccProvider_AssumeRole_empty(t *testing.T) { { Config: testAccProviderConfig_assumeRoleEmpty, Check: resource.ComposeTestCheckFunc( - acctest.CheckCallerIdentityAccountID("data.aws_caller_identity.current"), + acctest.CheckCallerIdentityAccountID(ctx, "data.aws_caller_identity.current"), ), }, }, From a5fc52031060538bb23e4294e91c23ea4aa5a9e9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:39 -0500 Subject: [PATCH 002/304] Make 'AWSClient.AccountID' a getter - accessanalyzer. --- internal/service/accessanalyzer/analyzer_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/accessanalyzer/analyzer_test.go b/internal/service/accessanalyzer/analyzer_test.go index d6f7e1e1eda..4048106cc4b 100644 --- a/internal/service/accessanalyzer/analyzer_test.go +++ b/internal/service/accessanalyzer/analyzer_test.go @@ -37,7 +37,7 @@ func testAccAnalyzer_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAnalyzerExists(ctx, resourceName, &analyzer), resource.TestCheckResourceAttr(resourceName, "analyzer_name", rName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "access-analyzer", fmt.Sprintf("analyzer/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "access-analyzer", fmt.Sprintf("analyzer/%s", rName)), resource.TestCheckResourceAttr(resourceName, "configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttr(resourceName, names.AttrType, string(types.TypeAccount)), From 946be9e4dca45742e0f978bd559e0cfcf23e7f72 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:39 -0500 Subject: [PATCH 003/304] Make 'AWSClient.AccountID' a getter - acm. --- internal/service/acm/certificate_test.go | 50 ++++++++++++------------ 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/internal/service/acm/certificate_test.go b/internal/service/acm/certificate_test.go index 4c4efe2c1c4..22ee7ea41dc 100644 --- a/internal/service/acm/certificate_test.go +++ b/internal/service/acm/certificate_test.go @@ -45,7 +45,7 @@ func TestAccACMCertificate_emailValidation(t *testing.T) { Config: testAccCertificateConfig_basic(domain, types.ValidationMethodEmail), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "acm", regexache.MustCompile("certificate/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "acm", regexache.MustCompile("certificate/.+$")), resource.TestCheckResourceAttr(resourceName, names.AttrDomainName, domain), resource.TestCheckResourceAttr(resourceName, "domain_validation_options.#", "0"), resource.TestCheckResourceAttr(resourceName, "early_renewal_duration", ""), @@ -90,7 +90,7 @@ func TestAccACMCertificate_dnsValidation(t *testing.T) { Config: testAccCertificateConfig_basic(domain, types.ValidationMethodDns), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "acm", regexache.MustCompile("certificate/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "acm", regexache.MustCompile("certificate/.+$")), resource.TestCheckResourceAttr(resourceName, names.AttrDomainName, domain), resource.TestCheckResourceAttr(resourceName, "domain_validation_options.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "domain_validation_options.*", map[string]string{ @@ -137,7 +137,7 @@ func TestAccACMCertificate_root(t *testing.T) { Config: testAccCertificateConfig_basic(rootDomain, types.ValidationMethodDns), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "acm", regexache.MustCompile("certificate/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "acm", regexache.MustCompile("certificate/.+$")), resource.TestCheckResourceAttr(resourceName, names.AttrDomainName, rootDomain), resource.TestCheckResourceAttr(resourceName, "domain_validation_options.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "domain_validation_options.*", map[string]string{ @@ -178,7 +178,7 @@ func TestAccACMCertificate_validationOptions(t *testing.T) { Config: testAccCertificateConfig_validationOptions(rootDomain, domain), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "acm", regexache.MustCompile("certificate/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "acm", regexache.MustCompile("certificate/.+$")), resource.TestCheckResourceAttr(resourceName, names.AttrDomainName, domain), resource.TestCheckResourceAttr(resourceName, "domain_validation_options.#", "0"), resource.TestCheckResourceAttr(resourceName, names.AttrStatus, string(types.CertificateStatusPendingValidation)), @@ -218,7 +218,7 @@ func TestAccACMCertificate_privateCertificate_renewable(t *testing.T) { Config: testAccCertificateConfig_privateCertificate_renewable(commonName.String(), certificateDomainName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateExists(ctx, resourceName, &v1), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "acm", regexache.MustCompile("certificate/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "acm", regexache.MustCompile("certificate/.+$")), resource.TestCheckResourceAttrPair(resourceName, "certificate_authority_arn", certificateAuthorityResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrDomainName, certificateDomainName), resource.TestCheckResourceAttr(resourceName, "domain_validation_options.#", "0"), @@ -344,7 +344,7 @@ func TestAccACMCertificate_privateCertificate_noRenewalPermission(t *testing.T) Config: testAccCertificateConfig_privateCertificate_noRenewalPermission(commonName.String(), certificateDomainName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateExists(ctx, resourceName, &v1), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "acm", regexache.MustCompile("certificate/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "acm", regexache.MustCompile("certificate/.+$")), resource.TestCheckResourceAttrPair(resourceName, "certificate_authority_arn", certificateAuthorityResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrDomainName, certificateDomainName), resource.TestCheckResourceAttr(resourceName, "domain_validation_options.#", "0"), @@ -462,7 +462,7 @@ func TestAccACMCertificate_privateCertificate_pendingRenewalGoDuration(t *testin Config: testAccCertificateConfig_privateCertificate_pendingRenewal(commonName.String(), certificateDomainName, duration), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateExists(ctx, resourceName, &v1), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "acm", regexache.MustCompile("certificate/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "acm", regexache.MustCompile("certificate/.+$")), resource.TestCheckResourceAttr(resourceName, "early_renewal_duration", duration), resource.TestCheckResourceAttr(resourceName, "pending_renewal", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "renewal_eligibility", string(types.RenewalEligibilityIneligible)), @@ -536,7 +536,7 @@ func TestAccACMCertificate_privateCertificate_pendingRenewalRFC3339Duration(t *t Config: testAccCertificateConfig_privateCertificate_pendingRenewal(commonName.String(), certificateDomainName, duration), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateExists(ctx, resourceName, &v1), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "acm", regexache.MustCompile("certificate/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "acm", regexache.MustCompile("certificate/.+$")), resource.TestCheckResourceAttr(resourceName, "early_renewal_duration", duration), resource.TestCheckResourceAttr(resourceName, "pending_renewal", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "renewal_eligibility", string(types.RenewalEligibilityIneligible)), @@ -610,7 +610,7 @@ func TestAccACMCertificate_privateCertificate_addEarlyRenewalPast(t *testing.T) Config: testAccCertificateConfig_privateCertificate_renewable(commonName.String(), certificateDomainName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateExists(ctx, resourceName, &v1), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "acm", regexache.MustCompile("certificate/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "acm", regexache.MustCompile("certificate/.+$")), resource.TestCheckResourceAttr(resourceName, "early_renewal_duration", ""), resource.TestCheckResourceAttr(resourceName, "pending_renewal", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "renewal_eligibility", string(types.RenewalEligibilityIneligible)), @@ -698,7 +698,7 @@ func TestAccACMCertificate_privateCertificate_addEarlyRenewalPastIneligible(t *t Config: testAccCertificateConfig_privateCertificate_renewable(commonName.String(), certificateDomainName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateExists(ctx, resourceName, &v1), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "acm", regexache.MustCompile("certificate/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "acm", regexache.MustCompile("certificate/.+$")), resource.TestCheckResourceAttr(resourceName, "early_renewal_duration", ""), resource.TestCheckResourceAttr(resourceName, "pending_renewal", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "renewal_eligibility", string(types.RenewalEligibilityIneligible)), @@ -751,7 +751,7 @@ func TestAccACMCertificate_privateCertificate_addEarlyRenewalFuture(t *testing.T Config: testAccCertificateConfig_privateCertificate_renewable(commonName.String(), certificateDomainName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateExists(ctx, resourceName, &v1), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "acm", regexache.MustCompile("certificate/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "acm", regexache.MustCompile("certificate/.+$")), resource.TestCheckResourceAttr(resourceName, "early_renewal_duration", ""), resource.TestCheckResourceAttr(resourceName, "pending_renewal", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "renewal_eligibility", string(types.RenewalEligibilityIneligible)), @@ -837,7 +837,7 @@ func TestAccACMCertificate_privateCertificate_updateEarlyRenewalFuture(t *testin Config: testAccCertificateConfig_privateCertificate_pendingRenewal(commonName.String(), certificateDomainName, duration), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateExists(ctx, resourceName, &v1), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "acm", regexache.MustCompile("certificate/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "acm", regexache.MustCompile("certificate/.+$")), resource.TestCheckResourceAttr(resourceName, "early_renewal_duration", duration), resource.TestCheckResourceAttr(resourceName, "pending_renewal", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "renewal_eligibility", string(types.RenewalEligibilityIneligible)), @@ -907,7 +907,7 @@ func TestAccACMCertificate_privateCertificate_removeEarlyRenewal(t *testing.T) { Config: testAccCertificateConfig_privateCertificate_pendingRenewal(commonName.String(), certificateDomainName, duration), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateExists(ctx, resourceName, &v1), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "acm", regexache.MustCompile("certificate/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "acm", regexache.MustCompile("certificate/.+$")), resource.TestCheckResourceAttr(resourceName, "early_renewal_duration", duration), resource.TestCheckResourceAttr(resourceName, "pending_renewal", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "renewal_eligibility", string(types.RenewalEligibilityIneligible)), @@ -997,7 +997,7 @@ func TestAccACMCertificate_rootAndWildcardSan(t *testing.T) { Config: testAccCertificateConfig_subjectAlternativeNames(rootDomain, strconv.Quote(wildcardDomain), types.ValidationMethodDns), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "acm", regexache.MustCompile("certificate/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "acm", regexache.MustCompile("certificate/.+$")), resource.TestCheckResourceAttr(resourceName, names.AttrDomainName, rootDomain), resource.TestCheckResourceAttr(resourceName, "domain_validation_options.#", "2"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "domain_validation_options.*", map[string]string{ @@ -1062,7 +1062,7 @@ func TestAccACMCertificate_San_single(t *testing.T) { Config: testAccCertificateConfig_subjectAlternativeNames(domain, strconv.Quote(sanDomain), types.ValidationMethodDns), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "acm", regexache.MustCompile("certificate/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "acm", regexache.MustCompile("certificate/.+$")), resource.TestCheckResourceAttr(resourceName, names.AttrDomainName, domain), resource.TestCheckResourceAttr(resourceName, "domain_validation_options.#", "2"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "domain_validation_options.*", map[string]string{ @@ -1109,7 +1109,7 @@ func TestAccACMCertificate_San_multiple(t *testing.T) { Config: testAccCertificateConfig_subjectAlternativeNames(domain, fmt.Sprintf("%q, %q", sanDomain1, sanDomain2), types.ValidationMethodDns), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "acm", regexache.MustCompile("certificate/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "acm", regexache.MustCompile("certificate/.+$")), resource.TestCheckResourceAttr(resourceName, names.AttrDomainName, domain), resource.TestCheckResourceAttr(resourceName, "domain_validation_options.#", "3"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "domain_validation_options.*", map[string]string{ @@ -1160,7 +1160,7 @@ func TestAccACMCertificate_San_trailingPeriod(t *testing.T) { Config: testAccCertificateConfig_subjectAlternativeNames(domain, strconv.Quote(sanDomain), types.ValidationMethodDns), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "acm", regexache.MustCompile(`certificate/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "acm", regexache.MustCompile(`certificate/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrDomainName, domain), resource.TestCheckResourceAttr(resourceName, "domain_validation_options.#", "2"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "domain_validation_options.*", map[string]string{ @@ -1206,7 +1206,7 @@ func TestAccACMCertificate_San_matches_domain(t *testing.T) { Config: testAccCertificateConfig_subjectAlternativeNames(domain, strconv.Quote(sanDomain), types.ValidationMethodDns), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "acm", regexache.MustCompile(`certificate/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "acm", regexache.MustCompile(`certificate/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrDomainName, domain), resource.TestCheckResourceAttr(resourceName, "domain_validation_options.#", "2"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "domain_validation_options.*", map[string]string{ @@ -1251,7 +1251,7 @@ func TestAccACMCertificate_wildcard(t *testing.T) { Config: testAccCertificateConfig_basic(wildcardDomain, types.ValidationMethodDns), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "acm", regexache.MustCompile("certificate/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "acm", regexache.MustCompile("certificate/.+$")), resource.TestCheckResourceAttr(resourceName, names.AttrDomainName, wildcardDomain), resource.TestCheckResourceAttr(resourceName, "domain_validation_options.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "domain_validation_options.*", map[string]string{ @@ -1291,7 +1291,7 @@ func TestAccACMCertificate_wildcardAndRootSan(t *testing.T) { Config: testAccCertificateConfig_subjectAlternativeNames(wildcardDomain, strconv.Quote(rootDomain), types.ValidationMethodDns), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "acm", regexache.MustCompile("certificate/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "acm", regexache.MustCompile("certificate/.+$")), resource.TestCheckResourceAttr(resourceName, names.AttrDomainName, wildcardDomain), resource.TestCheckResourceAttr(resourceName, "domain_validation_options.#", "2"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "domain_validation_options.*", map[string]string{ @@ -1335,7 +1335,7 @@ func TestAccACMCertificate_keyAlgorithm(t *testing.T) { Config: testAccCertificateConfig_keyAlgorithm(rootDomain, types.ValidationMethodDns, types.KeyAlgorithmEcPrime256v1), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "acm", regexache.MustCompile("certificate/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "acm", regexache.MustCompile("certificate/.+$")), resource.TestCheckResourceAttr(resourceName, names.AttrDomainName, rootDomain), resource.TestCheckResourceAttr(resourceName, "domain_validation_options.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "domain_validation_options.*", map[string]string{ @@ -1375,7 +1375,7 @@ func TestAccACMCertificate_disableCTLogging(t *testing.T) { Config: testAccCertificateConfig_disableCTLogging(rootDomain, types.ValidationMethodDns), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "acm", regexache.MustCompile("certificate/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "acm", regexache.MustCompile("certificate/.+$")), resource.TestCheckResourceAttr(resourceName, names.AttrDomainName, rootDomain), resource.TestCheckResourceAttr(resourceName, "domain_validation_options.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "domain_validation_options.*", map[string]string{ @@ -1421,7 +1421,7 @@ func TestAccACMCertificate_disableReenableCTLogging(t *testing.T) { Config: testAccCertificateConfig_optionsWithValidation(rootDomain, types.ValidationMethodDns, "ENABLED"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "acm", regexache.MustCompile("certificate/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "acm", regexache.MustCompile("certificate/.+$")), resource.TestCheckResourceAttr(resourceName, names.AttrDomainName, rootDomain), resource.TestCheckResourceAttr(resourceName, "domain_validation_options.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "domain_validation_options.*", map[string]string{ @@ -1446,7 +1446,7 @@ func TestAccACMCertificate_disableReenableCTLogging(t *testing.T) { Config: testAccCertificateConfig_optionsWithValidation(rootDomain, types.ValidationMethodDns, "DISABLED"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "acm", regexache.MustCompile("certificate/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "acm", regexache.MustCompile("certificate/.+$")), resource.TestCheckResourceAttr(resourceName, names.AttrDomainName, rootDomain), resource.TestCheckResourceAttr(resourceName, "domain_validation_options.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "domain_validation_options.*", map[string]string{ @@ -1471,7 +1471,7 @@ func TestAccACMCertificate_disableReenableCTLogging(t *testing.T) { Config: testAccCertificateConfig_optionsWithValidation(rootDomain, types.ValidationMethodDns, "ENABLED"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "acm", regexache.MustCompile("certificate/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "acm", regexache.MustCompile("certificate/.+$")), resource.TestCheckResourceAttr(resourceName, names.AttrDomainName, rootDomain), resource.TestCheckResourceAttr(resourceName, "domain_validation_options.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "domain_validation_options.*", map[string]string{ From 863e577fa68d57210e1a95843974e011abed7739 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:39 -0500 Subject: [PATCH 004/304] Make 'AWSClient.AccountID' a getter - acmpca. --- .../service/acmpca/certificate_authority_test.go | 4 ++-- internal/service/acmpca/certificate_test.go | 12 ++++++------ internal/service/acmpca/permission_test.go | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/internal/service/acmpca/certificate_authority_test.go b/internal/service/acmpca/certificate_authority_test.go index 944ebbb3bb0..5cac928059b 100644 --- a/internal/service/acmpca/certificate_authority_test.go +++ b/internal/service/acmpca/certificate_authority_test.go @@ -38,7 +38,7 @@ func TestAccACMPCACertificateAuthority_basic(t *testing.T) { Config: testAccCertificateAuthorityConfig_required(commonName), Check: resource.ComposeTestCheckFunc( testAccCheckCertificateAuthorityExists(ctx, resourceName, &certificateAuthority), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "acm-pca", regexache.MustCompile(`certificate-authority/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "acm-pca", regexache.MustCompile(`certificate-authority/.+`)), resource.TestCheckResourceAttr(resourceName, "certificate_authority_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "certificate_authority_configuration.0.key_algorithm", "RSA_4096"), resource.TestCheckResourceAttr(resourceName, "certificate_authority_configuration.0.signing_algorithm", "SHA512WITHRSA"), @@ -248,7 +248,7 @@ func TestAccACMPCACertificateAuthority_RevocationConfiguration_empty(t *testing. Config: testAccCertificateAuthorityConfig_revocationConfigurationEmpty(commonName), Check: resource.ComposeTestCheckFunc( testAccCheckCertificateAuthorityExists(ctx, resourceName, &certificateAuthority), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "acm-pca", regexache.MustCompile(`certificate-authority/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "acm-pca", regexache.MustCompile(`certificate-authority/.+`)), resource.TestCheckResourceAttr(resourceName, "certificate_authority_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "certificate_authority_configuration.0.key_algorithm", "RSA_4096"), resource.TestCheckResourceAttr(resourceName, "certificate_authority_configuration.0.signing_algorithm", "SHA512WITHRSA"), diff --git a/internal/service/acmpca/certificate_test.go b/internal/service/acmpca/certificate_test.go index bb8bd8aac92..a26934a1fc3 100644 --- a/internal/service/acmpca/certificate_test.go +++ b/internal/service/acmpca/certificate_test.go @@ -40,7 +40,7 @@ func TestAccACMPCACertificate_rootCertificate(t *testing.T) { Config: testAccCertificateConfig_root(domain), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "acm-pca", regexache.MustCompile(`certificate-authority/.+/certificate/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "acm-pca", regexache.MustCompile(`certificate-authority/.+/certificate/.+$`)), resource.TestCheckResourceAttrSet(resourceName, names.AttrCertificate), resource.TestCheckResourceAttr(resourceName, names.AttrCertificateChain, ""), resource.TestCheckResourceAttrPair(resourceName, "certificate_authority_arn", certificateAuthorityResourceName, names.AttrARN), @@ -85,7 +85,7 @@ func TestAccACMPCACertificate_rootCertificateWithAPIPassthrough(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateExists(ctx, resourceName), testAccCheckCertificateExtension(resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "acm-pca", regexache.MustCompile(`certificate-authority/.+/certificate/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "acm-pca", regexache.MustCompile(`certificate-authority/.+/certificate/.+$`)), resource.TestCheckResourceAttrSet(resourceName, names.AttrCertificate), resource.TestCheckResourceAttr(resourceName, names.AttrCertificateChain, ""), resource.TestCheckResourceAttrPair(resourceName, "certificate_authority_arn", certificateAuthorityResourceName, names.AttrARN), @@ -129,7 +129,7 @@ func TestAccACMPCACertificate_subordinateCertificate(t *testing.T) { Config: testAccCertificateConfig_subordinate(domain), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "acm-pca", regexache.MustCompile(`certificate-authority/.+/certificate/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "acm-pca", regexache.MustCompile(`certificate-authority/.+/certificate/.+$`)), resource.TestCheckResourceAttrSet(resourceName, names.AttrCertificate), resource.TestCheckResourceAttrSet(resourceName, names.AttrCertificateChain), resource.TestCheckResourceAttrPair(resourceName, "certificate_authority_arn", rootCertificateAuthorityResourceName, names.AttrARN), @@ -173,7 +173,7 @@ func TestAccACMPCACertificate_endEntityCertificate(t *testing.T) { Config: testAccCertificateConfig_endEntity(domain, acctest.TLSPEMEscapeNewlines(csr)), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "acm-pca", regexache.MustCompile(`certificate-authority/.+/certificate/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "acm-pca", regexache.MustCompile(`certificate-authority/.+/certificate/.+$`)), resource.TestCheckResourceAttrSet(resourceName, names.AttrCertificate), resource.TestCheckResourceAttrSet(resourceName, names.AttrCertificateChain), resource.TestCheckResourceAttr(resourceName, "certificate_signing_request", csr), @@ -217,7 +217,7 @@ func TestAccACMPCACertificate_Validity_endDate(t *testing.T) { Config: testAccCertificateConfig_validityEndDate(domain, acctest.TLSPEMEscapeNewlines(csr), later), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "acm-pca", regexache.MustCompile(`certificate-authority/.+/certificate/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "acm-pca", regexache.MustCompile(`certificate-authority/.+/certificate/.+$`)), resource.TestCheckResourceAttrSet(resourceName, names.AttrCertificate), resource.TestCheckResourceAttrSet(resourceName, names.AttrCertificateChain), resource.TestCheckResourceAttr(resourceName, "certificate_signing_request", csr), @@ -261,7 +261,7 @@ func TestAccACMPCACertificate_Validity_absolute(t *testing.T) { Config: testAccCertificateConfig_validityAbsolute(domain, acctest.TLSPEMEscapeNewlines(csr), later), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "acm-pca", regexache.MustCompile(`certificate-authority/.+/certificate/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "acm-pca", regexache.MustCompile(`certificate-authority/.+/certificate/.+$`)), resource.TestCheckResourceAttrSet(resourceName, names.AttrCertificate), resource.TestCheckResourceAttrSet(resourceName, names.AttrCertificateChain), resource.TestCheckResourceAttr(resourceName, "certificate_signing_request", csr), diff --git a/internal/service/acmpca/permission_test.go b/internal/service/acmpca/permission_test.go index 93daef315bb..e7a2f88f0ad 100644 --- a/internal/service/acmpca/permission_test.go +++ b/internal/service/acmpca/permission_test.go @@ -40,7 +40,7 @@ func TestAccACMPCAPermission_basic(t *testing.T) { resource.TestCheckTypeSetElemAttr(resourceName, "actions.*", "ListPermissions"), resource.TestCheckResourceAttrSet(resourceName, names.AttrPolicy), resource.TestCheckResourceAttr(resourceName, names.AttrPrincipal, "acm.amazonaws.com"), - acctest.CheckResourceAttrAccountID(resourceName, "source_account"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "source_account"), ), }, }, @@ -87,7 +87,7 @@ func TestAccACMPCAPermission_sourceAccount(t *testing.T) { Config: testAccPermissionConfig_sourceAccount(commonName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPermissionExists(ctx, resourceName, &permission), - acctest.CheckResourceAttrAccountID(resourceName, "source_account"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "source_account"), ), }, }, From 3433e44e8fb8e20a390a8175a991f238ceffeba7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:39 -0500 Subject: [PATCH 005/304] Make 'AWSClient.AccountID' a getter - amplify. --- internal/service/amplify/app_test.go | 2 +- internal/service/amplify/backend_environment_test.go | 4 ++-- internal/service/amplify/branch_test.go | 2 +- internal/service/amplify/domain_association_test.go | 8 ++++---- internal/service/amplify/webhook_test.go | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/internal/service/amplify/app_test.go b/internal/service/amplify/app_test.go index 7b6b5600d8e..798c7b6c03b 100644 --- a/internal/service/amplify/app_test.go +++ b/internal/service/amplify/app_test.go @@ -41,7 +41,7 @@ func testAccApp_basic(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckAppExists(ctx, resourceName, &app), resource.TestCheckNoResourceAttr(resourceName, "access_token"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "amplify", regexache.MustCompile(`apps/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "amplify", regexache.MustCompile(`apps/.+`)), resource.TestCheckResourceAttr(resourceName, "auto_branch_creation_config.#", "0"), resource.TestCheckResourceAttr(resourceName, "auto_branch_creation_patterns.#", "0"), resource.TestCheckResourceAttr(resourceName, "basic_auth_credentials", ""), diff --git a/internal/service/amplify/backend_environment_test.go b/internal/service/amplify/backend_environment_test.go index cdba1aee308..956d407f9bb 100644 --- a/internal/service/amplify/backend_environment_test.go +++ b/internal/service/amplify/backend_environment_test.go @@ -38,7 +38,7 @@ func testAccBackendEnvironment_basic(t *testing.T) { Config: testAccBackendEnvironmentConfig_basic(rName, environmentName), Check: resource.ComposeTestCheckFunc( testAccCheckBackendEnvironmentExists(ctx, resourceName, &env), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "amplify", regexache.MustCompile(`apps/[^/]+/backendenvironments/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "amplify", regexache.MustCompile(`apps/[^/]+/backendenvironments/.+`)), resource.TestCheckResourceAttrSet(resourceName, "deployment_artifacts"), resource.TestCheckResourceAttr(resourceName, "environment_name", environmentName), resource.TestCheckResourceAttrSet(resourceName, "stack_name"), @@ -97,7 +97,7 @@ func testAccBackendEnvironment_DeploymentArtifacts_StackName(t *testing.T) { Config: testAccBackendEnvironmentConfig_deploymentArtifactsAndStackName(rName, environmentName), Check: resource.ComposeTestCheckFunc( testAccCheckBackendEnvironmentExists(ctx, resourceName, &env), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "amplify", regexache.MustCompile(`apps/[^/]+/backendenvironments/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "amplify", regexache.MustCompile(`apps/[^/]+/backendenvironments/.+`)), resource.TestCheckResourceAttr(resourceName, "deployment_artifacts", rName), resource.TestCheckResourceAttr(resourceName, "environment_name", environmentName), resource.TestCheckResourceAttr(resourceName, "stack_name", rName), diff --git a/internal/service/amplify/branch_test.go b/internal/service/amplify/branch_test.go index 19bf45e1487..a8e2863b333 100644 --- a/internal/service/amplify/branch_test.go +++ b/internal/service/amplify/branch_test.go @@ -37,7 +37,7 @@ func testAccBranch_basic(t *testing.T) { Config: testAccBranchConfig_name(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckBranchExists(ctx, resourceName, &branch), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "amplify", regexache.MustCompile(`apps/.+/branches/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "amplify", regexache.MustCompile(`apps/.+/branches/.+`)), resource.TestCheckResourceAttr(resourceName, "associated_resources.#", "0"), resource.TestCheckResourceAttr(resourceName, "backend_environment_arn", ""), resource.TestCheckResourceAttr(resourceName, "basic_auth_credentials", ""), diff --git a/internal/service/amplify/domain_association_test.go b/internal/service/amplify/domain_association_test.go index 933e9424f78..cbe655d7017 100644 --- a/internal/service/amplify/domain_association_test.go +++ b/internal/service/amplify/domain_association_test.go @@ -43,7 +43,7 @@ func testAccDomainAssociation_basic(t *testing.T) { Config: testAccDomainAssociationConfig_basic(rName, domainName, false, false), Check: resource.ComposeTestCheckFunc( testAccCheckDomainAssociationExists(ctx, resourceName, &domain), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "amplify", regexache.MustCompile(`apps/.+/domains/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "amplify", regexache.MustCompile(`apps/.+/domains/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrDomainName, domainName), resource.TestCheckResourceAttr(resourceName, "enable_auto_sub_domain", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "sub_domain.#", "1"), @@ -116,7 +116,7 @@ func testAccDomainAssociation_update(t *testing.T) { Config: testAccDomainAssociationConfig_basic(rName, domainName, false, true), Check: resource.ComposeTestCheckFunc( testAccCheckDomainAssociationExists(ctx, resourceName, &domain), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "amplify", regexache.MustCompile(`apps/.+/domains/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "amplify", regexache.MustCompile(`apps/.+/domains/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrDomainName, domainName), resource.TestCheckResourceAttr(resourceName, "enable_auto_sub_domain", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "sub_domain.#", "1"), @@ -137,7 +137,7 @@ func testAccDomainAssociation_update(t *testing.T) { Config: testAccDomainAssociationConfig_updated(rName, domainName, true, true), Check: resource.ComposeTestCheckFunc( testAccCheckDomainAssociationExists(ctx, resourceName, &domain), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "amplify", regexache.MustCompile(`apps/.+/domains/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "amplify", regexache.MustCompile(`apps/.+/domains/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrDomainName, domainName), resource.TestCheckResourceAttr(resourceName, "enable_auto_sub_domain", acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, "sub_domain.#", "2"), @@ -178,7 +178,7 @@ func testAccDomainAssociation_certificateSettings(t *testing.T) { Config: testAccDomainAssociationConfig_certificateSettings(rName, domainName, false, false), Check: resource.ComposeTestCheckFunc( testAccCheckDomainAssociationExists(ctx, resourceName, &domain), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "amplify", regexache.MustCompile(`apps/.+/domains/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "amplify", regexache.MustCompile(`apps/.+/domains/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrDomainName, domainName), resource.TestCheckResourceAttr(resourceName, "certificate_settings.#", "1"), resource.TestCheckResourceAttr(resourceName, "certificate_settings.0.type", "AMPLIFY_MANAGED"), diff --git a/internal/service/amplify/webhook_test.go b/internal/service/amplify/webhook_test.go index 054aa9ad6c9..f666a949472 100644 --- a/internal/service/amplify/webhook_test.go +++ b/internal/service/amplify/webhook_test.go @@ -36,7 +36,7 @@ func testAccWebhook_basic(t *testing.T) { Config: testAccWebhookConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckWebhookExists(ctx, resourceName, &webhook), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "amplify", regexache.MustCompile(`apps/.+/webhooks/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "amplify", regexache.MustCompile(`apps/.+/webhooks/.+`)), resource.TestCheckResourceAttr(resourceName, "branch_name", rName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestMatchResourceAttr(resourceName, names.AttrURL, regexache.MustCompile(fmt.Sprintf(`^https://webhooks.amplify.%s.%s/.+$`, acctest.Region(), acctest.PartitionDNSSuffix()))), From b7f6aab161a8869b2e9ae1d83578e18f74470cb2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:39 -0500 Subject: [PATCH 006/304] Make 'AWSClient.AccountID' a getter - apigateway. --- internal/service/apigateway/deployment.go | 2 +- internal/service/apigateway/deployment_test.go | 6 +++--- internal/service/apigateway/rest_api_test.go | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/service/apigateway/deployment.go b/internal/service/apigateway/deployment.go index 1a101fba8fe..51c1e0c1aff 100644 --- a/internal/service/apigateway/deployment.go +++ b/internal/service/apigateway/deployment.go @@ -179,7 +179,7 @@ func resourceDeploymentRead(ctx context.Context, d *schema.ResourceData, meta in Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "execute-api", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("%s/%s", restAPIID, stageName), }.String() d.Set("execution_arn", executionARN) diff --git a/internal/service/apigateway/deployment_test.go b/internal/service/apigateway/deployment_test.go index 02d252bf0b1..e1de547945a 100644 --- a/internal/service/apigateway/deployment_test.go +++ b/internal/service/apigateway/deployment_test.go @@ -40,7 +40,7 @@ func TestAccAPIGatewayDeployment_basic(t *testing.T) { testAccCheckDeploymentExists(ctx, resourceName, &deployment), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), - acctest.MatchResourceAttrRegionalARN(resourceName, "execution_arn", "execute-api", regexache.MustCompile(".+/")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "execution_arn", "execute-api", regexache.MustCompile(".+/")), resource.TestMatchResourceAttr(resourceName, "invoke_url", regexache.MustCompile(fmt.Sprintf("https://.+\\.execute-api\\.%s.amazonaws\\.com/", acctest.Region()))), resource.TestCheckResourceAttrPair(resourceName, "rest_api_id", restApiResourceName, names.AttrID), resource.TestCheckNoResourceAttr(resourceName, "stage_description"), @@ -244,7 +244,7 @@ func TestAccAPIGatewayDeployment_stageName(t *testing.T) { testAccCheckDeploymentExists(ctx, resourceName, &deployment), testAccCheckStageExists(ctx, resourceName, &stage), resource.TestCheckResourceAttr(resourceName, "stage_name", stageName), - acctest.MatchResourceAttrRegionalARN(resourceName, "execution_arn", "execute-api", regexache.MustCompile(fmt.Sprintf(".+/%s", stageName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "execution_arn", "execute-api", regexache.MustCompile(fmt.Sprintf(".+/%s", stageName))), resource.TestMatchResourceAttr(resourceName, "invoke_url", regexache.MustCompile(fmt.Sprintf("https://.+\\.execute-api\\.%s.amazonaws\\.com/%s", acctest.Region(), stageName))), ), }, @@ -252,7 +252,7 @@ func TestAccAPIGatewayDeployment_stageName(t *testing.T) { Config: testAccDeploymentConfig_required(rName), Check: resource.ComposeTestCheckFunc( resource.TestCheckNoResourceAttr(resourceName, "stage_name"), - acctest.MatchResourceAttrRegionalARN(resourceName, "execution_arn", "execute-api", regexache.MustCompile(".+/")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "execution_arn", "execute-api", regexache.MustCompile(".+/")), resource.TestMatchResourceAttr(resourceName, "invoke_url", regexache.MustCompile(fmt.Sprintf("https://.+\\.execute-api\\.%s.amazonaws\\.com/", acctest.Region()))), ), }, diff --git a/internal/service/apigateway/rest_api_test.go b/internal/service/apigateway/rest_api_test.go index 5edda5c3fa7..6375d4eb082 100644 --- a/internal/service/apigateway/rest_api_test.go +++ b/internal/service/apigateway/rest_api_test.go @@ -50,7 +50,7 @@ func TestAccAPIGatewayRestAPI_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "endpoint_configuration.0.types.#", "1"), resource.TestCheckResourceAttr(resourceName, "endpoint_configuration.0.types.0", "EDGE"), resource.TestCheckResourceAttr(resourceName, "endpoint_configuration.0.vpc_endpoint_ids.#", "0"), - acctest.MatchResourceAttrRegionalARN(resourceName, "execution_arn", "execute-api", regexache.MustCompile(`[0-9a-z]+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "execution_arn", "execute-api", regexache.MustCompile(`[0-9a-z]+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "parameters.%", "0"), resource.TestMatchResourceAttr(resourceName, "root_resource_id", regexache.MustCompile(`^[0-9a-z]+$`)), From e1fc3b957fe7b93a2f6bcf8333291125a1eb16bb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:39 -0500 Subject: [PATCH 007/304] Make 'AWSClient.AccountID' a getter - apigatewayv2. --- internal/service/apigatewayv2/api_test.go | 16 ++++---- internal/service/apigatewayv2/stage_test.go | 44 ++++++++++----------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/internal/service/apigatewayv2/api_test.go b/internal/service/apigatewayv2/api_test.go index b90daeacd2d..d5d28f29fdb 100644 --- a/internal/service/apigatewayv2/api_test.go +++ b/internal/service/apigatewayv2/api_test.go @@ -44,7 +44,7 @@ func TestAccAPIGatewayV2API_basicWebSocket(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "cors_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttr(resourceName, "disable_execute_api_endpoint", acctest.CtFalse), - acctest.MatchResourceAttrRegionalARN(resourceName, "execution_arn", "execute-api", regexache.MustCompile(`.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "execution_arn", "execute-api", regexache.MustCompile(`.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "protocol_type", string(awstypes.ProtocolTypeWebsocket)), resource.TestCheckResourceAttr(resourceName, "route_selection_expression", "$request.body.action"), @@ -83,7 +83,7 @@ func TestAccAPIGatewayV2API_basicHTTP(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "cors_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttr(resourceName, "disable_execute_api_endpoint", acctest.CtFalse), - acctest.MatchResourceAttrRegionalARN(resourceName, "execution_arn", "execute-api", regexache.MustCompile(`.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "execution_arn", "execute-api", regexache.MustCompile(`.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "protocol_type", string(awstypes.ProtocolTypeHttp)), resource.TestCheckResourceAttr(resourceName, "route_selection_expression", "$request.method $request.path"), @@ -147,7 +147,7 @@ func TestAccAPIGatewayV2API_allAttributesWebSocket(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "cors_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "test description"), resource.TestCheckResourceAttr(resourceName, "disable_execute_api_endpoint", acctest.CtTrue), - acctest.MatchResourceAttrRegionalARN(resourceName, "execution_arn", "execute-api", regexache.MustCompile(`.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "execution_arn", "execute-api", regexache.MustCompile(`.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName1), resource.TestCheckResourceAttr(resourceName, "protocol_type", string(awstypes.ProtocolTypeWebsocket)), resource.TestCheckResourceAttr(resourceName, "route_selection_expression", "$request.body.service"), @@ -230,7 +230,7 @@ func TestAccAPIGatewayV2API_allAttributesHTTP(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "cors_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "test description"), resource.TestCheckResourceAttr(resourceName, "disable_execute_api_endpoint", acctest.CtTrue), - acctest.MatchResourceAttrRegionalARN(resourceName, "execution_arn", "execute-api", regexache.MustCompile(`.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "execution_arn", "execute-api", regexache.MustCompile(`.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName1), resource.TestCheckResourceAttr(resourceName, "protocol_type", string(awstypes.ProtocolTypeHttp)), resource.TestCheckResourceAttr(resourceName, "route_selection_expression", "$request.method $request.path"), @@ -616,7 +616,7 @@ func TestAccAPIGatewayV2API_cors(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "cors_configuration.0.expose_headers.#", "0"), resource.TestCheckResourceAttr(resourceName, "cors_configuration.0.max_age", "0"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), - acctest.MatchResourceAttrRegionalARN(resourceName, "execution_arn", "execute-api", regexache.MustCompile(`.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "execution_arn", "execute-api", regexache.MustCompile(`.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "protocol_type", string(awstypes.ProtocolTypeHttp)), resource.TestCheckResourceAttr(resourceName, "route_selection_expression", "$request.method $request.path"), @@ -649,7 +649,7 @@ func TestAccAPIGatewayV2API_cors(t *testing.T) { resource.TestCheckTypeSetElemAttr(resourceName, "cors_configuration.0.expose_headers.*", "X-Api-Id"), resource.TestCheckResourceAttr(resourceName, "cors_configuration.0.max_age", "500"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), - acctest.MatchResourceAttrRegionalARN(resourceName, "execution_arn", "execute-api", regexache.MustCompile(`.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "execution_arn", "execute-api", regexache.MustCompile(`.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "protocol_type", string(awstypes.ProtocolTypeHttp)), resource.TestCheckResourceAttr(resourceName, "route_selection_expression", "$request.method $request.path"), @@ -666,7 +666,7 @@ func TestAccAPIGatewayV2API_cors(t *testing.T) { acctest.MatchResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "apigateway", regexache.MustCompile(`/apis/.+`)), resource.TestCheckResourceAttr(resourceName, "cors_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), - acctest.MatchResourceAttrRegionalARN(resourceName, "execution_arn", "execute-api", regexache.MustCompile(`.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "execution_arn", "execute-api", regexache.MustCompile(`.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "protocol_type", string(awstypes.ProtocolTypeHttp)), resource.TestCheckResourceAttr(resourceName, "route_selection_expression", "$request.method $request.path"), @@ -702,7 +702,7 @@ func TestAccAPIGatewayV2API_quickCreate(t *testing.T) { acctest.MatchResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "apigateway", regexache.MustCompile(`/apis/.+`)), resource.TestCheckResourceAttr(resourceName, "cors_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), - acctest.MatchResourceAttrRegionalARN(resourceName, "execution_arn", "execute-api", regexache.MustCompile(`.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "execution_arn", "execute-api", regexache.MustCompile(`.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "protocol_type", string(awstypes.ProtocolTypeHttp)), resource.TestCheckResourceAttr(resourceName, "route_key", "GET /pets"), diff --git a/internal/service/apigatewayv2/stage_test.go b/internal/service/apigatewayv2/stage_test.go index 0c9fc991d06..d9daa7c4fae 100644 --- a/internal/service/apigatewayv2/stage_test.go +++ b/internal/service/apigatewayv2/stage_test.go @@ -53,7 +53,7 @@ func TestAccAPIGatewayV2Stage_basicWebSocket(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "0"), resource.TestCheckResourceAttr(resourceName, "deployment_id", ""), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), - testAccCheckStageExecutionARN(resourceName, "execution_arn", &api, &v), + testAccCheckStageExecutionARN(ctx, resourceName, "execution_arn", &api, &v), resource.TestMatchResourceAttr(resourceName, "invoke_url", regexache.MustCompile(fmt.Sprintf("wss://.+\\.execute-api\\.%s.amazonaws\\.com/%s", acctest.Region(), rName))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "route_settings.#", "0"), @@ -102,7 +102,7 @@ func TestAccAPIGatewayV2Stage_basicHTTP(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "0"), resource.TestCheckResourceAttr(resourceName, "deployment_id", ""), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), - testAccCheckStageExecutionARN(resourceName, "execution_arn", &api, &v), + testAccCheckStageExecutionARN(ctx, resourceName, "execution_arn", &api, &v), resource.TestMatchResourceAttr(resourceName, "invoke_url", regexache.MustCompile(fmt.Sprintf("https://.+\\.execute-api\\.%s.amazonaws\\.com/%s", acctest.Region(), rName))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "route_settings.#", "0"), @@ -151,7 +151,7 @@ func TestAccAPIGatewayV2Stage_defaultHTTPStage(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "0"), resource.TestCheckResourceAttr(resourceName, "deployment_id", ""), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), - testAccCheckStageExecutionARN(resourceName, "execution_arn", &api, &v), + testAccCheckStageExecutionARN(ctx, resourceName, "execution_arn", &api, &v), resource.TestMatchResourceAttr(resourceName, "invoke_url", regexache.MustCompile(fmt.Sprintf("https://.+\\.execute-api\\.%s.amazonaws\\.com/", acctest.Region()))), resource.TestCheckResourceAttr(resourceName, names.AttrName, "$default"), resource.TestCheckResourceAttr(resourceName, "route_settings.#", "0"), @@ -200,7 +200,7 @@ func TestAccAPIGatewayV2Stage_autoDeployHTTP(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "0"), resource.TestCheckResourceAttr(resourceName, "deployment_id", ""), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), - testAccCheckStageExecutionARN(resourceName, "execution_arn", &api, &v), + testAccCheckStageExecutionARN(ctx, resourceName, "execution_arn", &api, &v), resource.TestMatchResourceAttr(resourceName, "invoke_url", regexache.MustCompile(fmt.Sprintf("https://.+\\.execute-api\\.%s.amazonaws\\.com/%s", acctest.Region(), rName))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "route_settings.#", "0"), @@ -226,7 +226,7 @@ func TestAccAPIGatewayV2Stage_autoDeployHTTP(t *testing.T) { // The stage's DeploymentId attribute will be set asynchronously as deployments are done automatically. // resource.TestCheckResourceAttrSet(resourceName, "deployment_id"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), - testAccCheckStageExecutionARN(resourceName, "execution_arn", &api, &v), + testAccCheckStageExecutionARN(ctx, resourceName, "execution_arn", &api, &v), resource.TestMatchResourceAttr(resourceName, "invoke_url", regexache.MustCompile(fmt.Sprintf("https://.+\\.execute-api\\.%s.amazonaws\\.com/%s", acctest.Region(), rName))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "route_settings.#", "0"), @@ -306,7 +306,7 @@ func TestAccAPIGatewayV2Stage_accessLogSettings(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "0"), resource.TestCheckResourceAttr(resourceName, "deployment_id", ""), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), - testAccCheckStageExecutionARN(resourceName, "execution_arn", &api, &v), + testAccCheckStageExecutionARN(ctx, resourceName, "execution_arn", &api, &v), resource.TestMatchResourceAttr(resourceName, "invoke_url", regexache.MustCompile(fmt.Sprintf("wss://.+\\.execute-api\\.%s.amazonaws\\.com/%s", acctest.Region(), rName))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "route_settings.#", "0"), @@ -380,7 +380,7 @@ func TestAccAPIGatewayV2Stage_clientCertificateIdAndDescription(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "0"), resource.TestCheckResourceAttr(resourceName, "deployment_id", ""), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Test stage"), - testAccCheckStageExecutionARN(resourceName, "execution_arn", &api, &v), + testAccCheckStageExecutionARN(ctx, resourceName, "execution_arn", &api, &v), resource.TestMatchResourceAttr(resourceName, "invoke_url", regexache.MustCompile(fmt.Sprintf("wss://.+\\.execute-api\\.%s.amazonaws\\.com/%s", acctest.Region(), rName))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "route_settings.#", "0"), @@ -411,7 +411,7 @@ func TestAccAPIGatewayV2Stage_clientCertificateIdAndDescription(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "0"), resource.TestCheckResourceAttr(resourceName, "deployment_id", ""), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Test stage updated"), - testAccCheckStageExecutionARN(resourceName, "execution_arn", &api, &v), + testAccCheckStageExecutionARN(ctx, resourceName, "execution_arn", &api, &v), resource.TestMatchResourceAttr(resourceName, "invoke_url", regexache.MustCompile(fmt.Sprintf("wss://.+\\.execute-api\\.%s.amazonaws\\.com/%s", acctest.Region(), rName))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "route_settings.#", "0"), @@ -454,7 +454,7 @@ func TestAccAPIGatewayV2Stage_defaultRouteSettingsWebSocket(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "8888"), resource.TestCheckResourceAttr(resourceName, "deployment_id", ""), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), - testAccCheckStageExecutionARN(resourceName, "execution_arn", &api, &v), + testAccCheckStageExecutionARN(ctx, resourceName, "execution_arn", &api, &v), resource.TestMatchResourceAttr(resourceName, "invoke_url", regexache.MustCompile(fmt.Sprintf("wss://.+\\.execute-api\\.%s.amazonaws\\.com/%s", acctest.Region(), rName))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "route_settings.#", "0"), @@ -479,7 +479,7 @@ func TestAccAPIGatewayV2Stage_defaultRouteSettingsWebSocket(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "9999"), resource.TestCheckResourceAttr(resourceName, "deployment_id", ""), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), - testAccCheckStageExecutionARN(resourceName, "execution_arn", &api, &v), + testAccCheckStageExecutionARN(ctx, resourceName, "execution_arn", &api, &v), resource.TestMatchResourceAttr(resourceName, "invoke_url", regexache.MustCompile(fmt.Sprintf("wss://.+\\.execute-api\\.%s.amazonaws\\.com/%s", acctest.Region(), rName))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "route_settings.#", "0"), @@ -550,7 +550,7 @@ func TestAccAPIGatewayV2Stage_defaultRouteSettingsHTTP(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "8888"), resource.TestCheckResourceAttr(resourceName, "deployment_id", ""), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), - testAccCheckStageExecutionARN(resourceName, "execution_arn", &api, &v), + testAccCheckStageExecutionARN(ctx, resourceName, "execution_arn", &api, &v), resource.TestMatchResourceAttr(resourceName, "invoke_url", regexache.MustCompile(fmt.Sprintf("https://.+\\.execute-api\\.%s.amazonaws\\.com/%s", acctest.Region(), rName))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "route_settings.#", "0"), @@ -575,7 +575,7 @@ func TestAccAPIGatewayV2Stage_defaultRouteSettingsHTTP(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "9999"), resource.TestCheckResourceAttr(resourceName, "deployment_id", ""), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), - testAccCheckStageExecutionARN(resourceName, "execution_arn", &api, &v), + testAccCheckStageExecutionARN(ctx, resourceName, "execution_arn", &api, &v), resource.TestMatchResourceAttr(resourceName, "invoke_url", regexache.MustCompile(fmt.Sprintf("https://.+\\.execute-api\\.%s.amazonaws\\.com/%s", acctest.Region(), rName))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "route_settings.#", "0"), @@ -647,7 +647,7 @@ func TestAccAPIGatewayV2Stage_deployment(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "0"), resource.TestCheckResourceAttrPair(resourceName, "deployment_id", deploymentResourceName, names.AttrID), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), - testAccCheckStageExecutionARN(resourceName, "execution_arn", &api, &v), + testAccCheckStageExecutionARN(ctx, resourceName, "execution_arn", &api, &v), resource.TestMatchResourceAttr(resourceName, "invoke_url", regexache.MustCompile(fmt.Sprintf("wss://.+\\.execute-api\\.%s.amazonaws\\.com/%s", acctest.Region(), rName))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "route_settings.#", "0"), @@ -696,7 +696,7 @@ func TestAccAPIGatewayV2Stage_routeSettingsWebSocket(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "0"), resource.TestCheckResourceAttr(resourceName, "deployment_id", ""), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), - testAccCheckStageExecutionARN(resourceName, "execution_arn", &api, &v), + testAccCheckStageExecutionARN(ctx, resourceName, "execution_arn", &api, &v), resource.TestMatchResourceAttr(resourceName, "invoke_url", regexache.MustCompile(fmt.Sprintf("wss://.+\\.execute-api\\.%s.amazonaws\\.com/%s", acctest.Region(), rName))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "route_settings.#", "2"), @@ -736,7 +736,7 @@ func TestAccAPIGatewayV2Stage_routeSettingsWebSocket(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "0"), resource.TestCheckResourceAttr(resourceName, "deployment_id", ""), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), - testAccCheckStageExecutionARN(resourceName, "execution_arn", &api, &v), + testAccCheckStageExecutionARN(ctx, resourceName, "execution_arn", &api, &v), resource.TestMatchResourceAttr(resourceName, "invoke_url", regexache.MustCompile(fmt.Sprintf("wss://.+\\.execute-api\\.%s.amazonaws\\.com/%s", acctest.Region(), rName))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "route_settings.#", "3"), @@ -829,7 +829,7 @@ func TestAccAPIGatewayV2Stage_routeSettingsHTTP(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "0"), resource.TestCheckResourceAttr(resourceName, "deployment_id", ""), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), - testAccCheckStageExecutionARN(resourceName, "execution_arn", &api, &v), + testAccCheckStageExecutionARN(ctx, resourceName, "execution_arn", &api, &v), resource.TestMatchResourceAttr(resourceName, "invoke_url", regexache.MustCompile(fmt.Sprintf("https://.+\\.execute-api\\.%s.amazonaws\\.com/%s", acctest.Region(), rName))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "route_settings.#", "1"), @@ -861,7 +861,7 @@ func TestAccAPIGatewayV2Stage_routeSettingsHTTP(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "0"), resource.TestCheckResourceAttr(resourceName, "deployment_id", ""), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), - testAccCheckStageExecutionARN(resourceName, "execution_arn", &api, &v), + testAccCheckStageExecutionARN(ctx, resourceName, "execution_arn", &api, &v), resource.TestMatchResourceAttr(resourceName, "invoke_url", regexache.MustCompile(fmt.Sprintf("https://.+\\.execute-api\\.%s.amazonaws\\.com/%s", acctest.Region(), rName))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "route_settings.#", "1"), @@ -939,7 +939,7 @@ func TestAccAPIGatewayV2Stage_RouteSettingsHTTP_withRoute(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "0"), resource.TestCheckResourceAttr(resourceName, "deployment_id", ""), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), - testAccCheckStageExecutionARN(resourceName, "execution_arn", &api, &v), + testAccCheckStageExecutionARN(ctx, resourceName, "execution_arn", &api, &v), resource.TestMatchResourceAttr(resourceName, "invoke_url", regexache.MustCompile(fmt.Sprintf("https://.+\\.execute-api\\.%s.amazonaws\\.com/%s", acctest.Region(), rName))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "route_settings.#", "1"), @@ -971,7 +971,7 @@ func TestAccAPIGatewayV2Stage_RouteSettingsHTTP_withRoute(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "0"), resource.TestCheckResourceAttr(resourceName, "deployment_id", ""), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), - testAccCheckStageExecutionARN(resourceName, "execution_arn", &api, &v), + testAccCheckStageExecutionARN(ctx, resourceName, "execution_arn", &api, &v), resource.TestMatchResourceAttr(resourceName, "invoke_url", regexache.MustCompile(fmt.Sprintf("https://.+\\.execute-api\\.%s.amazonaws\\.com/%s", acctest.Region(), rName))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "route_settings.#", "1"), @@ -1027,7 +1027,7 @@ func TestAccAPIGatewayV2Stage_stageVariables(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_burst_limit", "0"), resource.TestCheckResourceAttr(resourceName, "default_route_settings.0.throttling_rate_limit", "0"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), - testAccCheckStageExecutionARN(resourceName, "execution_arn", &api, &v), + testAccCheckStageExecutionARN(ctx, resourceName, "execution_arn", &api, &v), resource.TestMatchResourceAttr(resourceName, "invoke_url", regexache.MustCompile(fmt.Sprintf("wss://.+\\.execute-api\\.%s.amazonaws\\.com/%s", acctest.Region(), rName))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "route_settings.#", "0"), @@ -1121,9 +1121,9 @@ func testAccCheckStageARN(resourceName, attributeName string, api *apigatewayv2. } } -func testAccCheckStageExecutionARN(resourceName, attributeName string, api *apigatewayv2.GetApiOutput, v *apigatewayv2.GetStageOutput) resource.TestCheckFunc { +func testAccCheckStageExecutionARN(ctx context.Context, resourceName, attributeName string, api *apigatewayv2.GetApiOutput, v *apigatewayv2.GetStageOutput) resource.TestCheckFunc { return func(s *terraform.State) error { - return acctest.CheckResourceAttrRegionalARN(resourceName, attributeName, "execute-api", fmt.Sprintf("%s/%s", aws.ToString(api.ApiId), aws.ToString(v.StageName)))(s) + return acctest.CheckResourceAttrRegionalARN(ctx, resourceName, attributeName, "execute-api", fmt.Sprintf("%s/%s", aws.ToString(api.ApiId), aws.ToString(v.StageName)))(s) } } From 0cf84c881e29ff01881fe00434f35ee4d24240c8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:39 -0500 Subject: [PATCH 008/304] Make 'AWSClient.AccountID' a getter - appautoscaling. --- .../appautoscaling/scheduled_action_test.go | 40 +++++++++---------- .../service/appautoscaling/target_test.go | 2 +- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/internal/service/appautoscaling/scheduled_action_test.go b/internal/service/appautoscaling/scheduled_action_test.go index fe16665b61c..76cba562029 100644 --- a/internal/service/appautoscaling/scheduled_action_test.go +++ b/internal/service/appautoscaling/scheduled_action_test.go @@ -51,7 +51,7 @@ func TestAccAppAutoScalingScheduledAction_dynamoDB(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "scalable_target_action.0.min_capacity", "1"), resource.TestCheckResourceAttr(resourceName, "scalable_target_action.0.max_capacity", "10"), resource.TestCheckResourceAttr(resourceName, "timezone", "UTC"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "autoscaling", regexache.MustCompile(fmt.Sprintf("scheduledAction:.+:scheduledActionName/%s$", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "autoscaling", regexache.MustCompile(fmt.Sprintf("scheduledAction:.+:scheduledActionName/%s$", rName))), resource.TestCheckNoResourceAttr(resourceName, names.AttrStartTime), resource.TestCheckNoResourceAttr(resourceName, "end_time"), ), @@ -70,7 +70,7 @@ func TestAccAppAutoScalingScheduledAction_dynamoDB(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "scalable_target_action.0.min_capacity", "2"), resource.TestCheckResourceAttr(resourceName, "scalable_target_action.0.max_capacity", "9"), resource.TestCheckResourceAttr(resourceName, "timezone", updatedTimezone), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "autoscaling", regexache.MustCompile(fmt.Sprintf("scheduledAction:.+:scheduledActionName/%s$", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "autoscaling", regexache.MustCompile(fmt.Sprintf("scheduledAction:.+:scheduledActionName/%s$", rName))), resource.TestCheckNoResourceAttr(resourceName, names.AttrStartTime), resource.TestCheckNoResourceAttr(resourceName, "end_time"), ), @@ -132,7 +132,7 @@ func TestAccAppAutoScalingScheduledAction_ecs(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "scalable_target_action.0.min_capacity", "1"), resource.TestCheckResourceAttr(resourceName, "scalable_target_action.0.max_capacity", "5"), resource.TestCheckResourceAttr(resourceName, "timezone", "UTC"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "autoscaling", regexache.MustCompile(fmt.Sprintf("scheduledAction:.+:scheduledActionName/%s$", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "autoscaling", regexache.MustCompile(fmt.Sprintf("scheduledAction:.+:scheduledActionName/%s$", rName))), ), }, }, @@ -171,7 +171,7 @@ func TestAccAppAutoScalingScheduledAction_ecsUpdateScheduleRetainStartAndEndTime resource.TestCheckResourceAttr(resourceName, "timezone", "UTC"), resource.TestCheckResourceAttr(resourceName, names.AttrStartTime, startTime), resource.TestCheckResourceAttr(resourceName, "end_time", endTime), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "autoscaling", regexache.MustCompile(fmt.Sprintf("scheduledAction:.+:scheduledActionName/%s$", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "autoscaling", regexache.MustCompile(fmt.Sprintf("scheduledAction:.+:scheduledActionName/%s$", rName))), ), }, { @@ -187,7 +187,7 @@ func TestAccAppAutoScalingScheduledAction_ecsUpdateScheduleRetainStartAndEndTime resource.TestCheckResourceAttr(resourceName, "scalable_target_action.0.min_capacity", "1"), resource.TestCheckResourceAttr(resourceName, "scalable_target_action.0.max_capacity", "5"), resource.TestCheckResourceAttr(resourceName, "timezone", "UTC"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "autoscaling", regexache.MustCompile(fmt.Sprintf("scheduledAction:.+:scheduledActionName/%s$", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "autoscaling", regexache.MustCompile(fmt.Sprintf("scheduledAction:.+:scheduledActionName/%s$", rName))), ), }, }, @@ -228,7 +228,7 @@ func TestAccAppAutoScalingScheduledAction_ecsUpdateStartAndEndTime(t *testing.T) resource.TestCheckResourceAttr(resourceName, "timezone", "UTC"), resource.TestCheckResourceAttr(resourceName, names.AttrStartTime, startTime), resource.TestCheckResourceAttr(resourceName, "end_time", endTime), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "autoscaling", regexache.MustCompile(fmt.Sprintf("scheduledAction:.+:scheduledActionName/%s$", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "autoscaling", regexache.MustCompile(fmt.Sprintf("scheduledAction:.+:scheduledActionName/%s$", rName))), ), }, { @@ -246,7 +246,7 @@ func TestAccAppAutoScalingScheduledAction_ecsUpdateStartAndEndTime(t *testing.T) resource.TestCheckResourceAttr(resourceName, "timezone", "UTC"), resource.TestCheckResourceAttr(resourceName, names.AttrStartTime, startTimeUpdate), resource.TestCheckResourceAttr(resourceName, "end_time", endTimeUpdate), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "autoscaling", regexache.MustCompile(fmt.Sprintf("scheduledAction:.+:scheduledActionName/%s$", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "autoscaling", regexache.MustCompile(fmt.Sprintf("scheduledAction:.+:scheduledActionName/%s$", rName))), ), }, }, @@ -285,7 +285,7 @@ func TestAccAppAutoScalingScheduledAction_ecsAddStartTimeAndEndTimeAfterResource resource.TestCheckResourceAttr(resourceName, "timezone", "UTC"), resource.TestCheckNoResourceAttr(resourceName, names.AttrStartTime), resource.TestCheckNoResourceAttr(resourceName, "end_time"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "autoscaling", regexache.MustCompile(fmt.Sprintf("scheduledAction:.+:scheduledActionName/%s$", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "autoscaling", regexache.MustCompile(fmt.Sprintf("scheduledAction:.+:scheduledActionName/%s$", rName))), ), }, { @@ -303,7 +303,7 @@ func TestAccAppAutoScalingScheduledAction_ecsAddStartTimeAndEndTimeAfterResource resource.TestCheckResourceAttr(resourceName, "timezone", "UTC"), resource.TestCheckResourceAttr(resourceName, names.AttrStartTime, startTime), resource.TestCheckResourceAttr(resourceName, "end_time", endTime), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "autoscaling", regexache.MustCompile(fmt.Sprintf("scheduledAction:.+:scheduledActionName/%s$", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "autoscaling", regexache.MustCompile(fmt.Sprintf("scheduledAction:.+:scheduledActionName/%s$", rName))), ), }, }, @@ -337,7 +337,7 @@ func TestAccAppAutoScalingScheduledAction_emr(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "scalable_target_action.0.min_capacity", "1"), resource.TestCheckResourceAttr(resourceName, "scalable_target_action.0.max_capacity", "5"), resource.TestCheckResourceAttr(resourceName, "timezone", "UTC"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "autoscaling", regexache.MustCompile(fmt.Sprintf("scheduledAction:.+:scheduledActionName/%s$", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "autoscaling", regexache.MustCompile(fmt.Sprintf("scheduledAction:.+:scheduledActionName/%s$", rName))), ), }, }, @@ -396,7 +396,7 @@ func TestAccAppAutoScalingScheduledAction_spotFleet(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "scalable_target_action.0.min_capacity", "1"), resource.TestCheckResourceAttr(resourceName, "scalable_target_action.0.max_capacity", "3"), resource.TestCheckResourceAttr(resourceName, "timezone", "UTC"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "autoscaling", regexache.MustCompile(fmt.Sprintf("scheduledAction:.+:scheduledActionName/%s$", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "autoscaling", regexache.MustCompile(fmt.Sprintf("scheduledAction:.+:scheduledActionName/%s$", rName))), ), }, }, @@ -434,7 +434,7 @@ func TestAccAppAutoScalingScheduledAction_ScheduleAtExpression_timezone(t *testi resource.TestCheckResourceAttr(resourceName, "scalable_target_action.0.min_capacity", "1"), resource.TestCheckResourceAttr(resourceName, "scalable_target_action.0.max_capacity", "10"), resource.TestCheckResourceAttr(resourceName, "timezone", timezone), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "autoscaling", regexache.MustCompile(fmt.Sprintf("scheduledAction:.+:scheduledActionName/%s$", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "autoscaling", regexache.MustCompile(fmt.Sprintf("scheduledAction:.+:scheduledActionName/%s$", rName))), resource.TestCheckResourceAttr(resourceName, names.AttrStartTime, startTime), resource.TestCheckResourceAttr(resourceName, "end_time", endTime), ), @@ -470,7 +470,7 @@ func TestAccAppAutoScalingScheduledAction_ScheduleCronExpression_basic(t *testin resource.TestCheckResourceAttr(resourceName, "scalable_target_action.0.min_capacity", "1"), resource.TestCheckResourceAttr(resourceName, "scalable_target_action.0.max_capacity", "10"), resource.TestCheckResourceAttr(resourceName, "timezone", "UTC"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "autoscaling", regexache.MustCompile(fmt.Sprintf("scheduledAction:.+:scheduledActionName/%s$", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "autoscaling", regexache.MustCompile(fmt.Sprintf("scheduledAction:.+:scheduledActionName/%s$", rName))), resource.TestCheckNoResourceAttr(resourceName, names.AttrStartTime), resource.TestCheckNoResourceAttr(resourceName, "end_time"), ), @@ -509,7 +509,7 @@ func TestAccAppAutoScalingScheduledAction_ScheduleCronExpression_timezone(t *tes resource.TestCheckResourceAttr(resourceName, "scalable_target_action.0.min_capacity", "1"), resource.TestCheckResourceAttr(resourceName, "scalable_target_action.0.max_capacity", "10"), resource.TestCheckResourceAttr(resourceName, "timezone", timezone), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "autoscaling", regexache.MustCompile(fmt.Sprintf("scheduledAction:.+:scheduledActionName/%s$", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "autoscaling", regexache.MustCompile(fmt.Sprintf("scheduledAction:.+:scheduledActionName/%s$", rName))), resource.TestCheckResourceAttr(resourceName, names.AttrStartTime, startTime), resource.TestCheckResourceAttr(resourceName, "end_time", endTime), ), @@ -552,7 +552,7 @@ func TestAccAppAutoScalingScheduledAction_ScheduleCronExpression_startEndTimeTim resource.TestCheckResourceAttr(resourceName, "scalable_target_action.0.min_capacity", "1"), resource.TestCheckResourceAttr(resourceName, "scalable_target_action.0.max_capacity", "10"), resource.TestCheckResourceAttr(resourceName, "timezone", scheduleTimezone), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "autoscaling", regexache.MustCompile(fmt.Sprintf("scheduledAction:.+:scheduledActionName/%s$", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "autoscaling", regexache.MustCompile(fmt.Sprintf("scheduledAction:.+:scheduledActionName/%s$", rName))), resource.TestCheckResourceAttr(resourceName, names.AttrStartTime, startTimeUtc.Format(time.RFC3339)), resource.TestCheckResourceAttr(resourceName, "end_time", endTimeUtc.Format(time.RFC3339)), ), @@ -570,7 +570,7 @@ func TestAccAppAutoScalingScheduledAction_ScheduleCronExpression_startEndTimeTim resource.TestCheckResourceAttr(resourceName, "scalable_target_action.0.min_capacity", "1"), resource.TestCheckResourceAttr(resourceName, "scalable_target_action.0.max_capacity", "10"), resource.TestCheckResourceAttr(resourceName, "timezone", "UTC"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "autoscaling", regexache.MustCompile(fmt.Sprintf("scheduledAction:.+:scheduledActionName/%s$", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "autoscaling", regexache.MustCompile(fmt.Sprintf("scheduledAction:.+:scheduledActionName/%s$", rName))), resource.TestCheckResourceAttr(resourceName, names.AttrStartTime, ""), resource.TestCheckResourceAttr(resourceName, "end_time", ""), ), @@ -606,7 +606,7 @@ func TestAccAppAutoScalingScheduledAction_ScheduleRateExpression_basic(t *testin resource.TestCheckResourceAttr(resourceName, "scalable_target_action.0.min_capacity", "1"), resource.TestCheckResourceAttr(resourceName, "scalable_target_action.0.max_capacity", "10"), resource.TestCheckResourceAttr(resourceName, "timezone", "UTC"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "autoscaling", regexache.MustCompile(fmt.Sprintf("scheduledAction:.+:scheduledActionName/%s$", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "autoscaling", regexache.MustCompile(fmt.Sprintf("scheduledAction:.+:scheduledActionName/%s$", rName))), resource.TestCheckNoResourceAttr(resourceName, names.AttrStartTime), resource.TestCheckNoResourceAttr(resourceName, "end_time"), ), @@ -645,7 +645,7 @@ func TestAccAppAutoScalingScheduledAction_ScheduleRateExpression_timezone(t *tes resource.TestCheckResourceAttr(resourceName, "scalable_target_action.0.min_capacity", "1"), resource.TestCheckResourceAttr(resourceName, "scalable_target_action.0.max_capacity", "10"), resource.TestCheckResourceAttr(resourceName, "timezone", timezone), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "autoscaling", regexache.MustCompile(fmt.Sprintf("scheduledAction:.+:scheduledActionName/%s$", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "autoscaling", regexache.MustCompile(fmt.Sprintf("scheduledAction:.+:scheduledActionName/%s$", rName))), resource.TestCheckResourceAttr(resourceName, names.AttrStartTime, startTime), resource.TestCheckResourceAttr(resourceName, "end_time", endTime), ), @@ -681,7 +681,7 @@ func TestAccAppAutoScalingScheduledAction_minCapacity(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "scalable_target_action.0.min_capacity", "1"), resource.TestCheckResourceAttr(resourceName, "scalable_target_action.0.max_capacity", ""), resource.TestCheckResourceAttr(resourceName, "timezone", "UTC"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "autoscaling", regexache.MustCompile(fmt.Sprintf("scheduledAction:.+:scheduledActionName/%s$", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "autoscaling", regexache.MustCompile(fmt.Sprintf("scheduledAction:.+:scheduledActionName/%s$", rName))), resource.TestCheckNoResourceAttr(resourceName, names.AttrStartTime), resource.TestCheckNoResourceAttr(resourceName, "end_time"), ), @@ -737,7 +737,7 @@ func TestAccAppAutoScalingScheduledAction_maxCapacity(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "scalable_target_action.0.min_capacity", ""), resource.TestCheckResourceAttr(resourceName, "scalable_target_action.0.max_capacity", "10"), resource.TestCheckResourceAttr(resourceName, "timezone", "UTC"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "autoscaling", regexache.MustCompile(fmt.Sprintf("scheduledAction:.+:scheduledActionName/%s$", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "autoscaling", regexache.MustCompile(fmt.Sprintf("scheduledAction:.+:scheduledActionName/%s$", rName))), resource.TestCheckNoResourceAttr(resourceName, names.AttrStartTime), resource.TestCheckNoResourceAttr(resourceName, "end_time"), ), diff --git a/internal/service/appautoscaling/target_test.go b/internal/service/appautoscaling/target_test.go index 01436dc3aca..0f3d9fce612 100644 --- a/internal/service/appautoscaling/target_test.go +++ b/internal/service/appautoscaling/target_test.go @@ -201,7 +201,7 @@ func TestAccAppAutoScalingTarget_optionalRoleARN(t *testing.T) { Config: testAccTargetConfig_optionalRoleARN(rName), Check: resource.ComposeTestCheckFunc( testAccCheckTargetExists(ctx, resourceName, &readTarget), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrRoleARN, "iam", "role/aws-service-role/dynamodb.application-autoscaling.amazonaws.com/AWSServiceRoleForApplicationAutoScaling_DynamoDBTable"), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrRoleARN, "iam", "role/aws-service-role/dynamodb.application-autoscaling.amazonaws.com/AWSServiceRoleForApplicationAutoScaling_DynamoDBTable"), ), }, }, From b4e1865eac984bda224bd8886149b5ced47fa030 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:39 -0500 Subject: [PATCH 009/304] Make 'AWSClient.AccountID' a getter - appconfig. --- internal/service/appconfig/application.go | 2 +- internal/service/appconfig/application_test.go | 2 +- internal/service/appconfig/configuration_profile.go | 2 +- .../service/appconfig/configuration_profile_data_source.go | 2 +- internal/service/appconfig/configuration_profile_test.go | 2 +- internal/service/appconfig/deployment.go | 2 +- internal/service/appconfig/deployment_strategy.go | 2 +- internal/service/appconfig/deployment_strategy_test.go | 2 +- internal/service/appconfig/deployment_test.go | 4 ++-- internal/service/appconfig/environment_test.go | 2 +- internal/service/appconfig/extension_test.go | 2 +- internal/service/appconfig/extenstion_association_test.go | 4 ++-- internal/service/appconfig/hosted_configuration_version.go | 2 +- .../service/appconfig/hosted_configuration_version_test.go | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/internal/service/appconfig/application.go b/internal/service/appconfig/application.go index 4243e2dd1d3..377b47645da 100644 --- a/internal/service/appconfig/application.go +++ b/internal/service/appconfig/application.go @@ -111,7 +111,7 @@ func resourceApplicationRead(ctx context.Context, d *schema.ResourceData, meta i } arn := arn.ARN{ - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, Resource: fmt.Sprintf("application/%s", aws.ToString(output.Id)), diff --git a/internal/service/appconfig/application_test.go b/internal/service/appconfig/application_test.go index 79aa1e6782d..cb2816bf1c0 100644 --- a/internal/service/appconfig/application_test.go +++ b/internal/service/appconfig/application_test.go @@ -37,7 +37,7 @@ func TestAccAppConfigApplication_basic(t *testing.T) { Config: testAccApplicationConfig_name(rName), Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "appconfig", regexache.MustCompile(`application/[0-9a-z]{4,7}`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appconfig", regexache.MustCompile(`application/[0-9a-z]{4,7}`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), diff --git a/internal/service/appconfig/configuration_profile.go b/internal/service/appconfig/configuration_profile.go index 0894f711f9f..c2ce63c9708 100644 --- a/internal/service/appconfig/configuration_profile.go +++ b/internal/service/appconfig/configuration_profile.go @@ -212,7 +212,7 @@ func resourceConfigurationProfileRead(ctx context.Context, d *schema.ResourceDat } arn := arn.ARN{ - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, Resource: fmt.Sprintf("application/%s/configurationprofile/%s", appID, confProfID), diff --git a/internal/service/appconfig/configuration_profile_data_source.go b/internal/service/appconfig/configuration_profile_data_source.go index b8317e74173..18f1e341f1b 100644 --- a/internal/service/appconfig/configuration_profile_data_source.go +++ b/internal/service/appconfig/configuration_profile_data_source.go @@ -108,7 +108,7 @@ func dataSourceConfigurationProfileRead(ctx context.Context, d *schema.ResourceD d.Set(names.AttrApplicationID, appId) arn := arn.ARN{ - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, Resource: fmt.Sprintf("application/%s/configurationprofile/%s", appId, profileId), diff --git a/internal/service/appconfig/configuration_profile_test.go b/internal/service/appconfig/configuration_profile_test.go index e6e04b4bfa6..a714aaff69b 100644 --- a/internal/service/appconfig/configuration_profile_test.go +++ b/internal/service/appconfig/configuration_profile_test.go @@ -39,7 +39,7 @@ func TestAccAppConfigConfigurationProfile_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckConfigurationProfileExists(ctx, resourceName), resource.TestCheckResourceAttrPair(resourceName, names.AttrApplicationID, appResourceName, names.AttrID), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "appconfig", regexache.MustCompile(`application/[0-9a-z]{4,7}/configurationprofile/[0-9a-z]{4,7}`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appconfig", regexache.MustCompile(`application/[0-9a-z]{4,7}/configurationprofile/[0-9a-z]{4,7}`)), resource.TestMatchResourceAttr(resourceName, "configuration_profile_id", regexache.MustCompile(`[0-9a-z]{4,7}`)), resource.TestCheckResourceAttr(resourceName, "location_uri", "hosted"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), diff --git a/internal/service/appconfig/deployment.go b/internal/service/appconfig/deployment.go index 0420e247d54..ba9da434da5 100644 --- a/internal/service/appconfig/deployment.go +++ b/internal/service/appconfig/deployment.go @@ -181,7 +181,7 @@ func resourceDeploymentRead(ctx context.Context, d *schema.ResourceData, meta in } arn := arn.ARN{ - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, Resource: fmt.Sprintf("application/%s/environment/%s/deployment/%d", aws.ToString(output.ApplicationId), aws.ToString(output.EnvironmentId), output.DeploymentNumber), diff --git a/internal/service/appconfig/deployment_strategy.go b/internal/service/appconfig/deployment_strategy.go index dbfabb2ee9d..3e321a95da3 100644 --- a/internal/service/appconfig/deployment_strategy.go +++ b/internal/service/appconfig/deployment_strategy.go @@ -152,7 +152,7 @@ func resourceDeploymentStrategyRead(ctx context.Context, d *schema.ResourceData, d.Set("replicate_to", output.ReplicateTo) arn := arn.ARN{ - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, Resource: fmt.Sprintf("deploymentstrategy/%s", d.Id()), diff --git a/internal/service/appconfig/deployment_strategy_test.go b/internal/service/appconfig/deployment_strategy_test.go index fed581672cc..74832847a22 100644 --- a/internal/service/appconfig/deployment_strategy_test.go +++ b/internal/service/appconfig/deployment_strategy_test.go @@ -37,7 +37,7 @@ func TestAccAppConfigDeploymentStrategy_basic(t *testing.T) { Config: testAccDeploymentStrategyConfig_name(rName), Check: resource.ComposeTestCheckFunc( testAccCheckDeploymentStrategyExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "appconfig", regexache.MustCompile(`deploymentstrategy/[0-9a-z]{4,7}`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appconfig", regexache.MustCompile(`deploymentstrategy/[0-9a-z]{4,7}`)), resource.TestCheckResourceAttr(resourceName, "deployment_duration_in_minutes", "3"), resource.TestCheckResourceAttr(resourceName, "growth_factor", "10"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), diff --git a/internal/service/appconfig/deployment_test.go b/internal/service/appconfig/deployment_test.go index 688b4406c52..0e106193406 100644 --- a/internal/service/appconfig/deployment_test.go +++ b/internal/service/appconfig/deployment_test.go @@ -40,7 +40,7 @@ func TestAccAppConfigDeployment_basic(t *testing.T) { Config: testAccDeploymentConfig_name(rName), Check: resource.ComposeTestCheckFunc( testAccCheckDeploymentExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "appconfig", regexache.MustCompile(`application/[0-9a-z]{4,7}/environment/[0-9a-z]{4,7}/deployment/1`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appconfig", regexache.MustCompile(`application/[0-9a-z]{4,7}/environment/[0-9a-z]{4,7}/deployment/1`)), resource.TestCheckResourceAttrPair(resourceName, names.AttrApplicationID, appResourceName, names.AttrID), resource.TestCheckResourceAttrPair(resourceName, "configuration_profile_id", confProfResourceName, "configuration_profile_id"), resource.TestCheckResourceAttrPair(resourceName, "configuration_version", confVersionResourceName, "version_number"), @@ -81,7 +81,7 @@ func TestAccAppConfigDeployment_kms(t *testing.T) { Config: testAccDeploymentConfig_kms(rName), Check: resource.ComposeTestCheckFunc( testAccCheckDeploymentExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "appconfig", regexache.MustCompile(`application/[0-9a-z]{4,7}/environment/[0-9a-z]{4,7}/deployment/1`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appconfig", regexache.MustCompile(`application/[0-9a-z]{4,7}/environment/[0-9a-z]{4,7}/deployment/1`)), resource.TestCheckResourceAttrPair(resourceName, names.AttrApplicationID, appResourceName, names.AttrID), resource.TestCheckResourceAttrPair(resourceName, "configuration_profile_id", confProfResourceName, "configuration_profile_id"), resource.TestCheckResourceAttrPair(resourceName, "configuration_version", confVersionResourceName, "version_number"), diff --git a/internal/service/appconfig/environment_test.go b/internal/service/appconfig/environment_test.go index 534d851eb22..ea097d2f26c 100644 --- a/internal/service/appconfig/environment_test.go +++ b/internal/service/appconfig/environment_test.go @@ -38,7 +38,7 @@ func TestAccAppConfigEnvironment_basic(t *testing.T) { Config: testAccEnvironmentConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckEnvironmentExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "appconfig", regexache.MustCompile(`application/[0-9a-z]{4,7}/environment/[0-9a-z]{4,7}`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appconfig", regexache.MustCompile(`application/[0-9a-z]{4,7}/environment/[0-9a-z]{4,7}`)), resource.TestCheckResourceAttrPair(resourceName, names.AttrApplicationID, appResourceName, names.AttrID), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttr(resourceName, "monitor.#", "0"), diff --git a/internal/service/appconfig/extension_test.go b/internal/service/appconfig/extension_test.go index 03d7acebad3..1cd62171237 100644 --- a/internal/service/appconfig/extension_test.go +++ b/internal/service/appconfig/extension_test.go @@ -37,7 +37,7 @@ func TestAccAppConfigExtension_basic(t *testing.T) { Config: testAccExtensionConfig_name(rName), Check: resource.ComposeTestCheckFunc( testAccCheckExtensionExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "appconfig", regexache.MustCompile(`extension/*`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appconfig", regexache.MustCompile(`extension/*`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "action_point.0.point", "ON_DEPLOYMENT_COMPLETE"), resource.TestCheckResourceAttr(resourceName, "action_point.0.action.0.name", "test"), diff --git a/internal/service/appconfig/extenstion_association_test.go b/internal/service/appconfig/extenstion_association_test.go index f5ea78514f9..1c74722804e 100644 --- a/internal/service/appconfig/extenstion_association_test.go +++ b/internal/service/appconfig/extenstion_association_test.go @@ -37,8 +37,8 @@ func TestAccAppConfigExtensionAssociation_basic(t *testing.T) { Config: testAccExtensionAssociationConfig_name(rName), Check: resource.ComposeTestCheckFunc( testAccCheckExtensionAssociationExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, "extension_arn", "appconfig", regexache.MustCompile(`extension/*`)), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrResourceARN, "appconfig", regexache.MustCompile(`application/*`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "extension_arn", "appconfig", regexache.MustCompile(`extension/*`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrResourceARN, "appconfig", regexache.MustCompile(`application/*`)), ), }, { diff --git a/internal/service/appconfig/hosted_configuration_version.go b/internal/service/appconfig/hosted_configuration_version.go index 769c70c3a0f..a53e5fa5828 100644 --- a/internal/service/appconfig/hosted_configuration_version.go +++ b/internal/service/appconfig/hosted_configuration_version.go @@ -146,7 +146,7 @@ func resourceHostedConfigurationVersionRead(ctx context.Context, d *schema.Resou d.Set("version_number", output.VersionNumber) arn := arn.ARN{ - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, Resource: fmt.Sprintf("application/%s/configurationprofile/%s/hostedconfigurationversion/%d", appID, confProfID, versionNumber), diff --git a/internal/service/appconfig/hosted_configuration_version_test.go b/internal/service/appconfig/hosted_configuration_version_test.go index 465f763ba7d..6e8f093c5ac 100644 --- a/internal/service/appconfig/hosted_configuration_version_test.go +++ b/internal/service/appconfig/hosted_configuration_version_test.go @@ -37,7 +37,7 @@ func TestAccAppConfigHostedConfigurationVersion_basic(t *testing.T) { Config: testAccHostedConfigurationVersionConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckHostedConfigurationVersionExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "appconfig", regexache.MustCompile(`application/[0-9a-z]{4,7}/configurationprofile/[0-9a-z]{4,7}/hostedconfigurationversion/[0-9]+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appconfig", regexache.MustCompile(`application/[0-9a-z]{4,7}/configurationprofile/[0-9a-z]{4,7}/hostedconfigurationversion/[0-9]+`)), resource.TestCheckResourceAttrPair(resourceName, names.AttrApplicationID, "aws_appconfig_application.test", names.AttrID), resource.TestCheckResourceAttrPair(resourceName, "configuration_profile_id", "aws_appconfig_configuration_profile.test", "configuration_profile_id"), resource.TestCheckResourceAttr(resourceName, names.AttrContent, "{\"foo\":\"bar\"}"), From d83a8d4cdbd6ad57ffa4055c1cedaaa7468714dc Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:40 -0500 Subject: [PATCH 010/304] Make 'AWSClient.AccountID' a getter - appflow. --- internal/service/appflow/connector_profile_test.go | 2 +- internal/service/appflow/flow_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/appflow/connector_profile_test.go b/internal/service/appflow/connector_profile_test.go index 86ca4355d66..d882ef22c0b 100644 --- a/internal/service/appflow/connector_profile_test.go +++ b/internal/service/appflow/connector_profile_test.go @@ -41,7 +41,7 @@ func TestAccAppFlowConnectorProfile_basic(t *testing.T) { Config: testAccConnectorProfileConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckConnectorProfileExists(ctx, resourceName, &connectorProfiles), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "appflow", regexache.MustCompile(`connectorprofile/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appflow", regexache.MustCompile(`connectorprofile/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttrSet(resourceName, "connection_mode"), resource.TestCheckResourceAttrSet(resourceName, "connector_profile_config.#"), diff --git a/internal/service/appflow/flow_test.go b/internal/service/appflow/flow_test.go index 940d549f9e0..375b7b96df3 100644 --- a/internal/service/appflow/flow_test.go +++ b/internal/service/appflow/flow_test.go @@ -38,7 +38,7 @@ func TestAccAppFlowFlow_basic(t *testing.T) { Config: testAccFlowConfig_basic(rName, scheduleStartTime), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckFlowExists(ctx, resourceName, &flowOutput), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "appflow", regexache.MustCompile(`flow/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appflow", regexache.MustCompile(`flow/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttrSet(resourceName, "destination_flow_config.#"), resource.TestCheckResourceAttrSet(resourceName, "destination_flow_config.0.connector_type"), From 2c910f46506773ee7119df7a611123d1767b2406 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:40 -0500 Subject: [PATCH 011/304] Make 'AWSClient.AccountID' a getter - applicationinsights. --- internal/service/applicationinsights/application.go | 2 +- internal/service/applicationinsights/application_test.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/applicationinsights/application.go b/internal/service/applicationinsights/application.go index 6331f1f78d8..ade20e114dc 100644 --- a/internal/service/applicationinsights/application.go +++ b/internal/service/applicationinsights/application.go @@ -143,7 +143,7 @@ func resourceApplicationRead(ctx context.Context, d *schema.ResourceData, meta i Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "applicationinsights", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: "application/resource-group/" + rgName, }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/applicationinsights/application_test.go b/internal/service/applicationinsights/application_test.go index e8ab4e15b36..7bc028b4a1b 100644 --- a/internal/service/applicationinsights/application_test.go +++ b/internal/service/applicationinsights/application_test.go @@ -36,7 +36,7 @@ func TestAccApplicationInsightsApplication_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &app), resource.TestCheckResourceAttr(resourceName, "resource_group_name", rName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "applicationinsights", fmt.Sprintf("application/resource-group/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "applicationinsights", fmt.Sprintf("application/resource-group/%s", rName)), resource.TestCheckResourceAttr(resourceName, "auto_config_enabled", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "cwe_monitor_enabled", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "ops_center_enabled", acctest.CtFalse), @@ -53,7 +53,7 @@ func TestAccApplicationInsightsApplication_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &app), resource.TestCheckResourceAttr(resourceName, "resource_group_name", rName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "applicationinsights", fmt.Sprintf("application/resource-group/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "applicationinsights", fmt.Sprintf("application/resource-group/%s", rName)), resource.TestCheckResourceAttr(resourceName, "auto_config_enabled", acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, "cwe_monitor_enabled", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "ops_center_enabled", acctest.CtFalse), @@ -81,7 +81,7 @@ func TestAccApplicationInsightsApplication_autoConfig(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &app), resource.TestCheckResourceAttr(resourceName, "resource_group_name", rName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "applicationinsights", fmt.Sprintf("application/resource-group/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "applicationinsights", fmt.Sprintf("application/resource-group/%s", rName)), resource.TestCheckResourceAttr(resourceName, "auto_config_enabled", acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, "cwe_monitor_enabled", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "ops_center_enabled", acctest.CtFalse), From 6806cf7ac4a2015de1a2d5ef411372e53c440fa1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:40 -0500 Subject: [PATCH 012/304] Make 'AWSClient.AccountID' a getter - appmesh. --- .../appmesh/gateway_route_data_source.go | 2 +- .../service/appmesh/gateway_route_test.go | 198 +++++++------- internal/service/appmesh/mesh_data_source.go | 2 +- internal/service/appmesh/mesh_test.go | 6 +- internal/service/appmesh/route_data_source.go | 2 +- internal/service/appmesh/route_test.go | 252 +++++++++--------- .../appmesh/virtual_gateway_data_source.go | 2 +- .../service/appmesh/virtual_gateway_test.go | 102 +++---- .../appmesh/virtual_node_data_source.go | 2 +- internal/service/appmesh/virtual_node_test.go | 132 ++++----- .../appmesh/virtual_router_data_source.go | 2 +- .../service/appmesh/virtual_router_test.go | 16 +- .../appmesh/virtual_service_data_source.go | 2 +- .../service/appmesh/virtual_service_test.go | 16 +- 14 files changed, 368 insertions(+), 368 deletions(-) diff --git a/internal/service/appmesh/gateway_route_data_source.go b/internal/service/appmesh/gateway_route_data_source.go index 8a22d6963fc..55022fe5a6a 100644 --- a/internal/service/appmesh/gateway_route_data_source.go +++ b/internal/service/appmesh/gateway_route_data_source.go @@ -98,7 +98,7 @@ func dataSourceGatewayRouteRead(ctx context.Context, d *schema.ResourceData, met // They can't list tags and tag/untag resources in a mesh that aren't created by the account. var tags tftags.KeyValueTags - if meshOwner == meta.(*conns.AWSClient).AccountID { + if meshOwner == meta.(*conns.AWSClient).AccountID(ctx) { tags, err = listTags(ctx, conn, arn) if err != nil { diff --git a/internal/service/appmesh/gateway_route_test.go b/internal/service/appmesh/gateway_route_test.go index ce1f72b5186..e3f58685ea1 100644 --- a/internal/service/appmesh/gateway_route_test.go +++ b/internal/service/appmesh/gateway_route_test.go @@ -39,7 +39,7 @@ func testAccGatewayRoute_basic(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGatewayRouteExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, grName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -60,8 +60,8 @@ func testAccGatewayRoute_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "virtual_gateway_name", vgName), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -122,7 +122,7 @@ func testAccGatewayRoute_grpcRoute(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGatewayRouteExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, grName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "1"), @@ -138,8 +138,8 @@ func testAccGatewayRoute_grpcRoute(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "virtual_gateway_name", vgName), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -148,7 +148,7 @@ func testAccGatewayRoute_grpcRoute(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGatewayRouteExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, grName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "1"), @@ -164,8 +164,8 @@ func testAccGatewayRoute_grpcRoute(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "virtual_gateway_name", vgName), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -200,7 +200,7 @@ func testAccGatewayRoute_grpcRouteWithPort(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGatewayRouteExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, grName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "1"), @@ -216,8 +216,8 @@ func testAccGatewayRoute_grpcRouteWithPort(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "virtual_gateway_name", vgName), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -226,7 +226,7 @@ func testAccGatewayRoute_grpcRouteWithPort(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGatewayRouteExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, grName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "1"), @@ -242,8 +242,8 @@ func testAccGatewayRoute_grpcRouteWithPort(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "virtual_gateway_name", vgName), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -277,7 +277,7 @@ func testAccGatewayRoute_grpcRouteTargetPort(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGatewayRouteExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, grName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "1"), @@ -293,8 +293,8 @@ func testAccGatewayRoute_grpcRouteTargetPort(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "virtual_gateway_name", vgName), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -303,7 +303,7 @@ func testAccGatewayRoute_grpcRouteTargetPort(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGatewayRouteExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, grName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "1"), @@ -319,8 +319,8 @@ func testAccGatewayRoute_grpcRouteTargetPort(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "virtual_gateway_name", vgName), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -355,7 +355,7 @@ func testAccGatewayRoute_httpRoute(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGatewayRouteExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, grName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -375,8 +375,8 @@ func testAccGatewayRoute_httpRoute(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "virtual_gateway_name", vgName), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -385,7 +385,7 @@ func testAccGatewayRoute_httpRoute(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGatewayRouteExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, grName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -405,8 +405,8 @@ func testAccGatewayRoute_httpRoute(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "virtual_gateway_name", vgName), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -415,7 +415,7 @@ func testAccGatewayRoute_httpRoute(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGatewayRouteExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, grName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -431,8 +431,8 @@ func testAccGatewayRoute_httpRoute(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "virtual_gateway_name", vgName), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -441,7 +441,7 @@ func testAccGatewayRoute_httpRoute(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGatewayRouteExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, grName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -461,8 +461,8 @@ func testAccGatewayRoute_httpRoute(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "virtual_gateway_name", vgName), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -471,7 +471,7 @@ func testAccGatewayRoute_httpRoute(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGatewayRouteExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, grName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -492,8 +492,8 @@ func testAccGatewayRoute_httpRoute(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "virtual_gateway_name", vgName), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -527,7 +527,7 @@ func testAccGatewayRoute_httpRouteTargetPort(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGatewayRouteExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, grName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -543,8 +543,8 @@ func testAccGatewayRoute_httpRouteTargetPort(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "virtual_gateway_name", vgName), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -553,7 +553,7 @@ func testAccGatewayRoute_httpRouteTargetPort(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGatewayRouteExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, grName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -569,8 +569,8 @@ func testAccGatewayRoute_httpRouteTargetPort(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "virtual_gateway_name", vgName), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -604,7 +604,7 @@ func testAccGatewayRoute_httpRouteWithPath(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGatewayRouteExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, grName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -626,8 +626,8 @@ func testAccGatewayRoute_httpRouteWithPath(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "virtual_gateway_name", vgName), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -662,7 +662,7 @@ func testAccGatewayRoute_httpRouteWithPort(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGatewayRouteExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, grName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -678,8 +678,8 @@ func testAccGatewayRoute_httpRouteWithPort(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "virtual_gateway_name", vgName), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -688,7 +688,7 @@ func testAccGatewayRoute_httpRouteWithPort(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGatewayRouteExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, grName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -704,8 +704,8 @@ func testAccGatewayRoute_httpRouteWithPort(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "virtual_gateway_name", vgName), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -714,7 +714,7 @@ func testAccGatewayRoute_httpRouteWithPort(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGatewayRouteExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, grName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -730,8 +730,8 @@ func testAccGatewayRoute_httpRouteWithPort(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "virtual_gateway_name", vgName), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -740,7 +740,7 @@ func testAccGatewayRoute_httpRouteWithPort(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGatewayRouteExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, grName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -760,8 +760,8 @@ func testAccGatewayRoute_httpRouteWithPort(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "virtual_gateway_name", vgName), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -770,7 +770,7 @@ func testAccGatewayRoute_httpRouteWithPort(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGatewayRouteExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, grName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -791,8 +791,8 @@ func testAccGatewayRoute_httpRouteWithPort(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "virtual_gateway_name", vgName), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -827,7 +827,7 @@ func testAccGatewayRoute_http2Route(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGatewayRouteExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, grName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -852,8 +852,8 @@ func testAccGatewayRoute_http2Route(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "virtual_gateway_name", vgName), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -862,7 +862,7 @@ func testAccGatewayRoute_http2Route(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGatewayRouteExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, grName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -895,8 +895,8 @@ func testAccGatewayRoute_http2Route(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "virtual_gateway_name", vgName), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -905,7 +905,7 @@ func testAccGatewayRoute_http2Route(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGatewayRouteExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, grName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -921,8 +921,8 @@ func testAccGatewayRoute_http2Route(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "virtual_gateway_name", vgName), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -931,7 +931,7 @@ func testAccGatewayRoute_http2Route(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGatewayRouteExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, grName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -951,8 +951,8 @@ func testAccGatewayRoute_http2Route(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "virtual_gateway_name", vgName), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -961,7 +961,7 @@ func testAccGatewayRoute_http2Route(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGatewayRouteExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, grName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -982,8 +982,8 @@ func testAccGatewayRoute_http2Route(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "virtual_gateway_name", vgName), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -1017,7 +1017,7 @@ func testAccGatewayRoute_http2RouteTargetPort(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGatewayRouteExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, grName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -1033,8 +1033,8 @@ func testAccGatewayRoute_http2RouteTargetPort(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "virtual_gateway_name", vgName), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -1043,7 +1043,7 @@ func testAccGatewayRoute_http2RouteTargetPort(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGatewayRouteExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, grName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -1059,8 +1059,8 @@ func testAccGatewayRoute_http2RouteTargetPort(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "virtual_gateway_name", vgName), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -1095,7 +1095,7 @@ func testAccGatewayRoute_http2RouteWithPort(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGatewayRouteExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, grName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -1111,8 +1111,8 @@ func testAccGatewayRoute_http2RouteWithPort(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "virtual_gateway_name", vgName), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -1121,7 +1121,7 @@ func testAccGatewayRoute_http2RouteWithPort(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGatewayRouteExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, grName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -1137,8 +1137,8 @@ func testAccGatewayRoute_http2RouteWithPort(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "virtual_gateway_name", vgName), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -1147,7 +1147,7 @@ func testAccGatewayRoute_http2RouteWithPort(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGatewayRouteExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, grName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -1163,8 +1163,8 @@ func testAccGatewayRoute_http2RouteWithPort(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "virtual_gateway_name", vgName), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -1173,7 +1173,7 @@ func testAccGatewayRoute_http2RouteWithPort(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGatewayRouteExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, grName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -1193,8 +1193,8 @@ func testAccGatewayRoute_http2RouteWithPort(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "virtual_gateway_name", vgName), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -1203,7 +1203,7 @@ func testAccGatewayRoute_http2RouteWithPort(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGatewayRouteExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, grName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -1224,8 +1224,8 @@ func testAccGatewayRoute_http2RouteWithPort(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "virtual_gateway_name", vgName), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -1259,7 +1259,7 @@ func testAccGatewayRoute_http2RouteWithQueryParameter(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGatewayRouteExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, grName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -1284,8 +1284,8 @@ func testAccGatewayRoute_http2RouteWithQueryParameter(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "virtual_gateway_name", vgName), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s/gatewayRoute/%s", meshName, vgName, grName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, diff --git a/internal/service/appmesh/mesh_data_source.go b/internal/service/appmesh/mesh_data_source.go index e22bb421559..49bdcc46af8 100644 --- a/internal/service/appmesh/mesh_data_source.go +++ b/internal/service/appmesh/mesh_data_source.go @@ -87,7 +87,7 @@ func dataSourceMeshRead(ctx context.Context, d *schema.ResourceData, meta interf // They can't list tags and tag/untag resources in a mesh that aren't created by the account. var tags tftags.KeyValueTags - if meshOwner == meta.(*conns.AWSClient).AccountID { + if meshOwner == meta.(*conns.AWSClient).AccountID(ctx) { tags, err = listTags(ctx, conn, arn) if err != nil { diff --git a/internal/service/appmesh/mesh_test.go b/internal/service/appmesh/mesh_test.go index d0525b30642..63a0eea1cff 100644 --- a/internal/service/appmesh/mesh_test.go +++ b/internal/service/appmesh/mesh_test.go @@ -36,12 +36,12 @@ func testAccMesh_basic(t *testing.T) { Config: testAccMeshConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckServiceMeshExists(ctx, resourceName, &mesh), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", regexache.MustCompile(`mesh/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", regexache.MustCompile(`mesh/.+`)), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), ), }, diff --git a/internal/service/appmesh/route_data_source.go b/internal/service/appmesh/route_data_source.go index d6e1718775e..dcb3b2e1bab 100644 --- a/internal/service/appmesh/route_data_source.go +++ b/internal/service/appmesh/route_data_source.go @@ -98,7 +98,7 @@ func dataSourceRouteRead(ctx context.Context, d *schema.ResourceData, meta inter // They can't list tags and tag/untag resources in a mesh that aren't created by the account. var tags tftags.KeyValueTags - if meshOwner == meta.(*conns.AWSClient).AccountID { + if meshOwner == meta.(*conns.AWSClient).AccountID(ctx) { tags, err = listTags(ctx, conn, arn) if err != nil { diff --git a/internal/service/appmesh/route_test.go b/internal/service/appmesh/route_test.go index 314d8853354..6ac09bb5343 100644 --- a/internal/service/appmesh/route_test.go +++ b/internal/service/appmesh/route_test.go @@ -41,7 +41,7 @@ func testAccRoute_grpcRoute(t *testing.T) { testAccCheckRouteExists(ctx, resourceName, &r), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "virtual_router_name", vrName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "1"), @@ -74,8 +74,8 @@ func testAccRoute_grpcRoute(t *testing.T) { resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), ), }, { @@ -84,7 +84,7 @@ func testAccRoute_grpcRoute(t *testing.T) { testAccCheckRouteExists(ctx, resourceName, &r), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "virtual_router_name", vrName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "1"), @@ -126,8 +126,8 @@ func testAccRoute_grpcRoute(t *testing.T) { resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), ), }, { @@ -136,7 +136,7 @@ func testAccRoute_grpcRoute(t *testing.T) { testAccCheckRouteExists(ctx, resourceName, &r), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "virtual_router_name", vrName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "1"), @@ -178,8 +178,8 @@ func testAccRoute_grpcRoute(t *testing.T) { resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), ), }, { @@ -188,7 +188,7 @@ func testAccRoute_grpcRoute(t *testing.T) { testAccCheckRouteExists(ctx, resourceName, &r), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "virtual_router_name", vrName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "1"), @@ -221,8 +221,8 @@ func testAccRoute_grpcRoute(t *testing.T) { resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), ), }, { @@ -257,7 +257,7 @@ func testAccRoute_grpcRouteWithPortMatch(t *testing.T) { testAccCheckRouteExists(ctx, resourceName, &r), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "virtual_router_name", vrName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "1"), @@ -292,8 +292,8 @@ func testAccRoute_grpcRouteWithPortMatch(t *testing.T) { resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), ), }, { @@ -302,7 +302,7 @@ func testAccRoute_grpcRouteWithPortMatch(t *testing.T) { testAccCheckRouteExists(ctx, resourceName, &r), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "virtual_router_name", vrName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "1"), @@ -347,8 +347,8 @@ func testAccRoute_grpcRouteWithPortMatch(t *testing.T) { resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), ), }, { @@ -357,7 +357,7 @@ func testAccRoute_grpcRouteWithPortMatch(t *testing.T) { testAccCheckRouteExists(ctx, resourceName, &r), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "virtual_router_name", vrName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "1"), @@ -399,8 +399,8 @@ func testAccRoute_grpcRouteWithPortMatch(t *testing.T) { resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), ), }, { @@ -409,7 +409,7 @@ func testAccRoute_grpcRouteWithPortMatch(t *testing.T) { testAccCheckRouteExists(ctx, resourceName, &r), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "virtual_router_name", vrName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "1"), @@ -442,8 +442,8 @@ func testAccRoute_grpcRouteWithPortMatch(t *testing.T) { resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), ), }, { @@ -478,7 +478,7 @@ func testAccRoute_grpcRouteTimeout(t *testing.T) { testAccCheckRouteExists(ctx, resourceName, &r), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "virtual_router_name", vrName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "1"), @@ -504,8 +504,8 @@ func testAccRoute_grpcRouteTimeout(t *testing.T) { resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), ), }, { @@ -514,7 +514,7 @@ func testAccRoute_grpcRouteTimeout(t *testing.T) { testAccCheckRouteExists(ctx, resourceName, &r), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "virtual_router_name", vrName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "1"), @@ -542,8 +542,8 @@ func testAccRoute_grpcRouteTimeout(t *testing.T) { resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), ), }, { @@ -578,7 +578,7 @@ func testAccRoute_grpcRouteEmptyMatch(t *testing.T) { testAccCheckRouteExists(ctx, resourceName, &r), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "virtual_router_name", vrName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "1"), @@ -596,8 +596,8 @@ func testAccRoute_grpcRouteEmptyMatch(t *testing.T) { resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), ), }, { @@ -632,7 +632,7 @@ func testAccRoute_http2Route(t *testing.T) { testAccCheckRouteExists(ctx, resourceName, &r), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "virtual_router_name", vrName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -666,8 +666,8 @@ func testAccRoute_http2Route(t *testing.T) { resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), ), }, { @@ -676,7 +676,7 @@ func testAccRoute_http2Route(t *testing.T) { testAccCheckRouteExists(ctx, resourceName, &r), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "virtual_router_name", vrName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -717,8 +717,8 @@ func testAccRoute_http2Route(t *testing.T) { resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), ), }, { @@ -753,7 +753,7 @@ func testAccRoute_http2RouteWithPathMatch(t *testing.T) { testAccCheckRouteExists(ctx, resourceName, &r), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "virtual_router_name", vrName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -784,8 +784,8 @@ func testAccRoute_http2RouteWithPathMatch(t *testing.T) { resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), ), }, { @@ -820,7 +820,7 @@ func testAccRoute_http2RouteWithPortMatch(t *testing.T) { testAccCheckRouteExists(ctx, resourceName, &r), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "virtual_router_name", vrName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -853,8 +853,8 @@ func testAccRoute_http2RouteWithPortMatch(t *testing.T) { resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), ), }, { @@ -863,7 +863,7 @@ func testAccRoute_http2RouteWithPortMatch(t *testing.T) { testAccCheckRouteExists(ctx, resourceName, &r), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "virtual_router_name", vrName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -906,8 +906,8 @@ func testAccRoute_http2RouteWithPortMatch(t *testing.T) { resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), ), }, { @@ -942,7 +942,7 @@ func testAccRoute_http2RouteTimeout(t *testing.T) { testAccCheckRouteExists(ctx, resourceName, &r), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "virtual_router_name", vrName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -970,8 +970,8 @@ func testAccRoute_http2RouteTimeout(t *testing.T) { resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), ), }, { @@ -980,7 +980,7 @@ func testAccRoute_http2RouteTimeout(t *testing.T) { testAccCheckRouteExists(ctx, resourceName, &r), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "virtual_router_name", vrName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -1010,8 +1010,8 @@ func testAccRoute_http2RouteTimeout(t *testing.T) { resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), ), }, { @@ -1046,7 +1046,7 @@ func testAccRoute_httpRoute(t *testing.T) { testAccCheckRouteExists(ctx, resourceName, &r), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "virtual_router_name", vrName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -1069,8 +1069,8 @@ func testAccRoute_httpRoute(t *testing.T) { resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), ), }, { @@ -1079,7 +1079,7 @@ func testAccRoute_httpRoute(t *testing.T) { testAccCheckRouteExists(ctx, resourceName, &r), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "virtual_router_name", vrName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -1100,8 +1100,8 @@ func testAccRoute_httpRoute(t *testing.T) { resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), ), }, { @@ -1110,7 +1110,7 @@ func testAccRoute_httpRoute(t *testing.T) { testAccCheckRouteExists(ctx, resourceName, &r), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "virtual_router_name", vrName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.http_route.#", "1"), @@ -1127,8 +1127,8 @@ func testAccRoute_httpRoute(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "spec.0.tcp_route.#", "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), ), }, { @@ -1163,7 +1163,7 @@ func testAccRoute_httpRouteWithPortMatch(t *testing.T) { testAccCheckRouteExists(ctx, resourceName, &r), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "virtual_router_name", vrName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -1185,8 +1185,8 @@ func testAccRoute_httpRouteWithPortMatch(t *testing.T) { resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), ), }, { @@ -1195,7 +1195,7 @@ func testAccRoute_httpRouteWithPortMatch(t *testing.T) { testAccCheckRouteExists(ctx, resourceName, &r), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "virtual_router_name", vrName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -1218,8 +1218,8 @@ func testAccRoute_httpRouteWithPortMatch(t *testing.T) { resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), ), }, { @@ -1228,7 +1228,7 @@ func testAccRoute_httpRouteWithPortMatch(t *testing.T) { testAccCheckRouteExists(ctx, resourceName, &r), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "virtual_router_name", vrName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.http_route.#", "1"), @@ -1244,8 +1244,8 @@ func testAccRoute_httpRouteWithPortMatch(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "spec.0.tcp_route.#", "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), ), }, { @@ -1280,7 +1280,7 @@ func testAccRoute_httpRouteWithQueryParameterMatch(t *testing.T) { testAccCheckRouteExists(ctx, resourceName, &r), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "virtual_router_name", vrName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -1308,8 +1308,8 @@ func testAccRoute_httpRouteWithQueryParameterMatch(t *testing.T) { resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), ), }, { @@ -1344,7 +1344,7 @@ func testAccRoute_httpRouteTimeout(t *testing.T) { testAccCheckRouteExists(ctx, resourceName, &r), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "virtual_router_name", vrName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -1368,8 +1368,8 @@ func testAccRoute_httpRouteTimeout(t *testing.T) { resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), ), }, { @@ -1378,7 +1378,7 @@ func testAccRoute_httpRouteTimeout(t *testing.T) { testAccCheckRouteExists(ctx, resourceName, &r), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "virtual_router_name", vrName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -1404,8 +1404,8 @@ func testAccRoute_httpRouteTimeout(t *testing.T) { resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), ), }, { @@ -1440,7 +1440,7 @@ func testAccRoute_tcpRoute(t *testing.T) { testAccCheckRouteExists(ctx, resourceName, &r), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "virtual_router_name", vrName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -1454,8 +1454,8 @@ func testAccRoute_tcpRoute(t *testing.T) { resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), ), }, { @@ -1464,7 +1464,7 @@ func testAccRoute_tcpRoute(t *testing.T) { testAccCheckRouteExists(ctx, resourceName, &r), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "virtual_router_name", vrName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -1478,8 +1478,8 @@ func testAccRoute_tcpRoute(t *testing.T) { resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), ), }, { @@ -1488,7 +1488,7 @@ func testAccRoute_tcpRoute(t *testing.T) { testAccCheckRouteExists(ctx, resourceName, &r), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "virtual_router_name", vrName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.http_route.#", "0"), @@ -1499,8 +1499,8 @@ func testAccRoute_tcpRoute(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "spec.0.tcp_route.0.timeout.#", "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), ), }, { @@ -1535,7 +1535,7 @@ func testAccRoute_tcpRouteWithPortMatch(t *testing.T) { testAccCheckRouteExists(ctx, resourceName, &r), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "virtual_router_name", vrName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -1552,8 +1552,8 @@ func testAccRoute_tcpRouteWithPortMatch(t *testing.T) { resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), ), }, { @@ -1562,7 +1562,7 @@ func testAccRoute_tcpRouteWithPortMatch(t *testing.T) { testAccCheckRouteExists(ctx, resourceName, &r), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "virtual_router_name", vrName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -1580,8 +1580,8 @@ func testAccRoute_tcpRouteWithPortMatch(t *testing.T) { resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), ), }, { @@ -1590,7 +1590,7 @@ func testAccRoute_tcpRouteWithPortMatch(t *testing.T) { testAccCheckRouteExists(ctx, resourceName, &r), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "virtual_router_name", vrName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.http_route.#", "0"), @@ -1601,8 +1601,8 @@ func testAccRoute_tcpRouteWithPortMatch(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "spec.0.tcp_route.0.timeout.#", "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), ), }, { @@ -1637,7 +1637,7 @@ func testAccRoute_tcpRouteTimeout(t *testing.T) { testAccCheckRouteExists(ctx, resourceName, &r), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "virtual_router_name", vrName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -1654,8 +1654,8 @@ func testAccRoute_tcpRouteTimeout(t *testing.T) { resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), ), }, { @@ -1664,7 +1664,7 @@ func testAccRoute_tcpRouteTimeout(t *testing.T) { testAccCheckRouteExists(ctx, resourceName, &r), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "virtual_router_name", vrName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -1681,8 +1681,8 @@ func testAccRoute_tcpRouteTimeout(t *testing.T) { resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), ), }, { @@ -1717,7 +1717,7 @@ func testAccRoute_httpHeader(t *testing.T) { testAccCheckRouteExists(ctx, resourceName, &r), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "virtual_router_name", vrName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -1740,8 +1740,8 @@ func testAccRoute_httpHeader(t *testing.T) { resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), ), }, { @@ -1750,7 +1750,7 @@ func testAccRoute_httpHeader(t *testing.T) { testAccCheckRouteExists(ctx, resourceName, &r), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "virtual_router_name", vrName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -1781,8 +1781,8 @@ func testAccRoute_httpHeader(t *testing.T) { resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), ), }, { @@ -1817,7 +1817,7 @@ func testAccRoute_routePriority(t *testing.T) { testAccCheckRouteExists(ctx, resourceName, &r), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "virtual_router_name", vrName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -1836,8 +1836,8 @@ func testAccRoute_routePriority(t *testing.T) { resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), ), }, { @@ -1846,7 +1846,7 @@ func testAccRoute_routePriority(t *testing.T) { testAccCheckRouteExists(ctx, resourceName, &r), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "virtual_router_name", vrName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -1865,8 +1865,8 @@ func testAccRoute_routePriority(t *testing.T) { resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), ), }, { @@ -1901,7 +1901,7 @@ func testAccRoute_httpRetryPolicy(t *testing.T) { testAccCheckRouteExists(ctx, resourceName, &r), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "virtual_router_name", vrName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -1926,8 +1926,8 @@ func testAccRoute_httpRetryPolicy(t *testing.T) { resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), ), }, { @@ -1936,7 +1936,7 @@ func testAccRoute_httpRetryPolicy(t *testing.T) { testAccCheckRouteExists(ctx, resourceName, &r), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "virtual_router_name", vrName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -1961,8 +1961,8 @@ func testAccRoute_httpRetryPolicy(t *testing.T) { resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), ), }, { @@ -1971,7 +1971,7 @@ func testAccRoute_httpRetryPolicy(t *testing.T) { testAccCheckRouteExists(ctx, resourceName, &r), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "virtual_router_name", vrName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.grpc_route.#", "0"), @@ -1998,8 +1998,8 @@ func testAccRoute_httpRetryPolicy(t *testing.T) { resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s/route/%s", meshName, vrName, rName)), ), }, { diff --git a/internal/service/appmesh/virtual_gateway_data_source.go b/internal/service/appmesh/virtual_gateway_data_source.go index 60db97ddf22..fa4b5382680 100644 --- a/internal/service/appmesh/virtual_gateway_data_source.go +++ b/internal/service/appmesh/virtual_gateway_data_source.go @@ -92,7 +92,7 @@ func dataSourceVirtualGatewayRead(ctx context.Context, d *schema.ResourceData, m // They can't list tags and tag/untag resources in a mesh that aren't created by the account. var tags tftags.KeyValueTags - if meshOwner == meta.(*conns.AWSClient).AccountID { + if meshOwner == meta.(*conns.AWSClient).AccountID(ctx) { tags, err = listTags(ctx, conn, arn) if err != nil { diff --git a/internal/service/appmesh/virtual_gateway_test.go b/internal/service/appmesh/virtual_gateway_test.go index 7998176ef73..8f4fd239577 100644 --- a/internal/service/appmesh/virtual_gateway_test.go +++ b/internal/service/appmesh/virtual_gateway_test.go @@ -38,7 +38,7 @@ func testAccVirtualGateway_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckVirtualGatewayExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, vgName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.backend_defaults.#", "0"), @@ -52,8 +52,8 @@ func testAccVirtualGateway_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "spec.0.logging.#", "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s", meshName, vgName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s", meshName, vgName)), ), }, { @@ -109,7 +109,7 @@ func testAccVirtualGateway_BackendDefaults(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckVirtualGatewayExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, vgName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.backend_defaults.#", "1"), @@ -135,8 +135,8 @@ func testAccVirtualGateway_BackendDefaults(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "spec.0.logging.#", "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s", meshName, vgName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s", meshName, vgName)), ), }, { @@ -144,7 +144,7 @@ func testAccVirtualGateway_BackendDefaults(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckVirtualGatewayExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, vgName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.backend_defaults.#", "1"), @@ -171,8 +171,8 @@ func testAccVirtualGateway_BackendDefaults(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "spec.0.logging.#", "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s", meshName, vgName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s", meshName, vgName)), ), }, { @@ -203,7 +203,7 @@ func testAccVirtualGateway_BackendDefaultsCertificate(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckVirtualGatewayExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, vgName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.backend_defaults.#", "1"), @@ -236,8 +236,8 @@ func testAccVirtualGateway_BackendDefaultsCertificate(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "spec.0.logging.#", "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s", meshName, vgName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s", meshName, vgName)), ), }, { @@ -268,7 +268,7 @@ func testAccVirtualGateway_ListenerConnectionPool(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckVirtualGatewayExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, vgName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.backend_defaults.#", "0"), @@ -286,8 +286,8 @@ func testAccVirtualGateway_ListenerConnectionPool(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "spec.0.logging.#", "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s", meshName, vgName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s", meshName, vgName)), ), }, { @@ -295,7 +295,7 @@ func testAccVirtualGateway_ListenerConnectionPool(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckVirtualGatewayExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, vgName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.backend_defaults.#", "0"), @@ -314,8 +314,8 @@ func testAccVirtualGateway_ListenerConnectionPool(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "spec.0.logging.#", "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s", meshName, vgName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s", meshName, vgName)), ), }, { @@ -346,7 +346,7 @@ func testAccVirtualGateway_ListenerHealthChecks(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckVirtualGatewayExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, vgName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.backend_defaults.#", "0"), @@ -367,8 +367,8 @@ func testAccVirtualGateway_ListenerHealthChecks(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "spec.0.logging.#", "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s", meshName, vgName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s", meshName, vgName)), ), }, { @@ -376,7 +376,7 @@ func testAccVirtualGateway_ListenerHealthChecks(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckVirtualGatewayExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, vgName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.backend_defaults.#", "0"), @@ -397,8 +397,8 @@ func testAccVirtualGateway_ListenerHealthChecks(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "spec.0.logging.#", "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s", meshName, vgName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s", meshName, vgName)), ), }, { @@ -434,7 +434,7 @@ func testAccVirtualGateway_ListenerTLS(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckVirtualGatewayExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, vgName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.backend_defaults.#", "0"), @@ -456,8 +456,8 @@ func testAccVirtualGateway_ListenerTLS(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "spec.0.logging.#", "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s", meshName, vgName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s", meshName, vgName)), ), }, { @@ -479,7 +479,7 @@ func testAccVirtualGateway_ListenerTLS(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckVirtualGatewayExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, vgName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.backend_defaults.#", "0"), @@ -499,8 +499,8 @@ func testAccVirtualGateway_ListenerTLS(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "spec.0.logging.#", "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s", meshName, vgName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s", meshName, vgName)), ), }, { @@ -539,7 +539,7 @@ func testAccVirtualGateway_ListenerValidation(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckVirtualGatewayExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, vgName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.backend_defaults.#", "0"), @@ -570,8 +570,8 @@ func testAccVirtualGateway_ListenerValidation(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "spec.0.logging.#", "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s", meshName, vgName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s", meshName, vgName)), ), }, { @@ -585,7 +585,7 @@ func testAccVirtualGateway_ListenerValidation(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckVirtualGatewayExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, vgName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.backend_defaults.#", "0"), @@ -612,8 +612,8 @@ func testAccVirtualGateway_ListenerValidation(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "spec.0.logging.#", "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s", meshName, vgName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s", meshName, vgName)), ), }, }, @@ -638,7 +638,7 @@ func testAccVirtualGateway_MultiListenerValidation(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckVirtualGatewayExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, vgName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.backend_defaults.#", "0"), @@ -692,8 +692,8 @@ func testAccVirtualGateway_MultiListenerValidation(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "spec.0.logging.#", "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s", meshName, vgName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s", meshName, vgName)), ), }, { @@ -707,7 +707,7 @@ func testAccVirtualGateway_MultiListenerValidation(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckVirtualGatewayExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, vgName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.backend_defaults.#", "0"), @@ -761,8 +761,8 @@ func testAccVirtualGateway_MultiListenerValidation(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "spec.0.logging.#", "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s", meshName, vgName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s", meshName, vgName)), ), }, }, @@ -787,7 +787,7 @@ func testAccVirtualGateway_Logging(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckVirtualGatewayExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, vgName), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.backend_defaults.#", "0"), @@ -805,8 +805,8 @@ func testAccVirtualGateway_Logging(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "spec.0.logging.0.access_log.0.file.0.path", "/dev/stdout"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s", meshName, vgName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s", meshName, vgName)), ), }, { @@ -820,7 +820,7 @@ func testAccVirtualGateway_Logging(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckVirtualGatewayExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, vgName), resource.TestCheckResourceAttr(resourceName, "spec.0.backend_defaults.#", "0"), resource.TestCheckResourceAttr(resourceName, "spec.0.listener.#", "1"), @@ -836,8 +836,8 @@ func testAccVirtualGateway_Logging(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "spec.0.logging.0.access_log.0.file.0.path", "/tmp/access.log"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s", meshName, vgName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s", meshName, vgName)), ), }, { @@ -845,7 +845,7 @@ func testAccVirtualGateway_Logging(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckVirtualGatewayExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, names.AttrName, vgName), resource.TestCheckResourceAttr(resourceName, "spec.0.backend_defaults.#", "0"), resource.TestCheckResourceAttr(resourceName, "spec.0.listener.#", "1"), @@ -865,8 +865,8 @@ func testAccVirtualGateway_Logging(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "spec.0.logging.0.access_log.0.file.0.path", "/tmp/access.log"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s", meshName, vgName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualGateway/%s", meshName, vgName)), ), }, }, diff --git a/internal/service/appmesh/virtual_node_data_source.go b/internal/service/appmesh/virtual_node_data_source.go index fb3485ea05c..81d72a17392 100644 --- a/internal/service/appmesh/virtual_node_data_source.go +++ b/internal/service/appmesh/virtual_node_data_source.go @@ -93,7 +93,7 @@ func dataSourceVirtualNodeRead(ctx context.Context, d *schema.ResourceData, meta // They can't list tags and tag/untag resources in a mesh that aren't created by the account. var tags tftags.KeyValueTags - if meshOwner == meta.(*conns.AWSClient).AccountID { + if meshOwner == meta.(*conns.AWSClient).AccountID(ctx) { tags, err = listTags(ctx, conn, arn) if err != nil { diff --git a/internal/service/appmesh/virtual_node_test.go b/internal/service/appmesh/virtual_node_test.go index 5daa6a1c76c..a4e2364a501 100644 --- a/internal/service/appmesh/virtual_node_test.go +++ b/internal/service/appmesh/virtual_node_test.go @@ -39,7 +39,7 @@ func testAccVirtualNode_basic(t *testing.T) { testAccCheckVirtualNodeExists(ctx, resourceName, &vn), resource.TestCheckResourceAttr(resourceName, names.AttrName, vnName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.backend.#", "0"), resource.TestCheckResourceAttr(resourceName, "spec.0.backend_defaults.#", "0"), @@ -48,8 +48,8 @@ func testAccVirtualNode_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "spec.0.service_discovery.#", "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualNode/%s", meshName, vnName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualNode/%s", meshName, vnName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -119,7 +119,7 @@ func testAccVirtualNode_backendClientPolicyACM(t *testing.T) { testAccCheckVirtualNodeExists(ctx, resourceName, &vn), resource.TestCheckResourceAttr(resourceName, names.AttrName, vnName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.backend.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "spec.0.backend.*", map[string]string{ @@ -154,8 +154,8 @@ func testAccVirtualNode_backendClientPolicyACM(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "spec.0.service_discovery.0.dns.0.hostname", "serviceb.simpleapp.local"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualNode/%s", meshName, vnName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualNode/%s", meshName, vnName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -196,7 +196,7 @@ func testAccVirtualNode_backendClientPolicyFile(t *testing.T) { testAccCheckVirtualNodeExists(ctx, resourceName, &vn), resource.TestCheckResourceAttr(resourceName, names.AttrName, vnName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.backend.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "spec.0.backend.*", map[string]string{ @@ -231,8 +231,8 @@ func testAccVirtualNode_backendClientPolicyFile(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "spec.0.service_discovery.0.dns.0.hostname", "serviceb.simpleapp.local"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualNode/%s", meshName, vnName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualNode/%s", meshName, vnName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -242,7 +242,7 @@ func testAccVirtualNode_backendClientPolicyFile(t *testing.T) { testAccCheckVirtualNodeExists(ctx, resourceName, &vn), resource.TestCheckResourceAttr(resourceName, names.AttrName, vnName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.backend.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "spec.0.backend.*", map[string]string{ @@ -279,8 +279,8 @@ func testAccVirtualNode_backendClientPolicyFile(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "spec.0.service_discovery.0.dns.0.hostname", "serviceb.simpleapp.local"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualNode/%s", meshName, vnName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualNode/%s", meshName, vnName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -313,7 +313,7 @@ func testAccVirtualNode_backendDefaults(t *testing.T) { testAccCheckVirtualNodeExists(ctx, resourceName, &vn), resource.TestCheckResourceAttr(resourceName, names.AttrName, vnName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.backend.#", "0"), resource.TestCheckResourceAttr(resourceName, "spec.0.backend_defaults.#", "1"), @@ -335,8 +335,8 @@ func testAccVirtualNode_backendDefaults(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "spec.0.service_discovery.#", "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualNode/%s", meshName, vnName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualNode/%s", meshName, vnName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -346,7 +346,7 @@ func testAccVirtualNode_backendDefaults(t *testing.T) { testAccCheckVirtualNodeExists(ctx, resourceName, &vn), resource.TestCheckResourceAttr(resourceName, names.AttrName, vnName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.backend.#", "0"), resource.TestCheckResourceAttr(resourceName, "spec.0.backend_defaults.#", "1"), @@ -369,8 +369,8 @@ func testAccVirtualNode_backendDefaults(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "spec.0.service_discovery.#", "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualNode/%s", meshName, vnName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualNode/%s", meshName, vnName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -403,7 +403,7 @@ func testAccVirtualNode_backendDefaultsCertificate(t *testing.T) { testAccCheckVirtualNodeExists(ctx, resourceName, &vn), resource.TestCheckResourceAttr(resourceName, names.AttrName, vnName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.backend.#", "0"), resource.TestCheckResourceAttr(resourceName, "spec.0.backend_defaults.#", "1"), @@ -432,8 +432,8 @@ func testAccVirtualNode_backendDefaultsCertificate(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "spec.0.service_discovery.#", "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualNode/%s", meshName, vnName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualNode/%s", meshName, vnName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -522,7 +522,7 @@ func testAccVirtualNode_listenerConnectionPool(t *testing.T) { testAccCheckVirtualNodeExists(ctx, resourceName, &vn), resource.TestCheckResourceAttr(resourceName, names.AttrName, vnName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.backend.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "spec.0.backend.*", map[string]string{ @@ -547,8 +547,8 @@ func testAccVirtualNode_listenerConnectionPool(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "spec.0.service_discovery.0.dns.0.response_type", ""), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualNode/%s", meshName, vnName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualNode/%s", meshName, vnName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -558,7 +558,7 @@ func testAccVirtualNode_listenerConnectionPool(t *testing.T) { testAccCheckVirtualNodeExists(ctx, resourceName, &vn), resource.TestCheckResourceAttr(resourceName, names.AttrName, vnName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.backend.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "spec.0.backend.*", map[string]string{ @@ -584,8 +584,8 @@ func testAccVirtualNode_listenerConnectionPool(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "spec.0.service_discovery.0.dns.0.response_type", "ENDPOINTS"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualNode/%s", meshName, vnName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualNode/%s", meshName, vnName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -618,7 +618,7 @@ func testAccVirtualNode_listenerHealthChecks(t *testing.T) { testAccCheckVirtualNodeExists(ctx, resourceName, &vn), resource.TestCheckResourceAttr(resourceName, names.AttrName, vnName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.backend.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "spec.0.backend.*", map[string]string{ @@ -649,8 +649,8 @@ func testAccVirtualNode_listenerHealthChecks(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "spec.0.service_discovery.0.dns.0.hostname", "serviceb.simpleapp.local"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualNode/%s", meshName, vnName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualNode/%s", meshName, vnName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -660,7 +660,7 @@ func testAccVirtualNode_listenerHealthChecks(t *testing.T) { testAccCheckVirtualNodeExists(ctx, resourceName, &vn), resource.TestCheckResourceAttr(resourceName, names.AttrName, vnName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.backend.#", "2"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "spec.0.backend.*", map[string]string{ @@ -695,8 +695,8 @@ func testAccVirtualNode_listenerHealthChecks(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "spec.0.service_discovery.0.dns.0.hostname", "serviceb1.simpleapp.local"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualNode/%s", meshName, vnName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualNode/%s", meshName, vnName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -729,7 +729,7 @@ func testAccVirtualNode_listenerOutlierDetection(t *testing.T) { testAccCheckVirtualNodeExists(ctx, resourceName, &vn), resource.TestCheckResourceAttr(resourceName, names.AttrName, vnName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.backend.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "spec.0.backend.*", map[string]string{ @@ -755,8 +755,8 @@ func testAccVirtualNode_listenerOutlierDetection(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "spec.0.service_discovery.0.dns.0.hostname", "serviceb.simpleapp.local"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualNode/%s", meshName, vnName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualNode/%s", meshName, vnName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -766,7 +766,7 @@ func testAccVirtualNode_listenerOutlierDetection(t *testing.T) { testAccCheckVirtualNodeExists(ctx, resourceName, &vn), resource.TestCheckResourceAttr(resourceName, names.AttrName, vnName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.backend.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "spec.0.backend.*", map[string]string{ @@ -792,8 +792,8 @@ func testAccVirtualNode_listenerOutlierDetection(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "spec.0.service_discovery.0.dns.0.hostname", "serviceb.simpleapp.local"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualNode/%s", meshName, vnName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualNode/%s", meshName, vnName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -826,7 +826,7 @@ func testAccVirtualNode_listenerTimeout(t *testing.T) { testAccCheckVirtualNodeExists(ctx, resourceName, &vn), resource.TestCheckResourceAttr(resourceName, names.AttrName, vnName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.backend.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "spec.0.backend.*", map[string]string{ @@ -851,8 +851,8 @@ func testAccVirtualNode_listenerTimeout(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "spec.0.service_discovery.0.dns.0.hostname", "serviceb.simpleapp.local"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualNode/%s", meshName, vnName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualNode/%s", meshName, vnName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -862,7 +862,7 @@ func testAccVirtualNode_listenerTimeout(t *testing.T) { testAccCheckVirtualNodeExists(ctx, resourceName, &vn), resource.TestCheckResourceAttr(resourceName, names.AttrName, vnName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.backend.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "spec.0.backend.*", map[string]string{ @@ -890,8 +890,8 @@ func testAccVirtualNode_listenerTimeout(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "spec.0.service_discovery.0.dns.0.hostname", "serviceb.simpleapp.local"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualNode/%s", meshName, vnName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualNode/%s", meshName, vnName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -929,7 +929,7 @@ func testAccVirtualNode_listenerTLS(t *testing.T) { testAccCheckVirtualNodeExists(ctx, resourceName, &vn), resource.TestCheckResourceAttr(resourceName, names.AttrName, vnName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.backend.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "spec.0.backend.*", map[string]string{ @@ -960,8 +960,8 @@ func testAccVirtualNode_listenerTLS(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "spec.0.service_discovery.0.dns.0.hostname", "serviceb.simpleapp.local"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualNode/%s", meshName, vnName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualNode/%s", meshName, vnName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -985,7 +985,7 @@ func testAccVirtualNode_listenerTLS(t *testing.T) { testAccCheckVirtualNodeExists(ctx, resourceName, &vn), resource.TestCheckResourceAttr(resourceName, names.AttrName, vnName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.backend.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "spec.0.backend.*", map[string]string{ @@ -1015,8 +1015,8 @@ func testAccVirtualNode_listenerTLS(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "spec.0.service_discovery.0.dns.0.hostname", "serviceb.simpleapp.local"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualNode/%s", meshName, vnName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualNode/%s", meshName, vnName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -1057,7 +1057,7 @@ func testAccVirtualNode_listenerValidation(t *testing.T) { testAccCheckVirtualNodeExists(ctx, resourceName, &vn), resource.TestCheckResourceAttr(resourceName, names.AttrName, vnName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.backend.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "spec.0.backend.*", map[string]string{ @@ -1097,8 +1097,8 @@ func testAccVirtualNode_listenerValidation(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "spec.0.service_discovery.0.dns.0.hostname", "serviceb.simpleapp.local"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualNode/%s", meshName, vnName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualNode/%s", meshName, vnName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -1114,7 +1114,7 @@ func testAccVirtualNode_listenerValidation(t *testing.T) { testAccCheckVirtualNodeExists(ctx, resourceName, &vn), resource.TestCheckResourceAttr(resourceName, names.AttrName, vnName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.backend.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "spec.0.backend.*", map[string]string{ @@ -1150,8 +1150,8 @@ func testAccVirtualNode_listenerValidation(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "spec.0.service_discovery.0.dns.0.hostname", "serviceb.simpleapp.local"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualNode/%s", meshName, vnName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualNode/%s", meshName, vnName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -1178,7 +1178,7 @@ func testAccVirtualNode_multiListenerValidation(t *testing.T) { testAccCheckVirtualNodeExists(ctx, resourceName, &vn), resource.TestCheckResourceAttr(resourceName, names.AttrName, vnName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.backend.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "spec.0.backend.*", map[string]string{ @@ -1242,8 +1242,8 @@ func testAccVirtualNode_multiListenerValidation(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "spec.0.service_discovery.0.dns.0.hostname", "serviceb.simpleapp.local"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualNode/%s", meshName, vnName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualNode/%s", meshName, vnName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -1259,7 +1259,7 @@ func testAccVirtualNode_multiListenerValidation(t *testing.T) { testAccCheckVirtualNodeExists(ctx, resourceName, &vn), resource.TestCheckResourceAttr(resourceName, names.AttrName, vnName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.backend.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "spec.0.backend.*", map[string]string{ @@ -1335,8 +1335,8 @@ func testAccVirtualNode_multiListenerValidation(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "spec.0.service_discovery.0.dns.0.hostname", "serviceb.simpleapp.local"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualNode/%s", meshName, vnName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualNode/%s", meshName, vnName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -1363,7 +1363,7 @@ func testAccVirtualNode_logging(t *testing.T) { testAccCheckVirtualNodeExists(ctx, resourceName, &vn), resource.TestCheckResourceAttr(resourceName, names.AttrName, vnName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.logging.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.logging.0.access_log.#", "1"), @@ -1384,7 +1384,7 @@ func testAccVirtualNode_logging(t *testing.T) { testAccCheckVirtualNodeExists(ctx, resourceName, &vn), resource.TestCheckResourceAttr(resourceName, names.AttrName, vnName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "spec.0.logging.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.logging.0.access_log.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.logging.0.access_log.0.file.#", "1"), @@ -1398,7 +1398,7 @@ func testAccVirtualNode_logging(t *testing.T) { testAccCheckVirtualNodeExists(ctx, resourceName, &vn), resource.TestCheckResourceAttr(resourceName, names.AttrName, vnName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "spec.0.logging.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.logging.0.access_log.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.logging.0.access_log.0.file.#", "1"), diff --git a/internal/service/appmesh/virtual_router_data_source.go b/internal/service/appmesh/virtual_router_data_source.go index fd56b9fb71a..28762d46d68 100644 --- a/internal/service/appmesh/virtual_router_data_source.go +++ b/internal/service/appmesh/virtual_router_data_source.go @@ -93,7 +93,7 @@ func dataSourceVirtualRouterRead(ctx context.Context, d *schema.ResourceData, me // They can't list tags and tag/untag resources in a mesh that aren't created by the account. var tags tftags.KeyValueTags - if meshOwner == meta.(*conns.AWSClient).AccountID { + if meshOwner == meta.(*conns.AWSClient).AccountID(ctx) { tags, err = listTags(ctx, conn, arn) if err != nil { diff --git a/internal/service/appmesh/virtual_router_test.go b/internal/service/appmesh/virtual_router_test.go index 205f97d68d8..b773f835c59 100644 --- a/internal/service/appmesh/virtual_router_test.go +++ b/internal/service/appmesh/virtual_router_test.go @@ -38,7 +38,7 @@ func testAccVirtualRouter_basic(t *testing.T) { testAccCheckVirtualRouterExists(ctx, resourceName, &vr), resource.TestCheckResourceAttr(resourceName, names.AttrName, vrName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.listener.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.listener.0.port_mapping.#", "1"), @@ -46,8 +46,8 @@ func testAccVirtualRouter_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "spec.0.listener.0.port_mapping.0.protocol", "http"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s", meshName, vrName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s", meshName, vrName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -57,7 +57,7 @@ func testAccVirtualRouter_basic(t *testing.T) { testAccCheckVirtualRouterExists(ctx, resourceName, &vr), resource.TestCheckResourceAttr(resourceName, names.AttrName, vrName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.listener.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.listener.0.port_mapping.#", "1"), @@ -95,7 +95,7 @@ func testAccVirtualRouter_multiListener(t *testing.T) { testAccCheckVirtualRouterExists(ctx, resourceName, &vr), resource.TestCheckResourceAttr(resourceName, names.AttrName, vrName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.listener.#", "2"), resource.TestCheckResourceAttr(resourceName, "spec.0.listener.0.port_mapping.#", "1"), @@ -106,8 +106,8 @@ func testAccVirtualRouter_multiListener(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "spec.0.listener.1.port_mapping.0.protocol", "http2"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s", meshName, vrName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualRouter/%s", meshName, vrName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -117,7 +117,7 @@ func testAccVirtualRouter_multiListener(t *testing.T) { testAccCheckVirtualRouterExists(ctx, resourceName, &vr), resource.TestCheckResourceAttr(resourceName, names.AttrName, vrName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.listener.#", "3"), resource.TestCheckResourceAttr(resourceName, "spec.0.listener.0.port_mapping.#", "1"), diff --git a/internal/service/appmesh/virtual_service_data_source.go b/internal/service/appmesh/virtual_service_data_source.go index 3932f352d22..d68dd2136c6 100644 --- a/internal/service/appmesh/virtual_service_data_source.go +++ b/internal/service/appmesh/virtual_service_data_source.go @@ -93,7 +93,7 @@ func dataSourceVirtualServiceRead(ctx context.Context, d *schema.ResourceData, m // They can't list tags and tag/untag resources in a mesh that aren't created by the account. var tags tftags.KeyValueTags - if meshOwner == meta.(*conns.AWSClient).AccountID { + if meshOwner == meta.(*conns.AWSClient).AccountID(ctx) { tags, err = listTags(ctx, conn, arn) if err != nil { diff --git a/internal/service/appmesh/virtual_service_test.go b/internal/service/appmesh/virtual_service_test.go index 817b0bcf476..e3fed27749c 100644 --- a/internal/service/appmesh/virtual_service_test.go +++ b/internal/service/appmesh/virtual_service_test.go @@ -40,15 +40,15 @@ func testAccVirtualService_virtualNode(t *testing.T) { testAccCheckVirtualServiceExists(ctx, resourceName, &vs), resource.TestCheckResourceAttr(resourceName, names.AttrName, vsName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.provider.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.provider.0.virtual_node.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.provider.0.virtual_node.0.virtual_node_name", vnName1), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualService/%s", meshName, vsName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualService/%s", meshName, vsName)), ), }, { @@ -57,7 +57,7 @@ func testAccVirtualService_virtualNode(t *testing.T) { testAccCheckVirtualServiceExists(ctx, resourceName, &vs), resource.TestCheckResourceAttr(resourceName, names.AttrName, vsName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.provider.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.provider.0.virtual_node.#", "1"), @@ -95,15 +95,15 @@ func testAccVirtualService_virtualRouter(t *testing.T) { testAccCheckVirtualServiceExists(ctx, resourceName, &vs), resource.TestCheckResourceAttr(resourceName, names.AttrName, vsName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.provider.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.provider.0.virtual_router.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.provider.0.virtual_router.0.virtual_router_name", vrName1), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedDate), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualService/%s", meshName, vsName))), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appmesh", fmt.Sprintf("mesh/%s/virtualService/%s", meshName, vsName))), }, { Config: testAccVirtualServiceConfig_virtualRouter(meshName, vrName1, vrName2, vsName, "aws_appmesh_virtual_router.test2"), @@ -111,7 +111,7 @@ func testAccVirtualService_virtualRouter(t *testing.T) { testAccCheckVirtualServiceExists(ctx, resourceName, &vs), resource.TestCheckResourceAttr(resourceName, names.AttrName, vsName), resource.TestCheckResourceAttr(resourceName, "mesh_name", meshName), - acctest.CheckResourceAttrAccountID(resourceName, "mesh_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "mesh_owner"), resource.TestCheckResourceAttr(resourceName, "spec.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.provider.#", "1"), resource.TestCheckResourceAttr(resourceName, "spec.0.provider.0.virtual_router.#", "1"), From c1ced15a9606304cb219e2a36096ed6c17dbef5f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:40 -0500 Subject: [PATCH 013/304] Make 'AWSClient.AccountID' a getter - apprunner. --- .../auto_scaling_configuration_version_test.go | 16 ++++++++-------- internal/service/apprunner/connection_test.go | 2 +- ...default_auto_scaling_configuration_version.go | 2 +- .../observability_configuration_test.go | 4 ++-- internal/service/apprunner/service_test.go | 4 ++-- internal/service/apprunner/vpc_connector_test.go | 2 +- .../apprunner/vpc_ingress_connection_test.go | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/internal/service/apprunner/auto_scaling_configuration_version_test.go b/internal/service/apprunner/auto_scaling_configuration_version_test.go index 27c27d00dbf..845bc7df616 100644 --- a/internal/service/apprunner/auto_scaling_configuration_version_test.go +++ b/internal/service/apprunner/auto_scaling_configuration_version_test.go @@ -34,7 +34,7 @@ func TestAccAppRunnerAutoScalingConfigurationVersion_basic(t *testing.T) { Config: testAccAutoScalingConfigurationVersionConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAutoScalingConfigurationVersionExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "apprunner", regexache.MustCompile(fmt.Sprintf(`autoscalingconfiguration/%s/1/.+`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "apprunner", regexache.MustCompile(fmt.Sprintf(`autoscalingconfiguration/%s/1/.+`, rName))), resource.TestCheckResourceAttr(resourceName, "auto_scaling_configuration_name", rName), resource.TestCheckResourceAttr(resourceName, "auto_scaling_configuration_revision", "1"), resource.TestCheckResourceAttr(resourceName, "has_associated_service", acctest.CtFalse), @@ -70,7 +70,7 @@ func TestAccAppRunnerAutoScalingConfigurationVersion_complex(t *testing.T) { Config: testAccAutoScalingConfigurationVersionConfig_nonDefaults(rName, 50, 10, 2), Check: resource.ComposeTestCheckFunc( testAccCheckAutoScalingConfigurationVersionExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "apprunner", regexache.MustCompile(fmt.Sprintf(`autoscalingconfiguration/%s/1/.+`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "apprunner", regexache.MustCompile(fmt.Sprintf(`autoscalingconfiguration/%s/1/.+`, rName))), resource.TestCheckResourceAttr(resourceName, "auto_scaling_configuration_name", rName), resource.TestCheckResourceAttr(resourceName, "auto_scaling_configuration_revision", "1"), resource.TestCheckResourceAttr(resourceName, "latest", acctest.CtTrue), @@ -90,7 +90,7 @@ func TestAccAppRunnerAutoScalingConfigurationVersion_complex(t *testing.T) { Config: testAccAutoScalingConfigurationVersionConfig_nonDefaults(rName, 150, 20, 5), Check: resource.ComposeTestCheckFunc( testAccCheckAutoScalingConfigurationVersionExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "apprunner", regexache.MustCompile(fmt.Sprintf(`autoscalingconfiguration/%s/1/.+`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "apprunner", regexache.MustCompile(fmt.Sprintf(`autoscalingconfiguration/%s/1/.+`, rName))), resource.TestCheckResourceAttr(resourceName, "auto_scaling_configuration_name", rName), resource.TestCheckResourceAttr(resourceName, "auto_scaling_configuration_revision", "1"), resource.TestCheckResourceAttr(resourceName, "latest", acctest.CtTrue), @@ -110,7 +110,7 @@ func TestAccAppRunnerAutoScalingConfigurationVersion_complex(t *testing.T) { Config: testAccAutoScalingConfigurationVersionConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAutoScalingConfigurationVersionExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "apprunner", regexache.MustCompile(fmt.Sprintf(`autoscalingconfiguration/%s/1/.+`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "apprunner", regexache.MustCompile(fmt.Sprintf(`autoscalingconfiguration/%s/1/.+`, rName))), resource.TestCheckResourceAttr(resourceName, "auto_scaling_configuration_name", rName), resource.TestCheckResourceAttr(resourceName, "auto_scaling_configuration_revision", "1"), resource.TestCheckResourceAttr(resourceName, "latest", acctest.CtTrue), @@ -141,7 +141,7 @@ func TestAccAppRunnerAutoScalingConfigurationVersion_multipleVersions(t *testing Check: resource.ComposeTestCheckFunc( testAccCheckAutoScalingConfigurationVersionExists(ctx, resourceName), testAccCheckAutoScalingConfigurationVersionExists(ctx, otherResourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "apprunner", regexache.MustCompile(fmt.Sprintf(`autoscalingconfiguration/%s/1/.+`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "apprunner", regexache.MustCompile(fmt.Sprintf(`autoscalingconfiguration/%s/1/.+`, rName))), resource.TestCheckResourceAttr(resourceName, "auto_scaling_configuration_name", rName), resource.TestCheckResourceAttr(resourceName, "auto_scaling_configuration_revision", "1"), resource.TestCheckResourceAttr(resourceName, "latest", acctest.CtTrue), @@ -149,7 +149,7 @@ func TestAccAppRunnerAutoScalingConfigurationVersion_multipleVersions(t *testing resource.TestCheckResourceAttr(resourceName, "max_size", "25"), resource.TestCheckResourceAttr(resourceName, "min_size", "1"), resource.TestCheckResourceAttr(resourceName, names.AttrStatus, "active"), - acctest.MatchResourceAttrRegionalARN(otherResourceName, names.AttrARN, "apprunner", regexache.MustCompile(fmt.Sprintf(`autoscalingconfiguration/%s/2/.+`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, otherResourceName, names.AttrARN, "apprunner", regexache.MustCompile(fmt.Sprintf(`autoscalingconfiguration/%s/2/.+`, rName))), resource.TestCheckResourceAttr(otherResourceName, "auto_scaling_configuration_name", rName), resource.TestCheckResourceAttr(otherResourceName, "auto_scaling_configuration_revision", "2"), resource.TestCheckResourceAttr(otherResourceName, "latest", acctest.CtTrue), @@ -207,7 +207,7 @@ func TestAccAppRunnerAutoScalingConfigurationVersion_updateMultipleVersions(t *t Check: resource.ComposeTestCheckFunc( testAccCheckAutoScalingConfigurationVersionExists(ctx, resourceName), testAccCheckAutoScalingConfigurationVersionExists(ctx, otherResourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "apprunner", regexache.MustCompile(fmt.Sprintf(`autoscalingconfiguration/%s/1/.+`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "apprunner", regexache.MustCompile(fmt.Sprintf(`autoscalingconfiguration/%s/1/.+`, rName))), resource.TestCheckResourceAttr(resourceName, "auto_scaling_configuration_name", rName), resource.TestCheckResourceAttr(resourceName, "auto_scaling_configuration_revision", "1"), resource.TestCheckResourceAttr(resourceName, "latest", acctest.CtFalse), @@ -215,7 +215,7 @@ func TestAccAppRunnerAutoScalingConfigurationVersion_updateMultipleVersions(t *t resource.TestCheckResourceAttr(resourceName, "max_size", "25"), resource.TestCheckResourceAttr(resourceName, "min_size", "1"), resource.TestCheckResourceAttr(resourceName, names.AttrStatus, "active"), - acctest.MatchResourceAttrRegionalARN(otherResourceName, names.AttrARN, "apprunner", regexache.MustCompile(fmt.Sprintf(`autoscalingconfiguration/%s/2/.+`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, otherResourceName, names.AttrARN, "apprunner", regexache.MustCompile(fmt.Sprintf(`autoscalingconfiguration/%s/2/.+`, rName))), resource.TestCheckResourceAttr(otherResourceName, "auto_scaling_configuration_name", rName), resource.TestCheckResourceAttr(otherResourceName, "auto_scaling_configuration_revision", "2"), resource.TestCheckResourceAttr(otherResourceName, "latest", acctest.CtTrue), diff --git a/internal/service/apprunner/connection_test.go b/internal/service/apprunner/connection_test.go index 867868b191e..17332533d42 100644 --- a/internal/service/apprunner/connection_test.go +++ b/internal/service/apprunner/connection_test.go @@ -35,7 +35,7 @@ func TestAccAppRunnerConnection_basic(t *testing.T) { Config: testAccConnectionConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckConnectionExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "apprunner", regexache.MustCompile(fmt.Sprintf(`connection/%s/.+`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "apprunner", regexache.MustCompile(fmt.Sprintf(`connection/%s/.+`, rName))), resource.TestCheckResourceAttr(resourceName, "connection_name", rName), resource.TestCheckResourceAttr(resourceName, "provider_type", string(types.ProviderTypeGithub)), resource.TestCheckResourceAttr(resourceName, names.AttrStatus, string(types.ConnectionStatusPendingHandshake)), diff --git a/internal/service/apprunner/default_auto_scaling_configuration_version.go b/internal/service/apprunner/default_auto_scaling_configuration_version.go index 34ac49fcfaa..1b30b1706fc 100644 --- a/internal/service/apprunner/default_auto_scaling_configuration_version.go +++ b/internal/service/apprunner/default_auto_scaling_configuration_version.go @@ -66,7 +66,7 @@ func (r *defaultAutoScalingConfigurationVersionResource) Create(ctx context.Cont } // Set values for unknowns. - data.ID = flex.StringValueToFramework(ctx, r.Meta().AccountID) + data.ID = flex.StringValueToFramework(ctx, r.Meta().AccountID(ctx)) response.Diagnostics.Append(response.State.Set(ctx, &data)...) } diff --git a/internal/service/apprunner/observability_configuration_test.go b/internal/service/apprunner/observability_configuration_test.go index 9f5922ee777..adbd2df0128 100644 --- a/internal/service/apprunner/observability_configuration_test.go +++ b/internal/service/apprunner/observability_configuration_test.go @@ -35,7 +35,7 @@ func TestAccAppRunnerObservabilityConfiguration_basic(t *testing.T) { Config: testAccObservabilityConfigurationConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckObservabilityConfigurationExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "apprunner", regexache.MustCompile(fmt.Sprintf(`observabilityconfiguration/%s/1/.+`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "apprunner", regexache.MustCompile(fmt.Sprintf(`observabilityconfiguration/%s/1/.+`, rName))), resource.TestCheckResourceAttr(resourceName, "observability_configuration_name", rName), resource.TestCheckResourceAttr(resourceName, "observability_configuration_revision", "1"), resource.TestCheckResourceAttr(resourceName, names.AttrStatus, string(types.ObservabilityConfigurationStatusActive)), @@ -65,7 +65,7 @@ func TestAccAppRunnerObservabilityConfiguration_traceConfiguration(t *testing.T) Config: testAccObservabilityConfigurationConfig_traceConfiguration(rName), Check: resource.ComposeTestCheckFunc( testAccCheckObservabilityConfigurationExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "apprunner", regexache.MustCompile(fmt.Sprintf(`observabilityconfiguration/%s/1/.+`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "apprunner", regexache.MustCompile(fmt.Sprintf(`observabilityconfiguration/%s/1/.+`, rName))), resource.TestCheckResourceAttr(resourceName, "observability_configuration_name", rName), resource.TestCheckResourceAttr(resourceName, "observability_configuration_revision", "1"), resource.TestCheckResourceAttr(resourceName, names.AttrStatus, string(types.ObservabilityConfigurationStatusActive)), diff --git a/internal/service/apprunner/service_test.go b/internal/service/apprunner/service_test.go index c8828bf419c..efcdeef45fc 100644 --- a/internal/service/apprunner/service_test.go +++ b/internal/service/apprunner/service_test.go @@ -37,8 +37,8 @@ func TestAccAppRunnerService_ImageRepository_basic(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckServiceExists(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, names.AttrServiceName, rName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "apprunner", regexache.MustCompile(fmt.Sprintf(`service/%s/.+`, rName))), - acctest.MatchResourceAttrRegionalARN(resourceName, "auto_scaling_configuration_arn", "apprunner", regexache.MustCompile(`autoscalingconfiguration/DefaultConfiguration/1/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "apprunner", regexache.MustCompile(fmt.Sprintf(`service/%s/.+`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "auto_scaling_configuration_arn", "apprunner", regexache.MustCompile(`autoscalingconfiguration/DefaultConfiguration/1/.+`)), resource.TestCheckResourceAttr(resourceName, "encryption_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "health_check_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "health_check_configuration.0.protocol", string(types.HealthCheckProtocolTcp)), diff --git a/internal/service/apprunner/vpc_connector_test.go b/internal/service/apprunner/vpc_connector_test.go index 184a44c3176..f2839134458 100644 --- a/internal/service/apprunner/vpc_connector_test.go +++ b/internal/service/apprunner/vpc_connector_test.go @@ -35,7 +35,7 @@ func TestAccAppRunnerVPCConnector_basic(t *testing.T) { Config: testAccVPCConnectorConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckVPCConnectorExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "apprunner", regexache.MustCompile(fmt.Sprintf(`vpcconnector/%s/1/.+`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "apprunner", regexache.MustCompile(fmt.Sprintf(`vpcconnector/%s/1/.+`, rName))), resource.TestCheckResourceAttr(resourceName, "vpc_connector_name", rName), resource.TestCheckResourceAttr(resourceName, "subnets.#", "1"), resource.TestCheckResourceAttr(resourceName, "security_groups.#", "1"), diff --git a/internal/service/apprunner/vpc_ingress_connection_test.go b/internal/service/apprunner/vpc_ingress_connection_test.go index d059ca64c49..db17da6f564 100644 --- a/internal/service/apprunner/vpc_ingress_connection_test.go +++ b/internal/service/apprunner/vpc_ingress_connection_test.go @@ -38,7 +38,7 @@ func TestAccAppRunnerVPCIngressConnection_basic(t *testing.T) { Config: testAccVPCIngressConnectionConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckVPCIngressConnectionExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "apprunner", regexache.MustCompile(fmt.Sprintf(`vpcingressconnection/%s/.+`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "apprunner", regexache.MustCompile(fmt.Sprintf(`vpcingressconnection/%s/.+`, rName))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrStatus, string(types.VpcIngressConnectionStatusAvailable)), resource.TestCheckResourceAttrSet(resourceName, names.AttrDomainName), From 21def68618c095429005070b19d5e1464f77ed96 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:40 -0500 Subject: [PATCH 014/304] Make 'AWSClient.AccountID' a getter - appsync. --- internal/service/appsync/datasource_test.go | 2 +- internal/service/appsync/function_test.go | 2 +- internal/service/appsync/graphql_api_test.go | 20 +++++++++---------- internal/service/appsync/resolver_test.go | 2 +- .../appsync/source_api_association_test.go | 6 +++--- internal/service/appsync/type_test.go | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/internal/service/appsync/datasource_test.go b/internal/service/appsync/datasource_test.go index 832a03e4917..40b68fa510a 100644 --- a/internal/service/appsync/datasource_test.go +++ b/internal/service/appsync/datasource_test.go @@ -35,7 +35,7 @@ func testAccDataSource_basic(t *testing.T) { Config: testAccDataSourceConfig_typeNone(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckExistsDataSource(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "appsync", regexache.MustCompile(fmt.Sprintf("apis/.+/datasources/%s", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appsync", regexache.MustCompile(fmt.Sprintf("apis/.+/datasources/%s", rName))), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttr(resourceName, "dynamodb_config.#", "0"), resource.TestCheckResourceAttr(resourceName, "elasticsearch_config.#", "0"), diff --git a/internal/service/appsync/function_test.go b/internal/service/appsync/function_test.go index a944ecb13d1..9162e44053f 100644 --- a/internal/service/appsync/function_test.go +++ b/internal/service/appsync/function_test.go @@ -38,7 +38,7 @@ func testAccFunction_basic(t *testing.T) { Config: testAccFunctionConfig_basic(rName1, rName2, acctest.Region()), Check: resource.ComposeTestCheckFunc( testAccCheckFunctionExists(ctx, resourceName, &config), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "appsync", regexache.MustCompile("apis/.+/functions/.+")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appsync", regexache.MustCompile("apis/.+/functions/.+")), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName2), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttr(resourceName, "max_batch_size", "0"), diff --git a/internal/service/appsync/graphql_api_test.go b/internal/service/appsync/graphql_api_test.go index 6a9de08c872..de439e4857b 100644 --- a/internal/service/appsync/graphql_api_test.go +++ b/internal/service/appsync/graphql_api_test.go @@ -37,7 +37,7 @@ func testAccGraphQLAPI_basic(t *testing.T) { Config: testAccGraphQLAPIConfig_authenticationType(rName, "API_KEY"), Check: resource.ComposeTestCheckFunc( testAccCheckGraphQLAPIExists(ctx, resourceName, &api1), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "appsync", regexache.MustCompile(`apis/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appsync", regexache.MustCompile(`apis/.+`)), resource.TestCheckResourceAttr(resourceName, "authentication_type", "API_KEY"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "log_config.#", "0"), @@ -104,7 +104,7 @@ func testAccGraphQLAPI_schema(t *testing.T) { Config: testAccGraphQLAPIConfig_schema(rName), Check: resource.ComposeTestCheckFunc( testAccCheckGraphQLAPIExists(ctx, resourceName, &api1), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "appsync", regexache.MustCompile(`apis/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appsync", regexache.MustCompile(`apis/.+`)), resource.TestCheckResourceAttr(resourceName, "authentication_type", "API_KEY"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "log_config.#", "0"), @@ -186,7 +186,7 @@ func testAccGraphQLAPI_AuthenticationType_apiKey(t *testing.T) { Config: testAccGraphQLAPIConfig_authenticationType(rName, "API_KEY"), Check: resource.ComposeTestCheckFunc( testAccCheckGraphQLAPIExists(ctx, resourceName, &api1), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "appsync", regexache.MustCompile(`apis/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appsync", regexache.MustCompile(`apis/.+`)), resource.TestCheckResourceAttr(resourceName, "authentication_type", "API_KEY"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), ), @@ -216,7 +216,7 @@ func testAccGraphQLAPI_AuthenticationType_iam(t *testing.T) { Config: testAccGraphQLAPIConfig_authenticationType(rName, "AWS_IAM"), Check: resource.ComposeTestCheckFunc( testAccCheckGraphQLAPIExists(ctx, resourceName, &api1), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "appsync", regexache.MustCompile(`apis/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appsync", regexache.MustCompile(`apis/.+`)), resource.TestCheckResourceAttr(resourceName, "authentication_type", "AWS_IAM"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), ), @@ -981,7 +981,7 @@ func testAccGraphQLAPI_AdditionalAuthentication_apiKey(t *testing.T) { Config: testAccGraphQLAPIConfig_additionalAuthAuthType(rName, "AWS_IAM", "API_KEY"), Check: resource.ComposeTestCheckFunc( testAccCheckGraphQLAPIExists(ctx, resourceName, &api1), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "appsync", regexache.MustCompile(`apis/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appsync", regexache.MustCompile(`apis/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "authentication_type", "AWS_IAM"), resource.TestCheckResourceAttr(resourceName, "additional_authentication_provider.#", "1"), @@ -1016,7 +1016,7 @@ func testAccGraphQLAPI_AdditionalAuthentication_iam(t *testing.T) { Config: testAccGraphQLAPIConfig_additionalAuthAuthType(rName, "API_KEY", "AWS_IAM"), Check: resource.ComposeTestCheckFunc( testAccCheckGraphQLAPIExists(ctx, resourceName, &api1), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "appsync", regexache.MustCompile(`apis/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appsync", regexache.MustCompile(`apis/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "authentication_type", "API_KEY"), resource.TestCheckResourceAttr(resourceName, "additional_authentication_provider.#", "1"), @@ -1052,7 +1052,7 @@ func testAccGraphQLAPI_AdditionalAuthentication_cognitoUserPools(t *testing.T) { Config: testAccGraphQLAPIConfig_additionalAuthUserPool(rName), Check: resource.ComposeTestCheckFunc( testAccCheckGraphQLAPIExists(ctx, resourceName, &api1), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "appsync", regexache.MustCompile(`apis/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appsync", regexache.MustCompile(`apis/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "authentication_type", "API_KEY"), resource.TestCheckResourceAttr(resourceName, "additional_authentication_provider.#", "1"), @@ -1088,7 +1088,7 @@ func testAccGraphQLAPI_AdditionalAuthentication_openIDConnect(t *testing.T) { Config: testAccGraphQLAPIConfig_additionalAuthOpenIdConnect(rName, "https://example.com"), Check: resource.ComposeTestCheckFunc( testAccCheckGraphQLAPIExists(ctx, resourceName, &api1), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "appsync", regexache.MustCompile(`apis/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appsync", regexache.MustCompile(`apis/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "authentication_type", "API_KEY"), resource.TestCheckResourceAttr(resourceName, "additional_authentication_provider.#", "1"), @@ -1125,7 +1125,7 @@ func testAccGraphQLAPI_AdditionalAuthentication_lambda(t *testing.T) { Config: testAccGraphQLAPIConfig_additionalAuthLambda(rName), Check: resource.ComposeTestCheckFunc( testAccCheckGraphQLAPIExists(ctx, resourceName, &api1), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "appsync", regexache.MustCompile(`apis/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appsync", regexache.MustCompile(`apis/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "authentication_type", "API_KEY"), resource.TestCheckResourceAttr(resourceName, "additional_authentication_provider.#", "1"), @@ -1165,7 +1165,7 @@ func testAccGraphQLAPI_AdditionalAuthentication_multiple(t *testing.T) { Config: testAccGraphQLAPIConfig_additionalAuthMultiple(rName, "https://example.com"), Check: resource.ComposeTestCheckFunc( testAccCheckGraphQLAPIExists(ctx, resourceName, &api1), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "appsync", regexache.MustCompile(`apis/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appsync", regexache.MustCompile(`apis/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "authentication_type", "API_KEY"), resource.TestCheckResourceAttr(resourceName, "additional_authentication_provider.#", "4"), diff --git a/internal/service/appsync/resolver_test.go b/internal/service/appsync/resolver_test.go index 4f082513626..91074bc76f5 100644 --- a/internal/service/appsync/resolver_test.go +++ b/internal/service/appsync/resolver_test.go @@ -36,7 +36,7 @@ func testAccResolver_basic(t *testing.T) { Config: testAccResolverConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckResolverExists(ctx, resourceName, &resolver1), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "appsync", regexache.MustCompile("apis/.+/types/.+/resolvers/.+")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appsync", regexache.MustCompile("apis/.+/types/.+/resolvers/.+")), resource.TestCheckResourceAttr(resourceName, "data_source", rName), resource.TestCheckResourceAttrSet(resourceName, "request_template"), resource.TestCheckResourceAttr(resourceName, "max_batch_size", "0"), diff --git a/internal/service/appsync/source_api_association_test.go b/internal/service/appsync/source_api_association_test.go index 84f99f7e3f7..2ccb8a3b762 100644 --- a/internal/service/appsync/source_api_association_test.go +++ b/internal/service/appsync/source_api_association_test.go @@ -48,7 +48,7 @@ func testAccAppSyncSourceAPIAssociation_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckSourceAPIAssociationExists(ctx, resourceName, &sourceapiassociation), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, rName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "appsync", regexache.MustCompile(`apis/.+/sourceApiAssociations/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appsync", regexache.MustCompile(`apis/.+/sourceApiAssociations/.+`)), ), }, { @@ -87,7 +87,7 @@ func testAccAppSyncSourceAPIAssociation_update(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckSourceAPIAssociationExists(ctx, resourceName, &sourceapiassociation), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, rName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "appsync", regexache.MustCompile(`apis/.+/sourceApiAssociations/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appsync", regexache.MustCompile(`apis/.+/sourceApiAssociations/.+`)), ), }, { @@ -96,7 +96,7 @@ func testAccAppSyncSourceAPIAssociation_update(t *testing.T) { testAccCheckSourceAPIAssociationExists(ctx, resourceName, &sourceapiassociationUpdated), testAccCheckSourceAPIAssociationNotRecreated(&sourceapiassociation, &sourceapiassociationUpdated), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, updateDesc), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "appsync", regexache.MustCompile(`apis/.+/sourceApiAssociations/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appsync", regexache.MustCompile(`apis/.+/sourceApiAssociations/.+`)), ), }, { diff --git a/internal/service/appsync/type_test.go b/internal/service/appsync/type_test.go index 4decf95f45d..05c7ce1acf2 100644 --- a/internal/service/appsync/type_test.go +++ b/internal/service/appsync/type_test.go @@ -36,7 +36,7 @@ func testAccType_basic(t *testing.T) { Config: testAccTypeConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckTypeExists(ctx, resourceName, &typ), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "appsync", regexache.MustCompile("apis/.+/types/.+")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "appsync", regexache.MustCompile("apis/.+/types/.+")), resource.TestCheckResourceAttrPair(resourceName, "api_id", "aws_appsync_graphql_api.test", names.AttrID), resource.TestCheckResourceAttr(resourceName, names.AttrFormat, "SDL"), resource.TestCheckResourceAttr(resourceName, names.AttrName, "Mutation"), From cd778c231b3ad9ae3d6bb1eeb73a44617b62dc81 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:40 -0500 Subject: [PATCH 015/304] Make 'AWSClient.AccountID' a getter - athena. --- internal/service/athena/data_catalog.go | 2 +- internal/service/athena/data_catalog_test.go | 2 +- internal/service/athena/workgroup.go | 2 +- internal/service/athena/workgroup_test.go | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/internal/service/athena/data_catalog.go b/internal/service/athena/data_catalog.go index ef38bb1be74..78b2c532efa 100644 --- a/internal/service/athena/data_catalog.go +++ b/internal/service/athena/data_catalog.go @@ -130,7 +130,7 @@ func resourceDataCatalogRead(ctx context.Context, d *schema.ResourceData, meta i Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, Service: "athena", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("datacatalog/%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/athena/data_catalog_test.go b/internal/service/athena/data_catalog_test.go index e564aa7ddfa..e84079e72a2 100644 --- a/internal/service/athena/data_catalog_test.go +++ b/internal/service/athena/data_catalog_test.go @@ -33,7 +33,7 @@ func TestAccAthenaDataCatalog_basic(t *testing.T) { Config: testAccDataCatalogConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckDataCatalogExists(ctx, resourceName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "athena", fmt.Sprintf("datacatalog/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "athena", fmt.Sprintf("datacatalog/%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrType, "LAMBDA"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "A test data catalog"), diff --git a/internal/service/athena/workgroup.go b/internal/service/athena/workgroup.go index 5006c9edf06..05cec0c7ad7 100644 --- a/internal/service/athena/workgroup.go +++ b/internal/service/athena/workgroup.go @@ -243,7 +243,7 @@ func resourceWorkGroupRead(ctx context.Context, d *schema.ResourceData, meta int Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, Service: "athena", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("workgroup/%s", d.Id()), } d.Set(names.AttrARN, arn.String()) diff --git a/internal/service/athena/workgroup_test.go b/internal/service/athena/workgroup_test.go index 9f867739895..e367ac47324 100644 --- a/internal/service/athena/workgroup_test.go +++ b/internal/service/athena/workgroup_test.go @@ -37,7 +37,7 @@ func TestAccAthenaWorkGroup_basic(t *testing.T) { Config: testAccWorkGroupConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckWorkGroupExists(ctx, resourceName, &workgroup1), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "athena", fmt.Sprintf("workgroup/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "athena", fmt.Sprintf("workgroup/%s", rName)), resource.TestCheckResourceAttr(resourceName, "configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "configuration.0.bytes_scanned_cutoff_per_query", "0"), resource.TestCheckResourceAttr(resourceName, "configuration.0.enforce_workgroup_configuration", acctest.CtTrue), @@ -80,7 +80,7 @@ func TestAccAthenaWorkGroup_aclConfig(t *testing.T) { Config: testAccWorkGroupConfig_configurationResultConfigurationACL(rName), Check: resource.ComposeTestCheckFunc( testAccCheckWorkGroupExists(ctx, resourceName, &workgroup1), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "athena", fmt.Sprintf("workgroup/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "athena", fmt.Sprintf("workgroup/%s", rName)), resource.TestCheckResourceAttr(resourceName, "configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "configuration.0.result_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "configuration.0.result_configuration.0.acl_configuration.#", "1"), @@ -456,7 +456,7 @@ func TestAccAthenaWorkGroup_requesterPaysEnabled(t *testing.T) { Config: testAccWorkGroupConfig_configurationRequesterPaysEnabled(rName), Check: resource.ComposeTestCheckFunc( testAccCheckWorkGroupExists(ctx, resourceName, &workgroup1), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "athena", fmt.Sprintf("workgroup/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "athena", fmt.Sprintf("workgroup/%s", rName)), resource.TestCheckResourceAttr(resourceName, "configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "configuration.0.requester_pays_enabled", acctest.CtTrue), ), @@ -471,7 +471,7 @@ func TestAccAthenaWorkGroup_requesterPaysEnabled(t *testing.T) { Config: testAccWorkGroupConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckWorkGroupExists(ctx, resourceName, &workgroup1), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "athena", fmt.Sprintf("workgroup/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "athena", fmt.Sprintf("workgroup/%s", rName)), resource.TestCheckResourceAttr(resourceName, "configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "configuration.0.requester_pays_enabled", acctest.CtFalse), ), From 84e2baca3d0f2bd871e290e7766931fad9a6e147 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:40 -0500 Subject: [PATCH 016/304] Make 'AWSClient.AccountID' a getter - 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 78c3d0e7efd..e64132bb7a4 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.#", "1"), resource.TestCheckResourceAttr(resourceName, "scope.0.aws_accounts.#", "1"), resource.TestCheckResourceAttr(resourceName, "scope.0.aws_services.#", "1"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "auditmanager", regexache.MustCompile(`assessment/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "auditmanager", regexache.MustCompile(`assessment/.+$`)), ), }, { diff --git a/internal/service/auditmanager/control_test.go b/internal/service/auditmanager/control_test.go index 18086418c33..23ea5d73ca7 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(ctx, resourceName, names.AttrARN, "auditmanager", regexache.MustCompile(`control/.+$`)), ), }, { diff --git a/internal/service/auditmanager/framework_test.go b/internal/service/auditmanager/framework_test.go index 6dbf8f3d251..b87dd96c676 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.#", "1"), resource.TestCheckResourceAttr(resourceName, "control_sets.0.name", rName), resource.TestCheckResourceAttr(resourceName, "control_sets.0.controls.#", "1"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "auditmanager", regexache.MustCompile(`assessmentFramework/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "auditmanager", regexache.MustCompile(`assessmentFramework/.+$`)), ), }, { From 047178a1b1c80ae749864ec96c1596d15d8bf880 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:41 -0500 Subject: [PATCH 017/304] Make 'AWSClient.AccountID' a getter - autoscaling. --- internal/service/autoscaling/group_test.go | 12 ++++++------ .../service/autoscaling/launch_configuration_test.go | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/internal/service/autoscaling/group_test.go b/internal/service/autoscaling/group_test.go index 46b28442347..7f507d9ab9b 100644 --- a/internal/service/autoscaling/group_test.go +++ b/internal/service/autoscaling/group_test.go @@ -73,7 +73,7 @@ func TestAccAutoScalingGroup_basic(t *testing.T) { Config: testAccGroupConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGroupExists(ctx, resourceName, &group), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "autoscaling", regexache.MustCompile(fmt.Sprintf(`autoScalingGroup:.+:autoScalingGroupName/%s`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "autoscaling", regexache.MustCompile(fmt.Sprintf(`autoScalingGroup:.+:autoScalingGroupName/%s`, rName))), resource.TestCheckResourceAttr(resourceName, "availability_zones.#", "1"), resource.TestCheckTypeSetElemAttrPair(resourceName, "availability_zones.*", "data.aws_availability_zones.available", "names.0"), resource.TestCheckResourceAttr(resourceName, "capacity_rebalance", acctest.CtFalse), @@ -104,7 +104,7 @@ func TestAccAutoScalingGroup_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "placement_group", ""), resource.TestCheckResourceAttr(resourceName, "predicted_capacity", "0"), resource.TestCheckResourceAttr(resourceName, "protect_from_scale_in", acctest.CtFalse), - acctest.CheckResourceAttrGlobalARN(resourceName, "service_linked_role_arn", "iam", "role/aws-service-role/autoscaling.amazonaws.com/AWSServiceRoleForAutoScaling"), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, "service_linked_role_arn", "iam", "role/aws-service-role/autoscaling.amazonaws.com/AWSServiceRoleForAutoScaling"), resource.TestCheckResourceAttr(resourceName, "tag.#", "0"), resource.TestCheckNoResourceAttr(resourceName, "tags.#"), // "tags" removed at v5.0.0. resource.TestCheckResourceAttr(resourceName, "target_group_arns.#", "0"), @@ -301,7 +301,7 @@ func TestAccAutoScalingGroup_simple(t *testing.T) { Config: testAccGroupConfig_simple(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGroupExists(ctx, resourceName, &group), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "autoscaling", regexache.MustCompile(fmt.Sprintf(`autoScalingGroup:.+:autoScalingGroupName/%s`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "autoscaling", regexache.MustCompile(fmt.Sprintf(`autoScalingGroup:.+:autoScalingGroupName/%s`, rName))), resource.TestCheckResourceAttr(resourceName, "availability_zones.#", "1"), resource.TestCheckTypeSetElemAttrPair(resourceName, "availability_zones.*", "data.aws_availability_zones.available", "names.0"), resource.TestCheckResourceAttr(resourceName, "capacity_rebalance", acctest.CtFalse), @@ -328,7 +328,7 @@ func TestAccAutoScalingGroup_simple(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrNamePrefix, ""), resource.TestCheckResourceAttr(resourceName, "placement_group", ""), resource.TestCheckResourceAttr(resourceName, "protect_from_scale_in", acctest.CtFalse), - acctest.CheckResourceAttrGlobalARN(resourceName, "service_linked_role_arn", "iam", "role/aws-service-role/autoscaling.amazonaws.com/AWSServiceRoleForAutoScaling"), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, "service_linked_role_arn", "iam", "role/aws-service-role/autoscaling.amazonaws.com/AWSServiceRoleForAutoScaling"), resource.TestCheckResourceAttr(resourceName, "suspended_processes.#", "0"), resource.TestCheckResourceAttr(resourceName, "tag.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "tag.*", map[string]string{ @@ -352,7 +352,7 @@ func TestAccAutoScalingGroup_simple(t *testing.T) { Config: testAccGroupConfig_simpleUpdated(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGroupExists(ctx, resourceName, &group), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "autoscaling", regexache.MustCompile(fmt.Sprintf(`autoScalingGroup:.+:autoScalingGroupName/%s`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "autoscaling", regexache.MustCompile(fmt.Sprintf(`autoScalingGroup:.+:autoScalingGroupName/%s`, rName))), resource.TestCheckResourceAttr(resourceName, "availability_zones.#", "1"), resource.TestCheckTypeSetElemAttrPair(resourceName, "availability_zones.*", "data.aws_availability_zones.available", "names.0"), resource.TestCheckResourceAttr(resourceName, "capacity_rebalance", acctest.CtFalse), @@ -379,7 +379,7 @@ func TestAccAutoScalingGroup_simple(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrNamePrefix, ""), resource.TestCheckResourceAttr(resourceName, "placement_group", ""), resource.TestCheckResourceAttr(resourceName, "protect_from_scale_in", acctest.CtTrue), - acctest.CheckResourceAttrGlobalARN(resourceName, "service_linked_role_arn", "iam", "role/aws-service-role/autoscaling.amazonaws.com/AWSServiceRoleForAutoScaling"), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, "service_linked_role_arn", "iam", "role/aws-service-role/autoscaling.amazonaws.com/AWSServiceRoleForAutoScaling"), resource.TestCheckResourceAttr(resourceName, "suspended_processes.#", "0"), resource.TestCheckResourceAttr(resourceName, "tag.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "tag.*", map[string]string{ diff --git a/internal/service/autoscaling/launch_configuration_test.go b/internal/service/autoscaling/launch_configuration_test.go index 65d95e9e114..9ebb5cd84f1 100644 --- a/internal/service/autoscaling/launch_configuration_test.go +++ b/internal/service/autoscaling/launch_configuration_test.go @@ -39,7 +39,7 @@ func TestAccAutoScalingLaunchConfiguration_basic(t *testing.T) { Config: testAccLaunchConfigurationConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckLaunchConfigurationExists(ctx, resourceName, &conf), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "autoscaling", regexache.MustCompile(`launchConfiguration:.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "autoscaling", regexache.MustCompile(`launchConfiguration:.+`)), resource.TestCheckResourceAttr(resourceName, "associate_public_ip_address", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "ebs_block_device.#", "0"), resource.TestCheckResourceAttr(resourceName, "ebs_optimized", acctest.CtFalse), From 6eb787e0b9dbfb5557520e700c6469fa5f0c24f3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:41 -0500 Subject: [PATCH 018/304] Make 'AWSClient.AccountID' a getter - backup. --- internal/service/backup/global_settings.go | 2 +- internal/service/backup/plan_test.go | 4 ++-- internal/service/backup/restore_testing_plan_test.go | 4 ++-- internal/service/backup/vault_test.go | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/service/backup/global_settings.go b/internal/service/backup/global_settings.go index 8841be1cbb0..d92b211a864 100644 --- a/internal/service/backup/global_settings.go +++ b/internal/service/backup/global_settings.go @@ -53,7 +53,7 @@ func resourceGlobalSettingsUpdate(ctx context.Context, d *schema.ResourceData, m } if d.IsNewResource() { - d.SetId(meta.(*conns.AWSClient).AccountID) + d.SetId(meta.(*conns.AWSClient).AccountID(ctx)) } return append(diags, resourceGlobalSettingsRead(ctx, d, meta)...) diff --git a/internal/service/backup/plan_test.go b/internal/service/backup/plan_test.go index 14a23b5bb06..122ed8ddf3b 100644 --- a/internal/service/backup/plan_test.go +++ b/internal/service/backup/plan_test.go @@ -36,7 +36,7 @@ func TestAccBackupPlan_basic(t *testing.T) { Config: testAccPlanConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckPlanExists(ctx, resourceName, &plan), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "backup", regexache.MustCompile(`backup-plan:.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "backup", regexache.MustCompile(`backup-plan:.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -598,7 +598,7 @@ func TestAccBackupPlan_enableContinuousBackup(t *testing.T) { Config: testAccPlanConfig_enableContinuous(rName), Check: resource.ComposeTestCheckFunc( testAccCheckPlanExists(ctx, resourceName, &plan), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "backup", regexache.MustCompile(`backup-plan:.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "backup", regexache.MustCompile(`backup-plan:.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ diff --git a/internal/service/backup/restore_testing_plan_test.go b/internal/service/backup/restore_testing_plan_test.go index 4ec41fea99b..5338075b9df 100644 --- a/internal/service/backup/restore_testing_plan_test.go +++ b/internal/service/backup/restore_testing_plan_test.go @@ -158,7 +158,7 @@ func TestAccBackupRestoreTestingPlan_includeVaults(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "recovery_point_selection.0.algorithm", "LATEST_WITHIN_WINDOW"), resource.TestCheckResourceAttr(resourceName, "recovery_point_selection.0.include_vaults.#", "1"), - acctest.CheckResourceAttrRegionalARN(resourceName, "recovery_point_selection.0.include_vaults.0", "backup", fmt.Sprintf("backup-vault:%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, "recovery_point_selection.0.include_vaults.0", "backup", fmt.Sprintf("backup-vault:%s", rName)), resource.TestCheckResourceAttr(resourceName, "recovery_point_selection.0.recovery_point_types.#", "1"), resource.TestCheckResourceAttr(resourceName, names.AttrScheduleExpression, "cron(0 12 ? * * *)"), ), @@ -196,7 +196,7 @@ func TestAccBackupRestoreTestingPlan_excludeVaults(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "recovery_point_selection.0.algorithm", "LATEST_WITHIN_WINDOW"), resource.TestCheckResourceAttr(resourceName, "recovery_point_selection.0.exclude_vaults.#", "1"), - acctest.CheckResourceAttrRegionalARN(resourceName, "recovery_point_selection.0.exclude_vaults.0", "backup", fmt.Sprintf("backup-vault:%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, "recovery_point_selection.0.exclude_vaults.0", "backup", fmt.Sprintf("backup-vault:%s", rName)), resource.TestCheckResourceAttr(resourceName, "recovery_point_selection.0.recovery_point_types.#", "1"), resource.TestCheckResourceAttr(resourceName, names.AttrScheduleExpression, "cron(0 12 ? * * *)"), ), diff --git a/internal/service/backup/vault_test.go b/internal/service/backup/vault_test.go index 012a9b9ac65..adf0d6f7528 100644 --- a/internal/service/backup/vault_test.go +++ b/internal/service/backup/vault_test.go @@ -43,7 +43,7 @@ func TestAccBackupVault_basic(t *testing.T) { Config: testAccVaultConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckVaultExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "backup", fmt.Sprintf("backup-vault:%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "backup", fmt.Sprintf("backup-vault:%s", rName)), resource.TestCheckResourceAttrSet(resourceName, names.AttrKMSKeyARN), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "recovery_points", "0"), @@ -233,14 +233,14 @@ func testAccCheckRunDynamoDBTableBackupJob(ctx context.Context, rName string) re iamRoleARN := arn.ARN{ Partition: client.Partition(ctx), Service: "iam", - AccountID: client.AccountID, + AccountID: client.AccountID(ctx), Resource: "role/service-role/AWSBackupDefaultServiceRole", }.String() resourceARN := arn.ARN{ Partition: client.Partition(ctx), Service: "dynamodb", Region: client.Region, - AccountID: client.AccountID, + AccountID: client.AccountID(ctx), Resource: fmt.Sprintf("table/%s", rName), }.String() output, err := conn.StartBackupJob(ctx, &backup.StartBackupJobInput{ From c1f48c30616be81268af82d81dfd6aa224769276 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:41 -0500 Subject: [PATCH 019/304] Make 'AWSClient.AccountID' a getter - batch. --- .../service/batch/compute_environment_test.go | 66 +++++++++---------- .../batch/job_definition_data_source_test.go | 2 +- internal/service/batch/job_definition_test.go | 44 ++++++------- internal/service/batch/job_queue_test.go | 6 +- 4 files changed, 59 insertions(+), 59 deletions(-) diff --git a/internal/service/batch/compute_environment_test.go b/internal/service/batch/compute_environment_test.go index 93943799861..e92062aabda 100644 --- a/internal/service/batch/compute_environment_test.go +++ b/internal/service/batch/compute_environment_test.go @@ -182,7 +182,7 @@ func TestAccBatchComputeEnvironment_basic(t *testing.T) { Config: testAccComputeEnvironmentConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckComputeEnvironmentExists(ctx, resourceName, &ce), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), resource.TestCheckResourceAttr(resourceName, "compute_environment_name", rName), resource.TestCheckResourceAttr(resourceName, "compute_environment_name_prefix", ""), resource.TestCheckResourceAttr(resourceName, "compute_resources.#", "0"), @@ -334,7 +334,7 @@ func TestAccBatchComputeEnvironment_createEC2(t *testing.T) { Config: testAccComputeEnvironmentConfig_ec2(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckComputeEnvironmentExists(ctx, resourceName, &ce), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), resource.TestCheckResourceAttr(resourceName, "compute_environment_name", rName), resource.TestCheckResourceAttr(resourceName, "compute_environment_name_prefix", ""), resource.TestCheckResourceAttr(resourceName, "compute_resources.#", "1"), @@ -393,7 +393,7 @@ func TestAccBatchComputeEnvironment_updatePolicyCreate(t *testing.T) { Config: testAccComputeEnvironmentConfig_ec2UpdatePolicyCreate(rName, 30, false), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckComputeEnvironmentExists(ctx, resourceName, &ce), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), resource.TestCheckResourceAttr(resourceName, "compute_environment_name", rName), resource.TestCheckResourceAttr(resourceName, "compute_resources.0.max_vcpus", "4"), resource.TestCheckResourceAttr(resourceName, "compute_resources.0.allocation_strategy", "BEST_FIT_PROGRESSIVE"), @@ -412,7 +412,7 @@ func TestAccBatchComputeEnvironment_updatePolicyCreate(t *testing.T) { Config: testAccComputeEnvironmentConfig_ec2UpdatePolicyCreate(rName, 60, true), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckComputeEnvironmentExists(ctx, resourceName, &ce), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), resource.TestCheckResourceAttr(resourceName, "compute_environment_name", rName), resource.TestCheckResourceAttr(resourceName, "compute_resources.0.max_vcpus", "4"), resource.TestCheckResourceAttr(resourceName, "compute_resources.0.allocation_strategy", "BEST_FIT_PROGRESSIVE"), @@ -442,7 +442,7 @@ func TestAccBatchComputeEnvironment_updatePolicyUpdate(t *testing.T) { Config: testAccComputeEnvironmentConfig_ec2UpdatePolicyOmitted(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckComputeEnvironmentExists(ctx, resourceName, &ce), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), resource.TestCheckResourceAttr(resourceName, "compute_environment_name", rName), resource.TestCheckResourceAttr(resourceName, "compute_resources.0.max_vcpus", "4"), resource.TestCheckResourceAttr(resourceName, "compute_resources.0.allocation_strategy", "BEST_FIT_PROGRESSIVE"), @@ -458,7 +458,7 @@ func TestAccBatchComputeEnvironment_updatePolicyUpdate(t *testing.T) { Config: testAccComputeEnvironmentConfig_ec2UpdatePolicyCreate(rName, 60, true), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckComputeEnvironmentExists(ctx, resourceName, &ce), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), resource.TestCheckResourceAttr(resourceName, "compute_environment_name", rName), resource.TestCheckResourceAttr(resourceName, "compute_resources.0.max_vcpus", "4"), resource.TestCheckResourceAttr(resourceName, "compute_resources.0.allocation_strategy", "BEST_FIT_PROGRESSIVE"), @@ -499,7 +499,7 @@ func TestAccBatchComputeEnvironment_CreateEC2DesiredVCPUsEC2KeyPairImageID_compu Config: testAccComputeEnvironmentConfig_ec2DesiredVCPUsEC2KeyPairImageIDAndResourcesTags(rName, publicKey), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckComputeEnvironmentExists(ctx, resourceName, &ce), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), resource.TestCheckResourceAttr(resourceName, "compute_environment_name", rName), resource.TestCheckResourceAttr(resourceName, "compute_environment_name_prefix", ""), resource.TestCheckResourceAttr(resourceName, "compute_resources.#", "1"), @@ -561,7 +561,7 @@ func TestAccBatchComputeEnvironment_createSpot(t *testing.T) { Config: testAccComputeEnvironmentConfig_spot(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckComputeEnvironmentExists(ctx, resourceName, &ce), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), resource.TestCheckResourceAttr(resourceName, "compute_environment_name", rName), resource.TestCheckResourceAttr(resourceName, "compute_environment_name_prefix", ""), resource.TestCheckResourceAttr(resourceName, "compute_resources.#", "1"), @@ -622,7 +622,7 @@ func TestAccBatchComputeEnvironment_CreateSpotAllocationStrategy_bidPercentage(t Config: testAccComputeEnvironmentConfig_spotAllocationStrategyAndBidPercentage(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckComputeEnvironmentExists(ctx, resourceName, &ce), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), resource.TestCheckResourceAttr(resourceName, "compute_environment_name", rName), resource.TestCheckResourceAttr(resourceName, "compute_environment_name_prefix", ""), resource.TestCheckResourceAttr(resourceName, "compute_resources.#", "1"), @@ -681,7 +681,7 @@ func TestAccBatchComputeEnvironment_createFargate(t *testing.T) { Config: testAccComputeEnvironmentConfig_fargate(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckComputeEnvironmentExists(ctx, resourceName, &ce), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), resource.TestCheckResourceAttr(resourceName, "compute_environment_name", rName), resource.TestCheckResourceAttr(resourceName, "compute_environment_name_prefix", ""), resource.TestCheckResourceAttr(resourceName, "compute_resources.#", "1"), @@ -739,7 +739,7 @@ func TestAccBatchComputeEnvironment_createFargateSpot(t *testing.T) { Config: testAccComputeEnvironmentConfig_fargateSpot(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckComputeEnvironmentExists(ctx, resourceName, &ce), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), resource.TestCheckResourceAttr(resourceName, "compute_environment_name", rName), resource.TestCheckResourceAttr(resourceName, "compute_environment_name_prefix", ""), resource.TestCheckResourceAttr(resourceName, "compute_resources.#", "1"), @@ -795,7 +795,7 @@ func TestAccBatchComputeEnvironment_updateState(t *testing.T) { Config: testAccComputeEnvironmentConfig_state(rName, "ENABLED"), Check: resource.ComposeTestCheckFunc( testAccCheckComputeEnvironmentExists(ctx, resourceName, &ce), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), resource.TestCheckResourceAttr(resourceName, "compute_environment_name", rName), resource.TestCheckResourceAttr(resourceName, "compute_environment_name_prefix", ""), resource.TestCheckResourceAttr(resourceName, "compute_resources.#", "0"), @@ -812,7 +812,7 @@ func TestAccBatchComputeEnvironment_updateState(t *testing.T) { Config: testAccComputeEnvironmentConfig_state(rName, "disabled"), Check: resource.ComposeTestCheckFunc( testAccCheckComputeEnvironmentExists(ctx, resourceName, &ce), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), resource.TestCheckResourceAttr(resourceName, "compute_environment_name", rName), resource.TestCheckResourceAttr(resourceName, "compute_environment_name_prefix", ""), resource.TestCheckResourceAttr(resourceName, "compute_resources.#", "0"), @@ -854,7 +854,7 @@ func TestAccBatchComputeEnvironment_updateServiceRole(t *testing.T) { Config: testAccComputeEnvironmentConfig_fargate(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckComputeEnvironmentExists(ctx, resourceName, &ce), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), resource.TestCheckResourceAttr(resourceName, "compute_environment_name", rName), resource.TestCheckResourceAttr(resourceName, "compute_environment_name_prefix", ""), resource.TestCheckResourceAttr(resourceName, "compute_resources.#", "1"), @@ -888,7 +888,7 @@ func TestAccBatchComputeEnvironment_updateServiceRole(t *testing.T) { Config: testAccComputeEnvironmentConfig_fargateUpdatedServiceRole(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckComputeEnvironmentExists(ctx, resourceName, &ce), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), resource.TestCheckResourceAttr(resourceName, "compute_environment_name", rName), resource.TestCheckResourceAttr(resourceName, "compute_environment_name_prefix", ""), resource.TestCheckResourceAttr(resourceName, "compute_resources.#", "1"), @@ -949,7 +949,7 @@ func TestAccBatchComputeEnvironment_defaultServiceRole(t *testing.T) { Config: testAccComputeEnvironmentConfig_fargateDefaultServiceRole(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckComputeEnvironmentExists(ctx, resourceName, &ce), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), resource.TestCheckResourceAttr(resourceName, "compute_environment_name", rName), resource.TestCheckResourceAttr(resourceName, "compute_environment_name_prefix", ""), resource.TestCheckResourceAttr(resourceName, "compute_resources.#", "1"), @@ -971,7 +971,7 @@ func TestAccBatchComputeEnvironment_defaultServiceRole(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "compute_resources.0.tags.%", "0"), resource.TestCheckResourceAttr(resourceName, "compute_resources.0.type", "FARGATE"), resource.TestCheckResourceAttrSet(resourceName, "ecs_cluster_arn"), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrServiceRole, "iam", regexache.MustCompile(`role/aws-service-role/batch`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrServiceRole, "iam", regexache.MustCompile(`role/aws-service-role/batch`)), resource.TestCheckResourceAttr(resourceName, names.AttrState, "ENABLED"), resource.TestCheckResourceAttrSet(resourceName, names.AttrStatus), resource.TestCheckResourceAttrSet(resourceName, names.AttrStatusReason), @@ -1008,7 +1008,7 @@ func TestAccBatchComputeEnvironment_ComputeResources_minVCPUs(t *testing.T) { Config: testAccComputeEnvironmentConfig_resourcesMaxVCPUsMinVCPUs(rName, 4, 0), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckComputeEnvironmentExists(ctx, resourceName, &ce), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), resource.TestCheckResourceAttr(resourceName, "compute_environment_name", rName), resource.TestCheckResourceAttr(resourceName, "compute_environment_name_prefix", ""), resource.TestCheckResourceAttr(resourceName, "compute_resources.#", "1"), @@ -1043,7 +1043,7 @@ func TestAccBatchComputeEnvironment_ComputeResources_minVCPUs(t *testing.T) { Config: testAccComputeEnvironmentConfig_resourcesMaxVCPUsMinVCPUs(rName, 4, 4), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckComputeEnvironmentExists(ctx, resourceName, &ce), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), resource.TestCheckResourceAttr(resourceName, "compute_environment_name", rName), resource.TestCheckResourceAttr(resourceName, "compute_environment_name_prefix", ""), resource.TestCheckResourceAttr(resourceName, "compute_resources.#", "1"), @@ -1078,7 +1078,7 @@ func TestAccBatchComputeEnvironment_ComputeResources_minVCPUs(t *testing.T) { Config: testAccComputeEnvironmentConfig_resourcesMaxVCPUsMinVCPUs(rName, 4, 2), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckComputeEnvironmentExists(ctx, resourceName, &ce), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), resource.TestCheckResourceAttr(resourceName, "compute_environment_name", rName), resource.TestCheckResourceAttr(resourceName, "compute_environment_name_prefix", ""), resource.TestCheckResourceAttr(resourceName, "compute_resources.#", "1"), @@ -1138,7 +1138,7 @@ func TestAccBatchComputeEnvironment_ComputeResources_maxVCPUs(t *testing.T) { Config: testAccComputeEnvironmentConfig_resourcesMaxVCPUsMinVCPUs(rName, 4, 0), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckComputeEnvironmentExists(ctx, resourceName, &ce), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), resource.TestCheckResourceAttr(resourceName, "compute_environment_name", rName), resource.TestCheckResourceAttr(resourceName, "compute_environment_name_prefix", ""), resource.TestCheckResourceAttr(resourceName, "compute_resources.#", "1"), @@ -1173,7 +1173,7 @@ func TestAccBatchComputeEnvironment_ComputeResources_maxVCPUs(t *testing.T) { Config: testAccComputeEnvironmentConfig_resourcesMaxVCPUsMinVCPUs(rName, 8, 0), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckComputeEnvironmentExists(ctx, resourceName, &ce), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), resource.TestCheckResourceAttr(resourceName, "compute_environment_name", rName), resource.TestCheckResourceAttr(resourceName, "compute_environment_name_prefix", ""), resource.TestCheckResourceAttr(resourceName, "compute_resources.#", "1"), @@ -1208,7 +1208,7 @@ func TestAccBatchComputeEnvironment_ComputeResources_maxVCPUs(t *testing.T) { Config: testAccComputeEnvironmentConfig_resourcesMaxVCPUsMinVCPUs(rName, 2, 0), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckComputeEnvironmentExists(ctx, resourceName, &ce), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), resource.TestCheckResourceAttr(resourceName, "compute_environment_name", rName), resource.TestCheckResourceAttr(resourceName, "compute_environment_name_prefix", ""), resource.TestCheckResourceAttr(resourceName, "compute_resources.#", "1"), @@ -1269,7 +1269,7 @@ func TestAccBatchComputeEnvironment_ec2Configuration(t *testing.T) { Config: testAccComputeEnvironmentConfig_ec2Configuration(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckComputeEnvironmentExists(ctx, resourceName, &ce), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), resource.TestCheckResourceAttr(resourceName, "compute_environment_name", rName), resource.TestCheckResourceAttr(resourceName, "compute_environment_name_prefix", ""), resource.TestCheckResourceAttr(resourceName, "compute_resources.#", "1"), @@ -1334,7 +1334,7 @@ func TestAccBatchComputeEnvironment_ec2ConfigurationPlacementGroup(t *testing.T) Config: testAccComputeEnvironmentConfig_ec2ConfigurationPlacementGroup(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckComputeEnvironmentExists(ctx, resourceName, &ce), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), resource.TestCheckResourceAttr(resourceName, "compute_environment_name", rName), resource.TestCheckResourceAttr(resourceName, "compute_environment_name_prefix", ""), resource.TestCheckResourceAttr(resourceName, "compute_resources.#", "1"), @@ -1400,7 +1400,7 @@ func TestAccBatchComputeEnvironment_launchTemplate(t *testing.T) { Config: testAccComputeEnvironmentConfig_launchTemplate(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckComputeEnvironmentExists(ctx, resourceName, &ce), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), resource.TestCheckResourceAttr(resourceName, "compute_environment_name", rName), resource.TestCheckResourceAttr(resourceName, "compute_environment_name_prefix", ""), resource.TestCheckResourceAttr(resourceName, "compute_resources.#", "1"), @@ -1464,7 +1464,7 @@ func TestAccBatchComputeEnvironment_updateLaunchTemplate(t *testing.T) { Config: testAccComputeEnvironmentConfig_updateLaunchTemplateInExisting(rName, "$Default"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckComputeEnvironmentExists(ctx, resourceName, &ce), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), resource.TestCheckResourceAttr(resourceName, "compute_environment_name", rName), resource.TestCheckResourceAttr(resourceName, "compute_environment_name_prefix", ""), resource.TestCheckResourceAttr(resourceName, "compute_resources.#", "1"), @@ -1502,7 +1502,7 @@ func TestAccBatchComputeEnvironment_updateLaunchTemplate(t *testing.T) { Config: testAccComputeEnvironmentConfig_updateLaunchTemplateInExisting(rName, "$Latest"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckComputeEnvironmentExists(ctx, resourceName, &ce), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), resource.TestCheckResourceAttr(resourceName, "compute_environment_name", rName), resource.TestCheckResourceAttr(resourceName, "compute_environment_name_prefix", ""), resource.TestCheckResourceAttr(resourceName, "compute_resources.#", "1"), @@ -1567,7 +1567,7 @@ func TestAccBatchComputeEnvironment_UpdateSecurityGroupsAndSubnets_fargate(t *te Config: testAccComputeEnvironmentConfig_fargate(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckComputeEnvironmentExists(ctx, resourceName, &ce), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), resource.TestCheckResourceAttr(resourceName, "compute_environment_name", rName), resource.TestCheckResourceAttr(resourceName, "compute_environment_name_prefix", ""), resource.TestCheckResourceAttr(resourceName, "compute_resources.#", "1"), @@ -1601,7 +1601,7 @@ func TestAccBatchComputeEnvironment_UpdateSecurityGroupsAndSubnets_fargate(t *te Config: testAccComputeEnvironmentConfig_fargateUpdatedSecurityGroupsAndSubnets(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckComputeEnvironmentExists(ctx, resourceName, &ce), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), resource.TestCheckResourceAttr(resourceName, "compute_environment_name", rName), resource.TestCheckResourceAttr(resourceName, "compute_environment_name_prefix", ""), resource.TestCheckResourceAttr(resourceName, "compute_resources.#", "1"), @@ -1688,7 +1688,7 @@ func TestAccBatchComputeEnvironment_updateEC2(t *testing.T) { Config: testAccComputeenvironmentConfig_ec2PreUpdate(rName, publicKey), Check: resource.ComposeTestCheckFunc( testAccCheckComputeEnvironmentExists(ctx, resourceName, &ce), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), resource.TestCheckResourceAttr(resourceName, "compute_environment_name", rName), resource.TestCheckResourceAttr(resourceName, "compute_environment_name_prefix", ""), resource.TestCheckResourceAttr(resourceName, "compute_resources.#", "1"), @@ -1724,7 +1724,7 @@ func TestAccBatchComputeEnvironment_updateEC2(t *testing.T) { Config: testAccComputeenvironmentConfig_ec2Update(rName, publicKey), Check: resource.ComposeTestCheckFunc( testAccCheckComputeEnvironmentExists(ctx, resourceName, &ce), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), resource.TestCheckResourceAttr(resourceName, "compute_environment_name", rName), resource.TestCheckResourceAttr(resourceName, "compute_environment_name_prefix", ""), resource.TestCheckResourceAttr(resourceName, "compute_resources.#", "1"), @@ -1764,7 +1764,7 @@ func TestAccBatchComputeEnvironment_updateEC2(t *testing.T) { Config: testAccComputeenvironmentConfig_ec2PreUpdate(rName, publicKey), Check: resource.ComposeTestCheckFunc( testAccCheckComputeEnvironmentExists(ctx, resourceName, &ce), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", fmt.Sprintf("compute-environment/%s", rName)), resource.TestCheckResourceAttr(resourceName, "compute_environment_name", rName), resource.TestCheckResourceAttr(resourceName, "compute_environment_name_prefix", ""), resource.TestCheckResourceAttr(resourceName, "compute_resources.#", "1"), diff --git a/internal/service/batch/job_definition_data_source_test.go b/internal/service/batch/job_definition_data_source_test.go index e64f0795008..ef4a258cf33 100644 --- a/internal/service/batch/job_definition_data_source_test.go +++ b/internal/service/batch/job_definition_data_source_test.go @@ -67,7 +67,7 @@ func TestAccBatchJobDefinitionDataSource_basicARN(t *testing.T) { resource.TestCheckResourceAttr(dataSourceName, "retry_strategy.0.attempts", "10"), resource.TestCheckResourceAttr(dataSourceName, "revision", "1"), resource.TestCheckResourceAttr(dataSourceName, "revision", "1"), - acctest.MatchResourceAttrRegionalARN(dataSourceName, names.AttrARN, "batch", regexache.MustCompile(fmt.Sprintf(`job-definition/%s:\d+`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, dataSourceName, names.AttrARN, "batch", regexache.MustCompile(fmt.Sprintf(`job-definition/%s:\d+`, rName))), ), }, { diff --git a/internal/service/batch/job_definition_test.go b/internal/service/batch/job_definition_test.go index 76694043cdb..6e04bd9ece5 100644 --- a/internal/service/batch/job_definition_test.go +++ b/internal/service/batch/job_definition_test.go @@ -44,8 +44,8 @@ func TestAccBatchJobDefinition_basic(t *testing.T) { Config: testAccJobDefinitionConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckJobDefinitionExists(ctx, resourceName, &jd), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", regexache.MustCompile(fmt.Sprintf(`job-definition/%s:\d+`, rName))), - acctest.MatchResourceAttrRegionalARN(resourceName, "arn_prefix", "batch", regexache.MustCompile(fmt.Sprintf(`job-definition/%s`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", regexache.MustCompile(fmt.Sprintf(`job-definition/%s:\d+`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "arn_prefix", "batch", regexache.MustCompile(fmt.Sprintf(`job-definition/%s`, rName))), acctest.CheckResourceAttrEquivalentJSON(resourceName, "container_properties", `{ "command": ["echo", "test"], "image": "busybox", @@ -99,8 +99,8 @@ func TestAccBatchJobDefinition_attributes(t *testing.T) { Config: testAccJobDefinitionConfig_attributes(rName, 2, true, 3, 120, false), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckJobDefinitionExists(ctx, resourceName, &jd), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", regexache.MustCompile(fmt.Sprintf(`job-definition/%s:1`, rName))), - acctest.MatchResourceAttrRegionalARN(resourceName, "arn_prefix", "batch", regexache.MustCompile(fmt.Sprintf(`job-definition/%s`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", regexache.MustCompile(fmt.Sprintf(`job-definition/%s:1`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "arn_prefix", "batch", regexache.MustCompile(fmt.Sprintf(`job-definition/%s`, rName))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "parameters.%", "0"), resource.TestCheckResourceAttr(resourceName, "platform_capabilities.#", "1"), @@ -120,7 +120,7 @@ func TestAccBatchJobDefinition_attributes(t *testing.T) { Config: testAccJobDefinitionConfig_attributes(rName, 2, true, 4, 120, false), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckJobDefinitionExists(ctx, resourceName, &jd), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", regexache.MustCompile(fmt.Sprintf(`job-definition/%s:2`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", regexache.MustCompile(fmt.Sprintf(`job-definition/%s:2`, rName))), testAccCheckJobDefinitionPreviousRegistered(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, "revision", "2"), ), @@ -130,8 +130,8 @@ func TestAccBatchJobDefinition_attributes(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckJobDefinitionExists(ctx, resourceName, &jd), testAccCheckJobDefinitionPreviousDeregistered(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", regexache.MustCompile(fmt.Sprintf(`job-definition/%s:3`, rName))), - acctest.MatchResourceAttrRegionalARN(resourceName, "arn_prefix", "batch", regexache.MustCompile(fmt.Sprintf(`job-definition/%s`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", regexache.MustCompile(fmt.Sprintf(`job-definition/%s:3`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "arn_prefix", "batch", regexache.MustCompile(fmt.Sprintf(`job-definition/%s`, rName))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "parameters.%", "0"), resource.TestCheckResourceAttr(resourceName, "platform_capabilities.#", "0"), @@ -155,8 +155,8 @@ func TestAccBatchJobDefinition_attributes(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckJobDefinitionExists(ctx, resourceName, &jd), testAccCheckJobDefinitionPreviousDeregistered(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", regexache.MustCompile(fmt.Sprintf(`job-definition/%s:\d+`, rName))), - acctest.MatchResourceAttrRegionalARN(resourceName, "arn_prefix", "batch", regexache.MustCompile(fmt.Sprintf(`job-definition/%s`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", regexache.MustCompile(fmt.Sprintf(`job-definition/%s:\d+`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "arn_prefix", "batch", regexache.MustCompile(fmt.Sprintf(`job-definition/%s`, rName))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "parameters.%", "0"), resource.TestCheckResourceAttr(resourceName, "platform_capabilities.#", "1"), @@ -216,7 +216,7 @@ func TestAccBatchJobDefinition_PlatformCapabilities_ec2(t *testing.T) { Config: testAccJobDefinitionConfig_capabilitiesEC2(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckJobDefinitionExists(ctx, resourceName, &jd), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", regexache.MustCompile(fmt.Sprintf(`job-definition/%s:\d+`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", regexache.MustCompile(fmt.Sprintf(`job-definition/%s:\d+`, rName))), acctest.CheckResourceAttrEquivalentJSON(resourceName, "container_properties", `{ "command": ["echo", "test"], "image": "busybox", @@ -269,7 +269,7 @@ func TestAccBatchJobDefinition_PlatformCapabilitiesFargate_containerPropertiesDe Config: testAccJobDefinitionConfig_capabilitiesFargateContainerPropertiesDefaults(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckJobDefinitionExists(ctx, resourceName, &jd), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", regexache.MustCompile(fmt.Sprintf(`job-definition/%s:\d+`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", regexache.MustCompile(fmt.Sprintf(`job-definition/%s:\d+`, rName))), acctest.CheckResourceAttrJMES(resourceName, "container_properties", "length(command)", "0"), acctest.CheckResourceAttrJMESPair(resourceName, "container_properties", "executionRoleArn", "aws_iam_role.ecs_task_execution_role", names.AttrARN), acctest.CheckResourceAttrJMES(resourceName, "container_properties", "fargatePlatformConfiguration.platformVersion", "LATEST"), @@ -316,7 +316,7 @@ func TestAccBatchJobDefinition_PlatformCapabilities_fargate(t *testing.T) { Config: testAccJobDefinitionConfig_capabilitiesFargate(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckJobDefinitionExists(ctx, resourceName, &jd), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", regexache.MustCompile(fmt.Sprintf(`job-definition/%s:\d+`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", regexache.MustCompile(fmt.Sprintf(`job-definition/%s:\d+`, rName))), acctest.CheckResourceAttrJMESPair(resourceName, "container_properties", "executionRoleArn", "aws_iam_role.ecs_task_execution_role", names.AttrARN), acctest.CheckResourceAttrJMES(resourceName, "container_properties", "fargatePlatformConfiguration.platformVersion", "LATEST"), acctest.CheckResourceAttrJMES(resourceName, "container_properties", "networkConfiguration.assignPublicIp", "DISABLED"), @@ -476,14 +476,14 @@ func TestAccBatchJobDefinition_ContainerProperties_minorUpdate(t *testing.T) { Config: testAccJobDefinitionConfig_containerProperties(rName, "-la"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckJobDefinitionExists(ctx, resourceName, &jd), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", regexache.MustCompile(fmt.Sprintf(`job-definition/%s:1`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", regexache.MustCompile(fmt.Sprintf(`job-definition/%s:1`, rName))), ), }, { Config: testAccJobDefinitionConfig_containerProperties(rName, "-lah"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckJobDefinitionExists(ctx, resourceName, &jd), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", regexache.MustCompile(fmt.Sprintf(`job-definition/%s:2`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", regexache.MustCompile(fmt.Sprintf(`job-definition/%s:2`, rName))), testAccCheckJobDefinitionPreviousDeregistered(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, "revision", "2"), ), @@ -492,7 +492,7 @@ func TestAccBatchJobDefinition_ContainerProperties_minorUpdate(t *testing.T) { Config: testAccJobDefinitionConfig_containerProperties(rName, "-hal"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckJobDefinitionExists(ctx, resourceName, &jd), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", regexache.MustCompile(fmt.Sprintf(`job-definition/%s:3`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", regexache.MustCompile(fmt.Sprintf(`job-definition/%s:3`, rName))), testAccCheckJobDefinitionPreviousDeregistered(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, "revision", "3"), ), @@ -517,7 +517,7 @@ func TestAccBatchJobDefinition_propagateTags(t *testing.T) { Config: testAccJobDefinitionConfig_propagateTags(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckJobDefinitionExists(ctx, resourceName, &jd), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", regexache.MustCompile(fmt.Sprintf(`job-definition/%s:\d+`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", regexache.MustCompile(fmt.Sprintf(`job-definition/%s:\d+`, rName))), acctest.CheckResourceAttrEquivalentJSON(resourceName, "container_properties", `{ "command": ["echo", "test"], "image": "busybox", @@ -596,7 +596,7 @@ func TestAccBatchJobDefinition_NodeProperties_basic(t *testing.T) { Config: testAccJobDefinitionConfig_nodeProperties(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckJobDefinitionExists(ctx, resourceName, &jd), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", regexache.MustCompile(fmt.Sprintf(`job-definition/%s:\d+`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", regexache.MustCompile(fmt.Sprintf(`job-definition/%s:\d+`, rName))), acctest.CheckResourceAttrEquivalentJSON(resourceName, "node_properties", `{ "mainNode": 0, "nodeRangeProperties": [ @@ -675,7 +675,7 @@ func TestAccBatchJobDefinition_NodeProperties_advanced(t *testing.T) { Config: testAccJobDefinitionConfig_nodePropertiesAdvanced(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckJobDefinitionExists(ctx, resourceName, &jd), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", regexache.MustCompile(fmt.Sprintf(`job-definition/%s:\d+`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", regexache.MustCompile(fmt.Sprintf(`job-definition/%s:\d+`, rName))), acctest.CheckResourceAttrEquivalentJSON(resourceName, "node_properties", `{ "mainNode": 1, "nodeRangeProperties": [ @@ -728,7 +728,7 @@ func TestAccBatchJobDefinition_NodeProperties_advanced(t *testing.T) { Config: testAccJobDefinitionConfig_nodePropertiesAdvancedUpdate(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckJobDefinitionExists(ctx, resourceName, &jd), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", regexache.MustCompile(fmt.Sprintf(`job-definition/%s:\d+`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", regexache.MustCompile(fmt.Sprintf(`job-definition/%s:\d+`, rName))), acctest.CheckResourceAttrEquivalentJSON(resourceName, "node_properties", `{ "mainNode": 1, "nodeRangeProperties": [ @@ -791,7 +791,7 @@ func TestAccBatchJobDefinition_NodeProperties_withEKS(t *testing.T) { Config: testAccJobDefinitionConfig_nodePropertiesEKS(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckJobDefinitionExists(ctx, resourceName, &jd), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", regexache.MustCompile(fmt.Sprintf(`job-definition/%s:\d+`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", regexache.MustCompile(fmt.Sprintf(`job-definition/%s:\d+`, rName))), acctest.CheckResourceAttrEquivalentJSON(resourceName, "node_properties", `{ "mainNode": 0, "nodeRangeProperties": [ @@ -858,7 +858,7 @@ func TestAccBatchJobDefinition_NodeProperties_withECS(t *testing.T) { Config: testAccJobDefinitionConfig_nodePropertiesECS(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckJobDefinitionExists(ctx, resourceName, &jd), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", regexache.MustCompile(fmt.Sprintf(`job-definition/%s:\d+`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", regexache.MustCompile(fmt.Sprintf(`job-definition/%s:\d+`, rName))), ), }, { @@ -1104,7 +1104,7 @@ func TestAccBatchJobDefinition_emptyRetryStrategy(t *testing.T) { Config: testAccJobDefinitionConfig_emptyRetryStrategy(rName), Check: resource.ComposeTestCheckFunc( testAccCheckJobDefinitionExists(ctx, resourceName, &jd), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", regexache.MustCompile(fmt.Sprintf(`job-definition/%s:\d+`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", regexache.MustCompile(fmt.Sprintf(`job-definition/%s:\d+`, rName))), ), ExpectNonEmptyPlan: true, }, diff --git a/internal/service/batch/job_queue_test.go b/internal/service/batch/job_queue_test.go index 2bf9e450bb8..9f120ef20cc 100644 --- a/internal/service/batch/job_queue_test.go +++ b/internal/service/batch/job_queue_test.go @@ -49,7 +49,7 @@ func TestAccBatchJobQueue_basic(t *testing.T) { Config: testAccJobQueueConfig_state(rName, string(awstypes.JQStateEnabled)), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckJobQueueExists(ctx, resourceName, &jobQueue1), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", fmt.Sprintf("job-queue/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", fmt.Sprintf("job-queue/%s", rName)), resource.TestCheckResourceAttr(resourceName, "compute_environments.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "compute_environments.0", "aws_batch_compute_environment.test", names.AttrARN), resource.TestCheckResourceAttr(resourceName, "job_state_time_limit_action.#", "0"), @@ -84,7 +84,7 @@ func TestAccBatchJobQueue_basicCEO(t *testing.T) { Config: testAccJobQueueConfig_stateCEO(rName, string(awstypes.JQStateEnabled)), Check: resource.ComposeTestCheckFunc( testAccCheckJobQueueExists(ctx, resourceName, &jobQueue1), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", fmt.Sprintf("job-queue/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", fmt.Sprintf("job-queue/%s", rName)), resource.TestCheckResourceAttr(resourceName, "compute_environment_order.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "compute_environment_order.0.compute_environment", "aws_batch_compute_environment.test", names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), @@ -172,7 +172,7 @@ func TestAccBatchJobQueue_MigrateFromPluginSDK(t *testing.T) { Config: testAccJobQueueConfig_state(rName, string(awstypes.JQStateEnabled)), Check: resource.ComposeTestCheckFunc( testAccCheckJobQueueExists(ctx, resourceName, &jobQueue1), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "batch", fmt.Sprintf("job-queue/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "batch", fmt.Sprintf("job-queue/%s", rName)), ), }, { From 39d48da2114a890de5fceec5a9246946f0e5c301 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:41 -0500 Subject: [PATCH 020/304] Make 'AWSClient.AccountID' a getter - budgets. --- internal/service/budgets/budget.go | 2 +- internal/service/budgets/budget_action.go | 4 ++-- internal/service/budgets/budget_action_test.go | 6 +++--- internal/service/budgets/budget_data_source.go | 2 +- internal/service/budgets/budget_data_source_test.go | 2 +- internal/service/budgets/budget_test.go | 4 ++-- internal/service/budgets/sweep.go | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/internal/service/budgets/budget.go b/internal/service/budgets/budget.go index 26837cb9566..e55e52e2aec 100644 --- a/internal/service/budgets/budget.go +++ b/internal/service/budgets/budget.go @@ -315,7 +315,7 @@ func resourceBudgetCreate(ctx context.Context, d *schema.ResourceData, meta inte accountID := d.Get(names.AttrAccountID).(string) if accountID == "" { - accountID = meta.(*conns.AWSClient).AccountID + accountID = meta.(*conns.AWSClient).AccountID(ctx) } _, err = conn.CreateBudget(ctx, &budgets.CreateBudgetInput{ diff --git a/internal/service/budgets/budget_action.go b/internal/service/budgets/budget_action.go index 34e267e4b7e..668beb1c217 100644 --- a/internal/service/budgets/budget_action.go +++ b/internal/service/budgets/budget_action.go @@ -237,7 +237,7 @@ func resourceBudgetActionCreate(ctx context.Context, d *schema.ResourceData, met accountID := d.Get(names.AttrAccountID).(string) if accountID == "" { - accountID = meta.(*conns.AWSClient).AccountID + accountID = meta.(*conns.AWSClient).AccountID(ctx) } input := &budgets.CreateBudgetActionInput{ AccountId: aws.String(accountID), @@ -303,7 +303,7 @@ func resourceBudgetActionRead(ctx context.Context, d *schema.ResourceData, meta arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "budgets", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("budget/%s/action/%s", budgetName, actionID), } d.Set(names.AttrARN, arn.String()) diff --git a/internal/service/budgets/budget_action_test.go b/internal/service/budgets/budget_action_test.go index b7ae0d8dcaf..241176263a7 100644 --- a/internal/service/budgets/budget_action_test.go +++ b/internal/service/budgets/budget_action_test.go @@ -38,7 +38,7 @@ func TestAccBudgetsBudgetAction_basic(t *testing.T) { Config: testAccBudgetActionConfig_basic(rName, string(awstypes.ApprovalModelAuto), thresholdValue), Check: resource.ComposeTestCheckFunc( testAccBudgetActionExists(ctx, resourceName, &conf), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "budgets", regexache.MustCompile(fmt.Sprintf(`budget/%s/action/.+`, rName))), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "budgets", regexache.MustCompile(fmt.Sprintf(`budget/%s/action/.+`, rName))), resource.TestCheckResourceAttrPair(resourceName, "budget_name", "aws_budgets_budget.test", names.AttrName), resource.TestCheckResourceAttrPair(resourceName, names.AttrExecutionRoleARN, "aws_iam_role.test", names.AttrARN), resource.TestCheckResourceAttr(resourceName, "action_type", "APPLY_IAM_POLICY"), @@ -82,7 +82,7 @@ func TestAccBudgetsBudgetAction_triggeredAutomatic(t *testing.T) { Config: testAccBudgetActionConfig_basic(rName, string(awstypes.ApprovalModelAuto), thresholdValue), Check: resource.ComposeTestCheckFunc( testAccBudgetActionExists(ctx, resourceName, &conf), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "budgets", regexache.MustCompile(fmt.Sprintf(`budget/%s/action/.+`, rName))), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "budgets", regexache.MustCompile(fmt.Sprintf(`budget/%s/action/.+`, rName))), resource.TestCheckResourceAttrPair(resourceName, "budget_name", "aws_budgets_budget.test", names.AttrName), resource.TestCheckResourceAttrPair(resourceName, names.AttrExecutionRoleARN, "aws_iam_role.test", names.AttrARN), resource.TestCheckResourceAttr(resourceName, "action_type", "APPLY_IAM_POLICY"), @@ -126,7 +126,7 @@ func TestAccBudgetsBudgetAction_triggeredManual(t *testing.T) { Config: testAccBudgetActionConfig_basic(rName, string(awstypes.ApprovalModelManual), thresholdValue), Check: resource.ComposeTestCheckFunc( testAccBudgetActionExists(ctx, resourceName, &conf), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "budgets", regexache.MustCompile(fmt.Sprintf(`budget/%s/action/.+`, rName))), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "budgets", regexache.MustCompile(fmt.Sprintf(`budget/%s/action/.+`, rName))), resource.TestCheckResourceAttrPair(resourceName, "budget_name", "aws_budgets_budget.test", names.AttrName), resource.TestCheckResourceAttrPair(resourceName, names.AttrExecutionRoleARN, "aws_iam_role.test", names.AttrARN), resource.TestCheckResourceAttr(resourceName, "action_type", "APPLY_IAM_POLICY"), diff --git a/internal/service/budgets/budget_data_source.go b/internal/service/budgets/budget_data_source.go index f19676d378a..6fb33182f1f 100644 --- a/internal/service/budgets/budget_data_source.go +++ b/internal/service/budgets/budget_data_source.go @@ -280,7 +280,7 @@ func dataSourceBudgetRead(ctx context.Context, d *schema.ResourceData, meta inte accountID := d.Get(names.AttrAccountID).(string) if accountID == "" { - accountID = meta.(*conns.AWSClient).AccountID + accountID = meta.(*conns.AWSClient).AccountID(ctx) } d.Set(names.AttrAccountID, accountID) diff --git a/internal/service/budgets/budget_data_source_test.go b/internal/service/budgets/budget_data_source_test.go index 309614536ac..e6f61288df2 100644 --- a/internal/service/budgets/budget_data_source_test.go +++ b/internal/service/budgets/budget_data_source_test.go @@ -35,7 +35,7 @@ func TestAccBudgetsBudgetDataSource_basic(t *testing.T) { Config: testAccBudgetDataSourceConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckBudgetExists(ctx, resourceName, &budget), - acctest.CheckResourceAttrAccountID(dataSourceName, names.AttrAccountID), + acctest.CheckResourceAttrAccountID(ctx, dataSourceName, names.AttrAccountID), resource.TestCheckResourceAttrPair(dataSourceName, names.AttrName, resourceName, names.AttrName), resource.TestCheckResourceAttrSet(dataSourceName, "calculated_spend.#"), resource.TestCheckResourceAttrSet(dataSourceName, "budget_limit.#"), diff --git a/internal/service/budgets/budget_test.go b/internal/service/budgets/budget_test.go index fccabe87cd8..e80183535c8 100644 --- a/internal/service/budgets/budget_test.go +++ b/internal/service/budgets/budget_test.go @@ -65,8 +65,8 @@ func TestAccBudgetsBudget_basic(t *testing.T) { Config: testAccBudgetConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckBudgetExists(ctx, resourceName, &budget), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrAccountID), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrARN, "budgets", fmt.Sprintf(`budget/%s`, rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrAccountID), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "budgets", fmt.Sprintf(`budget/%s`, rName)), resource.TestCheckResourceAttr(resourceName, "budget_type", "RI_UTILIZATION"), resource.TestCheckResourceAttr(resourceName, "cost_filter.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "cost_filter.*", map[string]string{ diff --git a/internal/service/budgets/sweep.go b/internal/service/budgets/sweep.go index 9c0c72e674d..fb6296fe8a2 100644 --- a/internal/service/budgets/sweep.go +++ b/internal/service/budgets/sweep.go @@ -37,7 +37,7 @@ func sweepBudgetActions(region string) error { return fmt.Errorf("error getting client: %w", err) } conn := client.BudgetsClient(ctx) - accountID := client.AccountID + accountID := client.AccountID(ctx) input := &budgets.DescribeBudgetActionsForAccountInput{ AccountId: aws.String(accountID), } @@ -81,7 +81,7 @@ func sweepBudgets(region string) error { // nosemgrep:ci.budgets-in-func-name return fmt.Errorf("error getting client: %w", err) } conn := client.BudgetsClient(ctx) - accountID := client.AccountID + accountID := client.AccountID(ctx) input := &budgets.DescribeBudgetsInput{ AccountId: aws.String(accountID), } From eb92a9180dc7ec7ce3006ecccbde60457f882459 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:41 -0500 Subject: [PATCH 021/304] Make 'AWSClient.AccountID' a getter - ce. --- internal/service/ce/anomaly_monitor_test.go | 2 +- internal/service/ce/anomaly_subscription_test.go | 4 ++-- internal/service/ce/cost_category_test.go | 2 +- internal/service/ce/tags_data_source.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/service/ce/anomaly_monitor_test.go b/internal/service/ce/anomaly_monitor_test.go index c2f9dca7b0a..0243a1dade0 100644 --- a/internal/service/ce/anomaly_monitor_test.go +++ b/internal/service/ce/anomaly_monitor_test.go @@ -37,7 +37,7 @@ func TestAccCEAnomalyMonitor_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAnomalyMonitorExists(ctx, resourceName, &monitor), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "ce", regexache.MustCompile(`anomalymonitor/.+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "ce", regexache.MustCompile(`anomalymonitor/.+`)), resource.TestCheckResourceAttr(resourceName, "monitor_type", "CUSTOM"), resource.TestCheckResourceAttrSet(resourceName, "monitor_specification"), ), diff --git a/internal/service/ce/anomaly_subscription_test.go b/internal/service/ce/anomaly_subscription_test.go index a9d4d0ef225..66ff8d74d25 100644 --- a/internal/service/ce/anomaly_subscription_test.go +++ b/internal/service/ce/anomaly_subscription_test.go @@ -39,8 +39,8 @@ func TestAccCEAnomalySubscription_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAnomalySubscriptionExists(ctx, resourceName, &subscription), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "ce", regexache.MustCompile(`anomalysubscription/.+`)), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrAccountID), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "ce", regexache.MustCompile(`anomalysubscription/.+`)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrAccountID), resource.TestCheckResourceAttr(resourceName, "frequency", "DAILY"), resource.TestCheckResourceAttrSet(resourceName, "monitor_arn_list.#"), resource.TestCheckResourceAttr(resourceName, "subscriber.0.type", "EMAIL"), diff --git a/internal/service/ce/cost_category_test.go b/internal/service/ce/cost_category_test.go index bfae647db1a..dc72865dfef 100644 --- a/internal/service/ce/cost_category_test.go +++ b/internal/service/ce/cost_category_test.go @@ -41,7 +41,7 @@ func TestAccCECostCategory_basic(t *testing.T) { testAccCheckCostCategoryExists(ctx, resourceName, &output), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttrSet(resourceName, "effective_start"), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "ce", regexache.MustCompile(`costcategory/.+$`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "ce", regexache.MustCompile(`costcategory/.+$`)), ), }, { diff --git a/internal/service/ce/tags_data_source.go b/internal/service/ce/tags_data_source.go index 821a0f44e35..700bb47e3c5 100644 --- a/internal/service/ce/tags_data_source.go +++ b/internal/service/ce/tags_data_source.go @@ -124,7 +124,7 @@ func dataSourceTagsRead(ctx context.Context, d *schema.ResourceData, meta interf return sdkdiag.AppendErrorf(diags, "reading Cost Explorer Tags: %s", err) } - d.SetId(meta.(*conns.AWSClient).AccountID) + d.SetId(meta.(*conns.AWSClient).AccountID(ctx)) d.Set(names.AttrTags, output.Tags) return diags From 8ed96445d9c7e8392be51d38aa083c4bf59d2aab Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:41 -0500 Subject: [PATCH 022/304] Make 'AWSClient.AccountID' a getter - chatbot. --- internal/service/chatbot/slack_channel_configuration_test.go | 2 +- internal/service/chatbot/teams_channel_configuration_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/chatbot/slack_channel_configuration_test.go b/internal/service/chatbot/slack_channel_configuration_test.go index ef5098e3624..4f1f9d85e30 100644 --- a/internal/service/chatbot/slack_channel_configuration_test.go +++ b/internal/service/chatbot/slack_channel_configuration_test.go @@ -66,7 +66,7 @@ func testAccSlackChannelConfiguration_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckSlackChannelConfigurationExists(ctx, testResourceSlackChannelConfiguration, &slackchannelconfiguration), resource.TestCheckResourceAttr(testResourceSlackChannelConfiguration, "configuration_name", rName), - acctest.MatchResourceAttrGlobalARN(testResourceSlackChannelConfiguration, "chat_configuration_arn", "chatbot", regexache.MustCompile(fmt.Sprintf(`chat-configuration/slack-channel/%s`, rName))), + acctest.MatchResourceAttrGlobalARN(ctx, testResourceSlackChannelConfiguration, "chat_configuration_arn", "chatbot", regexache.MustCompile(fmt.Sprintf(`chat-configuration/slack-channel/%s`, rName))), resource.TestCheckResourceAttrPair(testResourceSlackChannelConfiguration, names.AttrIAMRoleARN, "aws_iam_role.test", names.AttrARN), resource.TestCheckResourceAttr(testResourceSlackChannelConfiguration, "slack_channel_id", channelID), resource.TestCheckResourceAttrSet(testResourceSlackChannelConfiguration, "slack_channel_name"), diff --git a/internal/service/chatbot/teams_channel_configuration_test.go b/internal/service/chatbot/teams_channel_configuration_test.go index af1b8d12f17..cd89d632139 100644 --- a/internal/service/chatbot/teams_channel_configuration_test.go +++ b/internal/service/chatbot/teams_channel_configuration_test.go @@ -67,7 +67,7 @@ func testAccTeamsChannelConfiguration_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckTeamsChannelConfigurationExists(ctx, testResourceTeamsChannelConfiguration, &teamschannelconfiguration), resource.TestCheckResourceAttr(testResourceTeamsChannelConfiguration, "configuration_name", rName), - acctest.MatchResourceAttrGlobalARN(testResourceTeamsChannelConfiguration, "chat_configuration_arn", "chatbot", regexache.MustCompile(fmt.Sprintf(`chat-configuration/.*/%s`, rName))), + acctest.MatchResourceAttrGlobalARN(ctx, testResourceTeamsChannelConfiguration, "chat_configuration_arn", "chatbot", regexache.MustCompile(fmt.Sprintf(`chat-configuration/.*/%s`, rName))), resource.TestCheckResourceAttrPair(testResourceTeamsChannelConfiguration, names.AttrIAMRoleARN, "aws_iam_role.test", names.AttrARN), resource.TestCheckResourceAttr(testResourceTeamsChannelConfiguration, "channel_id", channelID), resource.TestCheckResourceAttrSet(testResourceTeamsChannelConfiguration, "channel_name"), From ea8d78cd5c2ce8db073f21d54a0640ffc9d67842 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:41 -0500 Subject: [PATCH 023/304] Make 'AWSClient.AccountID' a getter - chime. --- internal/service/chime/voice_connector_streaming_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/chime/voice_connector_streaming_test.go b/internal/service/chime/voice_connector_streaming_test.go index 540524181ba..1242abe2854 100644 --- a/internal/service/chime/voice_connector_streaming_test.go +++ b/internal/service/chime/voice_connector_streaming_test.go @@ -108,7 +108,7 @@ func testAccVoiceConnectorStreaming_update(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "disabled", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "streaming_notification_targets.#", "2"), resource.TestCheckResourceAttr(resourceName, "media_insights_configuration.0.disabled", acctest.CtFalse), - acctest.MatchResourceAttrRegionalARN(resourceName, + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "media_insights_configuration.0.configuration_arn", "chime", regexache.MustCompile(fmt.Sprintf(`media-insights-pipeline-configuration/test-config-%s`, name)), From 2eb19cd1a20048d1e50926b044d94c2c1da2c6f0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:42 -0500 Subject: [PATCH 024/304] Make 'AWSClient.AccountID' a getter - chimesdkmediapipelines. --- ...ia_insights_pipeline_configuration_test.go | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/internal/service/chimesdkmediapipelines/media_insights_pipeline_configuration_test.go b/internal/service/chimesdkmediapipelines/media_insights_pipeline_configuration_test.go index 9ac9bd200a5..0af331132e7 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.#", "2"), resource.TestCheckResourceAttr(resourceName, "elements.0.type", "AmazonTranscribeCallAnalyticsProcessor"), resource.TestCheckResourceAttr(resourceName, "elements.1.type", "KinesisDataStreamSink"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "chime", fmt.Sprintf(`media-insights-pipeline-configuration/%s`, rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "chime", fmt.Sprintf(`media-insights-pipeline-configuration/%s`, rName)), ), }, { @@ -125,11 +125,11 @@ func TestAccChimeSDKMediaPipelinesMediaInsightsPipelineConfiguration_updateAllPr testAccCheckMediaInsightsPipelineConfigurationExists(ctx, resourceName, &v1), 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.CheckResourceAttrGlobalARN(ctx, resourceName, "resource_access_role_arn", "iam", fmt.Sprintf(`role/%s`, roleName1)), resource.TestCheckResourceAttr(resourceName, "elements.#", "2"), resource.TestCheckResourceAttr(resourceName, "elements.0.type", "AmazonTranscribeCallAnalyticsProcessor"), resource.TestCheckResourceAttr(resourceName, "elements.1.type", "KinesisDataStreamSink"), - acctest.MatchResourceAttrRegionalARN(resourceName, "elements.1.kinesis_data_stream_sink_configuration.0.insights_target", "kinesis", regexache.MustCompile(fmt.Sprintf(`stream/%s`, streamName1))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "elements.1.kinesis_data_stream_sink_configuration.0.insights_target", "kinesis", regexache.MustCompile(fmt.Sprintf(`stream/%s`, streamName1))), resource.TestCheckResourceAttrSet(resourceName, "real_time_alert_configuration.0.%"), resource.TestCheckResourceAttr(resourceName, "real_time_alert_configuration.0.disabled", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "real_time_alert_configuration.0.rules.#", "3"), @@ -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.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "chime", fmt.Sprintf(`media-insights-pipeline-configuration/%s`, rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "chime", fmt.Sprintf(`media-insights-pipeline-configuration/%s`, rName)), ), }, { @@ -149,12 +149,12 @@ func TestAccChimeSDKMediaPipelinesMediaInsightsPipelineConfiguration_updateAllPr testAccCheckMediaInsightsPipelineConfigurationNotRecreated(&v1, &v2), 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.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "chime", fmt.Sprintf(`media-insights-pipeline-configuration/%s`, rName)), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, "resource_access_role_arn", "iam", fmt.Sprintf(`role/%s`, roleName1)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "chime", fmt.Sprintf(`media-insights-pipeline-configuration/%s`, rName)), resource.TestCheckResourceAttr(resourceName, "elements.#", "2"), resource.TestCheckResourceAttr(resourceName, "elements.0.type", "AmazonTranscribeProcessor"), resource.TestCheckResourceAttr(resourceName, "elements.1.type", "KinesisDataStreamSink"), - acctest.MatchResourceAttrRegionalARN(resourceName, "elements.1.kinesis_data_stream_sink_configuration.0.insights_target", "kinesis", regexache.MustCompile(fmt.Sprintf(`stream/%s`, streamName2))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "elements.1.kinesis_data_stream_sink_configuration.0.insights_target", "kinesis", regexache.MustCompile(fmt.Sprintf(`stream/%s`, streamName2))), resource.TestCheckNoResourceAttr(resourceName, "real_time_alert_configuration.0.%"), ), }, @@ -165,8 +165,8 @@ func TestAccChimeSDKMediaPipelinesMediaInsightsPipelineConfiguration_updateAllPr testAccCheckMediaInsightsPipelineConfigurationNotRecreated(&v2, &v3), 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.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "chime", fmt.Sprintf(`media-insights-pipeline-configuration/%s`, rName)), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, "resource_access_role_arn", "iam", fmt.Sprintf(`role/%s`, roleName2)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "chime", fmt.Sprintf(`media-insights-pipeline-configuration/%s`, rName)), resource.TestCheckResourceAttr(resourceName, "elements.#", "1"), resource.TestCheckResourceAttr(resourceName, "elements.0.type", "S3RecordingSink"), ), @@ -178,15 +178,15 @@ func TestAccChimeSDKMediaPipelinesMediaInsightsPipelineConfiguration_updateAllPr testAccCheckMediaInsightsPipelineConfigurationNotRecreated(&v3, &v4), 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.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "chime", fmt.Sprintf(`media-insights-pipeline-configuration/%s`, rName)), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, "resource_access_role_arn", "iam", fmt.Sprintf(`role/%s`, roleName2)), + acctest.CheckResourceAttrRegionalARN(ctx, 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"), resource.TestCheckResourceAttr(resourceName, "elements.2.type", "SnsTopicSink"), resource.TestCheckResourceAttr(resourceName, "elements.3.type", "SqsQueueSink"), resource.TestCheckResourceAttr(resourceName, "elements.4.type", "KinesisDataStreamSink"), - acctest.MatchResourceAttrRegionalARN(resourceName, "elements.4.kinesis_data_stream_sink_configuration.0.insights_target", "kinesis", regexache.MustCompile(fmt.Sprintf(`stream/%s`, streamName2))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "elements.4.kinesis_data_stream_sink_configuration.0.insights_target", "kinesis", regexache.MustCompile(fmt.Sprintf(`stream/%s`, streamName2))), ), }, { From 5a869a847f984766b9fc24135ddb25d1abb96eb7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:42 -0500 Subject: [PATCH 025/304] Make 'AWSClient.AccountID' a getter - chimesdkvoice. --- internal/service/chimesdkvoice/global_settings.go | 4 ++-- internal/service/chimesdkvoice/voice_profile_domain_test.go | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/service/chimesdkvoice/global_settings.go b/internal/service/chimesdkvoice/global_settings.go index 8125739125a..79cf6c4a5a3 100644 --- a/internal/service/chimesdkvoice/global_settings.go +++ b/internal/service/chimesdkvoice/global_settings.go @@ -89,7 +89,7 @@ func resourceGlobalSettingsRead(ctx context.Context, d *schema.ResourceData, met return create.AppendDiagError(diags, names.ChimeSDKVoice, create.ErrActionReading, ResNameGlobalSettings, d.Id(), err) } - d.SetId(meta.(*conns.AWSClient).AccountID) + d.SetId(meta.(*conns.AWSClient).AccountID(ctx)) d.Set("voice_connector", flattenVoiceConnectorSettings(out.VoiceConnector)) return diags @@ -109,7 +109,7 @@ func resourceGlobalSettingsUpdate(ctx context.Context, d *schema.ResourceData, m return create.AppendDiagError(diags, names.ChimeSDKVoice, create.ErrActionUpdating, ResNameGlobalSettings, d.Id(), err) } } - d.SetId(meta.(*conns.AWSClient).AccountID) + d.SetId(meta.(*conns.AWSClient).AccountID(ctx)) return append(diags, resourceGlobalSettingsRead(ctx, d, meta)...) } diff --git a/internal/service/chimesdkvoice/voice_profile_domain_test.go b/internal/service/chimesdkvoice/voice_profile_domain_test.go index 8f29d8cbdd6..576f2c17ae1 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(ctx, 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(ctx, 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(ctx, resourceName, names.AttrARN, "chime", regexache.MustCompile(`voice-profile-domain/.+$`)), ), }, }, From 0c6d9d4fcfb96b61b41de9a0c9d2d25b8d45e222 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:42 -0500 Subject: [PATCH 026/304] Make 'AWSClient.AccountID' a getter - cleanrooms. --- internal/service/cleanrooms/collaboration_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/service/cleanrooms/collaboration_test.go b/internal/service/cleanrooms/collaboration_test.go index 07686b77fe9..f7272e86bdf 100644 --- a/internal/service/cleanrooms/collaboration_test.go +++ b/internal/service/cleanrooms/collaboration_test.go @@ -49,7 +49,7 @@ func TestAccCleanRoomsCollaboration_basic(t *testing.T) { "allow_joins_on_columns_with_different_names": acctest.CtTrue, "preserve_nulls": acctest.CtFalse, }), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "cleanrooms", regexache.MustCompile(`collaboration:*`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "cleanrooms", regexache.MustCompile(`collaboration:*`)), testCheckCreatorMember(ctx, resourceName), testAccCollaborationTags(ctx, resourceName, map[string]string{ "Project": TEST_TAG, @@ -402,8 +402,8 @@ func testCheckCreatorMember(ctx context.Context, name string) resource.TestCheck return fmt.Errorf("Expected 1 member but found %d", len(membersOut.MemberSummaries)) } member := membersOut.MemberSummaries[0] - if *member.AccountId != acctest.AccountID() { - return fmt.Errorf("Member account id %s does not match expected value", acctest.AccountID()) + if *member.AccountId != acctest.AccountID(ctx) { + return fmt.Errorf("Member account id %s does not match expected value", acctest.AccountID(ctx)) } if member.Status != types.MemberStatusInvited { return fmt.Errorf("Member status: %s does not match expected value", member.Status) From 36c6008fe212e9db3204475a886601637a7c82ce Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:42 -0500 Subject: [PATCH 027/304] Make 'AWSClient.AccountID' a getter - cloud9. --- internal/service/cloud9/environment_ec2_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/cloud9/environment_ec2_test.go b/internal/service/cloud9/environment_ec2_test.go index 59604d2a47c..b002e41f232 100644 --- a/internal/service/cloud9/environment_ec2_test.go +++ b/internal/service/cloud9/environment_ec2_test.go @@ -36,7 +36,7 @@ func TestAccCloud9EnvironmentEC2_basic(t *testing.T) { Config: testAccEnvironmentEC2Config_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckEnvironmentEC2Exists(ctx, resourceName, &conf), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "cloud9", regexache.MustCompile(`environment:.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "cloud9", regexache.MustCompile(`environment:.+$`)), resource.TestCheckResourceAttr(resourceName, "connection_type", "CONNECT_SSH"), resource.TestCheckResourceAttr(resourceName, names.AttrInstanceType, "t2.micro"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), From e5c48074e0e17e44fc714be4cd48fa49698baf6d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:42 -0500 Subject: [PATCH 028/304] Make 'AWSClient.AccountID' a getter - cloudformation. --- internal/service/cloudformation/stack_instances.go | 6 +++--- internal/service/cloudformation/stack_instances_test.go | 6 +++--- internal/service/cloudformation/stack_set_instance.go | 2 +- internal/service/cloudformation/stack_set_instance_test.go | 2 +- internal/service/cloudformation/stack_set_test.go | 4 ++-- internal/service/cloudformation/type_test.go | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/internal/service/cloudformation/stack_instances.go b/internal/service/cloudformation/stack_instances.go index a32f57ce49e..e81a1f89f33 100644 --- a/internal/service/cloudformation/stack_instances.go +++ b/internal/service/cloudformation/stack_instances.go @@ -276,7 +276,7 @@ func resourceStackInstancesCreate(ctx context.Context, d *schema.ResourceData, m deployedByOU = "OU" } } else { - input.Accounts = []string{meta.(*conns.AWSClient).AccountID} + input.Accounts = []string{meta.(*conns.AWSClient).AccountID(ctx)} } callAs := d.Get("call_as").(string) @@ -507,7 +507,7 @@ func resourceStackInstancesUpdate(ctx context.Context, d *schema.ResourceData, m } // can only give either accounts or deployment_targets - input.Accounts = []string{meta.(*conns.AWSClient).AccountID} + input.Accounts = []string{meta.(*conns.AWSClient).AccountID(ctx)} if v, ok := d.GetOk(AttrAccounts); ok && v.(*schema.Set).Len() > 0 { input.Accounts = flex.ExpandStringValueSet(v.(*schema.Set)) } @@ -689,7 +689,7 @@ func findStackInstancesByNameCallAs(ctx context.Context, meta interface{}, stack } if len(output.Accounts) == 0 && len(accounts) == 0 { - output.Accounts = []string{meta.(*conns.AWSClient).AccountID} + output.Accounts = []string{meta.(*conns.AWSClient).AccountID(ctx)} } if len(output.Regions) == 0 && len(regions) > 0 { diff --git a/internal/service/cloudformation/stack_instances_test.go b/internal/service/cloudformation/stack_instances_test.go index 2051af39548..429605af240 100644 --- a/internal/service/cloudformation/stack_instances_test.go +++ b/internal/service/cloudformation/stack_instances_test.go @@ -42,7 +42,7 @@ func TestAccCloudFormationStackInstances_basic(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckStackInstancesExists(ctx, resourceName, &stackInstances1), resource.TestCheckResourceAttr(resourceName, "accounts.#", "1"), - acctest.CheckResourceAttrAccountID(resourceName, "accounts.0"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "accounts.0"), resource.TestCheckResourceAttr(resourceName, "call_as", "SELF"), resource.TestCheckResourceAttr(resourceName, "deployment_targets.#", "0"), resource.TestCheckResourceAttr(resourceName, "operation_preferences.#", "0"), @@ -51,7 +51,7 @@ func TestAccCloudFormationStackInstances_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "regions.0", acctest.Region()), resource.TestCheckResourceAttr(resourceName, "retain_stacks", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "stack_instance_summaries.#", "1"), - acctest.CheckResourceAttrAccountID(resourceName, "stack_instance_summaries.0.account_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "stack_instance_summaries.0.account_id"), resource.TestCheckResourceAttr(resourceName, "stack_instance_summaries.0.drift_status", "NOT_CHECKED"), resource.TestCheckResourceAttr(resourceName, "stack_instance_summaries.0.region", acctest.Region()), resource.TestCheckResourceAttrSet(resourceName, "stack_instance_summaries.0.stack_id"), @@ -142,7 +142,7 @@ func TestAccCloudFormationStackInstances_Multi_increaseRegions(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckStackInstancesExists(ctx, resourceName, &stackInstances1), resource.TestCheckResourceAttr(resourceName, "accounts.#", "1"), - acctest.CheckResourceAttrAccountID(resourceName, "accounts.0"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "accounts.0"), resource.TestCheckResourceAttr(resourceName, "call_as", "SELF"), resource.TestCheckResourceAttr(resourceName, "deployment_targets.#", "0"), resource.TestCheckResourceAttr(resourceName, "operation_preferences.#", "0"), diff --git a/internal/service/cloudformation/stack_set_instance.go b/internal/service/cloudformation/stack_set_instance.go index c5760d33d1a..b2af46fc77f 100644 --- a/internal/service/cloudformation/stack_set_instance.go +++ b/internal/service/cloudformation/stack_set_instance.go @@ -241,7 +241,7 @@ func resourceStackSetInstanceCreate(ctx context.Context, d *schema.ResourceData, StackSetName: aws.String(stackSetName), } - accountID := meta.(*conns.AWSClient).AccountID + accountID := meta.(*conns.AWSClient).AccountID(ctx) if v, ok := d.GetOk(names.AttrAccountID); ok { accountID = v.(string) } diff --git a/internal/service/cloudformation/stack_set_instance_test.go b/internal/service/cloudformation/stack_set_instance_test.go index 1773bd371c3..0e37d564b3a 100644 --- a/internal/service/cloudformation/stack_set_instance_test.go +++ b/internal/service/cloudformation/stack_set_instance_test.go @@ -40,7 +40,7 @@ func TestAccCloudFormationStackSetInstance_basic(t *testing.T) { Config: testAccStackSetInstanceConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckStackSetInstanceExists(ctx, resourceName, &stackInstance1), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrAccountID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrAccountID), resource.TestCheckResourceAttr(resourceName, "call_as", "SELF"), resource.TestCheckResourceAttr(resourceName, "deployment_targets.#", "0"), resource.TestCheckResourceAttr(resourceName, "operation_preferences.#", "0"), diff --git a/internal/service/cloudformation/stack_set_test.go b/internal/service/cloudformation/stack_set_test.go index ff83e7fbfa2..652bc4cb145 100644 --- a/internal/service/cloudformation/stack_set_test.go +++ b/internal/service/cloudformation/stack_set_test.go @@ -42,7 +42,7 @@ func TestAccCloudFormationStackSet_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckStackSetExists(ctx, resourceName, &stackSet1), resource.TestCheckResourceAttrPair(resourceName, "administration_role_arn", iamRoleResourceName, names.AttrARN), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "cloudformation", regexache.MustCompile(`stackset/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "cloudformation", regexache.MustCompile(`stackset/.+`)), resource.TestCheckResourceAttr(resourceName, "capabilities.#", "0"), resource.TestCheckResourceAttr(resourceName, "call_as", "SELF"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -596,7 +596,7 @@ func TestAccCloudFormationStackSet_PermissionModel_serviceManaged(t *testing.T) Config: testAccStackSetConfig_permissionModel(rName), Check: resource.ComposeTestCheckFunc( testAccCheckStackSetExists(ctx, resourceName, &stackSet1), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "cloudformation", regexache.MustCompile(`stackset/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "cloudformation", regexache.MustCompile(`stackset/.+`)), resource.TestCheckResourceAttr(resourceName, "permission_model", "SERVICE_MANAGED"), resource.TestCheckResourceAttr(resourceName, "auto_deployment.#", "1"), resource.TestCheckResourceAttr(resourceName, "auto_deployment.0.enabled", acctest.CtTrue), diff --git a/internal/service/cloudformation/type_test.go b/internal/service/cloudformation/type_test.go index 238c180ec49..936b1f5354b 100644 --- a/internal/service/cloudformation/type_test.go +++ b/internal/service/cloudformation/type_test.go @@ -44,7 +44,7 @@ func TestAccCloudFormationType_basic(t *testing.T) { Config: testAccTypeConfig_name(rName, zipPath, typeName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTypeExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "cloudformation", regexache.MustCompile(fmt.Sprintf("type/resource/%s/.+", strings.ReplaceAll(typeName, "::", "-")))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "cloudformation", regexache.MustCompile(fmt.Sprintf("type/resource/%s/.+", strings.ReplaceAll(typeName, "::", "-")))), resource.TestCheckResourceAttr(resourceName, "default_version_id", ""), resource.TestCheckResourceAttr(resourceName, "deprecated_status", string(awstypes.DeprecatedStatusLive)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "An example resource schema demonstrating some basic constructs and validation rules."), @@ -56,7 +56,7 @@ func TestAccCloudFormationType_basic(t *testing.T) { resource.TestMatchResourceAttr(resourceName, names.AttrSchema, regexache.MustCompile(`^\{.*`)), resource.TestCheckResourceAttr(resourceName, "source_url", "https://github.com/aws-cloudformation/aws-cloudformation-rpdk.git"), resource.TestCheckResourceAttr(resourceName, names.AttrType, string(awstypes.RegistryTypeResource)), - acctest.CheckResourceAttrRegionalARN(resourceName, "type_arn", "cloudformation", fmt.Sprintf("type/resource/%s", strings.ReplaceAll(typeName, "::", "-"))), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, "type_arn", "cloudformation", fmt.Sprintf("type/resource/%s", strings.ReplaceAll(typeName, "::", "-"))), resource.TestCheckResourceAttr(resourceName, "type_name", typeName), resource.TestCheckResourceAttr(resourceName, "visibility", string(awstypes.VisibilityPrivate)), resource.TestMatchResourceAttr(resourceName, "version_id", regexache.MustCompile(`.+`)), From 83ed51cde876ed7818211eb9547cc6362e0d2937 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:42 -0500 Subject: [PATCH 029/304] Make 'AWSClient.AccountID' a getter - cloudfront. --- internal/service/cloudfront/distribution_test.go | 2 +- internal/service/cloudfront/function_test.go | 2 +- .../cloudfront/origin_access_identities_data_source.go | 2 +- internal/service/cloudfront/realtime_log_config_test.go | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/cloudfront/distribution_test.go b/internal/service/cloudfront/distribution_test.go index 2cb16be603d..39ae34e0e47 100644 --- a/internal/service/cloudfront/distribution_test.go +++ b/internal/service/cloudfront/distribution_test.go @@ -676,7 +676,7 @@ func TestAccCloudFrontDistribution_noOptionalItems(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckDistributionExists(ctx, resourceName, &distribution), resource.TestCheckResourceAttr(resourceName, "aliases.#", "0"), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "cloudfront", regexache.MustCompile(`distribution/[0-9A-Z]+$`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "cloudfront", regexache.MustCompile(`distribution/[0-9A-Z]+$`)), resource.TestCheckResourceAttr(resourceName, "custom_error_response.#", "0"), resource.TestCheckResourceAttr(resourceName, "default_cache_behavior.#", "1"), resource.TestCheckResourceAttr(resourceName, "default_cache_behavior.0.allowed_methods.#", "7"), diff --git a/internal/service/cloudfront/function_test.go b/internal/service/cloudfront/function_test.go index 429aefc7726..2bfd28ee204 100644 --- a/internal/service/cloudfront/function_test.go +++ b/internal/service/cloudfront/function_test.go @@ -46,7 +46,7 @@ func TestAccCloudFrontFunction_basic(t *testing.T) { Config: testAccFunctionConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckFunctionExists(ctx, resourceName, &conf), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrARN, "cloudfront", fmt.Sprintf("function/%s", rName)), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "cloudfront", fmt.Sprintf("function/%s", rName)), resource.TestCheckResourceAttrSet(resourceName, "code"), resource.TestCheckResourceAttr(resourceName, names.AttrComment, ""), resource.TestCheckResourceAttr(resourceName, "etag", "ETVPDKIKX0DER"), diff --git a/internal/service/cloudfront/origin_access_identities_data_source.go b/internal/service/cloudfront/origin_access_identities_data_source.go index 7cc966aa043..a5ccfbd1f2c 100644 --- a/internal/service/cloudfront/origin_access_identities_data_source.go +++ b/internal/service/cloudfront/origin_access_identities_data_source.go @@ -87,7 +87,7 @@ func dataSourceOriginAccessIdentitiesRead(ctx context.Context, d *schema.Resourc s3CanonicalUserIDs = append(s3CanonicalUserIDs, aws.ToString(v.S3CanonicalUserId)) } - d.SetId(meta.(*conns.AWSClient).AccountID) + d.SetId(meta.(*conns.AWSClient).AccountID(ctx)) d.Set("iam_arns", iamARNs) d.Set(names.AttrIDs, ids) d.Set("s3_canonical_user_ids", s3CanonicalUserIDs) diff --git a/internal/service/cloudfront/realtime_log_config_test.go b/internal/service/cloudfront/realtime_log_config_test.go index aeb342fa876..03e00875c19 100644 --- a/internal/service/cloudfront/realtime_log_config_test.go +++ b/internal/service/cloudfront/realtime_log_config_test.go @@ -39,7 +39,7 @@ func TestAccCloudFrontRealtimeLogConfig_basic(t *testing.T) { Config: testAccRealtimeLogConfigConfig_basic(rName, samplingRate), Check: resource.ComposeTestCheckFunc( testAccCheckRealtimeLogConfigExists(ctx, resourceName, &v), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrARN, "cloudfront", fmt.Sprintf("realtime-log-config/%s", rName)), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "cloudfront", fmt.Sprintf("realtime-log-config/%s", rName)), resource.TestCheckResourceAttr(resourceName, "endpoint.#", "1"), resource.TestCheckResourceAttr(resourceName, "endpoint.0.stream_type", "Kinesis"), resource.TestCheckResourceAttr(resourceName, "endpoint.0.kinesis_stream_config.#", "1"), @@ -108,7 +108,7 @@ func TestAccCloudFrontRealtimeLogConfig_updates(t *testing.T) { Config: testAccRealtimeLogConfigConfig_basic(rName, samplingRate1), Check: resource.ComposeTestCheckFunc( testAccCheckRealtimeLogConfigExists(ctx, resourceName, &v), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrARN, "cloudfront", fmt.Sprintf("realtime-log-config/%s", rName)), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "cloudfront", fmt.Sprintf("realtime-log-config/%s", rName)), resource.TestCheckResourceAttr(resourceName, "endpoint.#", "1"), resource.TestCheckResourceAttr(resourceName, "endpoint.0.stream_type", "Kinesis"), resource.TestCheckResourceAttr(resourceName, "endpoint.0.kinesis_stream_config.#", "1"), @@ -125,7 +125,7 @@ func TestAccCloudFrontRealtimeLogConfig_updates(t *testing.T) { Config: testAccRealtimeLogConfigConfig_updated(rName, samplingRate2), Check: resource.ComposeTestCheckFunc( testAccCheckRealtimeLogConfigExists(ctx, resourceName, &v), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrARN, "cloudfront", fmt.Sprintf("realtime-log-config/%s", rName)), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "cloudfront", fmt.Sprintf("realtime-log-config/%s", rName)), resource.TestCheckResourceAttr(resourceName, "endpoint.#", "1"), resource.TestCheckResourceAttr(resourceName, "endpoint.0.stream_type", "Kinesis"), resource.TestCheckResourceAttr(resourceName, "endpoint.0.kinesis_stream_config.#", "1"), From 8eead5884d3ed1d083c546760fb9663df5877402 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:42 -0500 Subject: [PATCH 030/304] Make 'AWSClient.AccountID' a getter - cloudsearch. --- internal/service/cloudsearch/domain_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/service/cloudsearch/domain_test.go b/internal/service/cloudsearch/domain_test.go index 50c5e1c3636..9296bcb8dc1 100644 --- a/internal/service/cloudsearch/domain_test.go +++ b/internal/service/cloudsearch/domain_test.go @@ -41,7 +41,7 @@ func TestAccCloudSearchDomain_basic(t *testing.T) { Config: testAccDomainConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccDomainExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "cloudsearch", fmt.Sprintf("domain/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "cloudsearch", fmt.Sprintf("domain/%s", rName)), resource.TestCheckResourceAttrSet(resourceName, "domain_id"), resource.TestCheckResourceAttr(resourceName, "endpoint_options.#", "1"), resource.TestCheckResourceAttr(resourceName, "endpoint_options.0.enforce_https", acctest.CtFalse), @@ -267,7 +267,7 @@ func TestAccCloudSearchDomain_update(t *testing.T) { Config: testAccDomainConfig_allOptions(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccDomainExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "cloudsearch", fmt.Sprintf("domain/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "cloudsearch", fmt.Sprintf("domain/%s", rName)), resource.TestCheckResourceAttrSet(resourceName, "domain_id"), resource.TestCheckResourceAttr(resourceName, "endpoint_options.#", "1"), resource.TestCheckResourceAttr(resourceName, "endpoint_options.0.enforce_https", acctest.CtTrue), @@ -294,7 +294,7 @@ func TestAccCloudSearchDomain_update(t *testing.T) { Config: testAccDomainConfig_allOptionsUpdated(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccDomainExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "cloudsearch", fmt.Sprintf("domain/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "cloudsearch", fmt.Sprintf("domain/%s", rName)), resource.TestCheckResourceAttrSet(resourceName, "domain_id"), resource.TestCheckResourceAttr(resourceName, "endpoint_options.#", "1"), resource.TestCheckResourceAttr(resourceName, "endpoint_options.0.enforce_https", acctest.CtTrue), From 60c7aaa06d851cf862c28cf42fa393f9fcf1f605 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:42 -0500 Subject: [PATCH 031/304] Make 'AWSClient.AccountID' a getter - cloudtrail. --- internal/service/cloudtrail/event_data_store_test.go | 4 ++-- internal/service/cloudtrail/trail_test.go | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/internal/service/cloudtrail/event_data_store_test.go b/internal/service/cloudtrail/event_data_store_test.go index 0312273a6de..7091a50ce81 100644 --- a/internal/service/cloudtrail/event_data_store_test.go +++ b/internal/service/cloudtrail/event_data_store_test.go @@ -42,7 +42,7 @@ func TestAccCloudTrailEventDataStore_basic(t *testing.T) { names.AttrField: "eventCategory", }), resource.TestCheckResourceAttr(resourceName, "advanced_event_selector.0.name", "Default management events"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "cloudtrail", regexache.MustCompile(`eventdatastore/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "cloudtrail", regexache.MustCompile(`eventdatastore/.+`)), resource.TestCheckResourceAttr(resourceName, "billing_mode", "EXTENDABLE_RETENTION_PRICING"), resource.TestCheckResourceAttr(resourceName, "multi_region_enabled", acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), @@ -113,7 +113,7 @@ func TestAccCloudTrailEventDataStore_kmsKeyId(t *testing.T) { Config: testAccEventDataStoreConfig_kmsKeyId(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckEventDataStoreExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "cloudtrail", regexache.MustCompile(`eventdatastore/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "cloudtrail", regexache.MustCompile(`eventdatastore/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "multi_region_enabled", acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, "organization_enabled", acctest.CtFalse), diff --git a/internal/service/cloudtrail/trail_test.go b/internal/service/cloudtrail/trail_test.go index 3b4ac2c63d8..cdb584b58d9 100644 --- a/internal/service/cloudtrail/trail_test.go +++ b/internal/service/cloudtrail/trail_test.go @@ -39,7 +39,7 @@ func testAccTrail_basic(t *testing.T) { Config: testAccCloudTrailConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckTrailExists(ctx, resourceName, &trail), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "cloudtrail", fmt.Sprintf("trail/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "cloudtrail", fmt.Sprintf("trail/%s", rName)), resource.TestCheckResourceAttr(resourceName, "include_global_service_events", acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, "is_organization_trail", acctest.CtFalse), testAccCheckLogValidationEnabled(resourceName, false, &trail), @@ -458,7 +458,7 @@ func testAccTrail_eventSelector(t *testing.T) { acctest.CheckResourceAttrGlobalARNNoAccount(resourceName, "event_selector.1.data_resource.0.values.1", "s3", fmt.Sprintf("%s-2/tf2", rName)), resource.TestCheckResourceAttr(resourceName, "event_selector.1.data_resource.1.type", "AWS::Lambda::Function"), resource.TestCheckResourceAttr(resourceName, "event_selector.1.data_resource.1.values.#", "1"), - acctest.CheckResourceAttrRegionalARN(resourceName, "event_selector.1.data_resource.1.values.0", "lambda", fmt.Sprintf("function:%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, "event_selector.1.data_resource.1.values.0", "lambda", fmt.Sprintf("function:%s", rName)), resource.TestCheckResourceAttr(resourceName, "event_selector.0.exclude_management_event_sources.#", "0"), resource.TestCheckResourceAttr(resourceName, "event_selector.1.include_management_events", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "event_selector.1.read_write_type", "All"), @@ -492,7 +492,7 @@ func testAccTrail_eventSelectorDynamoDB(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "event_selector.0.data_resource.#", "1"), resource.TestCheckResourceAttr(resourceName, "event_selector.0.data_resource.0.type", "AWS::DynamoDB::Table"), resource.TestCheckResourceAttr(resourceName, "event_selector.0.data_resource.0.values.#", "1"), - acctest.MatchResourceAttrRegionalARN(resourceName, "event_selector.0.data_resource.0.values.0", "dynamodb", regexache.MustCompile(`table/tf-acc-test-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "event_selector.0.data_resource.0.values.0", "dynamodb", regexache.MustCompile(`table/tf-acc-test-.+`)), resource.TestCheckResourceAttr(resourceName, "event_selector.0.include_management_events", acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, "event_selector.0.read_write_type", "All"), ), @@ -748,7 +748,7 @@ func testAccTrail_migrateV0(t *testing.T) { Config: testAccCloudTrailConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckTrailExists(ctx, resourceName, &trail), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "cloudtrail", fmt.Sprintf("trail/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "cloudtrail", fmt.Sprintf("trail/%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, names.AttrName), ), @@ -758,7 +758,7 @@ func testAccTrail_migrateV0(t *testing.T) { Config: testAccCloudTrailConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckTrailExists(ctx, resourceName, &trail), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "cloudtrail", fmt.Sprintf("trail/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "cloudtrail", fmt.Sprintf("trail/%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, names.AttrARN), ), From d473bec36ea619170e4ea53086dcc324308ddabd Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:43 -0500 Subject: [PATCH 032/304] Make 'AWSClient.AccountID' a getter - cloudwatch. --- .../cloudwatch/composite_alarm_test.go | 2 +- .../service/cloudwatch/metric_alarm_test.go | 2 +- .../service/cloudwatch/metric_stream_test.go | 22 +++++++++---------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/cloudwatch/composite_alarm_test.go b/internal/service/cloudwatch/composite_alarm_test.go index e1241db1571..d4867c0c392 100644 --- a/internal/service/cloudwatch/composite_alarm_test.go +++ b/internal/service/cloudwatch/composite_alarm_test.go @@ -40,7 +40,7 @@ func TestAccCloudWatchCompositeAlarm_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "alarm_description", ""), resource.TestCheckResourceAttr(resourceName, "alarm_name", rName), resource.TestCheckResourceAttr(resourceName, "alarm_rule", fmt.Sprintf("ALARM(%[1]s-0) OR ALARM(%[1]s-1)", rName)), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "cloudwatch", regexache.MustCompile(`alarm:.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "cloudwatch", regexache.MustCompile(`alarm:.+`)), resource.TestCheckResourceAttr(resourceName, "insufficient_data_actions.#", "0"), resource.TestCheckResourceAttr(resourceName, "ok_actions.#", "0"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), diff --git a/internal/service/cloudwatch/metric_alarm_test.go b/internal/service/cloudwatch/metric_alarm_test.go index cac3f1ce5d3..07bf5434b4c 100755 --- a/internal/service/cloudwatch/metric_alarm_test.go +++ b/internal/service/cloudwatch/metric_alarm_test.go @@ -38,7 +38,7 @@ func TestAccCloudWatchMetricAlarm_basic(t *testing.T) { testAccCheckMetricAlarmExists(ctx, resourceName, &alarm), resource.TestCheckResourceAttr(resourceName, names.AttrMetricName, "CPUUtilization"), resource.TestCheckResourceAttr(resourceName, "statistic", "Average"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "cloudwatch", regexache.MustCompile(`alarm:.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "cloudwatch", regexache.MustCompile(`alarm:.+`)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttr(resourceName, "alarm_description", "This metric monitors ec2 cpu utilization"), resource.TestCheckResourceAttr(resourceName, "threshold", "80"), diff --git a/internal/service/cloudwatch/metric_stream_test.go b/internal/service/cloudwatch/metric_stream_test.go index 12458593ce1..e33209f08d4 100644 --- a/internal/service/cloudwatch/metric_stream_test.go +++ b/internal/service/cloudwatch/metric_stream_test.go @@ -45,7 +45,7 @@ func TestAccCloudWatchMetricStream_basic(t *testing.T) { Config: testAccMetricStreamConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckMetricStreamExists(ctx, resourceName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "cloudwatch", fmt.Sprintf("metric-stream/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "cloudwatch", fmt.Sprintf("metric-stream/%s", rName)), acctest.CheckResourceAttrRFC3339(resourceName, names.AttrCreationDate), resource.TestCheckResourceAttr(resourceName, "exclude_filter.#", "0"), resource.TestCheckResourceAttr(resourceName, "include_filter.#", "0"), @@ -286,8 +286,8 @@ func TestAccCloudWatchMetricStream_update(t *testing.T) { Config: testAccMetricStreamConfig_arns(rName, "S1"), Check: resource.ComposeTestCheckFunc( testAccCheckMetricStreamExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, "firehose_arn", "firehose", regexache.MustCompile(`deliverystream/S1$`)), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrRoleARN, "iam", regexache.MustCompile(`role/S1$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "firehose_arn", "firehose", regexache.MustCompile(`deliverystream/S1$`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrRoleARN, "iam", regexache.MustCompile(`role/S1$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -300,8 +300,8 @@ func TestAccCloudWatchMetricStream_update(t *testing.T) { Config: testAccMetricStreamConfig_arns(rName, "S2"), Check: resource.ComposeTestCheckFunc( testAccCheckMetricStreamExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, "firehose_arn", "firehose", regexache.MustCompile(`deliverystream/S2$`)), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrRoleARN, "iam", regexache.MustCompile(`role/S2$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "firehose_arn", "firehose", regexache.MustCompile(`deliverystream/S2$`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrRoleARN, "iam", regexache.MustCompile(`role/S2$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -309,8 +309,8 @@ func TestAccCloudWatchMetricStream_update(t *testing.T) { Config: testAccMetricStreamConfig_arnsWithTag(rName, "S3", acctest.CtKey1, acctest.CtValue1), Check: resource.ComposeTestCheckFunc( testAccCheckMetricStreamExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, "firehose_arn", "firehose", regexache.MustCompile(`deliverystream/S3$`)), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrRoleARN, "iam", regexache.MustCompile(`role/S3$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "firehose_arn", "firehose", regexache.MustCompile(`deliverystream/S3$`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrRoleARN, "iam", regexache.MustCompile(`role/S3$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsKey1, acctest.CtValue1), ), @@ -319,8 +319,8 @@ func TestAccCloudWatchMetricStream_update(t *testing.T) { Config: testAccMetricStreamConfig_arnsWithTag(rName, "S4", acctest.CtKey1, acctest.CtValue1), Check: resource.ComposeTestCheckFunc( testAccCheckMetricStreamExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, "firehose_arn", "firehose", regexache.MustCompile(`deliverystream/S4$`)), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrRoleARN, "iam", regexache.MustCompile(`role/S4$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "firehose_arn", "firehose", regexache.MustCompile(`deliverystream/S4$`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrRoleARN, "iam", regexache.MustCompile(`role/S4$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsKey1, acctest.CtValue1), ), @@ -329,8 +329,8 @@ func TestAccCloudWatchMetricStream_update(t *testing.T) { Config: testAccMetricStreamConfig_arnsWithTag(rName, "S4", acctest.CtKey1, acctest.CtValue1Updated), Check: resource.ComposeTestCheckFunc( testAccCheckMetricStreamExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, "firehose_arn", "firehose", regexache.MustCompile(`deliverystream/S4$`)), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrRoleARN, "iam", regexache.MustCompile(`role/S4$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "firehose_arn", "firehose", regexache.MustCompile(`deliverystream/S4$`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrRoleARN, "iam", regexache.MustCompile(`role/S4$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsKey1, acctest.CtValue1Updated), ), From 6fbaf5bae739b9eddf326c608993a3da54a10f5b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:43 -0500 Subject: [PATCH 033/304] Make 'AWSClient.AccountID' a getter - codeartifact. --- .../codeartifact/authorization_token_data_source.go | 2 +- .../authorization_token_data_source_test.go | 6 +++--- internal/service/codeartifact/domain_test.go | 10 +++++----- .../codeartifact/repository_endpoint_data_source.go | 2 +- .../repository_endpoint_data_source_test.go | 10 +++++----- internal/service/codeartifact/repository_test.go | 4 ++-- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/internal/service/codeartifact/authorization_token_data_source.go b/internal/service/codeartifact/authorization_token_data_source.go index 1e240b7abd6..6b1fca819f8 100644 --- a/internal/service/codeartifact/authorization_token_data_source.go +++ b/internal/service/codeartifact/authorization_token_data_source.go @@ -64,7 +64,7 @@ func dataSourceAuthorizationTokenRead(ctx context.Context, d *schema.ResourceDat if v, ok := d.GetOk("domain_owner"); ok { domainOwner = v.(string) } else { - domainOwner = meta.(*conns.AWSClient).AccountID + domainOwner = meta.(*conns.AWSClient).AccountID(ctx) } input := &codeartifact.GetAuthorizationTokenInput{ Domain: aws.String(domainName), diff --git a/internal/service/codeartifact/authorization_token_data_source_test.go b/internal/service/codeartifact/authorization_token_data_source_test.go index a34bd568a61..ff98b92edde 100644 --- a/internal/service/codeartifact/authorization_token_data_source_test.go +++ b/internal/service/codeartifact/authorization_token_data_source_test.go @@ -28,7 +28,7 @@ func testAccAuthorizationTokenDataSource_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet(dataSourceName, "authorization_token"), resource.TestCheckResourceAttrSet(dataSourceName, "expiration"), - acctest.CheckResourceAttrAccountID(dataSourceName, "domain_owner"), + acctest.CheckResourceAttrAccountID(ctx, dataSourceName, "domain_owner"), ), }, }, @@ -50,7 +50,7 @@ func testAccAuthorizationTokenDataSource_owner(t *testing.T) { Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet(dataSourceName, "authorization_token"), resource.TestCheckResourceAttrSet(dataSourceName, "expiration"), - acctest.CheckResourceAttrAccountID(dataSourceName, "domain_owner"), + acctest.CheckResourceAttrAccountID(ctx, dataSourceName, "domain_owner"), ), }, }, @@ -73,7 +73,7 @@ func testAccAuthorizationTokenDataSource_duration(t *testing.T) { resource.TestCheckResourceAttrSet(dataSourceName, "authorization_token"), resource.TestCheckResourceAttrSet(dataSourceName, "expiration"), resource.TestCheckResourceAttr(dataSourceName, "duration_seconds", "900"), - acctest.CheckResourceAttrAccountID(dataSourceName, "domain_owner"), + acctest.CheckResourceAttrAccountID(ctx, dataSourceName, "domain_owner"), ), }, }, diff --git a/internal/service/codeartifact/domain_test.go b/internal/service/codeartifact/domain_test.go index aa7444565e6..cac55a927a9 100644 --- a/internal/service/codeartifact/domain_test.go +++ b/internal/service/codeartifact/domain_test.go @@ -34,14 +34,14 @@ func testAccDomain_basic(t *testing.T) { Config: testAccDomainConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckDomainExists(ctx, resourceName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "codeartifact", fmt.Sprintf("domain/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "codeartifact", fmt.Sprintf("domain/%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrDomain, rName), resource.TestCheckResourceAttr(resourceName, "asset_size_bytes", "0"), resource.TestCheckResourceAttr(resourceName, "repository_count", "0"), resource.TestCheckResourceAttrSet(resourceName, "s3_bucket_arn"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedTime), resource.TestCheckResourceAttrPair(resourceName, "encryption_key", "aws_kms_key.test", names.AttrARN), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwner), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwner), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -69,14 +69,14 @@ func testAccDomain_defaultEncryptionKey(t *testing.T) { Config: testAccDomainConfig_defaultEncryptionKey(rName), Check: resource.ComposeTestCheckFunc( testAccCheckDomainExists(ctx, resourceName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "codeartifact", fmt.Sprintf("domain/%s", rName)), - acctest.MatchResourceAttrRegionalARN(resourceName, "encryption_key", "kms", regexache.MustCompile(`key/.+`)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "codeartifact", fmt.Sprintf("domain/%s", rName)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "encryption_key", "kms", regexache.MustCompile(`key/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrDomain, rName), resource.TestCheckResourceAttr(resourceName, "asset_size_bytes", "0"), resource.TestCheckResourceAttr(resourceName, "repository_count", "0"), resource.TestCheckResourceAttrSet(resourceName, "s3_bucket_arn"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedTime), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwner), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwner), ), }, { diff --git a/internal/service/codeartifact/repository_endpoint_data_source.go b/internal/service/codeartifact/repository_endpoint_data_source.go index 0ed73cc4f6c..34c31b64896 100644 --- a/internal/service/codeartifact/repository_endpoint_data_source.go +++ b/internal/service/codeartifact/repository_endpoint_data_source.go @@ -61,7 +61,7 @@ func dataSourceRepositoryEndpointRead(ctx context.Context, d *schema.ResourceDat if v, ok := d.GetOk("domain_owner"); ok { domainOwner = v.(string) } else { - domainOwner = meta.(*conns.AWSClient).AccountID + domainOwner = meta.(*conns.AWSClient).AccountID(ctx) } format := types.PackageFormat(d.Get(names.AttrFormat).(string)) repositoryName := d.Get("repository").(string) diff --git a/internal/service/codeartifact/repository_endpoint_data_source_test.go b/internal/service/codeartifact/repository_endpoint_data_source_test.go index 470a0f4740b..ed9bfb667ef 100644 --- a/internal/service/codeartifact/repository_endpoint_data_source_test.go +++ b/internal/service/codeartifact/repository_endpoint_data_source_test.go @@ -27,28 +27,28 @@ func testAccRepositoryEndpointDataSource_basic(t *testing.T) { Config: testAccRepositoryEndpointDataSourceConfig_basic(rName, "npm"), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet(dataSourceName, "repository_endpoint"), - acctest.CheckResourceAttrAccountID(dataSourceName, "domain_owner"), + acctest.CheckResourceAttrAccountID(ctx, dataSourceName, "domain_owner"), ), }, { Config: testAccRepositoryEndpointDataSourceConfig_basic(rName, "pypi"), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet(dataSourceName, "repository_endpoint"), - acctest.CheckResourceAttrAccountID(dataSourceName, "domain_owner"), + acctest.CheckResourceAttrAccountID(ctx, dataSourceName, "domain_owner"), ), }, { Config: testAccRepositoryEndpointDataSourceConfig_basic(rName, "maven"), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet(dataSourceName, "repository_endpoint"), - acctest.CheckResourceAttrAccountID(dataSourceName, "domain_owner"), + acctest.CheckResourceAttrAccountID(ctx, dataSourceName, "domain_owner"), ), }, { Config: testAccRepositoryEndpointDataSourceConfig_basic(rName, "nuget"), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet(dataSourceName, "repository_endpoint"), - acctest.CheckResourceAttrAccountID(dataSourceName, "domain_owner"), + acctest.CheckResourceAttrAccountID(ctx, dataSourceName, "domain_owner"), ), }, }, @@ -69,7 +69,7 @@ func testAccRepositoryEndpointDataSource_owner(t *testing.T) { Config: testAccRepositoryEndpointDataSourceConfig_owner(rName), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet(dataSourceName, "repository_endpoint"), - acctest.CheckResourceAttrAccountID(dataSourceName, "domain_owner"), + acctest.CheckResourceAttrAccountID(ctx, dataSourceName, "domain_owner"), ), }, }, diff --git a/internal/service/codeartifact/repository_test.go b/internal/service/codeartifact/repository_test.go index ade85523658..1c15ae5cdfc 100644 --- a/internal/service/codeartifact/repository_test.go +++ b/internal/service/codeartifact/repository_test.go @@ -33,7 +33,7 @@ func testAccRepository_basic(t *testing.T) { Config: testAccRepositoryConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckRepositoryExists(ctx, resourceName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "codeartifact", fmt.Sprintf("repository/%s/%s", rName, rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "codeartifact", fmt.Sprintf("repository/%s/%s", rName, rName)), resource.TestCheckResourceAttr(resourceName, "repository", rName), resource.TestCheckResourceAttr(resourceName, names.AttrDomain, rName), resource.TestCheckResourceAttrPair(resourceName, "domain_owner", "aws_codeartifact_domain.test", names.AttrOwner), @@ -113,7 +113,7 @@ func testAccRepository_owner(t *testing.T) { Config: testAccRepositoryConfig_owner(rName), Check: resource.ComposeTestCheckFunc( testAccCheckRepositoryExists(ctx, resourceName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "codeartifact", fmt.Sprintf("repository/%s/%s", rName, rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "codeartifact", fmt.Sprintf("repository/%s/%s", rName, rName)), resource.TestCheckResourceAttr(resourceName, "repository", rName), resource.TestCheckResourceAttr(resourceName, names.AttrDomain, rName), resource.TestCheckResourceAttrPair(resourceName, "domain_owner", "aws_codeartifact_domain.test", names.AttrOwner), From 876b2b4157ffb0c89cab10fffc61068f9c96b0f7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:43 -0500 Subject: [PATCH 034/304] Make 'AWSClient.AccountID' a getter - codebuild. --- internal/service/codebuild/project_test.go | 6 +++--- internal/service/codebuild/report_group_test.go | 6 +++--- internal/service/codebuild/source_credential_test.go | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/internal/service/codebuild/project_test.go b/internal/service/codebuild/project_test.go index 79f67f654a0..300254e3e64 100644 --- a/internal/service/codebuild/project_test.go +++ b/internal/service/codebuild/project_test.go @@ -102,7 +102,7 @@ func TestAccCodeBuildProject_basic(t *testing.T) { Config: testAccProjectConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckProjectExists(ctx, resourceName, &project), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "codebuild", fmt.Sprintf("project/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "codebuild", fmt.Sprintf("project/%s", rName)), resource.TestCheckResourceAttr(resourceName, "artifacts.#", "1"), resource.TestCheckResourceAttr(resourceName, "badge_enabled", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "build_batch_config.#", "0"), @@ -111,7 +111,7 @@ func TestAccCodeBuildProject_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "cache.#", "1"), resource.TestCheckResourceAttr(resourceName, "cache.0.type", string(types.CacheTypeNoCache)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), - acctest.CheckResourceAttrRegionalARN(resourceName, "encryption_key", "kms", "alias/aws/s3"), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, "encryption_key", "kms", "alias/aws/s3"), resource.TestCheckResourceAttr(resourceName, "environment.#", "1"), resource.TestCheckResourceAttr(resourceName, "environment.0.compute_type", string(types.ComputeTypeBuildGeneral1Small)), resource.TestCheckResourceAttr(resourceName, "environment.0.environment_variable.#", "0"), @@ -2884,7 +2884,7 @@ func TestAccCodeBuildProject_fleet(t *testing.T) { Config: testAccProjectConfig_fleet(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckProjectExists(ctx, resourceName, &project), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "codebuild", fmt.Sprintf("project/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "codebuild", fmt.Sprintf("project/%s", rName)), resource.TestCheckResourceAttr(resourceName, "environment.0.compute_type", string(types.ComputeTypeBuildGeneral1Small)), resource.TestCheckResourceAttr(resourceName, "environment.0.fleet.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "environment.0.fleet.0.fleet_arn", fleetResourceName, names.AttrARN), diff --git a/internal/service/codebuild/report_group_test.go b/internal/service/codebuild/report_group_test.go index 5136e31f556..9c2824179a7 100644 --- a/internal/service/codebuild/report_group_test.go +++ b/internal/service/codebuild/report_group_test.go @@ -39,7 +39,7 @@ func TestAccCodeBuildReportGroup_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "export_config.#", "1"), resource.TestCheckResourceAttr(resourceName, "export_config.0.type", "NO_EXPORT"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "codebuild", fmt.Sprintf("report-group/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "codebuild", fmt.Sprintf("report-group/%s", rName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -77,7 +77,7 @@ func TestAccCodeBuildReportGroup_Export_s3(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "export_config.0.s3_destination.0.encryption_disabled", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "export_config.0.s3_destination.0.path", "/some"), resource.TestCheckResourceAttrPair(resourceName, "export_config.0.s3_destination.0.encryption_key", "aws_kms_key.test", names.AttrARN), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "codebuild", fmt.Sprintf("report-group/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "codebuild", fmt.Sprintf("report-group/%s", rName)), ), }, { @@ -97,7 +97,7 @@ func TestAccCodeBuildReportGroup_Export_s3(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "export_config.0.s3_destination.0.packaging", "ZIP"), resource.TestCheckResourceAttr(resourceName, "export_config.0.s3_destination.0.encryption_disabled", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "export_config.0.s3_destination.0.path", "/some2"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "codebuild", fmt.Sprintf("report-group/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "codebuild", fmt.Sprintf("report-group/%s", rName)), ), }, }, diff --git a/internal/service/codebuild/source_credential_test.go b/internal/service/codebuild/source_credential_test.go index b821aaa8798..c4b269d4f90 100644 --- a/internal/service/codebuild/source_credential_test.go +++ b/internal/service/codebuild/source_credential_test.go @@ -37,7 +37,7 @@ func TestAccCodeBuildSourceCredential_basic(t *testing.T) { Config: testAccSourceCredentialConfig_basic("PERSONAL_ACCESS_TOKEN", "GITHUB", token), Check: resource.ComposeTestCheckFunc( testAccCheckSourceCredentialExists(ctx, resourceName, &sourceCredentialsInfo), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "codebuild", regexache.MustCompile(`token/github`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "codebuild", regexache.MustCompile(`token/github`)), resource.TestCheckResourceAttr(resourceName, "server_type", "GITHUB"), resource.TestCheckResourceAttr(resourceName, "auth_type", "PERSONAL_ACCESS_TOKEN"), ), @@ -46,7 +46,7 @@ func TestAccCodeBuildSourceCredential_basic(t *testing.T) { Config: testAccSourceCredentialConfig_basic("PERSONAL_ACCESS_TOKEN", "GITHUB_ENTERPRISE", token), Check: resource.ComposeTestCheckFunc( testAccCheckSourceCredentialExists(ctx, resourceName, &sourceCredentialsInfo), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "codebuild", regexache.MustCompile(`token/github_enterprise`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "codebuild", regexache.MustCompile(`token/github_enterprise`)), resource.TestCheckResourceAttr(resourceName, "server_type", "GITHUB_ENTERPRISE"), resource.TestCheckResourceAttr(resourceName, "auth_type", "PERSONAL_ACCESS_TOKEN"), ), @@ -77,7 +77,7 @@ func TestAccCodeBuildSourceCredential_basicAuth(t *testing.T) { Config: testAccSourceCredentialConfig_basicAuth(token, "user1"), Check: resource.ComposeTestCheckFunc( testAccCheckSourceCredentialExists(ctx, resourceName, &sourceCredentialsInfo), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "codebuild", regexache.MustCompile(`token/bitbucket`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "codebuild", regexache.MustCompile(`token/bitbucket`)), resource.TestCheckResourceAttr(resourceName, names.AttrUserName, "user1"), resource.TestCheckResourceAttr(resourceName, "server_type", "BITBUCKET"), resource.TestCheckResourceAttr(resourceName, "auth_type", "BASIC_AUTH"), From 7a42fa63f0517738ebd3b9d2b38c93c17abbc38c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:43 -0500 Subject: [PATCH 035/304] Make 'AWSClient.AccountID' a getter - codecommit. --- .../service/codecommit/approval_rule_template_test.go | 10 +++++----- internal/service/codecommit/repository_test.go | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/codecommit/approval_rule_template_test.go b/internal/service/codecommit/approval_rule_template_test.go index de499ca3cc7..f5390d4c7b9 100644 --- a/internal/service/codecommit/approval_rule_template_test.go +++ b/internal/service/codecommit/approval_rule_template_test.go @@ -33,7 +33,7 @@ func TestAccCodeCommitApprovalRuleTemplate_basic(t *testing.T) { Config: testAccApprovalRuleTemplateConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckApprovalRuleTemplateExists(ctx, resourceName), - testAccCheckApprovalRuleTemplateContent(resourceName, 2), + testAccCheckApprovalRuleTemplateContent(ctx, resourceName, 2), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttrSet(resourceName, "approval_rule_template_id"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreationDate), @@ -89,7 +89,7 @@ func TestAccCodeCommitApprovalRuleTemplate_updateContentAndDescription(t *testin Config: testAccApprovalRuleTemplateConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckApprovalRuleTemplateExists(ctx, resourceName), - testAccCheckApprovalRuleTemplateContent(resourceName, 2), + testAccCheckApprovalRuleTemplateContent(ctx, resourceName, 2), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), ), }, @@ -97,7 +97,7 @@ func TestAccCodeCommitApprovalRuleTemplate_updateContentAndDescription(t *testin Config: testAccApprovalRuleTemplateConfig_updateContentAndDescription(rName), Check: resource.ComposeTestCheckFunc( testAccCheckApprovalRuleTemplateExists(ctx, resourceName), - testAccCheckApprovalRuleTemplateContent(resourceName, 1), + testAccCheckApprovalRuleTemplateContent(ctx, resourceName, 1), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "This is a test description"), ), }, @@ -145,10 +145,10 @@ func TestAccCodeCommitApprovalRuleTemplate_updateName(t *testing.T) { }) } -func testAccCheckApprovalRuleTemplateContent(resourceName string, numApprovals int) resource.TestCheckFunc { +func testAccCheckApprovalRuleTemplateContent(ctx context.Context, resourceName string, numApprovals int) resource.TestCheckFunc { return func(s *terraform.State) error { expectedContent := fmt.Sprintf(`{"Version":"2018-11-08","DestinationReferences":["refs/heads/master"],"Statements":[{"Type":"Approvers","NumberOfApprovalsNeeded":%d,"ApprovalPoolMembers":["arn:%s:sts::%s:assumed-role/CodeCommitReview/*"]}]}`, - numApprovals, acctest.Partition(), acctest.AccountID(), + numApprovals, acctest.Partition(), acctest.AccountID(ctx), ) return resource.TestCheckResourceAttr(resourceName, names.AttrContent, expectedContent)(s) } diff --git a/internal/service/codecommit/repository_test.go b/internal/service/codecommit/repository_test.go index 8212939af23..17035a2905c 100644 --- a/internal/service/codecommit/repository_test.go +++ b/internal/service/codecommit/repository_test.go @@ -36,7 +36,7 @@ func TestAccCodeCommitRepository_basic(t *testing.T) { Config: testAccRepositoryConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckRepositoryExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "codecommit", rName), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "codecommit", rName), resource.TestCheckResourceAttrSet(resourceName, "clone_url_http"), resource.TestCheckResourceAttrSet(resourceName, "clone_url_ssh"), resource.TestCheckNoResourceAttr(resourceName, "default_branch"), From 066cdb341de79b99b1eb581f1e8dfc49243615ff Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:43 -0500 Subject: [PATCH 036/304] Make 'AWSClient.AccountID' a getter - codegurureviewer. --- .../codegurureviewer/repository_association_test.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/codegurureviewer/repository_association_test.go b/internal/service/codegurureviewer/repository_association_test.go index 2d63758c152..570d7fd6d74 100644 --- a/internal/service/codegurureviewer/repository_association_test.go +++ b/internal/service/codegurureviewer/repository_association_test.go @@ -43,8 +43,8 @@ func TestAccCodeGuruReviewerRepositoryAssociation_basic(t *testing.T) { Config: testAccRepositoryAssociationConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckRepositoryAssociationExists(ctx, resourceName, &repositoryassociation), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "codeguru-reviewer", regexache.MustCompile(`association:+.`)), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrID, "codeguru-reviewer", regexache.MustCompile(`association:+.`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "codeguru-reviewer", regexache.MustCompile(`association:+.`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrID, "codeguru-reviewer", regexache.MustCompile(`association:+.`)), resource.TestCheckResourceAttr(resourceName, "repository.0.bitbucket.#", "0"), resource.TestCheckResourceAttr(resourceName, "repository.0.codecommit.#", "1"), resource.TestCheckResourceAttr(resourceName, "repository.0.github_enterprise_server.#", "0"), @@ -78,8 +78,8 @@ func TestAccCodeGuruReviewerRepositoryAssociation_KMSKey(t *testing.T) { Config: testAccRepositoryAssociationConfig_kms_key(rName), Check: resource.ComposeTestCheckFunc( testAccCheckRepositoryAssociationExists(ctx, resourceName, &repositoryassociation), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "codeguru-reviewer", regexache.MustCompile(`association:+.`)), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrID, "codeguru-reviewer", regexache.MustCompile(`association:+.`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "codeguru-reviewer", regexache.MustCompile(`association:+.`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrID, "codeguru-reviewer", regexache.MustCompile(`association:+.`)), resource.TestCheckResourceAttr(resourceName, "repository.0.bitbucket.#", "0"), resource.TestCheckResourceAttr(resourceName, "repository.0.codecommit.#", "1"), resource.TestCheckResourceAttr(resourceName, "repository.0.github_enterprise_server.#", "0"), @@ -113,8 +113,8 @@ func TestAccCodeGuruReviewerRepositoryAssociation_S3Repository(t *testing.T) { Config: testAccRepositoryAssociationConfig_s3_repository(rName), Check: resource.ComposeTestCheckFunc( testAccCheckRepositoryAssociationExists(ctx, resourceName, &repositoryassociation), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "codeguru-reviewer", regexache.MustCompile(`association:+.`)), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrID, "codeguru-reviewer", regexache.MustCompile(`association:+.`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "codeguru-reviewer", regexache.MustCompile(`association:+.`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrID, "codeguru-reviewer", regexache.MustCompile(`association:+.`)), resource.TestCheckResourceAttr(resourceName, "repository.0.bitbucket.#", "0"), resource.TestCheckResourceAttr(resourceName, "repository.0.codecommit.#", "0"), resource.TestCheckResourceAttr(resourceName, "repository.0.github_enterprise_server.#", "0"), From 763e9215c0d99fcc256cd7993d842b180fee41ff Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:43 -0500 Subject: [PATCH 037/304] Make 'AWSClient.AccountID' a getter - codepipeline. --- internal/service/codepipeline/codepipeline_test.go | 14 +++++++------- .../service/codepipeline/custom_action_type.go | 2 +- .../codepipeline/custom_action_type_test.go | 4 ++-- internal/service/codepipeline/webhook_test.go | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/internal/service/codepipeline/codepipeline_test.go b/internal/service/codepipeline/codepipeline_test.go index 4025e91df80..ec83c63c48a 100644 --- a/internal/service/codepipeline/codepipeline_test.go +++ b/internal/service/codepipeline/codepipeline_test.go @@ -43,7 +43,7 @@ func TestAccCodePipeline_basic(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPipelineExists(ctx, resourceName, &p), resource.TestCheckResourceAttrPair(resourceName, names.AttrRoleARN, "aws_iam_role.codepipeline_role", names.AttrARN), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "codepipeline", regexache.MustCompile(fmt.Sprintf("test-pipeline-%s", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "codepipeline", regexache.MustCompile(fmt.Sprintf("test-pipeline-%s", rName))), resource.TestCheckResourceAttr(resourceName, "artifact_store.#", "1"), resource.TestCheckResourceAttr(resourceName, "stage.#", "2"), resource.TestCheckResourceAttr(resourceName, "stage.0.name", "Source"), @@ -170,7 +170,7 @@ func TestAccCodePipeline_emptyStageArtifacts(t *testing.T) { Config: testAccCodePipelineConfig_emptyStageArtifacts(rName), Check: resource.ComposeTestCheckFunc( testAccCheckPipelineExists(ctx, resourceName, &p), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "codepipeline", regexache.MustCompile(fmt.Sprintf("test-pipeline-%s$", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "codepipeline", regexache.MustCompile(fmt.Sprintf("test-pipeline-%s$", rName))), resource.TestCheckResourceAttr(resourceName, "artifact_store.#", "1"), resource.TestCheckResourceAttr(resourceName, "stage.#", "2"), resource.TestCheckResourceAttr(resourceName, "stage.1.name", "Build"), @@ -461,7 +461,7 @@ func TestAccCodePipeline_withNamespace(t *testing.T) { Config: testAccCodePipelineConfig_namespace(rName), Check: resource.ComposeTestCheckFunc( testAccCheckPipelineExists(ctx, resourceName, &p), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "codepipeline", regexache.MustCompile(fmt.Sprintf("test-pipeline-%s", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "codepipeline", regexache.MustCompile(fmt.Sprintf("test-pipeline-%s", rName))), resource.TestCheckResourceAttr(resourceName, "stage.0.action.0.namespace", "SourceVariables"), ), }, @@ -617,7 +617,7 @@ func TestAccCodePipeline_pipelinetype(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckPipelineExists(ctx, resourceName, &p), resource.TestCheckResourceAttrPair(resourceName, names.AttrRoleARN, "aws_iam_role.codepipeline_role", names.AttrARN), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "codepipeline", regexache.MustCompile(fmt.Sprintf("test-pipeline-%s", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "codepipeline", regexache.MustCompile(fmt.Sprintf("test-pipeline-%s", rName))), resource.TestCheckResourceAttr(resourceName, "artifact_store.#", "1"), resource.TestCheckResourceAttr(resourceName, "execution_mode", string(types.ExecutionModeSuperseded)), resource.TestCheckResourceAttr(resourceName, "pipeline_type", string(types.PipelineTypeV1)), @@ -925,7 +925,7 @@ func TestAccCodePipeline_pipelinetype(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckPipelineExists(ctx, resourceName, &p), resource.TestCheckResourceAttrPair(resourceName, names.AttrRoleARN, "aws_iam_role.codepipeline_role", names.AttrARN), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "codepipeline", regexache.MustCompile(fmt.Sprintf("test-pipeline-%s", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "codepipeline", regexache.MustCompile(fmt.Sprintf("test-pipeline-%s", rName))), resource.TestCheckResourceAttr(resourceName, "artifact_store.#", "1"), resource.TestCheckResourceAttr(resourceName, "execution_mode", string(types.ExecutionModeSuperseded)), resource.TestCheckResourceAttr(resourceName, "pipeline_type", string(types.PipelineTypeV2)), @@ -994,7 +994,7 @@ func TestAccCodePipeline_manualApprovalTimeoutInMinutes(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPipelineExists(ctx, resourceName, &p), resource.TestCheckResourceAttrPair(resourceName, names.AttrRoleARN, "aws_iam_role.codepipeline_role", names.AttrARN), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "codepipeline", regexache.MustCompile(fmt.Sprintf("test-pipeline-%s", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "codepipeline", regexache.MustCompile(fmt.Sprintf("test-pipeline-%s", rName))), resource.TestCheckResourceAttr(resourceName, "artifact_store.#", "1"), resource.TestCheckResourceAttr(resourceName, "stage.#", "3"), resource.TestCheckResourceAttr(resourceName, "stage.0.name", "Source"), @@ -1018,7 +1018,7 @@ func TestAccCodePipeline_manualApprovalTimeoutInMinutes(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPipelineExists(ctx, resourceName, &p), resource.TestCheckResourceAttrPair(resourceName, names.AttrRoleARN, "aws_iam_role.codepipeline_role", names.AttrARN), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "codepipeline", regexache.MustCompile(fmt.Sprintf("test-pipeline-%s", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "codepipeline", regexache.MustCompile(fmt.Sprintf("test-pipeline-%s", rName))), resource.TestCheckResourceAttr(resourceName, "artifact_store.#", "1"), resource.TestCheckResourceAttr(resourceName, "stage.#", "3"), resource.TestCheckResourceAttr(resourceName, "stage.0.name", "Source"), diff --git a/internal/service/codepipeline/custom_action_type.go b/internal/service/codepipeline/custom_action_type.go index 707b6bf8358..208941f5ad8 100644 --- a/internal/service/codepipeline/custom_action_type.go +++ b/internal/service/codepipeline/custom_action_type.go @@ -250,7 +250,7 @@ func resourceCustomActionTypeRead(ctx context.Context, d *schema.ResourceData, m Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "codepipeline", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("actiontype:%s/%s/%s/%s", types.ActionOwnerCustom, category, provider, version), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/codepipeline/custom_action_type_test.go b/internal/service/codepipeline/custom_action_type_test.go index e2851e3c343..418b6612984 100644 --- a/internal/service/codepipeline/custom_action_type_test.go +++ b/internal/service/codepipeline/custom_action_type_test.go @@ -38,7 +38,7 @@ func TestAccCodePipelineCustomActionType_basic(t *testing.T) { Config: testAccCustomActionTypeConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCustomActionTypeExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "codepipeline", fmt.Sprintf("actiontype:Custom/Test/%s/1", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "codepipeline", fmt.Sprintf("actiontype:Custom/Test/%s/1", rName)), resource.TestCheckResourceAttr(resourceName, "category", "Test"), resource.TestCheckResourceAttr(resourceName, "configuration_property.#", "0"), resource.TestCheckResourceAttr(resourceName, "input_artifact_details.#", "1"), @@ -158,7 +158,7 @@ func TestAccCodePipelineCustomActionType_allAttributes(t *testing.T) { Config: testAccCustomActionTypeConfig_allAttributes(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCustomActionTypeExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "codepipeline", fmt.Sprintf("actiontype:Custom/Test/%s/1", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "codepipeline", fmt.Sprintf("actiontype:Custom/Test/%s/1", rName)), resource.TestCheckResourceAttr(resourceName, "category", "Test"), resource.TestCheckResourceAttr(resourceName, "configuration_property.#", "2"), resource.TestCheckResourceAttr(resourceName, "configuration_property.0.description", ""), diff --git a/internal/service/codepipeline/webhook_test.go b/internal/service/codepipeline/webhook_test.go index b72a85673dc..2369f5b7a4f 100644 --- a/internal/service/codepipeline/webhook_test.go +++ b/internal/service/codepipeline/webhook_test.go @@ -42,7 +42,7 @@ func TestAccCodePipelineWebhook_basic(t *testing.T) { Config: testAccWebhookConfig_basic(rName, ghToken), Check: resource.ComposeTestCheckFunc( testAccCheckWebhookExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "codepipeline", regexache.MustCompile(fmt.Sprintf("webhook:%s", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "codepipeline", regexache.MustCompile(fmt.Sprintf("webhook:%s", rName))), resource.TestCheckResourceAttr(resourceName, "authentication", "GITHUB_HMAC"), resource.TestCheckResourceAttr(resourceName, "target_action", "Source"), resource.TestCheckResourceAttrPair(resourceName, "target_pipeline", "aws_codepipeline.test", names.AttrName), From 0c38f8eb14298b083d5c24b4cb5656a181ab11bb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:43 -0500 Subject: [PATCH 038/304] Make 'AWSClient.AccountID' a getter - codestarconnections. --- .../service/codestarconnections/connection_test.go | 10 +++++----- internal/service/codestarconnections/host_test.go | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/internal/service/codestarconnections/connection_test.go b/internal/service/codestarconnections/connection_test.go index 42468bbb9d2..bb0d4d297e7 100644 --- a/internal/service/codestarconnections/connection_test.go +++ b/internal/service/codestarconnections/connection_test.go @@ -39,8 +39,8 @@ func TestAccCodeStarConnectionsConnection_basic(t *testing.T) { Config: testAccConnectionConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckConnectionExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrID, "codestar-connections", regexache.MustCompile("connection/.+")), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "codestar-connections", regexache.MustCompile("connection/.+")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrID, "codestar-connections", regexache.MustCompile("connection/.+")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "codestar-connections", regexache.MustCompile("connection/.+")), resource.TestCheckResourceAttr(resourceName, "provider_type", string(types.ProviderTypeBitbucket)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "connection_status", string(types.ConnectionStatusPending)), @@ -74,9 +74,9 @@ func TestAccCodeStarConnectionsConnection_hostARN(t *testing.T) { Config: testAccConnectionConfig_hostARN(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckConnectionExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrID, "codestar-connections", regexache.MustCompile("connection/.+")), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "codestar-connections", regexache.MustCompile("connection/.+")), - acctest.MatchResourceAttrRegionalARN(resourceName, "host_arn", "codestar-connections", regexache.MustCompile("host/.+")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrID, "codestar-connections", regexache.MustCompile("connection/.+")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "codestar-connections", regexache.MustCompile("connection/.+")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "host_arn", "codestar-connections", regexache.MustCompile("host/.+")), resource.TestCheckResourceAttr(resourceName, "provider_type", string(types.ProviderTypeGithubEnterpriseServer)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "connection_status", string(types.ConnectionStatusPending)), diff --git a/internal/service/codestarconnections/host_test.go b/internal/service/codestarconnections/host_test.go index 75da7b796e3..00a215d8474 100644 --- a/internal/service/codestarconnections/host_test.go +++ b/internal/service/codestarconnections/host_test.go @@ -40,8 +40,8 @@ func TestAccCodeStarConnectionsHost_basic(t *testing.T) { Config: testAccHostConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckHostExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrID, "codestar-connections", regexache.MustCompile("host/.+")), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "codestar-connections", regexache.MustCompile("host/.+")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrID, "codestar-connections", regexache.MustCompile("host/.+")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "codestar-connections", regexache.MustCompile("host/.+")), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "provider_endpoint", "https://example.com"), resource.TestCheckResourceAttr(resourceName, "provider_type", string(types.ProviderTypeGithubEnterpriseServer)), @@ -102,8 +102,8 @@ func TestAccCodeStarConnectionsHost_vpc(t *testing.T) { Config: testAccHostConfig_vpc(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckHostExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrID, "codestar-connections", regexache.MustCompile("host/.+")), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "codestar-connections", regexache.MustCompile("host/.+")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrID, "codestar-connections", regexache.MustCompile("host/.+")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "codestar-connections", regexache.MustCompile("host/.+")), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "provider_endpoint", "https://example.com"), resource.TestCheckResourceAttr(resourceName, "provider_type", string(types.ProviderTypeGithubEnterpriseServer)), From c8adf02d95f0141b4e56746a46e6ba41cf844af3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:43 -0500 Subject: [PATCH 039/304] Make 'AWSClient.AccountID' a getter - codestarnotifications. --- .../service/codestarnotifications/notification_rule_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/codestarnotifications/notification_rule_test.go b/internal/service/codestarnotifications/notification_rule_test.go index 86fd6ea825e..7e492a5d6d0 100644 --- a/internal/service/codestarnotifications/notification_rule_test.go +++ b/internal/service/codestarnotifications/notification_rule_test.go @@ -37,7 +37,7 @@ func TestAccCodeStarNotificationsNotificationRule_basic(t *testing.T) { Config: testAccNotificationRuleConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckNotificationRuleExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "codestar-notifications", regexache.MustCompile("notificationrule/.+")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "codestar-notifications", regexache.MustCompile("notificationrule/.+")), resource.TestCheckResourceAttr(resourceName, "detail_type", string(types.DetailTypeBasic)), resource.TestCheckResourceAttr(resourceName, "event_type_ids.#", "1"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), From 6d2fb3d85ad71e65d27c5290e5e9e4fa7ca07448 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:44 -0500 Subject: [PATCH 040/304] Make 'AWSClient.AccountID' a getter - cognitoidentity. --- internal/service/cognitoidentity/pool.go | 2 +- internal/service/cognitoidentity/pool_data_source.go | 2 +- internal/service/cognitoidentity/pool_test.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/service/cognitoidentity/pool.go b/internal/service/cognitoidentity/pool.go index 7759c21affe..3dfe7615587 100644 --- a/internal/service/cognitoidentity/pool.go +++ b/internal/service/cognitoidentity/pool.go @@ -189,7 +189,7 @@ func resourcePoolRead(ctx context.Context, d *schema.ResourceData, meta interfac Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, Service: "cognito-identity", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("identitypool/%s", d.Id()), } d.Set(names.AttrARN, arn.String()) diff --git a/internal/service/cognitoidentity/pool_data_source.go b/internal/service/cognitoidentity/pool_data_source.go index 64df8d1cf7a..576f92c7773 100644 --- a/internal/service/cognitoidentity/pool_data_source.go +++ b/internal/service/cognitoidentity/pool_data_source.go @@ -115,7 +115,7 @@ func dataSourcePoolRead(ctx context.Context, d *schema.ResourceData, meta interf Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, Service: "cognito-identity", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("identitypool/%s", d.Id()), } d.Set(names.AttrARN, arn.String()) diff --git a/internal/service/cognitoidentity/pool_test.go b/internal/service/cognitoidentity/pool_test.go index 2b14605eb7b..4454c7ddfd2 100644 --- a/internal/service/cognitoidentity/pool_test.go +++ b/internal/service/cognitoidentity/pool_test.go @@ -41,7 +41,7 @@ func TestAccCognitoIdentityPool_basic(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPoolExists(ctx, resourceName, &v1), resource.TestCheckResourceAttr(resourceName, "identity_pool_name", fmt.Sprintf("identity pool %s", name)), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "cognito-identity", regexache.MustCompile(`identitypool/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "cognito-identity", regexache.MustCompile(`identitypool/.+`)), resource.TestCheckResourceAttr(resourceName, "allow_unauthenticated_identities", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "developer_provider_name", ""), ), From 6bec9bbd7e8901717f1ffac2bb4fca9da91019d9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:44 -0500 Subject: [PATCH 041/304] Make 'AWSClient.AccountID' a getter - cognitoidp. --- internal/service/cognitoidp/user_pool_data_source_test.go | 2 +- internal/service/cognitoidp/user_pool_domain_test.go | 4 ++-- internal/service/cognitoidp/user_pool_test.go | 2 +- internal/service/cognitoidp/user_pools_data_source.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/service/cognitoidp/user_pool_data_source_test.go b/internal/service/cognitoidp/user_pool_data_source_test.go index e3ef3c31fed..efb09270a48 100644 --- a/internal/service/cognitoidp/user_pool_data_source_test.go +++ b/internal/service/cognitoidp/user_pool_data_source_test.go @@ -40,7 +40,7 @@ func TestAccCognitoIDPUserPoolDataSource_basic(t *testing.T) { Config: testAccUserPoolDataSourceConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckUserPoolExists(ctx, dataSourceName, &userpool), - acctest.MatchResourceAttrRegionalARN(dataSourceName, names.AttrARN, "cognito-idp", regexache.MustCompile(`userpool/.*`)), + acctest.MatchResourceAttrRegionalARN(ctx, dataSourceName, names.AttrARN, "cognito-idp", regexache.MustCompile(`userpool/.*`)), resource.TestCheckResourceAttr(dataSourceName, names.AttrName, rName), ), ConfigStateChecks: []statecheck.StateCheck{ diff --git a/internal/service/cognitoidp/user_pool_domain_test.go b/internal/service/cognitoidp/user_pool_domain_test.go index 5ec08a8099d..adec2cdf07b 100644 --- a/internal/service/cognitoidp/user_pool_domain_test.go +++ b/internal/service/cognitoidp/user_pool_domain_test.go @@ -34,7 +34,7 @@ func TestAccCognitoIDPUserPoolDomain_basic(t *testing.T) { Config: testAccUserPoolDomainConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckUserPoolDomainExists(ctx, resourceName), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrAWSAccountID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrAWSAccountID), resource.TestCheckResourceAttrSet(resourceName, "cloudfront_distribution"), resource.TestCheckResourceAttrSet(resourceName, "cloudfront_distribution_arn"), resource.TestCheckResourceAttr(resourceName, "cloudfront_distribution_zone_id", "Z2FDTNDATAQYW2"), @@ -93,7 +93,7 @@ func TestAccCognitoIDPUserPoolDomain_custom(t *testing.T) { Config: testAccUserPoolDomainConfig_custom(rootDomain, domain, poolName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckUserPoolDomainExists(ctx, resourceName), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrAWSAccountID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrAWSAccountID), resource.TestCheckResourceAttrPair(resourceName, names.AttrCertificateARN, acmCertificateResourceName, names.AttrARN), resource.TestCheckResourceAttrSet(resourceName, "cloudfront_distribution"), resource.TestCheckResourceAttr(resourceName, "cloudfront_distribution_zone_id", "Z2FDTNDATAQYW2"), diff --git a/internal/service/cognitoidp/user_pool_test.go b/internal/service/cognitoidp/user_pool_test.go index 06b2725d928..668b8324214 100644 --- a/internal/service/cognitoidp/user_pool_test.go +++ b/internal/service/cognitoidp/user_pool_test.go @@ -48,7 +48,7 @@ func TestAccCognitoIDPUserPool_basic(t *testing.T) { Config: testAccUserPoolConfig_name(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckUserPoolExists(ctx, resourceName, &pool), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "cognito-idp", regexache.MustCompile(`userpool/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "cognito-idp", regexache.MustCompile(`userpool/.+`)), resource.TestMatchResourceAttr(resourceName, names.AttrEndpoint, regexache.MustCompile(`^cognito-idp\.[^.]+\.amazonaws.com/[\w-]+_[0-9A-Za-z]+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreationDate), diff --git a/internal/service/cognitoidp/user_pools_data_source.go b/internal/service/cognitoidp/user_pools_data_source.go index 5251cbf9e06..b8597386d88 100644 --- a/internal/service/cognitoidp/user_pools_data_source.go +++ b/internal/service/cognitoidp/user_pools_data_source.go @@ -60,7 +60,7 @@ func dataSourceUserPoolsRead(ctx context.Context, d *schema.ResourceData, meta i Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "cognito-idp", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: "userpool/" + userPoolID, }.String() From 8ae25698f717b5651bcb0f3f2fa36c0d8fcda791 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:44 -0500 Subject: [PATCH 042/304] Make 'AWSClient.AccountID' a getter - comprehend. --- .../comprehend/document_classifier_test.go | 18 +++++++++--------- .../comprehend/entity_recognizer_test.go | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/internal/service/comprehend/document_classifier_test.go b/internal/service/comprehend/document_classifier_test.go index 8b7280d9388..293f14c9180 100644 --- a/internal/service/comprehend/document_classifier_test.go +++ b/internal/service/comprehend/document_classifier_test.go @@ -49,7 +49,7 @@ func TestAccComprehendDocumentClassifier_basic(t *testing.T) { testAccCheckDocumentClassifierPublishedVersions(ctx, resourceName, 1), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttrPair(resourceName, "data_access_role_arn", "aws_iam_role.test", names.AttrARN), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "comprehend", regexache.MustCompile(fmt.Sprintf(`document-classifier/%s/version/%s$`, rName, uniqueIDPattern()))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "comprehend", regexache.MustCompile(fmt.Sprintf(`document-classifier/%s/version/%s$`, rName, uniqueIDPattern()))), resource.TestCheckResourceAttr(resourceName, "input_data_config.#", "1"), resource.TestCheckResourceAttr(resourceName, "input_data_config.0.augmented_manifests.#", "0"), resource.TestCheckResourceAttr(resourceName, "input_data_config.0.data_format", string(types.DocumentClassifierDataFormatComprehendCsv)), @@ -143,7 +143,7 @@ func TestAccComprehendDocumentClassifier_versionName(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "version_name", vName1), resource.TestCheckResourceAttr(resourceName, "version_name_prefix", ""), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "comprehend", regexache.MustCompile(fmt.Sprintf(`document-classifier/%s/version/%s$`, rName, vName1))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "comprehend", regexache.MustCompile(fmt.Sprintf(`document-classifier/%s/version/%s$`, rName, vName1))), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), resource.TestCheckResourceAttr(resourceName, "tags.key", acctest.CtValue1), ), @@ -161,7 +161,7 @@ func TestAccComprehendDocumentClassifier_versionName(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "version_name", vName2), resource.TestCheckResourceAttr(resourceName, "version_name_prefix", ""), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "comprehend", regexache.MustCompile(fmt.Sprintf(`document-classifier/%s/version/%s$`, rName, vName2))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "comprehend", regexache.MustCompile(fmt.Sprintf(`document-classifier/%s/version/%s$`, rName, vName2))), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), resource.TestCheckResourceAttr(resourceName, "tags.key", acctest.CtValue2), ), @@ -203,7 +203,7 @@ func TestAccComprehendDocumentClassifier_versionNameEmpty(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "version_name", ""), resource.TestCheckResourceAttr(resourceName, "version_name_prefix", ""), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "comprehend", regexache.MustCompile(fmt.Sprintf(`document-classifier/%s$`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "comprehend", regexache.MustCompile(fmt.Sprintf(`document-classifier/%s$`, rName))), ), }, { @@ -242,7 +242,7 @@ func TestAccComprehendDocumentClassifier_versionNameGenerated(t *testing.T) { testAccCheckDocumentClassifierPublishedVersions(ctx, resourceName, 1), acctest.CheckResourceAttrNameGenerated(resourceName, "version_name"), resource.TestCheckResourceAttr(resourceName, "version_name_prefix", id.UniqueIdPrefix), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "comprehend", regexache.MustCompile(fmt.Sprintf(`document-classifier/%s/version/%s$`, rName, uniqueIDPattern()))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "comprehend", regexache.MustCompile(fmt.Sprintf(`document-classifier/%s/version/%s$`, rName, uniqueIDPattern()))), ), }, { @@ -281,7 +281,7 @@ func TestAccComprehendDocumentClassifier_versionNamePrefix(t *testing.T) { testAccCheckDocumentClassifierPublishedVersions(ctx, resourceName, 1), acctest.CheckResourceAttrNameFromPrefix(resourceName, "version_name", "tf-acc-test-prefix-"), resource.TestCheckResourceAttr(resourceName, "version_name_prefix", "tf-acc-test-prefix-"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "comprehend", regexache.MustCompile(fmt.Sprintf(`document-classifier/%s/version/%s$`, rName, prefixedUniqueIDPattern("tf-acc-test-prefix-")))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "comprehend", regexache.MustCompile(fmt.Sprintf(`document-classifier/%s/version/%s$`, rName, prefixedUniqueIDPattern("tf-acc-test-prefix-")))), ), }, { @@ -319,7 +319,7 @@ func TestAccComprehendDocumentClassifier_testDocuments(t *testing.T) { testAccCheckDocumentClassifierExists(ctx, resourceName, &documentclassifier), testAccCheckDocumentClassifierPublishedVersions(ctx, resourceName, 1), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "comprehend", regexache.MustCompile(fmt.Sprintf(`document-classifier/%s/version/%s$`, rName, uniqueIDPattern()))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "comprehend", regexache.MustCompile(fmt.Sprintf(`document-classifier/%s/version/%s$`, rName, uniqueIDPattern()))), resource.TestCheckResourceAttr(resourceName, "input_data_config.#", "1"), resource.TestCheckResourceAttr(resourceName, "input_data_config.0.augmented_manifests.#", "0"), resource.TestCheckResourceAttr(resourceName, "input_data_config.0.data_format", string(types.DocumentClassifierDataFormatComprehendCsv)), @@ -408,7 +408,7 @@ func TestAccComprehendDocumentClassifier_multiLabel_basic(t *testing.T) { testAccCheckDocumentClassifierPublishedVersions(ctx, resourceName, 1), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttrPair(resourceName, "data_access_role_arn", "aws_iam_role.test", names.AttrARN), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "comprehend", regexache.MustCompile(fmt.Sprintf(`document-classifier/%s/version/%s$`, rName, uniqueIDPattern()))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "comprehend", regexache.MustCompile(fmt.Sprintf(`document-classifier/%s/version/%s$`, rName, uniqueIDPattern()))), resource.TestCheckResourceAttr(resourceName, "input_data_config.#", "1"), resource.TestCheckResourceAttr(resourceName, "input_data_config.0.augmented_manifests.#", "0"), resource.TestCheckResourceAttr(resourceName, "input_data_config.0.data_format", string(types.DocumentClassifierDataFormatComprehendCsv)), @@ -818,7 +818,7 @@ func TestAccComprehendDocumentClassifier_multiLabel_labelDelimiter(t *testing.T) testAccCheckDocumentClassifierPublishedVersions(ctx, resourceName, 1), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttrPair(resourceName, "data_access_role_arn", "aws_iam_role.test", names.AttrARN), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "comprehend", regexache.MustCompile(fmt.Sprintf(`document-classifier/%s/version/%s$`, rName, uniqueIDPattern()))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "comprehend", regexache.MustCompile(fmt.Sprintf(`document-classifier/%s/version/%s$`, rName, uniqueIDPattern()))), resource.TestCheckResourceAttr(resourceName, "input_data_config.#", "1"), resource.TestCheckResourceAttr(resourceName, "input_data_config.0.augmented_manifests.#", "0"), resource.TestCheckResourceAttr(resourceName, "input_data_config.0.data_format", string(types.DocumentClassifierDataFormatComprehendCsv)), diff --git a/internal/service/comprehend/entity_recognizer_test.go b/internal/service/comprehend/entity_recognizer_test.go index 3b1d5e96562..f77f410038d 100644 --- a/internal/service/comprehend/entity_recognizer_test.go +++ b/internal/service/comprehend/entity_recognizer_test.go @@ -49,7 +49,7 @@ func TestAccComprehendEntityRecognizer_basic(t *testing.T) { testAccCheckEntityRecognizerPublishedVersions(ctx, resourceName, 1), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttrPair(resourceName, "data_access_role_arn", "aws_iam_role.test", names.AttrARN), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "comprehend", regexache.MustCompile(fmt.Sprintf(`entity-recognizer/%s/version/%s$`, rName, uniqueIDPattern()))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "comprehend", regexache.MustCompile(fmt.Sprintf(`entity-recognizer/%s/version/%s$`, rName, uniqueIDPattern()))), resource.TestCheckResourceAttr(resourceName, "input_data_config.#", "1"), resource.TestCheckResourceAttr(resourceName, "input_data_config.0.entity_types.#", "2"), resource.TestCheckResourceAttr(resourceName, "input_data_config.0.annotations.#", "0"), @@ -140,7 +140,7 @@ func TestAccComprehendEntityRecognizer_versionName(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "version_name", vName1), resource.TestCheckResourceAttr(resourceName, "version_name_prefix", ""), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "comprehend", regexache.MustCompile(fmt.Sprintf(`entity-recognizer/%s/version/%s$`, rName, vName1))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "comprehend", regexache.MustCompile(fmt.Sprintf(`entity-recognizer/%s/version/%s$`, rName, vName1))), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), resource.TestCheckResourceAttr(resourceName, "tags.key", acctest.CtValue1), ), @@ -158,7 +158,7 @@ func TestAccComprehendEntityRecognizer_versionName(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "version_name", vName2), resource.TestCheckResourceAttr(resourceName, "version_name_prefix", ""), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "comprehend", regexache.MustCompile(fmt.Sprintf(`entity-recognizer/%s/version/%s$`, rName, vName2))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "comprehend", regexache.MustCompile(fmt.Sprintf(`entity-recognizer/%s/version/%s$`, rName, vName2))), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), resource.TestCheckResourceAttr(resourceName, "tags.key", acctest.CtValue2), ), @@ -200,7 +200,7 @@ func TestAccComprehendEntityRecognizer_versionNameEmpty(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "version_name", ""), resource.TestCheckResourceAttr(resourceName, "version_name_prefix", ""), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "comprehend", regexache.MustCompile(fmt.Sprintf(`entity-recognizer/%s$`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "comprehend", regexache.MustCompile(fmt.Sprintf(`entity-recognizer/%s$`, rName))), ), }, { @@ -239,7 +239,7 @@ func TestAccComprehendEntityRecognizer_versionNameGenerated(t *testing.T) { testAccCheckEntityRecognizerPublishedVersions(ctx, resourceName, 1), acctest.CheckResourceAttrNameGenerated(resourceName, "version_name"), resource.TestCheckResourceAttr(resourceName, "version_name_prefix", id.UniqueIdPrefix), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "comprehend", regexache.MustCompile(fmt.Sprintf(`entity-recognizer/%s/version/%s$`, rName, uniqueIDPattern()))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "comprehend", regexache.MustCompile(fmt.Sprintf(`entity-recognizer/%s/version/%s$`, rName, uniqueIDPattern()))), ), }, { @@ -278,7 +278,7 @@ func TestAccComprehendEntityRecognizer_versionNamePrefix(t *testing.T) { testAccCheckEntityRecognizerPublishedVersions(ctx, resourceName, 1), acctest.CheckResourceAttrNameFromPrefix(resourceName, "version_name", "tf-acc-test-prefix-"), resource.TestCheckResourceAttr(resourceName, "version_name_prefix", "tf-acc-test-prefix-"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "comprehend", regexache.MustCompile(fmt.Sprintf(`entity-recognizer/%s/version/%s$`, rName, prefixedUniqueIDPattern("tf-acc-test-prefix-")))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "comprehend", regexache.MustCompile(fmt.Sprintf(`entity-recognizer/%s/version/%s$`, rName, prefixedUniqueIDPattern("tf-acc-test-prefix-")))), ), }, { @@ -316,7 +316,7 @@ func TestAccComprehendEntityRecognizer_documents_testDocuments(t *testing.T) { testAccCheckEntityRecognizerExists(ctx, resourceName, &entityrecognizer), testAccCheckEntityRecognizerPublishedVersions(ctx, resourceName, 1), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "comprehend", regexache.MustCompile(fmt.Sprintf(`entity-recognizer/%s/version/%s$`, rName, uniqueIDPattern()))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "comprehend", regexache.MustCompile(fmt.Sprintf(`entity-recognizer/%s/version/%s$`, rName, uniqueIDPattern()))), resource.TestCheckResourceAttr(resourceName, "input_data_config.#", "1"), resource.TestCheckResourceAttr(resourceName, "input_data_config.0.entity_types.#", "2"), resource.TestCheckResourceAttr(resourceName, "input_data_config.0.annotations.#", "0"), @@ -371,7 +371,7 @@ func TestAccComprehendEntityRecognizer_annotations_basic(t *testing.T) { testAccCheckEntityRecognizerPublishedVersions(ctx, resourceName, 1), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttrPair(resourceName, "data_access_role_arn", "aws_iam_role.test", names.AttrARN), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "comprehend", regexache.MustCompile(fmt.Sprintf(`entity-recognizer/%s/version/%s$`, rName, uniqueIDPattern()))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "comprehend", regexache.MustCompile(fmt.Sprintf(`entity-recognizer/%s/version/%s$`, rName, uniqueIDPattern()))), resource.TestCheckResourceAttr(resourceName, "input_data_config.#", "1"), resource.TestCheckResourceAttr(resourceName, "input_data_config.0.entity_types.#", "2"), resource.TestCheckResourceAttr(resourceName, "input_data_config.0.annotations.#", "1"), @@ -427,7 +427,7 @@ func TestAccComprehendEntityRecognizer_annotations_testDocuments(t *testing.T) { testAccCheckEntityRecognizerPublishedVersions(ctx, resourceName, 1), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttrPair(resourceName, "data_access_role_arn", "aws_iam_role.test", names.AttrARN), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "comprehend", regexache.MustCompile(fmt.Sprintf(`entity-recognizer/%s/version/%s$`, rName, uniqueIDPattern()))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "comprehend", regexache.MustCompile(fmt.Sprintf(`entity-recognizer/%s/version/%s$`, rName, uniqueIDPattern()))), resource.TestCheckResourceAttr(resourceName, "input_data_config.#", "1"), resource.TestCheckResourceAttr(resourceName, "input_data_config.0.entity_types.#", "2"), resource.TestCheckResourceAttr(resourceName, "input_data_config.0.annotations.#", "1"), From eae51e5a06824556a094dd277d66d8b366141dfe Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:44 -0500 Subject: [PATCH 043/304] Make 'AWSClient.AccountID' a getter - computeoptimizer. --- internal/service/computeoptimizer/enrollment_status.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/computeoptimizer/enrollment_status.go b/internal/service/computeoptimizer/enrollment_status.go index 42d40eac25d..8c8d79e6f04 100644 --- a/internal/service/computeoptimizer/enrollment_status.go +++ b/internal/service/computeoptimizer/enrollment_status.go @@ -105,7 +105,7 @@ func (r *enrollmentStatusResource) Create(ctx context.Context, request resource. } // Set values for unknowns. - data.ID = fwflex.StringValueToFramework(ctx, r.Meta().AccountID) + data.ID = fwflex.StringValueToFramework(ctx, r.Meta().AccountID(ctx)) output, err := waitEnrollmentStatusUpdated(ctx, conn, string(input.Status), r.CreateTimeout(ctx, data.Timeouts)) From 1b432ee36b9719205b72b95ed0970d22e0f28860 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:44 -0500 Subject: [PATCH 044/304] Make 'AWSClient.AccountID' a getter - configservice. --- .../service/configservice/config_rule_test.go | 8 ++++---- .../configuration_aggregator_test.go | 4 ++-- .../configuration_recorder_test.go | 6 +++--- .../configservice/conformance_pack_test.go | 18 +++++++++--------- .../organization_conformance_pack_test.go | 6 +++--- .../organization_custom_policy_rule_test.go | 2 +- .../organization_custom_rule_test.go | 2 +- .../organization_managed_rule_test.go | 2 +- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/internal/service/configservice/config_rule_test.go b/internal/service/configservice/config_rule_test.go index 3aa49e30e82..d3f37f8de51 100644 --- a/internal/service/configservice/config_rule_test.go +++ b/internal/service/configservice/config_rule_test.go @@ -119,7 +119,7 @@ func testAccConfigRule_ownerAWS(t *testing.T) { // nosemgrep:ci.aws-in-func-name Config: testAccConfigRuleConfig_ownerAWS(rName), Check: resource.ComposeTestCheckFunc( testAccCheckConfigRuleExists(ctx, resourceName, &cr), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "config", regexache.MustCompile("config-rule/config-rule-[0-9a-z]+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "config", regexache.MustCompile("config-rule/config-rule-[0-9a-z]+$")), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestMatchResourceAttr(resourceName, "rule_id", regexache.MustCompile("config-rule-[0-9a-z]+$")), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Terraform Acceptance tests"), @@ -158,7 +158,7 @@ func testAccConfigRule_customlambda(t *testing.T) { Config: testAccConfigRuleConfig_customLambda(rName), Check: resource.ComposeTestCheckFunc( testAccCheckConfigRuleExists(ctx, resourceName, &cr), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "config", regexache.MustCompile("config-rule/config-rule-[0-9a-z]+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "config", regexache.MustCompile("config-rule/config-rule-[0-9a-z]+$")), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestMatchResourceAttr(resourceName, "rule_id", regexache.MustCompile("config-rule-[0-9a-z]+$")), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Terraform Acceptance tests"), @@ -202,7 +202,7 @@ func testAccConfigRule_ownerPolicy(t *testing.T) { Config: testAccConfigRuleConfig_ownerPolicy(rName, false), Check: resource.ComposeTestCheckFunc( testAccCheckConfigRuleExists(ctx, resourceName, &cr), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "config", regexache.MustCompile("config-rule/config-rule-[0-9a-z]+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "config", regexache.MustCompile("config-rule/config-rule-[0-9a-z]+$")), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestMatchResourceAttr(resourceName, "rule_id", regexache.MustCompile("config-rule-[0-9a-z]+$")), resource.TestCheckResourceAttr(resourceName, "scope.#", "0"), @@ -225,7 +225,7 @@ func testAccConfigRule_ownerPolicy(t *testing.T) { Config: testAccConfigRuleConfig_ownerPolicy(rName, true), Check: resource.ComposeTestCheckFunc( testAccCheckConfigRuleExists(ctx, resourceName, &cr), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "config", regexache.MustCompile("config-rule/config-rule-[0-9a-z]+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "config", regexache.MustCompile("config-rule/config-rule-[0-9a-z]+$")), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestMatchResourceAttr(resourceName, "rule_id", regexache.MustCompile("config-rule-[0-9a-z]+$")), resource.TestCheckResourceAttr(resourceName, "scope.#", "0"), diff --git a/internal/service/configservice/configuration_aggregator_test.go b/internal/service/configservice/configuration_aggregator_test.go index 60dcb6aa737..d2cf17c0cc4 100644 --- a/internal/service/configservice/configuration_aggregator_test.go +++ b/internal/service/configservice/configuration_aggregator_test.go @@ -38,10 +38,10 @@ func TestAccConfigServiceConfigurationAggregator_account(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckConfigurationAggregatorExists(ctx, resourceName, &ca), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "config", regexache.MustCompile(`config-aggregator/config-aggregator-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "config", regexache.MustCompile(`config-aggregator/config-aggregator-.+`)), resource.TestCheckResourceAttr(resourceName, "account_aggregation_source.#", "1"), resource.TestCheckResourceAttr(resourceName, "account_aggregation_source.0.account_ids.#", "1"), - acctest.CheckResourceAttrAccountID(resourceName, "account_aggregation_source.0.account_ids.0"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "account_aggregation_source.0.account_ids.0"), resource.TestCheckResourceAttr(resourceName, "account_aggregation_source.0.regions.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "account_aggregation_source.0.regions.0", "data.aws_region.current", names.AttrName), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), diff --git a/internal/service/configservice/configuration_recorder_test.go b/internal/service/configservice/configuration_recorder_test.go index 7c76eb92cc1..85f4194f308 100644 --- a/internal/service/configservice/configuration_recorder_test.go +++ b/internal/service/configservice/configuration_recorder_test.go @@ -36,7 +36,7 @@ func testAccConfigurationRecorder_basic(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckConfigurationRecorderExists(ctx, resourceName, &cr), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrRoleARN, "iam", fmt.Sprintf("role/%s", rName)), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrRoleARN, "iam", fmt.Sprintf("role/%s", rName)), ), }, { @@ -99,7 +99,7 @@ func testAccConfigurationRecorder_allParams(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "recording_mode.0.recording_mode_override.0.recording_frequency", "CONTINUOUS"), resource.TestCheckResourceAttr(resourceName, "recording_mode.0.recording_mode_override.0.resource_types.#", "1"), resource.TestCheckResourceAttr(resourceName, "recording_mode.0.recording_mode_override.0.resource_types.0", "AWS::EC2::Instance"), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrRoleARN, "iam", fmt.Sprintf("role/%s", rName)), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrRoleARN, "iam", fmt.Sprintf("role/%s", rName)), ), }, }, @@ -127,7 +127,7 @@ func testAccConfigurationRecorder_recordStrategy(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "recording_group.0.all_supported", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "recording_group.0.exclusion_by_resource_types.0.resource_types.#", "2"), resource.TestCheckResourceAttr(resourceName, "recording_group.0.recording_strategy.0.use_only", "EXCLUSION_BY_RESOURCE_TYPES"), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrRoleARN, "iam", fmt.Sprintf("role/%s", rName)), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrRoleARN, "iam", fmt.Sprintf("role/%s", rName)), ), }, }, diff --git a/internal/service/configservice/conformance_pack_test.go b/internal/service/configservice/conformance_pack_test.go index a014ea33528..79a95ab6cef 100644 --- a/internal/service/configservice/conformance_pack_test.go +++ b/internal/service/configservice/conformance_pack_test.go @@ -38,7 +38,7 @@ func testAccConformancePack_basic(t *testing.T) { Config: testAccConformancePackConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckConformancePackExists(ctx, resourceName, &pack), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "config", regexache.MustCompile(fmt.Sprintf("conformance-pack/%s/.+", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "config", regexache.MustCompile(fmt.Sprintf("conformance-pack/%s/.+", rName))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "delivery_s3_bucket", ""), resource.TestCheckResourceAttr(resourceName, "delivery_s3_key_prefix", ""), @@ -82,7 +82,7 @@ func testAccConformancePack_updateName(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckConformancePackExists(ctx, resourceName, &after), testAccCheckConformancePackRecreated(&before, &after), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "config", regexache.MustCompile(fmt.Sprintf("conformance-pack/%s/.+", rNameUpdated))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "config", regexache.MustCompile(fmt.Sprintf("conformance-pack/%s/.+", rNameUpdated))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rNameUpdated), resource.TestCheckResourceAttr(resourceName, "delivery_s3_bucket", ""), resource.TestCheckResourceAttr(resourceName, "delivery_s3_key_prefix", ""), @@ -141,7 +141,7 @@ func testAccConformancePack_inputParameters(t *testing.T) { Config: testAccConformancePackConfig_inputParameter(rName, "TestKey", "TestValue"), Check: resource.ComposeTestCheckFunc( testAccCheckConformancePackExists(ctx, resourceName, &pack), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "config", regexache.MustCompile(fmt.Sprintf("conformance-pack/%s/.+", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "config", regexache.MustCompile(fmt.Sprintf("conformance-pack/%s/.+", rName))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "delivery_s3_bucket", ""), resource.TestCheckResourceAttr(resourceName, "delivery_s3_key_prefix", ""), @@ -178,7 +178,7 @@ func testAccConformancePack_S3Delivery(t *testing.T) { Config: testAccConformancePackConfig_s3Delivery(rName, rName), Check: resource.ComposeTestCheckFunc( testAccCheckConformancePackExists(ctx, resourceName, &pack), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "config", regexache.MustCompile(fmt.Sprintf("conformance-pack/%s/.+", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "config", regexache.MustCompile(fmt.Sprintf("conformance-pack/%s/.+", rName))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "delivery_s3_bucket", rName), resource.TestCheckResourceAttr(resourceName, "delivery_s3_key_prefix", rName), @@ -211,7 +211,7 @@ func testAccConformancePack_S3Template(t *testing.T) { Config: testAccConformancePackConfig_s3Template(rName, rName), Check: resource.ComposeTestCheckFunc( testAccCheckConformancePackExists(ctx, resourceName, &pack), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "config", regexache.MustCompile(fmt.Sprintf("conformance-pack/%s/.+", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "config", regexache.MustCompile(fmt.Sprintf("conformance-pack/%s/.+", rName))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "delivery_s3_bucket", ""), resource.TestCheckResourceAttr(resourceName, "delivery_s3_key_prefix", ""), @@ -301,7 +301,7 @@ func testAccConformancePack_updateS3Delivery(t *testing.T) { Config: testAccConformancePackConfig_s3Delivery(rName, bucketName), Check: resource.ComposeTestCheckFunc( testAccCheckConformancePackExists(ctx, resourceName, &pack), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "config", regexache.MustCompile(fmt.Sprintf("conformance-pack/%s/.+", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "config", regexache.MustCompile(fmt.Sprintf("conformance-pack/%s/.+", rName))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "delivery_s3_bucket", bucketName), resource.TestCheckResourceAttr(resourceName, "delivery_s3_key_prefix", bucketName), @@ -341,7 +341,7 @@ func testAccConformancePack_updateS3Template(t *testing.T) { Config: testAccConformancePackConfig_s3Template(rName, bucketName), Check: resource.ComposeTestCheckFunc( testAccCheckConformancePackExists(ctx, resourceName, &pack), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "config", regexache.MustCompile(fmt.Sprintf("conformance-pack/%s/.+", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "config", regexache.MustCompile(fmt.Sprintf("conformance-pack/%s/.+", rName))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "delivery_s3_bucket", ""), resource.TestCheckResourceAttr(resourceName, "delivery_s3_key_prefix", ""), @@ -380,7 +380,7 @@ func testAccConformancePack_updateTemplateBody(t *testing.T) { Config: testAccConformancePackConfig_update(rName), Check: resource.ComposeTestCheckFunc( testAccCheckConformancePackExists(ctx, resourceName, &pack), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "config", regexache.MustCompile(fmt.Sprintf("conformance-pack/%s/.+", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "config", regexache.MustCompile(fmt.Sprintf("conformance-pack/%s/.+", rName))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "delivery_s3_bucket", ""), resource.TestCheckResourceAttr(resourceName, "delivery_s3_key_prefix", ""), @@ -415,7 +415,7 @@ func testAccConformancePack_S3TemplateAndTemplateBody(t *testing.T) { Config: testAccConformancePackConfig_s3TemplateAndTemplateBody(rName), Check: resource.ComposeTestCheckFunc( testAccCheckConformancePackExists(ctx, resourceName, &pack), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "config", regexache.MustCompile(fmt.Sprintf("conformance-pack/%s/.+", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "config", regexache.MustCompile(fmt.Sprintf("conformance-pack/%s/.+", rName))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "delivery_s3_bucket", ""), resource.TestCheckResourceAttr(resourceName, "delivery_s3_key_prefix", ""), diff --git a/internal/service/configservice/organization_conformance_pack_test.go b/internal/service/configservice/organization_conformance_pack_test.go index 6d785db0533..3a7fca542e7 100644 --- a/internal/service/configservice/organization_conformance_pack_test.go +++ b/internal/service/configservice/organization_conformance_pack_test.go @@ -39,7 +39,7 @@ func testAccOrganizationConformancePack_basic(t *testing.T) { Config: testAccOrganizationConformancePackConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckOrganizationConformancePackExists(ctx, resourceName, &pack), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "config", regexache.MustCompile(fmt.Sprintf("organization-conformance-pack/%s-.+", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "config", regexache.MustCompile(fmt.Sprintf("organization-conformance-pack/%s-.+", rName))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "delivery_s3_bucket", ""), resource.TestCheckResourceAttr(resourceName, "delivery_s3_key_prefix", ""), @@ -155,7 +155,7 @@ func testAccOrganizationConformancePack_updateName(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckOrganizationConformancePackExists(ctx, resourceName, &after), testAccCheckOrganizationConformancePackRecreated(&before, &after), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "config", regexache.MustCompile(fmt.Sprintf("organization-conformance-pack/%s-.+", rNameUpdated))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "config", regexache.MustCompile(fmt.Sprintf("organization-conformance-pack/%s-.+", rNameUpdated))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rNameUpdated), resource.TestCheckResourceAttr(resourceName, "delivery_s3_bucket", ""), resource.TestCheckResourceAttr(resourceName, "delivery_s3_key_prefix", ""), @@ -255,7 +255,7 @@ func testAccOrganizationConformancePack_S3Template(t *testing.T) { Config: testAccOrganizationConformancePackConfig_s3Template(rName, rName), Check: resource.ComposeTestCheckFunc( testAccCheckOrganizationConformancePackExists(ctx, resourceName, &pack), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "config", regexache.MustCompile(fmt.Sprintf("organization-conformance-pack/%s-.+", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "config", regexache.MustCompile(fmt.Sprintf("organization-conformance-pack/%s-.+", rName))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "delivery_s3_bucket", ""), resource.TestCheckResourceAttr(resourceName, "delivery_s3_key_prefix", ""), diff --git a/internal/service/configservice/organization_custom_policy_rule_test.go b/internal/service/configservice/organization_custom_policy_rule_test.go index d39e0018d31..087416ae44f 100644 --- a/internal/service/configservice/organization_custom_policy_rule_test.go +++ b/internal/service/configservice/organization_custom_policy_rule_test.go @@ -41,7 +41,7 @@ func testAccOrganizationCustomPolicyRule_basic(t *testing.T) { Config: testAccOrganizationCustomPolicyRuleConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckOrganizationCustomPolicyRuleExists(ctx, resourceName, &rule), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "config", regexache.MustCompile(fmt.Sprintf("organization-config-rule/%s-.+", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "config", regexache.MustCompile(fmt.Sprintf("organization-config-rule/%s-.+", rName))), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttr(resourceName, "excluded_accounts.#", "0"), resource.TestCheckResourceAttr(resourceName, "input_parameters", ""), diff --git a/internal/service/configservice/organization_custom_rule_test.go b/internal/service/configservice/organization_custom_rule_test.go index 20e06e86b6d..c509d7f1585 100644 --- a/internal/service/configservice/organization_custom_rule_test.go +++ b/internal/service/configservice/organization_custom_rule_test.go @@ -38,7 +38,7 @@ func testAccOrganizationCustomRule_basic(t *testing.T) { Config: testAccOrganizationCustomRuleConfig_triggerTypes1(rName, "ConfigurationItemChangeNotification"), Check: resource.ComposeTestCheckFunc( testAccCheckOrganizationCustomRuleExists(ctx, resourceName, &rule), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "config", regexache.MustCompile(fmt.Sprintf("organization-config-rule/%s-.+", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "config", regexache.MustCompile(fmt.Sprintf("organization-config-rule/%s-.+", rName))), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttr(resourceName, "excluded_accounts.#", "0"), resource.TestCheckResourceAttr(resourceName, "input_parameters", ""), diff --git a/internal/service/configservice/organization_managed_rule_test.go b/internal/service/configservice/organization_managed_rule_test.go index e5866c36060..6d087ac3954 100644 --- a/internal/service/configservice/organization_managed_rule_test.go +++ b/internal/service/configservice/organization_managed_rule_test.go @@ -37,7 +37,7 @@ func testAccOrganizationManagedRule_basic(t *testing.T) { Config: testAccOrganizationManagedRuleConfig_identifier(rName, "IAM_PASSWORD_POLICY"), Check: resource.ComposeTestCheckFunc( testAccCheckOrganizationManagedRuleExists(ctx, resourceName, &rule), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "config", regexache.MustCompile(fmt.Sprintf("organization-config-rule/%s-.+", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "config", regexache.MustCompile(fmt.Sprintf("organization-config-rule/%s-.+", rName))), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttr(resourceName, "excluded_accounts.#", "0"), resource.TestCheckResourceAttr(resourceName, "input_parameters", ""), From 5b6907185954ad797af4e47b18b6c1b23e5848b0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:44 -0500 Subject: [PATCH 045/304] Make 'AWSClient.AccountID' a getter - connect. --- internal/service/connect/instance_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/service/connect/instance_test.go b/internal/service/connect/instance_test.go index 46cdbc8ab56..ff56425a3ca 100644 --- a/internal/service/connect/instance_test.go +++ b/internal/service/connect/instance_test.go @@ -36,7 +36,7 @@ func testAccInstance_basic(t *testing.T) { Config: testAccInstanceConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckInstanceExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "connect", regexache.MustCompile(`instance/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "connect", regexache.MustCompile(`instance/.+`)), resource.TestCheckResourceAttr(resourceName, "auto_resolve_best_voices_enabled", acctest.CtTrue), //verified default result from ListInstanceAttributes() resource.TestCheckResourceAttr(resourceName, "contact_flow_logs_enabled", acctest.CtFalse), //verified default result from ListInstanceAttributes() resource.TestCheckResourceAttr(resourceName, "contact_lens_enabled", acctest.CtTrue), //verified default result from ListInstanceAttributes() @@ -47,7 +47,7 @@ func testAccInstance_basic(t *testing.T) { resource.TestMatchResourceAttr(resourceName, "instance_alias", regexache.MustCompile(rName)), resource.TestCheckResourceAttr(resourceName, "multi_party_conference_enabled", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "outbound_calls_enabled", acctest.CtTrue), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrServiceRole, "iam", regexache.MustCompile(`role/aws-service-role/connect.amazonaws.com/.+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrServiceRole, "iam", regexache.MustCompile(`role/aws-service-role/connect.amazonaws.com/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrStatus, string(awstypes.InstanceStatusActive)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), @@ -61,7 +61,7 @@ func testAccInstance_basic(t *testing.T) { Config: testAccInstanceConfig_basicFlipped(rName), Check: resource.ComposeTestCheckFunc( testAccCheckInstanceExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "connect", regexache.MustCompile(`instance/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "connect", regexache.MustCompile(`instance/.+`)), resource.TestCheckResourceAttr(resourceName, "auto_resolve_best_voices_enabled", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "contact_flow_logs_enabled", acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, "contact_lens_enabled", acctest.CtFalse), From b7802bfe8c4ae0f60d7cffde6f4e11942e735434 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:44 -0500 Subject: [PATCH 046/304] Make 'AWSClient.AccountID' a getter - costoptimizationhub. --- internal/service/costoptimizationhub/enrollment_status.go | 2 +- internal/service/costoptimizationhub/preferences.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/service/costoptimizationhub/enrollment_status.go b/internal/service/costoptimizationhub/enrollment_status.go index 2d41370966d..656fb729dc4 100644 --- a/internal/service/costoptimizationhub/enrollment_status.go +++ b/internal/service/costoptimizationhub/enrollment_status.go @@ -104,7 +104,7 @@ func (r *resourceEnrollmentStatus) Create(ctx context.Context, request resource. return } - data.ID = fwflex.StringValueToFramework(ctx, r.Meta().AccountID) + data.ID = fwflex.StringValueToFramework(ctx, r.Meta().AccountID(ctx)) data.Status = fwflex.StringValueToFramework(ctx, aws.ToString(out.Status)) response.Diagnostics.Append(response.State.Set(ctx, data)...) diff --git a/internal/service/costoptimizationhub/preferences.go b/internal/service/costoptimizationhub/preferences.go index fbb54132131..738c236ebe3 100644 --- a/internal/service/costoptimizationhub/preferences.go +++ b/internal/service/costoptimizationhub/preferences.go @@ -111,7 +111,7 @@ func (r *resourcePreferences) Create(ctx context.Context, req resource.CreateReq return } - plan.ID = flex.StringValueToFramework(ctx, r.Meta().AccountID) + plan.ID = flex.StringValueToFramework(ctx, r.Meta().AccountID(ctx)) plan.MemberAccountDiscountVisibility = flex.StringValueToFramework(ctx, out.MemberAccountDiscountVisibility) plan.SavingsEstimationMode = flex.StringValueToFramework(ctx, out.SavingsEstimationMode) @@ -144,7 +144,7 @@ func (r *resourcePreferences) Read(ctx context.Context, req resource.ReadRequest return } - state.ID = flex.StringValueToFramework(ctx, r.Meta().AccountID) + state.ID = flex.StringValueToFramework(ctx, r.Meta().AccountID(ctx)) state.MemberAccountDiscountVisibility = flex.StringValueToFramework(ctx, out.MemberAccountDiscountVisibility) state.SavingsEstimationMode = flex.StringValueToFramework(ctx, out.SavingsEstimationMode) From 39eb5a1ad87e8a4b6d8f0183f17b9ad41a8ffd50 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:44 -0500 Subject: [PATCH 047/304] Make 'AWSClient.AccountID' a getter - cur. --- internal/service/cur/report_definition.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/cur/report_definition.go b/internal/service/cur/report_definition.go index 250f6ff6338..5e6a8e53267 100644 --- a/internal/service/cur/report_definition.go +++ b/internal/service/cur/report_definition.go @@ -195,7 +195,7 @@ func resourceReportDefinitionRead(ctx context.Context, d *schema.ResourceData, m Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.CUR, Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: "definition/" + reportName, }.String() d.Set(names.AttrARN, arn) From 10ac6ec4458d1da43de122f09160f2e07e131a1a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:45 -0500 Subject: [PATCH 048/304] Make 'AWSClient.AccountID' a getter - dataexchange. --- internal/service/dataexchange/data_set_test.go | 4 ++-- internal/service/dataexchange/revision_test.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/service/dataexchange/data_set_test.go b/internal/service/dataexchange/data_set_test.go index 6e54adf6394..1ca7b1657a5 100644 --- a/internal/service/dataexchange/data_set_test.go +++ b/internal/service/dataexchange/data_set_test.go @@ -40,7 +40,7 @@ func TestAccDataExchangeDataSet_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, rName), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "dataexchange", regexache.MustCompile(`data-sets/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "dataexchange", regexache.MustCompile(`data-sets/.+`)), ), }, { @@ -54,7 +54,7 @@ func TestAccDataExchangeDataSet_basic(t *testing.T) { testAccCheckDataSetExists(ctx, resourceName, &proj), resource.TestCheckResourceAttr(resourceName, names.AttrName, rNameUpdated), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, rNameUpdated), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "dataexchange", regexache.MustCompile(`data-sets/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "dataexchange", regexache.MustCompile(`data-sets/.+`)), ), }, }, diff --git a/internal/service/dataexchange/revision_test.go b/internal/service/dataexchange/revision_test.go index 887bb07ccee..760129bfae5 100644 --- a/internal/service/dataexchange/revision_test.go +++ b/internal/service/dataexchange/revision_test.go @@ -38,7 +38,7 @@ func TestAccDataExchangeRevision_basic(t *testing.T) { testAccCheckRevisionExists(ctx, resourceName, &proj), resource.TestCheckResourceAttrPair(resourceName, "data_set_id", "aws_dataexchange_data_set.test", names.AttrID), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "dataexchange", regexache.MustCompile(`data-sets/.+/revisions/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "dataexchange", regexache.MustCompile(`data-sets/.+/revisions/.+`)), ), }, { From e8eb93cb9192fa2d2d935465ba413be1927363df Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:45 -0500 Subject: [PATCH 049/304] Make 'AWSClient.AccountID' a getter - datasync. --- internal/service/datasync/agent_test.go | 2 +- internal/service/datasync/location_azure_blob_test.go | 6 +++--- internal/service/datasync/location_efs_test.go | 2 +- .../datasync/location_fsx_lustre_file_system_test.go | 2 +- .../datasync/location_fsx_ontap_file_system_test.go | 2 +- .../datasync/location_fsx_openzfs_file_system_test.go | 2 +- .../datasync/location_fsx_windows_file_system_test.go | 2 +- internal/service/datasync/location_hdfs_test.go | 4 ++-- internal/service/datasync/location_nfs_test.go | 2 +- internal/service/datasync/location_object_storage_test.go | 8 ++++---- internal/service/datasync/location_s3_test.go | 4 ++-- internal/service/datasync/location_smb_test.go | 4 ++-- internal/service/datasync/task_test.go | 2 +- 13 files changed, 21 insertions(+), 21 deletions(-) diff --git a/internal/service/datasync/agent_test.go b/internal/service/datasync/agent_test.go index 0a9e1b1acf7..7eab86f5545 100644 --- a/internal/service/datasync/agent_test.go +++ b/internal/service/datasync/agent_test.go @@ -38,7 +38,7 @@ func TestAccDataSyncAgent_basic(t *testing.T) { Config: testAccAgentConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAgentExists(ctx, resourceName, &agent1), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "datasync", regexache.MustCompile(`agent/agent-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "datasync", regexache.MustCompile(`agent/agent-.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, ""), resource.TestCheckResourceAttr(resourceName, "private_link_endpoint", ""), resource.TestCheckResourceAttr(resourceName, "security_group_arns.#", "0"), diff --git a/internal/service/datasync/location_azure_blob_test.go b/internal/service/datasync/location_azure_blob_test.go index 5724349a8bd..23f16cfa7a6 100644 --- a/internal/service/datasync/location_azure_blob_test.go +++ b/internal/service/datasync/location_azure_blob_test.go @@ -38,7 +38,7 @@ func TestAccDataSyncLocationAzureBlob_basic(t *testing.T) { testAccCheckLocationAzureBlobExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "access_tier", "HOT"), resource.TestCheckResourceAttr(resourceName, "agent_arns.#", "1"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "datasync", regexache.MustCompile(`location/loc-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "datasync", regexache.MustCompile(`location/loc-.+`)), resource.TestCheckResourceAttr(resourceName, "authentication_type", "SAS"), resource.TestCheckResourceAttr(resourceName, "blob_type", "BLOCK"), resource.TestCheckResourceAttr(resourceName, "container_url", "https://myaccount.blob.core.windows.net/mycontainer"), @@ -148,7 +148,7 @@ func TestAccDataSyncLocationAzureBlob_update(t *testing.T) { testAccCheckLocationAzureBlobExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "access_tier", "HOT"), resource.TestCheckResourceAttr(resourceName, "agent_arns.#", "1"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "datasync", regexache.MustCompile(`location/loc-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "datasync", regexache.MustCompile(`location/loc-.+`)), resource.TestCheckResourceAttr(resourceName, "authentication_type", "SAS"), resource.TestCheckResourceAttr(resourceName, "blob_type", "BLOCK"), resource.TestCheckResourceAttr(resourceName, "container_url", "https://myaccount.blob.core.windows.net/mycontainer"), @@ -165,7 +165,7 @@ func TestAccDataSyncLocationAzureBlob_update(t *testing.T) { testAccCheckLocationAzureBlobExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "access_tier", "COOL"), resource.TestCheckResourceAttr(resourceName, "agent_arns.#", "1"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "datasync", regexache.MustCompile(`location/loc-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "datasync", regexache.MustCompile(`location/loc-.+`)), resource.TestCheckResourceAttr(resourceName, "authentication_type", "SAS"), resource.TestCheckResourceAttr(resourceName, "blob_type", "BLOCK"), resource.TestCheckResourceAttr(resourceName, "container_url", "https://myaccount.blob.core.windows.net/mycontainer"), diff --git a/internal/service/datasync/location_efs_test.go b/internal/service/datasync/location_efs_test.go index e2deded61f7..4a5fa8cb3cc 100644 --- a/internal/service/datasync/location_efs_test.go +++ b/internal/service/datasync/location_efs_test.go @@ -38,7 +38,7 @@ func TestAccDataSyncLocationEFS_basic(t *testing.T) { Config: testAccLocationEFSConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckLocationEFSExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "datasync", regexache.MustCompile(`location/loc-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "datasync", regexache.MustCompile(`location/loc-.+`)), resource.TestCheckResourceAttr(resourceName, "ec2_config.#", "1"), resource.TestCheckResourceAttr(resourceName, "ec2_config.0.security_group_arns.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "ec2_config.0.subnet_arn", subnetResourceName, names.AttrARN), diff --git a/internal/service/datasync/location_fsx_lustre_file_system_test.go b/internal/service/datasync/location_fsx_lustre_file_system_test.go index ccdf6c85bcd..8dc6df5a6f4 100644 --- a/internal/service/datasync/location_fsx_lustre_file_system_test.go +++ b/internal/service/datasync/location_fsx_lustre_file_system_test.go @@ -41,7 +41,7 @@ func TestAccDataSyncLocationFSxLustreFileSystem_basic(t *testing.T) { Config: testAccLocationFSxLustreFileSystemConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckLocationFSxLustreExists(ctx, resourceName, &locationFsxLustre1), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "datasync", regexache.MustCompile(`location/loc-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "datasync", regexache.MustCompile(`location/loc-.+`)), resource.TestCheckResourceAttrPair(resourceName, "fsx_filesystem_arn", fsResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "subdirectory", "/"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), diff --git a/internal/service/datasync/location_fsx_ontap_file_system_test.go b/internal/service/datasync/location_fsx_ontap_file_system_test.go index 330b9e3da51..234011dab3c 100644 --- a/internal/service/datasync/location_fsx_ontap_file_system_test.go +++ b/internal/service/datasync/location_fsx_ontap_file_system_test.go @@ -42,7 +42,7 @@ func TestAccDataSyncLocationFSxONTAPFileSystem_basic(t *testing.T) { Config: testAccLocationFSxONTAPFileSystemConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckLocationFSxONTAPExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "datasync", regexache.MustCompile(`location/loc-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "datasync", regexache.MustCompile(`location/loc-.+`)), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreationTime), resource.TestCheckResourceAttrPair(resourceName, "fsx_filesystem_arn", fsResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "protocol.#", "1"), diff --git a/internal/service/datasync/location_fsx_openzfs_file_system_test.go b/internal/service/datasync/location_fsx_openzfs_file_system_test.go index 0baf8babf36..e59474ad469 100644 --- a/internal/service/datasync/location_fsx_openzfs_file_system_test.go +++ b/internal/service/datasync/location_fsx_openzfs_file_system_test.go @@ -41,7 +41,7 @@ func TestAccDataSyncLocationFSxOpenZFSFileSystem_basic(t *testing.T) { Config: testAccLocationFSxOpenZFSFileSystemConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckLocationFSxOpenZFSExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "datasync", regexache.MustCompile(`location/loc-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "datasync", regexache.MustCompile(`location/loc-.+`)), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreationTime), resource.TestCheckResourceAttrPair(resourceName, "fsx_filesystem_arn", fsResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "subdirectory", "/fsx/"), diff --git a/internal/service/datasync/location_fsx_windows_file_system_test.go b/internal/service/datasync/location_fsx_windows_file_system_test.go index 6d789e6bca0..e9563b2566b 100644 --- a/internal/service/datasync/location_fsx_windows_file_system_test.go +++ b/internal/service/datasync/location_fsx_windows_file_system_test.go @@ -42,7 +42,7 @@ func TestAccDataSyncLocationFSxWindowsFileSystem_basic(t *testing.T) { Config: testAccLocationFSxWindowsFileSystemConfig_basic(rName, domainName), Check: resource.ComposeTestCheckFunc( testAccCheckLocationFSxWindowsExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "datasync", regexache.MustCompile(`location/loc-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "datasync", regexache.MustCompile(`location/loc-.+`)), resource.TestCheckResourceAttrPair(resourceName, "fsx_filesystem_arn", fsResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "subdirectory", "/"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), diff --git a/internal/service/datasync/location_hdfs_test.go b/internal/service/datasync/location_hdfs_test.go index 56254dfc788..0bbae7c75f1 100644 --- a/internal/service/datasync/location_hdfs_test.go +++ b/internal/service/datasync/location_hdfs_test.go @@ -37,7 +37,7 @@ func TestAccDataSyncLocationHDFS_basic(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckLocationHDFSExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "agent_arns.#", "1"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "datasync", regexache.MustCompile(`location/loc-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "datasync", regexache.MustCompile(`location/loc-.+`)), resource.TestCheckResourceAttr(resourceName, "authentication_type", "SIMPLE"), resource.TestCheckResourceAttr(resourceName, "block_size", "134217728"), resource.TestCheckNoResourceAttr(resourceName, "kerberos_keytab"), @@ -155,7 +155,7 @@ func TestAccDataSyncLocationHDFS_kerberos(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckLocationHDFSExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "agent_arns.#", "1"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "datasync", regexache.MustCompile(`location/loc-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "datasync", regexache.MustCompile(`location/loc-.+`)), resource.TestCheckResourceAttr(resourceName, "authentication_type", "KERBEROS"), resource.TestCheckResourceAttr(resourceName, "block_size", "134217728"), resource.TestCheckNoResourceAttr(resourceName, "kerberos_keytab"), diff --git a/internal/service/datasync/location_nfs_test.go b/internal/service/datasync/location_nfs_test.go index 1f1e8fea1e9..e0675c481a7 100644 --- a/internal/service/datasync/location_nfs_test.go +++ b/internal/service/datasync/location_nfs_test.go @@ -36,7 +36,7 @@ func TestAccDataSyncLocationNFS_basic(t *testing.T) { Config: testAccLocationNFSConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckLocationNFSExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "datasync", regexache.MustCompile(`location/loc-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "datasync", regexache.MustCompile(`location/loc-.+`)), resource.TestCheckResourceAttr(resourceName, "on_prem_config.#", "1"), resource.TestCheckResourceAttr(resourceName, "on_prem_config.0.agent_arns.#", "1"), resource.TestCheckResourceAttr(resourceName, "mount_options.#", "1"), diff --git a/internal/service/datasync/location_object_storage_test.go b/internal/service/datasync/location_object_storage_test.go index 31a88797ae0..4f1d740c18f 100644 --- a/internal/service/datasync/location_object_storage_test.go +++ b/internal/service/datasync/location_object_storage_test.go @@ -39,7 +39,7 @@ func TestAccDataSyncLocationObjectStorage_basic(t *testing.T) { testAccCheckLocationObjectStorageExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, names.AttrAccessKey, ""), resource.TestCheckResourceAttr(resourceName, "agent_arns.#", "1"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "datasync", regexache.MustCompile(`location/loc-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "datasync", regexache.MustCompile(`location/loc-.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrBucketName, rName), resource.TestCheckNoResourceAttr(resourceName, names.AttrSecretKey), resource.TestCheckResourceAttr(resourceName, "server_certificate", ""), @@ -79,7 +79,7 @@ func TestAccDataSyncLocationObjectStorage_update(t *testing.T) { testAccCheckLocationObjectStorageExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, names.AttrAccessKey, ""), resource.TestCheckResourceAttr(resourceName, "agent_arns.#", "1"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "datasync", regexache.MustCompile(`location/loc-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "datasync", regexache.MustCompile(`location/loc-.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrBucketName, rName), resource.TestCheckNoResourceAttr(resourceName, names.AttrSecretKey), resource.TestCheckResourceAttr(resourceName, "server_certificate", ""), @@ -97,7 +97,7 @@ func TestAccDataSyncLocationObjectStorage_update(t *testing.T) { testAccCheckLocationObjectStorageExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, names.AttrAccessKey, ""), resource.TestCheckResourceAttr(resourceName, "agent_arns.#", "2"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "datasync", regexache.MustCompile(`location/loc-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "datasync", regexache.MustCompile(`location/loc-.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrBucketName, rName), resource.TestCheckNoResourceAttr(resourceName, names.AttrSecretKey), resource.TestCheckResourceAttr(resourceName, "server_certificate", ""), @@ -115,7 +115,7 @@ func TestAccDataSyncLocationObjectStorage_update(t *testing.T) { testAccCheckLocationObjectStorageExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, names.AttrAccessKey, ""), resource.TestCheckResourceAttr(resourceName, "agent_arns.#", "1"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "datasync", regexache.MustCompile(`location/loc-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "datasync", regexache.MustCompile(`location/loc-.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrBucketName, rName), resource.TestCheckNoResourceAttr(resourceName, names.AttrSecretKey), resource.TestCheckResourceAttr(resourceName, "server_certificate", ""), diff --git a/internal/service/datasync/location_s3_test.go b/internal/service/datasync/location_s3_test.go index 821989b9017..ff52634a7aa 100644 --- a/internal/service/datasync/location_s3_test.go +++ b/internal/service/datasync/location_s3_test.go @@ -39,7 +39,7 @@ func TestAccDataSyncLocationS3_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckLocationS3Exists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "agent_arns.#", "0"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "datasync", regexache.MustCompile(`location/loc-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "datasync", regexache.MustCompile(`location/loc-.+`)), resource.TestCheckResourceAttrPair(resourceName, "s3_bucket_arn", s3BucketResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "s3_config.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "s3_config.0.bucket_access_role_arn", iamRoleResourceName, names.AttrARN), @@ -76,7 +76,7 @@ func TestAccDataSyncLocationS3_storageClass(t *testing.T) { Config: testAccLocationS3Config_storageClass(rName), Check: resource.ComposeTestCheckFunc( testAccCheckLocationS3Exists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "datasync", regexache.MustCompile(`location/loc-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "datasync", regexache.MustCompile(`location/loc-.+`)), resource.TestCheckResourceAttrPair(resourceName, "s3_bucket_arn", s3BucketResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "s3_config.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "s3_config.0.bucket_access_role_arn", iamRoleResourceName, names.AttrARN), diff --git a/internal/service/datasync/location_smb_test.go b/internal/service/datasync/location_smb_test.go index 6322911eaad..a61a192f24d 100644 --- a/internal/service/datasync/location_smb_test.go +++ b/internal/service/datasync/location_smb_test.go @@ -36,7 +36,7 @@ func TestAccDataSyncLocationSMB_basic(t *testing.T) { Config: testAccLocationSMBConfig_basic(rName, "/test/"), Check: resource.ComposeTestCheckFunc( testAccCheckLocationSMBExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "datasync", regexache.MustCompile(`location/loc-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "datasync", regexache.MustCompile(`location/loc-.+`)), resource.TestCheckResourceAttr(resourceName, "agent_arns.#", "1"), resource.TestCheckResourceAttr(resourceName, "mount_options.#", "1"), resource.TestCheckResourceAttr(resourceName, "mount_options.0.version", "AUTOMATIC"), @@ -55,7 +55,7 @@ func TestAccDataSyncLocationSMB_basic(t *testing.T) { Config: testAccLocationSMBConfig_basic(rName, "/test2/"), Check: resource.ComposeTestCheckFunc( testAccCheckLocationSMBExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "datasync", regexache.MustCompile(`location/loc-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "datasync", regexache.MustCompile(`location/loc-.+`)), resource.TestCheckResourceAttr(resourceName, "agent_arns.#", "1"), resource.TestCheckResourceAttr(resourceName, "mount_options.#", "1"), resource.TestCheckResourceAttr(resourceName, "mount_options.0.version", "AUTOMATIC"), diff --git a/internal/service/datasync/task_test.go b/internal/service/datasync/task_test.go index 87bf8c5fabb..014e6a85b5d 100644 --- a/internal/service/datasync/task_test.go +++ b/internal/service/datasync/task_test.go @@ -41,7 +41,7 @@ func TestAccDataSyncTask_basic(t *testing.T) { Config: testAccTaskConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTaskExists(ctx, resourceName, &task1), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "datasync", regexache.MustCompile(`task/task-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "datasync", regexache.MustCompile(`task/task-.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrCloudWatchLogGroupARN, ""), resource.TestCheckResourceAttrPair(resourceName, "destination_location_arn", dataSyncDestinationLocationResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "excludes.#", "0"), From c5fa14952b6ef5d1579fc20eccd0fe35f8e87450 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:45 -0500 Subject: [PATCH 050/304] Make 'AWSClient.AccountID' a getter - dax. --- internal/service/dax/cluster_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/dax/cluster_test.go b/internal/service/dax/cluster_test.go index 94ea49d137c..48e51fcfa3b 100644 --- a/internal/service/dax/cluster_test.go +++ b/internal/service/dax/cluster_test.go @@ -40,7 +40,7 @@ func TestAccDAXCluster_basic(t *testing.T) { Config: testAccClusterConfig_basic(rString), Check: resource.ComposeTestCheckFunc( testAccCheckClusterExists(ctx, resourceName, &dc), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "dax", regexache.MustCompile("cache/.+")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "dax", regexache.MustCompile("cache/.+")), resource.TestCheckResourceAttr( resourceName, "cluster_endpoint_encryption_type", "NONE"), resource.TestMatchResourceAttr( From 38c8348c050994db13c6f1c191f1a2c7b3068c93 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:45 -0500 Subject: [PATCH 051/304] Make 'AWSClient.AccountID' a getter - deploy. --- internal/service/deploy/app.go | 2 +- internal/service/deploy/app_test.go | 2 +- internal/service/deploy/deployment_config.go | 2 +- internal/service/deploy/deployment_group.go | 2 +- internal/service/deploy/deployment_group_test.go | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/deploy/app.go b/internal/service/deploy/app.go index cc4fae3905b..7b642a7dd94 100644 --- a/internal/service/deploy/app.go +++ b/internal/service/deploy/app.go @@ -157,7 +157,7 @@ func resourceAppRead(ctx context.Context, d *schema.ResourceData, meta interface Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "codedeploy", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("application:%s", appName), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/deploy/app_test.go b/internal/service/deploy/app_test.go index 81c7916d491..7bb62327f0e 100644 --- a/internal/service/deploy/app_test.go +++ b/internal/service/deploy/app_test.go @@ -37,7 +37,7 @@ func TestAccDeployApp_basic(t *testing.T) { Config: testAccAppConfig_name(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAppExists(ctx, resourceName, &application1), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "codedeploy", fmt.Sprintf(`application:%s`, rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "codedeploy", fmt.Sprintf(`application:%s`, rName)), resource.TestCheckResourceAttr(resourceName, "compute_platform", "Server"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "linked_to_github", acctest.CtFalse), diff --git a/internal/service/deploy/deployment_config.go b/internal/service/deploy/deployment_config.go index 6b9c8c8f39f..a9cf962726d 100644 --- a/internal/service/deploy/deployment_config.go +++ b/internal/service/deploy/deployment_config.go @@ -224,7 +224,7 @@ func resourceDeploymentConfigRead(ctx context.Context, d *schema.ResourceData, m Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "codedeploy", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: "deploymentconfig:" + deploymentConfigName, }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/deploy/deployment_group.go b/internal/service/deploy/deployment_group.go index f7b84d423a2..288eb47513c 100644 --- a/internal/service/deploy/deployment_group.go +++ b/internal/service/deploy/deployment_group.go @@ -577,7 +577,7 @@ func resourceDeploymentGroupRead(ctx context.Context, d *schema.ResourceData, me Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "codedeploy", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("deploymentgroup:%s/%s", appName, groupName), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/deploy/deployment_group_test.go b/internal/service/deploy/deployment_group_test.go index cd6de3d6689..14900762c92 100644 --- a/internal/service/deploy/deployment_group_test.go +++ b/internal/service/deploy/deployment_group_test.go @@ -39,7 +39,7 @@ func TestAccDeployDeploymentGroup_basic(t *testing.T) { Config: testAccDeploymentGroupConfig_basic(rName, false), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckDeploymentGroupExists(ctx, resourceName, &group), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "codedeploy", fmt.Sprintf(`deploymentgroup:%s/%s`, rName, rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "codedeploy", fmt.Sprintf(`deploymentgroup:%s/%s`, rName, rName)), resource.TestCheckResourceAttr(resourceName, "app_name", rName), resource.TestCheckResourceAttr(resourceName, "deployment_group_name", rName), resource.TestCheckResourceAttr(resourceName, "deployment_config_name", "CodeDeployDefault.OneAtATime"), @@ -65,7 +65,7 @@ func TestAccDeployDeploymentGroup_basic(t *testing.T) { Config: testAccDeploymentGroupConfig_modified(rName, false), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckDeploymentGroupExists(ctx, resourceName, &group), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "codedeploy", fmt.Sprintf(`deploymentgroup:%s/%s-updated`, rName, rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "codedeploy", fmt.Sprintf(`deploymentgroup:%s/%s-updated`, rName, rName)), resource.TestCheckResourceAttr(resourceName, "app_name", rName), resource.TestCheckResourceAttr(resourceName, "deployment_group_name", rName+"-updated"), resource.TestCheckResourceAttr(resourceName, "deployment_config_name", "CodeDeployDefault.OneAtATime"), From dfdf2a8ab34d2f70312348635bc53c4231f98b2f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:45 -0500 Subject: [PATCH 052/304] Make 'AWSClient.AccountID' a getter - detective. --- internal/service/detective/member_test.go | 4 ++-- internal/service/detective/organization_admin_account_test.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/service/detective/member_test.go b/internal/service/detective/member_test.go index 05e14d65dd6..e938aed0f03 100644 --- a/internal/service/detective/member_test.go +++ b/internal/service/detective/member_test.go @@ -38,7 +38,7 @@ func testAccMember_basic(t *testing.T) { Config: testAccMemberConfig_basic(email), Check: resource.ComposeTestCheckFunc( testAccCheckMemberExists(ctx, resourceName, &detectiveOutput), - acctest.CheckResourceAttrAccountID(resourceName, "administrator_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "administrator_id"), resource.TestCheckResourceAttrPair(resourceName, names.AttrAccountID, dataSourceAlternate, names.AttrAccountID), acctest.CheckResourceAttrRFC3339(resourceName, "invited_time"), acctest.CheckResourceAttrRFC3339(resourceName, "updated_time"), @@ -103,7 +103,7 @@ func testAccMember_message(t *testing.T) { Config: testAccMemberConfig_invitationMessage(email), Check: resource.ComposeTestCheckFunc( testAccCheckMemberExists(ctx, resourceName, &detectiveOutput), - acctest.CheckResourceAttrAccountID(resourceName, "administrator_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "administrator_id"), resource.TestCheckResourceAttrPair(resourceName, names.AttrAccountID, dataSourceAlternate, names.AttrAccountID), acctest.CheckResourceAttrRFC3339(resourceName, "invited_time"), acctest.CheckResourceAttrRFC3339(resourceName, "updated_time"), diff --git a/internal/service/detective/organization_admin_account_test.go b/internal/service/detective/organization_admin_account_test.go index a3dacc46db9..ec83bc60a11 100644 --- a/internal/service/detective/organization_admin_account_test.go +++ b/internal/service/detective/organization_admin_account_test.go @@ -34,7 +34,7 @@ func testAccOrganizationAdminAccount_basic(t *testing.T) { Config: testAccOrganizationAdminAccountConfig_self(), Check: resource.ComposeTestCheckFunc( testAccCheckOrganizationAdminAccountExists(ctx, resourceName), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrAccountID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrAccountID), ), }, { From d2aefebfc65bf984cf0c430c5b806e1ea1f60f1c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:45 -0500 Subject: [PATCH 053/304] Make 'AWSClient.AccountID' a getter - devicefarm. --- internal/service/devicefarm/device_pool_test.go | 4 ++-- internal/service/devicefarm/instance_profile_test.go | 4 ++-- internal/service/devicefarm/network_profile_test.go | 4 ++-- internal/service/devicefarm/project_test.go | 4 ++-- internal/service/devicefarm/test_grid_project_test.go | 4 ++-- internal/service/devicefarm/upload_test.go | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/internal/service/devicefarm/device_pool_test.go b/internal/service/devicefarm/device_pool_test.go index ac8d604c65e..f94a4b29f51 100644 --- a/internal/service/devicefarm/device_pool_test.go +++ b/internal/service/devicefarm/device_pool_test.go @@ -47,7 +47,7 @@ func TestAccDeviceFarmDevicePool_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckResourceAttrPair(resourceName, "project_arn", "aws_devicefarm_project.test", names.AttrARN), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "devicefarm", regexache.MustCompile(`devicepool:.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "devicefarm", regexache.MustCompile(`devicepool:.+`)), ), }, { @@ -60,7 +60,7 @@ func TestAccDeviceFarmDevicePool_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckDevicePoolExists(ctx, resourceName, &pool), resource.TestCheckResourceAttr(resourceName, names.AttrName, rNameUpdated), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "devicefarm", regexache.MustCompile(`devicepool:.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "devicefarm", regexache.MustCompile(`devicepool:.+`)), ), }, }, diff --git a/internal/service/devicefarm/instance_profile_test.go b/internal/service/devicefarm/instance_profile_test.go index 68ee7ecc8a0..cea337a0011 100644 --- a/internal/service/devicefarm/instance_profile_test.go +++ b/internal/service/devicefarm/instance_profile_test.go @@ -46,7 +46,7 @@ func TestAccDeviceFarmInstanceProfile_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "reboot_after_use", acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "devicefarm", regexache.MustCompile(`instanceprofile:.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "devicefarm", regexache.MustCompile(`instanceprofile:.+`)), ), }, { @@ -61,7 +61,7 @@ func TestAccDeviceFarmInstanceProfile_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrName, rNameUpdated), resource.TestCheckResourceAttr(resourceName, "reboot_after_use", acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "devicefarm", regexache.MustCompile(`instanceprofile:.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "devicefarm", regexache.MustCompile(`instanceprofile:.+`)), ), }, }, diff --git a/internal/service/devicefarm/network_profile_test.go b/internal/service/devicefarm/network_profile_test.go index b56627b3587..bc951ea155e 100644 --- a/internal/service/devicefarm/network_profile_test.go +++ b/internal/service/devicefarm/network_profile_test.go @@ -49,7 +49,7 @@ func TestAccDeviceFarmNetworkProfile_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "uplink_bandwidth_bits", "104857600"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrPair(resourceName, "project_arn", "aws_devicefarm_project.test", names.AttrARN), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "devicefarm", regexache.MustCompile(`networkprofile:.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "devicefarm", regexache.MustCompile(`networkprofile:.+`)), ), }, { @@ -67,7 +67,7 @@ func TestAccDeviceFarmNetworkProfile_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "uplink_bandwidth_bits", "104857600"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrPair(resourceName, "project_arn", "aws_devicefarm_project.test", names.AttrARN), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "devicefarm", regexache.MustCompile(`networkprofile:.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "devicefarm", regexache.MustCompile(`networkprofile:.+`)), ), }, }, diff --git a/internal/service/devicefarm/project_test.go b/internal/service/devicefarm/project_test.go index af4e3377a18..44094eb84f9 100644 --- a/internal/service/devicefarm/project_test.go +++ b/internal/service/devicefarm/project_test.go @@ -45,7 +45,7 @@ func TestAccDeviceFarmProject_basic(t *testing.T) { testAccCheckProjectExists(ctx, resourceName, &proj), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "devicefarm", regexache.MustCompile(`project:.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "devicefarm", regexache.MustCompile(`project:.+`)), ), }, { @@ -58,7 +58,7 @@ func TestAccDeviceFarmProject_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckProjectExists(ctx, resourceName, &proj), resource.TestCheckResourceAttr(resourceName, names.AttrName, rNameUpdated), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "devicefarm", regexache.MustCompile(`project:.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "devicefarm", regexache.MustCompile(`project:.+`)), ), }, }, diff --git a/internal/service/devicefarm/test_grid_project_test.go b/internal/service/devicefarm/test_grid_project_test.go index 02bdcdea31d..8c5b2e5f843 100644 --- a/internal/service/devicefarm/test_grid_project_test.go +++ b/internal/service/devicefarm/test_grid_project_test.go @@ -46,7 +46,7 @@ func TestAccDeviceFarmTestGridProject_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "vpc_config.#", "0"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "devicefarm", regexache.MustCompile(`testgrid-project:.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "devicefarm", regexache.MustCompile(`testgrid-project:.+`)), ), }, { @@ -59,7 +59,7 @@ func TestAccDeviceFarmTestGridProject_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckProjectTestGridProjectExists(ctx, resourceName, &proj), resource.TestCheckResourceAttr(resourceName, names.AttrName, rNameUpdated), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "devicefarm", regexache.MustCompile(`testgrid-project:.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "devicefarm", regexache.MustCompile(`testgrid-project:.+`)), ), }, }, diff --git a/internal/service/devicefarm/upload_test.go b/internal/service/devicefarm/upload_test.go index 40cff3c52e4..d5003fb4fc0 100644 --- a/internal/service/devicefarm/upload_test.go +++ b/internal/service/devicefarm/upload_test.go @@ -44,7 +44,7 @@ func TestAccDeviceFarmUpload_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckUploadExists(ctx, resourceName, &proj), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "devicefarm", regexache.MustCompile(`upload:.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "devicefarm", regexache.MustCompile(`upload:.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrType, "APPIUM_JAVA_TESTNG_TEST_SPEC"), resource.TestCheckResourceAttr(resourceName, "category", "PRIVATE"), resource.TestCheckResourceAttrSet(resourceName, names.AttrURL), @@ -61,7 +61,7 @@ func TestAccDeviceFarmUpload_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckUploadExists(ctx, resourceName, &proj), resource.TestCheckResourceAttr(resourceName, names.AttrName, rNameUpdated), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "devicefarm", regexache.MustCompile(`upload:.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "devicefarm", regexache.MustCompile(`upload:.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrType, "APPIUM_JAVA_TESTNG_TEST_SPEC"), resource.TestCheckResourceAttr(resourceName, "category", "PRIVATE"), resource.TestCheckResourceAttrSet(resourceName, names.AttrURL), From d8bf3282389138703106e547e1294b5ab3ffec37 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:45 -0500 Subject: [PATCH 054/304] Make 'AWSClient.AccountID' a getter - directconnect. --- .../service/directconnect/connection_test.go | 16 ++++++++-------- .../gateway_association_proposal_test.go | 4 ++-- .../directconnect/gateway_association_test.go | 16 ++++++++-------- internal/service/directconnect/gateway_test.go | 4 ++-- .../hosted_private_virtual_interface.go | 2 +- .../hosted_private_virtual_interface_accepter.go | 4 ++-- .../hosted_private_virtual_interface_test.go | 6 +++--- .../hosted_public_virtual_interface.go | 2 +- .../hosted_public_virtual_interface_accepter.go | 4 ++-- .../hosted_public_virtual_interface_test.go | 6 +++--- .../hosted_transit_virtual_interface.go | 2 +- .../hosted_transit_virtual_interface_accepter.go | 4 ++-- .../hosted_transit_virtual_interface_test.go | 6 +++--- internal/service/directconnect/lag_test.go | 16 ++++++++-------- .../directconnect/private_virtual_interface.go | 2 +- .../private_virtual_interface_test.go | 14 +++++++------- .../directconnect/public_virtual_interface.go | 2 +- .../public_virtual_interface_test.go | 6 +++--- .../directconnect/transit_virtual_interface.go | 2 +- .../transit_virtual_interface_test.go | 12 ++++++------ 20 files changed, 65 insertions(+), 65 deletions(-) diff --git a/internal/service/directconnect/connection_test.go b/internal/service/directconnect/connection_test.go index 0d1426f2832..6e2a22cf301 100644 --- a/internal/service/directconnect/connection_test.go +++ b/internal/service/directconnect/connection_test.go @@ -36,10 +36,10 @@ func TestAccDirectConnectConnection_basic(t *testing.T) { Config: testAccConnectionConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckConnectionExists(ctx, resourceName, &connection), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "directconnect", regexache.MustCompile(`dxcon/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "directconnect", regexache.MustCompile(`dxcon/.+`)), resource.TestCheckResourceAttr(resourceName, "bandwidth", "1Gbps"), resource.TestCheckResourceAttrSet(resourceName, names.AttrLocation), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerAccountID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerAccountID), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "partner_name", ""), resource.TestCheckResourceAttr(resourceName, names.AttrProviderName, ""), @@ -108,7 +108,7 @@ func TestAccDirectConnectConnection_encryptionMode(t *testing.T) { Config: testAccConnectionConfig_encryptionModeNoEncrypt(connectionName), Check: resource.ComposeTestCheckFunc( testAccCheckConnectionExists(ctx, resourceName, &connection), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "directconnect", regexache.MustCompile(`dxcon/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "directconnect", regexache.MustCompile(`dxcon/.+`)), resource.TestCheckResourceAttr(resourceName, "encryption_mode", "no_encrypt"), resource.TestCheckResourceAttrSet(resourceName, names.AttrLocation), resource.TestCheckResourceAttr(resourceName, names.AttrName, connectionName), @@ -119,7 +119,7 @@ func TestAccDirectConnectConnection_encryptionMode(t *testing.T) { Config: testAccConnectionConfig_encryptionModeShouldEncrypt(connectionName, ckn, cak), Check: resource.ComposeTestCheckFunc( testAccCheckConnectionExists(ctx, resourceName, &connection), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "directconnect", regexache.MustCompile(`dxcon/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "directconnect", regexache.MustCompile(`dxcon/.+`)), resource.TestCheckResourceAttr(resourceName, "encryption_mode", "should_encrypt"), resource.TestCheckResourceAttrSet(resourceName, names.AttrLocation), resource.TestCheckResourceAttr(resourceName, names.AttrName, connectionName), @@ -146,11 +146,11 @@ func TestAccDirectConnectConnection_macsecRequested(t *testing.T) { Config: testAccConnectionConfig_macsecEnabled(rName), Check: resource.ComposeTestCheckFunc( testAccCheckConnectionExists(ctx, resourceName, &connection), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "directconnect", regexache.MustCompile(`dxcon/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "directconnect", regexache.MustCompile(`dxcon/.+`)), resource.TestCheckResourceAttr(resourceName, "bandwidth", "100Gbps"), resource.TestCheckResourceAttrSet(resourceName, names.AttrLocation), resource.TestCheckResourceAttr(resourceName, "request_macsec", acctest.CtTrue), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerAccountID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerAccountID), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttrSet(resourceName, names.AttrProviderName), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), @@ -182,10 +182,10 @@ func TestAccDirectConnectConnection_providerName(t *testing.T) { Config: testAccConnectionConfig_providerName(rName), Check: resource.ComposeTestCheckFunc( testAccCheckConnectionExists(ctx, resourceName, &connection), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "directconnect", regexache.MustCompile(`dxcon/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "directconnect", regexache.MustCompile(`dxcon/.+`)), resource.TestCheckResourceAttr(resourceName, "bandwidth", "1Gbps"), resource.TestCheckResourceAttrSet(resourceName, names.AttrLocation), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerAccountID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerAccountID), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttrSet(resourceName, names.AttrProviderName), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), diff --git a/internal/service/directconnect/gateway_association_proposal_test.go b/internal/service/directconnect/gateway_association_proposal_test.go index 2c448649520..dd985d66f5d 100644 --- a/internal/service/directconnect/gateway_association_proposal_test.go +++ b/internal/service/directconnect/gateway_association_proposal_test.go @@ -42,7 +42,7 @@ func TestAccDirectConnectGatewayAssociationProposal_basicVPNGateway(t *testing.T testAccCheckGatewayAssociationProposalExists(ctx, resourceName, &proposal), resource.TestCheckResourceAttr(resourceName, "allowed_prefixes.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "associated_gateway_id", resourceNameVgw, names.AttrID), - acctest.CheckResourceAttrAccountID(resourceName, "associated_gateway_owner_account_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "associated_gateway_owner_account_id"), resource.TestCheckResourceAttr(resourceName, "associated_gateway_type", "virtualPrivateGateway"), resource.TestCheckResourceAttrPair(resourceName, "dx_gateway_id", resourceNameDxGw, names.AttrID), ), @@ -80,7 +80,7 @@ func TestAccDirectConnectGatewayAssociationProposal_basicTransitGateway(t *testi resource.TestCheckTypeSetElemAttr(resourceName, "allowed_prefixes.*", "10.255.255.0/30"), resource.TestCheckTypeSetElemAttr(resourceName, "allowed_prefixes.*", "10.255.255.8/30"), resource.TestCheckResourceAttrPair(resourceName, "associated_gateway_id", resourceNameTgw, names.AttrID), - acctest.CheckResourceAttrAccountID(resourceName, "associated_gateway_owner_account_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "associated_gateway_owner_account_id"), resource.TestCheckResourceAttr(resourceName, "associated_gateway_type", "transitGateway"), resource.TestCheckResourceAttrPair(resourceName, "dx_gateway_id", resourceNameDxGw, names.AttrID), ), diff --git a/internal/service/directconnect/gateway_association_test.go b/internal/service/directconnect/gateway_association_test.go index 41e14a39a77..89845b83ea9 100644 --- a/internal/service/directconnect/gateway_association_test.go +++ b/internal/service/directconnect/gateway_association_test.go @@ -69,11 +69,11 @@ func TestAccDirectConnectGatewayAssociation_basicVPNGatewaySingleAccount(t *test resource.TestCheckResourceAttr(resourceName, "allowed_prefixes.#", "1"), resource.TestCheckTypeSetElemAttr(resourceName, "allowed_prefixes.*", "10.255.255.0/28"), resource.TestCheckResourceAttrPair(resourceName, "associated_gateway_id", resourceNameVgw, names.AttrID), - acctest.CheckResourceAttrAccountID(resourceName, "associated_gateway_owner_account_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "associated_gateway_owner_account_id"), resource.TestCheckResourceAttr(resourceName, "associated_gateway_type", "virtualPrivateGateway"), resource.TestCheckResourceAttrSet(resourceName, "dx_gateway_association_id"), resource.TestCheckResourceAttrPair(resourceName, "dx_gateway_id", resourceNameDxGw, names.AttrID), - acctest.CheckResourceAttrAccountID(resourceName, "dx_gateway_owner_account_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "dx_gateway_owner_account_id"), ), }, { @@ -109,12 +109,12 @@ func TestAccDirectConnectGatewayAssociation_basicVPNGatewayCrossAccount(t *testi resource.TestCheckResourceAttr(resourceName, "allowed_prefixes.#", "1"), resource.TestCheckTypeSetElemAttr(resourceName, "allowed_prefixes.*", "10.255.255.0/28"), resource.TestCheckResourceAttrPair(resourceName, "associated_gateway_id", resourceNameVgw, names.AttrID), - acctest.CheckResourceAttrAccountID(resourceName, "associated_gateway_owner_account_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "associated_gateway_owner_account_id"), resource.TestCheckResourceAttr(resourceName, "associated_gateway_type", "virtualPrivateGateway"), resource.TestCheckResourceAttrSet(resourceName, "dx_gateway_association_id"), resource.TestCheckResourceAttrPair(resourceName, "dx_gateway_id", resourceNameDxGw, names.AttrID), // dx_gateway_owner_account_id is the "awsalternate" provider's account ID. - // acctest.CheckResourceAttrAccountID(resourceName, "dx_gateway_owner_account_id"), + // acctest.CheckResourceAttrAccountID(ctx, resourceName, "dx_gateway_owner_account_id"), ), }, }, @@ -145,11 +145,11 @@ func TestAccDirectConnectGatewayAssociation_basicTransitGatewaySingleAccount(t * resource.TestCheckTypeSetElemAttr(resourceName, "allowed_prefixes.*", "10.255.255.0/30"), resource.TestCheckTypeSetElemAttr(resourceName, "allowed_prefixes.*", "10.255.255.8/30"), resource.TestCheckResourceAttrPair(resourceName, "associated_gateway_id", resourceNameTgw, names.AttrID), - acctest.CheckResourceAttrAccountID(resourceName, "associated_gateway_owner_account_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "associated_gateway_owner_account_id"), resource.TestCheckResourceAttr(resourceName, "associated_gateway_type", "transitGateway"), resource.TestCheckResourceAttrSet(resourceName, "dx_gateway_association_id"), resource.TestCheckResourceAttrPair(resourceName, "dx_gateway_id", resourceNameDxGw, names.AttrID), - acctest.CheckResourceAttrAccountID(resourceName, "dx_gateway_owner_account_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "dx_gateway_owner_account_id"), ), }, { @@ -186,12 +186,12 @@ func TestAccDirectConnectGatewayAssociation_basicTransitGatewayCrossAccount(t *t resource.TestCheckTypeSetElemAttr(resourceName, "allowed_prefixes.*", "10.255.255.0/30"), resource.TestCheckTypeSetElemAttr(resourceName, "allowed_prefixes.*", "10.255.255.8/30"), resource.TestCheckResourceAttrPair(resourceName, "associated_gateway_id", resourceNameTgw, names.AttrID), - acctest.CheckResourceAttrAccountID(resourceName, "associated_gateway_owner_account_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "associated_gateway_owner_account_id"), resource.TestCheckResourceAttr(resourceName, "associated_gateway_type", "transitGateway"), resource.TestCheckResourceAttrSet(resourceName, "dx_gateway_association_id"), resource.TestCheckResourceAttrPair(resourceName, "dx_gateway_id", resourceNameDxGw, names.AttrID), // dx_gateway_owner_account_id is the "awsalternate" provider's account ID. - // acctest.CheckResourceAttrAccountID(resourceName, "dx_gateway_owner_account_id"), + // acctest.CheckResourceAttrAccountID(ctx, resourceName, "dx_gateway_owner_account_id"), ), }, }, diff --git a/internal/service/directconnect/gateway_test.go b/internal/service/directconnect/gateway_test.go index 58d7c8fb14d..50cdb3194cc 100644 --- a/internal/service/directconnect/gateway_test.go +++ b/internal/service/directconnect/gateway_test.go @@ -36,7 +36,7 @@ func TestAccDirectConnectGateway_basic(t *testing.T) { Config: testAccGatewayConfig_basic(rName, rBgpAsn), Check: resource.ComposeTestCheckFunc( testAccCheckGatewayExists(ctx, resourceName, &v), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerAccountID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerAccountID), ), }, { @@ -90,7 +90,7 @@ func TestAccDirectConnectGateway_complex(t *testing.T) { Config: testAccGatewayConfig_associationMultiVPNSingleAccount(rName, rBgpAsn), Check: resource.ComposeTestCheckFunc( testAccCheckGatewayExists(ctx, resourceName, &v), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerAccountID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerAccountID), ), }, { diff --git a/internal/service/directconnect/hosted_private_virtual_interface.go b/internal/service/directconnect/hosted_private_virtual_interface.go index cbd0c6a31c9..f42b8227ca8 100644 --- a/internal/service/directconnect/hosted_private_virtual_interface.go +++ b/internal/service/directconnect/hosted_private_virtual_interface.go @@ -190,7 +190,7 @@ func resourceHostedPrivateVirtualInterfaceRead(ctx context.Context, d *schema.Re Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, Service: "directconnect", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("dxvif/%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/directconnect/hosted_private_virtual_interface_accepter.go b/internal/service/directconnect/hosted_private_virtual_interface_accepter.go index 31c191ded2d..0a916098a6d 100644 --- a/internal/service/directconnect/hosted_private_virtual_interface_accepter.go +++ b/internal/service/directconnect/hosted_private_virtual_interface_accepter.go @@ -100,7 +100,7 @@ func resourceHostedPrivateVirtualInterfaceAccepterCreate(ctx context.Context, d Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, Service: "directconnect", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("dxvif/%s", d.Id()), }.String() d.Set(names.AttrARN, arn) @@ -173,7 +173,7 @@ func resourceHostedPrivateVirtualInterfaceAccepterImport(ctx context.Context, d Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, Service: "directconnect", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("dxvif/%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/directconnect/hosted_private_virtual_interface_test.go b/internal/service/directconnect/hosted_private_virtual_interface_test.go index 7c5a80b7d80..13c10f195a5 100644 --- a/internal/service/directconnect/hosted_private_virtual_interface_test.go +++ b/internal/service/directconnect/hosted_private_virtual_interface_test.go @@ -46,7 +46,7 @@ func TestAccDirectConnectHostedPrivateVirtualInterface_basic(t *testing.T) { testAccCheckHostedPrivateVirtualInterfaceExists(ctx, resourceName, &vif), resource.TestCheckResourceAttr(resourceName, "address_family", "ipv4"), resource.TestCheckResourceAttrSet(resourceName, "amazon_side_asn"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), resource.TestCheckResourceAttrSet(resourceName, "aws_device"), resource.TestCheckResourceAttr(resourceName, "bgp_asn", strconv.Itoa(bgpAsn)), resource.TestCheckResourceAttrSet(resourceName, "bgp_auth_key"), @@ -100,7 +100,7 @@ func TestAccDirectConnectHostedPrivateVirtualInterface_accepterTags(t *testing.T testAccCheckHostedPrivateVirtualInterfaceExists(ctx, resourceName, &vif), resource.TestCheckResourceAttr(resourceName, "address_family", "ipv4"), resource.TestCheckResourceAttrSet(resourceName, "amazon_side_asn"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), resource.TestCheckResourceAttrSet(resourceName, "aws_device"), resource.TestCheckResourceAttr(resourceName, "bgp_asn", strconv.Itoa(bgpAsn)), resource.TestCheckResourceAttrSet(resourceName, "bgp_auth_key"), @@ -126,7 +126,7 @@ func TestAccDirectConnectHostedPrivateVirtualInterface_accepterTags(t *testing.T testAccCheckHostedPrivateVirtualInterfaceExists(ctx, resourceName, &vif), resource.TestCheckResourceAttr(resourceName, "address_family", "ipv4"), resource.TestCheckResourceAttrSet(resourceName, "amazon_side_asn"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), resource.TestCheckResourceAttrSet(resourceName, "aws_device"), resource.TestCheckResourceAttr(resourceName, "bgp_asn", strconv.Itoa(bgpAsn)), resource.TestCheckResourceAttrSet(resourceName, "bgp_auth_key"), diff --git a/internal/service/directconnect/hosted_public_virtual_interface.go b/internal/service/directconnect/hosted_public_virtual_interface.go index 769931e386f..60731577931 100644 --- a/internal/service/directconnect/hosted_public_virtual_interface.go +++ b/internal/service/directconnect/hosted_public_virtual_interface.go @@ -187,7 +187,7 @@ func resourceHostedPublicVirtualInterfaceRead(ctx context.Context, d *schema.Res Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, Service: "directconnect", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("dxvif/%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/directconnect/hosted_public_virtual_interface_accepter.go b/internal/service/directconnect/hosted_public_virtual_interface_accepter.go index 40955116f10..8ec9cf4a1c4 100644 --- a/internal/service/directconnect/hosted_public_virtual_interface_accepter.go +++ b/internal/service/directconnect/hosted_public_virtual_interface_accepter.go @@ -80,7 +80,7 @@ func resourceHostedPublicVirtualInterfaceAccepterCreate(ctx context.Context, d * Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, Service: "directconnect", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("dxvif/%s", d.Id()), }.String() d.Set(names.AttrARN, arn) @@ -151,7 +151,7 @@ func resourceHostedPublicVirtualInterfaceAccepterImport(ctx context.Context, d * Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, Service: "directconnect", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("dxvif/%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/directconnect/hosted_public_virtual_interface_test.go b/internal/service/directconnect/hosted_public_virtual_interface_test.go index 03fe96f5e54..0576ce0a53d 100644 --- a/internal/service/directconnect/hosted_public_virtual_interface_test.go +++ b/internal/service/directconnect/hosted_public_virtual_interface_test.go @@ -48,7 +48,7 @@ func TestAccDirectConnectHostedPublicVirtualInterface_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "address_family", "ipv4"), resource.TestCheckResourceAttrSet(resourceName, "amazon_address"), resource.TestCheckResourceAttrSet(resourceName, "amazon_side_asn"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), resource.TestCheckResourceAttrSet(resourceName, "aws_device"), resource.TestCheckResourceAttr(resourceName, "bgp_asn", strconv.Itoa(bgpAsn)), resource.TestCheckResourceAttrSet(resourceName, "bgp_auth_key"), @@ -104,7 +104,7 @@ func TestAccDirectConnectHostedPublicVirtualInterface_accepterTags(t *testing.T) resource.TestCheckResourceAttr(resourceName, "address_family", "ipv4"), resource.TestCheckResourceAttr(resourceName, "amazon_address", amazonAddress), resource.TestCheckResourceAttrSet(resourceName, "amazon_side_asn"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), resource.TestCheckResourceAttrSet(resourceName, "aws_device"), resource.TestCheckResourceAttr(resourceName, "bgp_asn", strconv.Itoa(bgpAsn)), resource.TestCheckResourceAttrSet(resourceName, "bgp_auth_key"), @@ -131,7 +131,7 @@ func TestAccDirectConnectHostedPublicVirtualInterface_accepterTags(t *testing.T) resource.TestCheckResourceAttr(resourceName, "address_family", "ipv4"), resource.TestCheckResourceAttr(resourceName, "amazon_address", amazonAddress), resource.TestCheckResourceAttrSet(resourceName, "amazon_side_asn"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), resource.TestCheckResourceAttrSet(resourceName, "aws_device"), resource.TestCheckResourceAttr(resourceName, "bgp_asn", strconv.Itoa(bgpAsn)), resource.TestCheckResourceAttrSet(resourceName, "bgp_auth_key"), diff --git a/internal/service/directconnect/hosted_transit_virtual_interface.go b/internal/service/directconnect/hosted_transit_virtual_interface.go index 2929b0d0bbe..c05de044175 100644 --- a/internal/service/directconnect/hosted_transit_virtual_interface.go +++ b/internal/service/directconnect/hosted_transit_virtual_interface.go @@ -186,7 +186,7 @@ func resourceHostedTransitVirtualInterfaceRead(ctx context.Context, d *schema.Re Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, Service: "directconnect", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("dxvif/%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/directconnect/hosted_transit_virtual_interface_accepter.go b/internal/service/directconnect/hosted_transit_virtual_interface_accepter.go index ab660b5f8f2..d72f626d6af 100644 --- a/internal/service/directconnect/hosted_transit_virtual_interface_accepter.go +++ b/internal/service/directconnect/hosted_transit_virtual_interface_accepter.go @@ -86,7 +86,7 @@ func resourceHostedTransitVirtualInterfaceAccepterCreate(ctx context.Context, d Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, Service: "directconnect", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("dxvif/%s", d.Id()), }.String() d.Set(names.AttrARN, arn) @@ -158,7 +158,7 @@ func resourceHostedTransitVirtualInterfaceAccepterImport(ctx context.Context, d Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, Service: "directconnect", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("dxvif/%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/directconnect/hosted_transit_virtual_interface_test.go b/internal/service/directconnect/hosted_transit_virtual_interface_test.go index 82104cc0acd..22aa6aeb9a9 100644 --- a/internal/service/directconnect/hosted_transit_virtual_interface_test.go +++ b/internal/service/directconnect/hosted_transit_virtual_interface_test.go @@ -58,7 +58,7 @@ func testAccHostedTransitVirtualInterface_basic(t *testing.T) { testAccCheckHostedTransitVirtualInterfaceExists(ctx, resourceName, &vif), resource.TestCheckResourceAttr(resourceName, "address_family", "ipv4"), resource.TestCheckResourceAttrSet(resourceName, "amazon_side_asn"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), resource.TestCheckResourceAttrSet(resourceName, "aws_device"), resource.TestCheckResourceAttr(resourceName, "bgp_asn", strconv.Itoa(bgpAsn)), resource.TestCheckResourceAttrSet(resourceName, "bgp_auth_key"), @@ -113,7 +113,7 @@ func testAccHostedTransitVirtualInterface_accepterTags(t *testing.T) { testAccCheckHostedTransitVirtualInterfaceExists(ctx, resourceName, &vif), resource.TestCheckResourceAttr(resourceName, "address_family", "ipv4"), resource.TestCheckResourceAttrSet(resourceName, "amazon_side_asn"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), resource.TestCheckResourceAttrSet(resourceName, "aws_device"), resource.TestCheckResourceAttr(resourceName, "bgp_asn", strconv.Itoa(bgpAsn)), resource.TestCheckResourceAttrSet(resourceName, "bgp_auth_key"), @@ -139,7 +139,7 @@ func testAccHostedTransitVirtualInterface_accepterTags(t *testing.T) { testAccCheckHostedTransitVirtualInterfaceExists(ctx, resourceName, &vif), resource.TestCheckResourceAttr(resourceName, "address_family", "ipv4"), resource.TestCheckResourceAttrSet(resourceName, "amazon_side_asn"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), resource.TestCheckResourceAttrSet(resourceName, "aws_device"), resource.TestCheckResourceAttr(resourceName, "bgp_asn", strconv.Itoa(bgpAsn)), resource.TestCheckResourceAttrSet(resourceName, "bgp_auth_key"), diff --git a/internal/service/directconnect/lag_test.go b/internal/service/directconnect/lag_test.go index 1ad15a56ec2..d05f2187258 100644 --- a/internal/service/directconnect/lag_test.go +++ b/internal/service/directconnect/lag_test.go @@ -37,7 +37,7 @@ func TestAccDirectConnectLag_basic(t *testing.T) { Config: testAccLagConfig_basic(rName1), Check: resource.ComposeTestCheckFunc( testAccCheckLagExists(ctx, resourceName, &lag), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "directconnect", regexache.MustCompile(`dxlag/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "directconnect", regexache.MustCompile(`dxlag/.+`)), resource.TestCheckNoResourceAttr(resourceName, names.AttrConnectionID), resource.TestCheckResourceAttr(resourceName, "connections_bandwidth", "10Gbps"), resource.TestCheckResourceAttr(resourceName, names.AttrForceDestroy, acctest.CtFalse), @@ -45,7 +45,7 @@ func TestAccDirectConnectLag_basic(t *testing.T) { resource.TestCheckResourceAttrSet(resourceName, "jumbo_frame_capable"), resource.TestCheckResourceAttrSet(resourceName, names.AttrLocation), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName1), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerAccountID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerAccountID), resource.TestCheckResourceAttr(resourceName, names.AttrProviderName, ""), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), @@ -54,7 +54,7 @@ func TestAccDirectConnectLag_basic(t *testing.T) { Config: testAccLagConfig_basic(rName2), Check: resource.ComposeTestCheckFunc( testAccCheckLagExists(ctx, resourceName, &lag), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "directconnect", regexache.MustCompile(`dxlag/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "directconnect", regexache.MustCompile(`dxlag/.+`)), resource.TestCheckNoResourceAttr(resourceName, names.AttrConnectionID), resource.TestCheckResourceAttr(resourceName, "connections_bandwidth", "10Gbps"), resource.TestCheckResourceAttr(resourceName, names.AttrForceDestroy, acctest.CtFalse), @@ -62,7 +62,7 @@ func TestAccDirectConnectLag_basic(t *testing.T) { resource.TestCheckResourceAttrSet(resourceName, "jumbo_frame_capable"), resource.TestCheckResourceAttrSet(resourceName, names.AttrLocation), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName2), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerAccountID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerAccountID), resource.TestCheckResourceAttr(resourceName, names.AttrProviderName, ""), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), @@ -118,7 +118,7 @@ func TestAccDirectConnectLag_connectionID(t *testing.T) { Config: testAccLagConfig_connectionID(rName), Check: resource.ComposeTestCheckFunc( testAccCheckLagExists(ctx, resourceName, &lag), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "directconnect", regexache.MustCompile(`dxlag/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "directconnect", regexache.MustCompile(`dxlag/.+`)), resource.TestCheckResourceAttrPair(resourceName, names.AttrConnectionID, connectionResourceName, names.AttrID), resource.TestCheckResourceAttr(resourceName, "connections_bandwidth", "10Gbps"), resource.TestCheckResourceAttr(resourceName, names.AttrForceDestroy, acctest.CtFalse), @@ -126,7 +126,7 @@ func TestAccDirectConnectLag_connectionID(t *testing.T) { resource.TestCheckResourceAttrSet(resourceName, "jumbo_frame_capable"), resource.TestCheckResourceAttrSet(resourceName, names.AttrLocation), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerAccountID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerAccountID), resource.TestCheckResourceAttr(resourceName, names.AttrProviderName, ""), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), @@ -157,7 +157,7 @@ func TestAccDirectConnectLag_providerName(t *testing.T) { Config: testAccLagConfig_providerName(rName), Check: resource.ComposeTestCheckFunc( testAccCheckLagExists(ctx, resourceName, &lag), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "directconnect", regexache.MustCompile(`dxlag/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "directconnect", regexache.MustCompile(`dxlag/.+`)), resource.TestCheckNoResourceAttr(resourceName, names.AttrConnectionID), resource.TestCheckResourceAttr(resourceName, "connections_bandwidth", "10Gbps"), resource.TestCheckResourceAttr(resourceName, names.AttrForceDestroy, acctest.CtFalse), @@ -165,7 +165,7 @@ func TestAccDirectConnectLag_providerName(t *testing.T) { resource.TestCheckResourceAttrSet(resourceName, "jumbo_frame_capable"), resource.TestCheckResourceAttrSet(resourceName, names.AttrLocation), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerAccountID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerAccountID), resource.TestCheckResourceAttrSet(resourceName, names.AttrProviderName), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), diff --git a/internal/service/directconnect/private_virtual_interface.go b/internal/service/directconnect/private_virtual_interface.go index ef1ea10656d..f6d5a051850 100644 --- a/internal/service/directconnect/private_virtual_interface.go +++ b/internal/service/directconnect/private_virtual_interface.go @@ -212,7 +212,7 @@ func resourcePrivateVirtualInterfaceRead(ctx context.Context, d *schema.Resource Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, Service: "directconnect", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("dxvif/%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/directconnect/private_virtual_interface_test.go b/internal/service/directconnect/private_virtual_interface_test.go index 9be7a9869bd..7fbd4464746 100644 --- a/internal/service/directconnect/private_virtual_interface_test.go +++ b/internal/service/directconnect/private_virtual_interface_test.go @@ -43,7 +43,7 @@ func TestAccDirectConnectPrivateVirtualInterface_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "address_family", "ipv4"), resource.TestCheckResourceAttrSet(resourceName, "amazon_address"), resource.TestCheckResourceAttrSet(resourceName, "amazon_side_asn"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), resource.TestCheckResourceAttrSet(resourceName, "aws_device"), resource.TestCheckResourceAttr(resourceName, "bgp_asn", strconv.Itoa(bgpAsn)), resource.TestCheckResourceAttrSet(resourceName, "bgp_auth_key"), @@ -64,7 +64,7 @@ func TestAccDirectConnectPrivateVirtualInterface_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "address_family", "ipv4"), resource.TestCheckResourceAttrSet(resourceName, "amazon_address"), resource.TestCheckResourceAttrSet(resourceName, "amazon_side_asn"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), resource.TestCheckResourceAttrSet(resourceName, "aws_device"), resource.TestCheckResourceAttr(resourceName, "bgp_asn", strconv.Itoa(bgpAsn)), resource.TestCheckResourceAttrSet(resourceName, "bgp_auth_key"), @@ -111,7 +111,7 @@ func TestAccDirectConnectPrivateVirtualInterface_tags(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "address_family", "ipv4"), resource.TestCheckResourceAttrSet(resourceName, "amazon_address"), resource.TestCheckResourceAttrSet(resourceName, "amazon_side_asn"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), resource.TestCheckResourceAttrSet(resourceName, "aws_device"), resource.TestCheckResourceAttr(resourceName, "bgp_asn", strconv.Itoa(bgpAsn)), resource.TestCheckResourceAttrSet(resourceName, "bgp_auth_key"), @@ -135,7 +135,7 @@ func TestAccDirectConnectPrivateVirtualInterface_tags(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "address_family", "ipv4"), resource.TestCheckResourceAttrSet(resourceName, "amazon_address"), resource.TestCheckResourceAttrSet(resourceName, "amazon_side_asn"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), resource.TestCheckResourceAttrSet(resourceName, "aws_device"), resource.TestCheckResourceAttr(resourceName, "bgp_asn", strconv.Itoa(bgpAsn)), resource.TestCheckResourceAttrSet(resourceName, "bgp_auth_key"), @@ -186,7 +186,7 @@ func TestAccDirectConnectPrivateVirtualInterface_dxGateway(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "address_family", "ipv4"), resource.TestCheckResourceAttrSet(resourceName, "amazon_address"), resource.TestCheckResourceAttrSet(resourceName, "amazon_side_asn"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), resource.TestCheckResourceAttrSet(resourceName, "aws_device"), resource.TestCheckResourceAttr(resourceName, "bgp_asn", strconv.Itoa(bgpAsn)), resource.TestCheckResourceAttrSet(resourceName, "bgp_auth_key"), @@ -234,7 +234,7 @@ func TestAccDirectConnectPrivateVirtualInterface_siteLink(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "address_family", "ipv4"), resource.TestCheckResourceAttrSet(resourceName, "amazon_address"), resource.TestCheckResourceAttrSet(resourceName, "amazon_side_asn"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), resource.TestCheckResourceAttrSet(resourceName, "aws_device"), resource.TestCheckResourceAttr(resourceName, "bgp_asn", strconv.Itoa(bgpAsn)), resource.TestCheckResourceAttrSet(resourceName, "bgp_auth_key"), @@ -256,7 +256,7 @@ func TestAccDirectConnectPrivateVirtualInterface_siteLink(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "address_family", "ipv4"), resource.TestCheckResourceAttrSet(resourceName, "amazon_address"), resource.TestCheckResourceAttrSet(resourceName, "amazon_side_asn"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), resource.TestCheckResourceAttrSet(resourceName, "aws_device"), resource.TestCheckResourceAttr(resourceName, "bgp_asn", strconv.Itoa(bgpAsn)), resource.TestCheckResourceAttrSet(resourceName, "bgp_auth_key"), diff --git a/internal/service/directconnect/public_virtual_interface.go b/internal/service/directconnect/public_virtual_interface.go index 99ec2d81894..396c22b5b0c 100644 --- a/internal/service/directconnect/public_virtual_interface.go +++ b/internal/service/directconnect/public_virtual_interface.go @@ -190,7 +190,7 @@ func resourcePublicVirtualInterfaceRead(ctx context.Context, d *schema.ResourceD Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, Service: "directconnect", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("dxvif/%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/directconnect/public_virtual_interface_test.go b/internal/service/directconnect/public_virtual_interface_test.go index 3bf2b15e4f5..01e53cd5620 100644 --- a/internal/service/directconnect/public_virtual_interface_test.go +++ b/internal/service/directconnect/public_virtual_interface_test.go @@ -48,7 +48,7 @@ func TestAccDirectConnectPublicVirtualInterface_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "address_family", "ipv4"), resource.TestCheckResourceAttr(resourceName, "amazon_address", amazonAddress), resource.TestCheckResourceAttrSet(resourceName, "amazon_side_asn"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), resource.TestCheckResourceAttrSet(resourceName, "aws_device"), resource.TestCheckResourceAttr(resourceName, "bgp_asn", strconv.Itoa(bgpAsn)), resource.TestCheckResourceAttrSet(resourceName, "bgp_auth_key"), @@ -96,7 +96,7 @@ func TestAccDirectConnectPublicVirtualInterface_tags(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "address_family", "ipv4"), resource.TestCheckResourceAttr(resourceName, "amazon_address", amazonAddress), resource.TestCheckResourceAttrSet(resourceName, "amazon_side_asn"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), resource.TestCheckResourceAttrSet(resourceName, "aws_device"), resource.TestCheckResourceAttr(resourceName, "bgp_asn", strconv.Itoa(bgpAsn)), resource.TestCheckResourceAttrSet(resourceName, "bgp_auth_key"), @@ -120,7 +120,7 @@ func TestAccDirectConnectPublicVirtualInterface_tags(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "address_family", "ipv4"), resource.TestCheckResourceAttr(resourceName, "amazon_address", amazonAddress), resource.TestCheckResourceAttrSet(resourceName, "amazon_side_asn"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), resource.TestCheckResourceAttrSet(resourceName, "aws_device"), resource.TestCheckResourceAttr(resourceName, "bgp_asn", strconv.Itoa(bgpAsn)), resource.TestCheckResourceAttrSet(resourceName, "bgp_auth_key"), diff --git a/internal/service/directconnect/transit_virtual_interface.go b/internal/service/directconnect/transit_virtual_interface.go index 1a8030cb737..ef361ca46fa 100644 --- a/internal/service/directconnect/transit_virtual_interface.go +++ b/internal/service/directconnect/transit_virtual_interface.go @@ -198,7 +198,7 @@ func resourceTransitVirtualInterfaceRead(ctx context.Context, d *schema.Resource Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, Service: "directconnect", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("dxvif/%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/directconnect/transit_virtual_interface_test.go b/internal/service/directconnect/transit_virtual_interface_test.go index baeada002a9..960b0c22e81 100644 --- a/internal/service/directconnect/transit_virtual_interface_test.go +++ b/internal/service/directconnect/transit_virtual_interface_test.go @@ -56,7 +56,7 @@ func testAccTransitVirtualInterface_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "address_family", "ipv4"), resource.TestCheckResourceAttrSet(resourceName, "amazon_address"), resource.TestCheckResourceAttrSet(resourceName, "amazon_side_asn"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), resource.TestCheckResourceAttrSet(resourceName, "aws_device"), resource.TestCheckResourceAttr(resourceName, "bgp_asn", strconv.Itoa(bgpAsn)), resource.TestCheckResourceAttrSet(resourceName, "bgp_auth_key"), @@ -77,7 +77,7 @@ func testAccTransitVirtualInterface_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "address_family", "ipv4"), resource.TestCheckResourceAttrSet(resourceName, "amazon_address"), resource.TestCheckResourceAttrSet(resourceName, "amazon_side_asn"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), resource.TestCheckResourceAttrSet(resourceName, "aws_device"), resource.TestCheckResourceAttr(resourceName, "bgp_asn", strconv.Itoa(bgpAsn)), resource.TestCheckResourceAttrSet(resourceName, "bgp_auth_key"), @@ -125,7 +125,7 @@ func testAccTransitVirtualInterface_tags(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "address_family", "ipv4"), resource.TestCheckResourceAttrSet(resourceName, "amazon_address"), resource.TestCheckResourceAttrSet(resourceName, "amazon_side_asn"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), resource.TestCheckResourceAttrSet(resourceName, "aws_device"), resource.TestCheckResourceAttr(resourceName, "bgp_asn", strconv.Itoa(bgpAsn)), resource.TestCheckResourceAttrSet(resourceName, "bgp_auth_key"), @@ -149,7 +149,7 @@ func testAccTransitVirtualInterface_tags(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "address_family", "ipv4"), resource.TestCheckResourceAttrSet(resourceName, "amazon_address"), resource.TestCheckResourceAttrSet(resourceName, "amazon_side_asn"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), resource.TestCheckResourceAttrSet(resourceName, "aws_device"), resource.TestCheckResourceAttr(resourceName, "bgp_asn", strconv.Itoa(bgpAsn)), resource.TestCheckResourceAttrSet(resourceName, "bgp_auth_key"), @@ -200,7 +200,7 @@ func testAccTransitVirtualInterface_siteLink(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "address_family", "ipv4"), resource.TestCheckResourceAttrSet(resourceName, "amazon_address"), resource.TestCheckResourceAttrSet(resourceName, "amazon_side_asn"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), resource.TestCheckResourceAttrSet(resourceName, "aws_device"), resource.TestCheckResourceAttr(resourceName, "bgp_asn", strconv.Itoa(bgpAsn)), resource.TestCheckResourceAttrSet(resourceName, "bgp_auth_key"), @@ -222,7 +222,7 @@ func testAccTransitVirtualInterface_siteLink(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "address_family", "ipv4"), resource.TestCheckResourceAttrSet(resourceName, "amazon_address"), resource.TestCheckResourceAttrSet(resourceName, "amazon_side_asn"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "directconnect", regexache.MustCompile(fmt.Sprintf("dxvif/%s", aws.ToString(vif.VirtualInterfaceId)))), resource.TestCheckResourceAttrSet(resourceName, "aws_device"), resource.TestCheckResourceAttr(resourceName, "bgp_asn", strconv.Itoa(bgpAsn)), resource.TestCheckResourceAttrSet(resourceName, "bgp_auth_key"), From 1d9143562156952f54231bf974377f5d33ce6f5d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:46 -0500 Subject: [PATCH 055/304] Make 'AWSClient.AccountID' a getter - dlm. --- internal/service/dlm/lifecycle_policy_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/dlm/lifecycle_policy_test.go b/internal/service/dlm/lifecycle_policy_test.go index ae1ad154a33..7a0465ac62e 100644 --- a/internal/service/dlm/lifecycle_policy_test.go +++ b/internal/service/dlm/lifecycle_policy_test.go @@ -37,7 +37,7 @@ func TestAccDLMLifecyclePolicy_basic(t *testing.T) { Config: testAccLifecyclePolicyConfig_basic(rName), Check: resource.ComposeTestCheckFunc( checkLifecyclePolicyExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "dlm", regexache.MustCompile(`policy/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "dlm", regexache.MustCompile(`policy/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "tf-acc-basic"), resource.TestCheckResourceAttrSet(resourceName, names.AttrExecutionRoleARN), resource.TestCheckResourceAttr(resourceName, names.AttrState, "ENABLED"), @@ -80,7 +80,7 @@ func TestAccDLMLifecyclePolicy_event(t *testing.T) { Config: testAccLifecyclePolicyConfig_event(rName), Check: resource.ComposeTestCheckFunc( checkLifecyclePolicyExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "dlm", regexache.MustCompile(`policy/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "dlm", regexache.MustCompile(`policy/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "tf-acc-basic"), resource.TestCheckResourceAttrSet(resourceName, names.AttrExecutionRoleARN), resource.TestCheckResourceAttr(resourceName, names.AttrState, "ENABLED"), From 526749999fc82972e0ae2a3e285f82c99ee267a6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:46 -0500 Subject: [PATCH 056/304] Make 'AWSClient.AccountID' a getter - dms. --- internal/service/dms/event_subscription.go | 2 +- internal/service/dms/replication_config_test.go | 2 +- internal/service/dms/replication_subnet_group.go | 2 +- internal/service/dms/replication_subnet_group_data_source.go | 2 +- internal/service/dms/replication_task_test.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/service/dms/event_subscription.go b/internal/service/dms/event_subscription.go index 5d97aa47f69..22bb6153722 100644 --- a/internal/service/dms/event_subscription.go +++ b/internal/service/dms/event_subscription.go @@ -149,7 +149,7 @@ func resourceEventSubscriptionRead(ctx context.Context, d *schema.ResourceData, Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "dms", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("es:%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/dms/replication_config_test.go b/internal/service/dms/replication_config_test.go index f5d24b3875f..819a142aee9 100644 --- a/internal/service/dms/replication_config_test.go +++ b/internal/service/dms/replication_config_test.go @@ -43,7 +43,7 @@ func TestAccDMSReplicationConfig_basic(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckReplicationConfigExists(ctx, resourceName, &v), resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "dms", regexache.MustCompile(`replication-config:[A-Z0-9]{26}`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "dms", regexache.MustCompile(`replication-config:[A-Z0-9]{26}`)), resource.TestCheckResourceAttr(resourceName, "compute_config.#", "1"), resource.TestCheckResourceAttr(resourceName, "compute_config.0.availability_zone", ""), resource.TestCheckResourceAttr(resourceName, "compute_config.0.dns_name_servers", ""), diff --git a/internal/service/dms/replication_subnet_group.go b/internal/service/dms/replication_subnet_group.go index 43d28747a0d..add559c6309 100644 --- a/internal/service/dms/replication_subnet_group.go +++ b/internal/service/dms/replication_subnet_group.go @@ -118,7 +118,7 @@ func resourceReplicationSubnetGroupRead(ctx context.Context, d *schema.ResourceD Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "dms", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("subgrp:%s", d.Id()), }.String() d.Set("replication_subnet_group_arn", arn) diff --git a/internal/service/dms/replication_subnet_group_data_source.go b/internal/service/dms/replication_subnet_group_data_source.go index 1eb9b010092..8db4b4548a9 100644 --- a/internal/service/dms/replication_subnet_group_data_source.go +++ b/internal/service/dms/replication_subnet_group_data_source.go @@ -72,7 +72,7 @@ func dataSourceReplicationSubnetGroupRead(ctx context.Context, d *schema.Resourc Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "dms", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("subgrp:%s", d.Id()), }.String() d.Set("replication_subnet_group_arn", arn) diff --git a/internal/service/dms/replication_task_test.go b/internal/service/dms/replication_task_test.go index 5ef3361ad86..69097ebbb01 100644 --- a/internal/service/dms/replication_task_test.go +++ b/internal/service/dms/replication_task_test.go @@ -49,7 +49,7 @@ func TestAccDMSReplicationTask_basic(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckReplicationTaskExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "replication_task_id", rName), - acctest.MatchResourceAttrRegionalARN(resourceName, "replication_task_arn", "dms", regexache.MustCompile(`task:[A-Z0-9]{26}`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "replication_task_arn", "dms", regexache.MustCompile(`task:[A-Z0-9]{26}`)), resource.TestCheckResourceAttr(resourceName, "cdc_start_position", ""), resource.TestCheckNoResourceAttr(resourceName, "cdc_start_time"), resource.TestCheckResourceAttr(resourceName, "migration_type", migrationType), From 2dfdd0d8c14fe6beab0cd0fb9bcbc9093536cdac Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:46 -0500 Subject: [PATCH 057/304] Make 'AWSClient.AccountID' a getter - docdb. --- internal/service/docdb/cluster_instance_test.go | 2 +- internal/service/docdb/cluster_snapshot_test.go | 2 +- internal/service/docdb/cluster_test.go | 4 ++-- internal/service/docdb/global_cluster_test.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/service/docdb/cluster_instance_test.go b/internal/service/docdb/cluster_instance_test.go index 24a68925f34..662bb011383 100644 --- a/internal/service/docdb/cluster_instance_test.go +++ b/internal/service/docdb/cluster_instance_test.go @@ -37,7 +37,7 @@ func TestAccDocDBClusterInstance_basic(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckClusterInstanceExists(ctx, resourceName, &v), resource.TestCheckNoResourceAttr(resourceName, names.AttrApplyImmediately), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "rds", regexache.MustCompile(fmt.Sprintf("db:%s", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "rds", regexache.MustCompile(fmt.Sprintf("db:%s", rName))), resource.TestCheckResourceAttr(resourceName, names.AttrAutoMinorVersionUpgrade, acctest.CtTrue), resource.TestCheckResourceAttrSet(resourceName, names.AttrAvailabilityZone), resource.TestCheckResourceAttrSet(resourceName, "ca_cert_identifier"), diff --git a/internal/service/docdb/cluster_snapshot_test.go b/internal/service/docdb/cluster_snapshot_test.go index c9982d82e88..9c175b1add1 100644 --- a/internal/service/docdb/cluster_snapshot_test.go +++ b/internal/service/docdb/cluster_snapshot_test.go @@ -37,7 +37,7 @@ func TestAccDocDBClusterSnapshot_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckClusterSnapshotExists(ctx, resourceName, &dbClusterSnapshot), resource.TestCheckResourceAttrSet(resourceName, "availability_zones.#"), - acctest.MatchResourceAttrRegionalARN(resourceName, "db_cluster_snapshot_arn", "rds", regexache.MustCompile(`cluster-snapshot:.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "db_cluster_snapshot_arn", "rds", regexache.MustCompile(`cluster-snapshot:.+`)), resource.TestCheckResourceAttrSet(resourceName, names.AttrEngine), resource.TestCheckResourceAttrSet(resourceName, names.AttrEngineVersion), resource.TestCheckResourceAttr(resourceName, names.AttrKMSKeyID, ""), diff --git a/internal/service/docdb/cluster_test.go b/internal/service/docdb/cluster_test.go index e719e14ddd1..06f402718eb 100644 --- a/internal/service/docdb/cluster_test.go +++ b/internal/service/docdb/cluster_test.go @@ -52,7 +52,7 @@ func TestAccDocDBCluster_basic(t *testing.T) { testAccCheckClusterExists(ctx, resourceName, &dbCluster), resource.TestCheckNoResourceAttr(resourceName, names.AttrAllowMajorVersionUpgrade), resource.TestCheckNoResourceAttr(resourceName, names.AttrApplyImmediately), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "rds", regexache.MustCompile(fmt.Sprintf("cluster:%s", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "rds", regexache.MustCompile(fmt.Sprintf("cluster:%s", rName))), resource.TestCheckResourceAttr(resourceName, "availability_zones.#", "3"), resource.TestCheckResourceAttr(resourceName, "backup_retention_period", "1"), resource.TestCheckResourceAttr(resourceName, names.AttrClusterIdentifier, rName), @@ -819,7 +819,7 @@ func TestAccDocDBCluster_updateEngineMajorVersion(t *testing.T) { testAccCheckClusterExists(ctx, resourceName, &dbCluster), resource.TestCheckResourceAttr(resourceName, names.AttrAllowMajorVersionUpgrade, acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, names.AttrApplyImmediately, acctest.CtTrue), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "rds", regexache.MustCompile(fmt.Sprintf("cluster:%s", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "rds", regexache.MustCompile(fmt.Sprintf("cluster:%s", rName))), resource.TestCheckResourceAttr(resourceName, "availability_zones.#", "3"), resource.TestCheckResourceAttr(resourceName, "backup_retention_period", "1"), resource.TestCheckResourceAttr(resourceName, names.AttrClusterIdentifier, rName), diff --git a/internal/service/docdb/global_cluster_test.go b/internal/service/docdb/global_cluster_test.go index 2901a389d5f..293d532f540 100644 --- a/internal/service/docdb/global_cluster_test.go +++ b/internal/service/docdb/global_cluster_test.go @@ -41,7 +41,7 @@ func TestAccDocDBGlobalCluster_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckGlobalClusterExists(ctx, resourceName, &globalCluster), //This is a rds arn - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrARN, "rds", fmt.Sprintf("global-cluster:%s", rName)), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "rds", fmt.Sprintf("global-cluster:%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrDatabaseName, ""), resource.TestCheckResourceAttr(resourceName, names.AttrDeletionProtection, acctest.CtFalse), resource.TestCheckResourceAttrSet(resourceName, names.AttrEngine), From 6b4acfca7bbc9c56c952d529312215ddaac9b3d6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:46 -0500 Subject: [PATCH 058/304] Make 'AWSClient.AccountID' a getter - dynamodb. --- .../service/dynamodb/contributor_insights.go | 2 +- .../service/dynamodb/global_table_test.go | 4 +-- .../kinesis_streaming_destination_test.go | 4 +-- .../service/dynamodb/table_export_test.go | 12 +++---- internal/service/dynamodb/table_replica.go | 2 +- internal/service/dynamodb/table_test.go | 32 +++++++++---------- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/internal/service/dynamodb/contributor_insights.go b/internal/service/dynamodb/contributor_insights.go index faadfb3b9ce..fb5c09b6ea4 100644 --- a/internal/service/dynamodb/contributor_insights.go +++ b/internal/service/dynamodb/contributor_insights.go @@ -77,7 +77,7 @@ func resourceContributorInsightsCreate(ctx context.Context, d *schema.ResourceDa return sdkdiag.AppendErrorf(diags, "creating DynamoDB Contributor Insights for table (%s): %s", tableName, err) } - d.SetId(contributorInsightsCreateResourceID(tableName, indexName, meta.(*conns.AWSClient).AccountID)) + d.SetId(contributorInsightsCreateResourceID(tableName, indexName, meta.(*conns.AWSClient).AccountID(ctx))) if _, err := waitContributorInsightsCreated(ctx, conn, tableName, indexName, d.Timeout(schema.TimeoutCreate)); err != nil { return sdkdiag.AppendErrorf(diags, "waiting for DynamoDB Contributor Insights (%s) create: %s", d.Id(), err) diff --git a/internal/service/dynamodb/global_table_test.go b/internal/service/dynamodb/global_table_test.go index e200d34767c..3865da661d3 100644 --- a/internal/service/dynamodb/global_table_test.go +++ b/internal/service/dynamodb/global_table_test.go @@ -50,7 +50,7 @@ func TestAccDynamoDBGlobalTable_basic(t *testing.T) { Config: testAccGlobalTableConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckGlobalTableExists(ctx, resourceName), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "dynamodb", regexache.MustCompile("global-table/[0-9a-z-]+$")), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "dynamodb", regexache.MustCompile("global-table/[0-9a-z-]+$")), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "replica.#", "1"), ), @@ -83,7 +83,7 @@ func TestAccDynamoDBGlobalTable_multipleRegions(t *testing.T) { Config: testAccGlobalTableConfig_multipleRegions1(rName), Check: resource.ComposeTestCheckFunc( testAccCheckGlobalTableExists(ctx, resourceName), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "dynamodb", regexache.MustCompile("global-table/[0-9a-z-]+$")), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "dynamodb", regexache.MustCompile("global-table/[0-9a-z-]+$")), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "replica.#", "1"), ), diff --git a/internal/service/dynamodb/kinesis_streaming_destination_test.go b/internal/service/dynamodb/kinesis_streaming_destination_test.go index 216db131560..02c234d35a1 100644 --- a/internal/service/dynamodb/kinesis_streaming_destination_test.go +++ b/internal/service/dynamodb/kinesis_streaming_destination_test.go @@ -35,7 +35,7 @@ func TestAccDynamoDBKinesisStreamingDestination_basic(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckKinesisStreamingDestinationExists(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, "approximate_creation_date_time_precision", ""), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrStreamARN, "kinesis", regexache.MustCompile(fmt.Sprintf("stream/%s", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrStreamARN, "kinesis", regexache.MustCompile(fmt.Sprintf("stream/%s", rName))), resource.TestCheckResourceAttr(resourceName, names.AttrTableName, rName), ), }, @@ -64,7 +64,7 @@ func TestAccDynamoDBKinesisStreamingDestination_approximateCreationDateTimePreci Check: resource.ComposeTestCheckFunc( testAccCheckKinesisStreamingDestinationExists(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, "approximate_creation_date_time_precision", "MICROSECOND"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrStreamARN, "kinesis", regexache.MustCompile(fmt.Sprintf("stream/%s", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrStreamARN, "kinesis", regexache.MustCompile(fmt.Sprintf("stream/%s", rName))), resource.TestCheckResourceAttr(resourceName, names.AttrTableName, rName), ), }, diff --git a/internal/service/dynamodb/table_export_test.go b/internal/service/dynamodb/table_export_test.go index ff4261d2eb4..6613b4c8b0e 100644 --- a/internal/service/dynamodb/table_export_test.go +++ b/internal/service/dynamodb/table_export_test.go @@ -53,10 +53,10 @@ func TestAccDynamoDBTableExport_basic(t *testing.T) { resource.TestCheckResourceAttrSet(resourceName, "export_time"), resource.TestCheckResourceAttrSet(resourceName, names.AttrStartTime), resource.TestCheckResourceAttrSet(resourceName, "end_time"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "dynamodb", regexache.MustCompile( + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "dynamodb", regexache.MustCompile( fmt.Sprintf(`table/%s/export/.+$`, rName), )), - acctest.CheckResourceAttrRegionalARN(resourceName, "table_arn", "dynamodb", fmt.Sprintf("table/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, "table_arn", "dynamodb", fmt.Sprintf("table/%s", rName)), ), }, { @@ -106,10 +106,10 @@ func TestAccDynamoDBTableExport_kms(t *testing.T) { resource.TestCheckResourceAttrSet(resourceName, "export_time"), resource.TestCheckResourceAttrSet(resourceName, names.AttrStartTime), resource.TestCheckResourceAttrSet(resourceName, "end_time"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "dynamodb", regexache.MustCompile( + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "dynamodb", regexache.MustCompile( fmt.Sprintf(`table/%s/export/.+$`, rName), )), - acctest.CheckResourceAttrRegionalARN(resourceName, "table_arn", "dynamodb", fmt.Sprintf("table/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, "table_arn", "dynamodb", fmt.Sprintf("table/%s", rName)), ), }, { @@ -158,10 +158,10 @@ func TestAccDynamoDBTableExport_s3Prefix(t *testing.T) { resource.TestCheckResourceAttrSet(resourceName, "export_time"), resource.TestCheckResourceAttrSet(resourceName, names.AttrStartTime), resource.TestCheckResourceAttrSet(resourceName, "end_time"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "dynamodb", regexache.MustCompile( + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "dynamodb", regexache.MustCompile( fmt.Sprintf(`table/%s/export/.+$`, rName), )), - acctest.CheckResourceAttrRegionalARN(resourceName, "table_arn", "dynamodb", fmt.Sprintf("table/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, "table_arn", "dynamodb", fmt.Sprintf("table/%s", rName)), ), }, { diff --git a/internal/service/dynamodb/table_replica.go b/internal/service/dynamodb/table_replica.go index 1dfae612d14..f3002481867 100644 --- a/internal/service/dynamodb/table_replica.go +++ b/internal/service/dynamodb/table_replica.go @@ -206,7 +206,7 @@ func resourceTableReplicaRead(ctx context.Context, d *schema.ResourceData, meta } globalTableARN := arn.ARN{ - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Partition: meta.(*conns.AWSClient).Partition(ctx), Region: mainRegion, Resource: fmt.Sprintf("table/%s", tableName), diff --git a/internal/service/dynamodb/table_test.go b/internal/service/dynamodb/table_test.go index 7f4597d207e..a8f244992a0 100644 --- a/internal/service/dynamodb/table_test.go +++ b/internal/service/dynamodb/table_test.go @@ -349,7 +349,7 @@ func TestAccDynamoDBTable_basic(t *testing.T) { Config: testAccTableConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckInitialTableExists(ctx, resourceName, &conf), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "dynamodb", fmt.Sprintf("table/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "dynamodb", fmt.Sprintf("table/%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "attribute.*", map[string]string{ names.AttrName: rName, @@ -412,7 +412,7 @@ func TestAccDynamoDBTable_deletion_protection(t *testing.T) { Config: testAccTableConfig_enable_deletion_protection(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckInitialTableExists(ctx, resourceName, &conf), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "dynamodb", fmt.Sprintf("table/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "dynamodb", fmt.Sprintf("table/%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "attribute.*", map[string]string{ names.AttrName: rName, @@ -1021,7 +1021,7 @@ func TestAccDynamoDBTable_streamSpecification(t *testing.T) { testAccCheckInitialTableExists(ctx, resourceName, &conf), resource.TestCheckResourceAttr(resourceName, "stream_enabled", acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, "stream_view_type", "KEYS_ONLY"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrStreamARN, "dynamodb", regexache.MustCompile(fmt.Sprintf("table/%s/stream", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrStreamARN, "dynamodb", regexache.MustCompile(fmt.Sprintf("table/%s/stream", rName))), resource.TestCheckResourceAttrSet(resourceName, "stream_label"), ), }, @@ -1036,7 +1036,7 @@ func TestAccDynamoDBTable_streamSpecification(t *testing.T) { testAccCheckInitialTableExists(ctx, resourceName, &conf), resource.TestCheckResourceAttr(resourceName, "stream_enabled", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "stream_view_type", "KEYS_ONLY"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrStreamARN, "dynamodb", regexache.MustCompile(fmt.Sprintf("table/%s/stream", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrStreamARN, "dynamodb", regexache.MustCompile(fmt.Sprintf("table/%s/stream", rName))), resource.TestCheckResourceAttrSet(resourceName, "stream_label"), ), }, @@ -1062,7 +1062,7 @@ func TestAccDynamoDBTable_streamSpecificationDiffs(t *testing.T) { testAccCheckInitialTableExists(ctx, resourceName, &conf), resource.TestCheckResourceAttr(resourceName, "stream_enabled", acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, "stream_view_type", "KEYS_ONLY"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrStreamARN, "dynamodb", regexache.MustCompile(fmt.Sprintf("table/%s/stream", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrStreamARN, "dynamodb", regexache.MustCompile(fmt.Sprintf("table/%s/stream", rName))), resource.TestCheckResourceAttrSet(resourceName, "stream_label"), ), }, @@ -1072,7 +1072,7 @@ func TestAccDynamoDBTable_streamSpecificationDiffs(t *testing.T) { testAccCheckInitialTableExists(ctx, resourceName, &conf), resource.TestCheckResourceAttr(resourceName, "stream_enabled", acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, "stream_view_type", "NEW_IMAGE"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrStreamARN, "dynamodb", regexache.MustCompile(fmt.Sprintf("table/%s/stream", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrStreamARN, "dynamodb", regexache.MustCompile(fmt.Sprintf("table/%s/stream", rName))), resource.TestCheckResourceAttrSet(resourceName, "stream_label"), ), }, @@ -1082,7 +1082,7 @@ func TestAccDynamoDBTable_streamSpecificationDiffs(t *testing.T) { testAccCheckInitialTableExists(ctx, resourceName, &conf), resource.TestCheckResourceAttr(resourceName, "stream_enabled", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "stream_view_type", "NEW_IMAGE"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrStreamARN, "dynamodb", regexache.MustCompile(fmt.Sprintf("table/%s/stream", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrStreamARN, "dynamodb", regexache.MustCompile(fmt.Sprintf("table/%s/stream", rName))), resource.TestCheckResourceAttrSet(resourceName, "stream_label"), ), }, @@ -1092,7 +1092,7 @@ func TestAccDynamoDBTable_streamSpecificationDiffs(t *testing.T) { testAccCheckInitialTableExists(ctx, resourceName, &conf), resource.TestCheckResourceAttr(resourceName, "stream_enabled", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "stream_view_type", "KEYS_ONLY"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrStreamARN, "dynamodb", regexache.MustCompile(fmt.Sprintf("table/%s/stream", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrStreamARN, "dynamodb", regexache.MustCompile(fmt.Sprintf("table/%s/stream", rName))), resource.TestCheckResourceAttrSet(resourceName, "stream_label"), ), }, @@ -1102,7 +1102,7 @@ func TestAccDynamoDBTable_streamSpecificationDiffs(t *testing.T) { testAccCheckInitialTableExists(ctx, resourceName, &conf), resource.TestCheckResourceAttr(resourceName, "stream_enabled", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "stream_view_type", "KEYS_ONLY"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrStreamARN, "dynamodb", regexache.MustCompile(fmt.Sprintf("table/%s/stream", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrStreamARN, "dynamodb", regexache.MustCompile(fmt.Sprintf("table/%s/stream", rName))), resource.TestCheckResourceAttrSet(resourceName, "stream_label"), ), }, @@ -1112,7 +1112,7 @@ func TestAccDynamoDBTable_streamSpecificationDiffs(t *testing.T) { testAccCheckInitialTableExists(ctx, resourceName, &conf), resource.TestCheckResourceAttr(resourceName, "stream_enabled", acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, "stream_view_type", "KEYS_ONLY"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrStreamARN, "dynamodb", regexache.MustCompile(fmt.Sprintf("table/%s/stream", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrStreamARN, "dynamodb", regexache.MustCompile(fmt.Sprintf("table/%s/stream", rName))), resource.TestCheckResourceAttrSet(resourceName, "stream_label"), ), }, @@ -1122,7 +1122,7 @@ func TestAccDynamoDBTable_streamSpecificationDiffs(t *testing.T) { testAccCheckInitialTableExists(ctx, resourceName, &conf), resource.TestCheckResourceAttr(resourceName, "stream_enabled", acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, "stream_view_type", "KEYS_ONLY"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrStreamARN, "dynamodb", regexache.MustCompile(fmt.Sprintf("table/%s/stream", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrStreamARN, "dynamodb", regexache.MustCompile(fmt.Sprintf("table/%s/stream", rName))), resource.TestCheckResourceAttrSet(resourceName, "stream_label"), ), }, @@ -1906,8 +1906,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(ctx, resourceName, names.AttrARN, "dynamodb", acctest.Region(), regexache.MustCompile(`table/.+$`)), + acctest.MatchResourceAttrRegionalARNRegion(ctx, resourceNameRestore, names.AttrARN, "dynamodb", acctest.AlternateRegion(), regexache.MustCompile(`table/.+$`)), ), }, { @@ -1993,7 +1993,7 @@ func TestAccDynamoDBTable_Replica_single(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckInitialTableExists(ctx, resourceName, &conf), resource.TestCheckResourceAttr(resourceName, "replica.#", "1"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "dynamodb", fmt.Sprintf("table/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "dynamodb", fmt.Sprintf("table/%s", rName)), resource.TestMatchTypeSetElemNestedAttrs(resourceName, "replica.*", map[string]*regexp.Regexp{ names.AttrARN: regexache.MustCompile(fmt.Sprintf(`:dynamodb:%s:`, acctest.AlternateRegion())), }), @@ -2051,7 +2051,7 @@ func TestAccDynamoDBTable_Replica_singleStreamSpecification(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckInitialTableExists(ctx, resourceName, &conf), resource.TestCheckResourceAttr(resourceName, "replica.#", "1"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "dynamodb", fmt.Sprintf("table/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "dynamodb", fmt.Sprintf("table/%s", rName)), resource.TestMatchTypeSetElemNestedAttrs(resourceName, "replica.*", map[string]*regexp.Regexp{ names.AttrARN: regexache.MustCompile(fmt.Sprintf(`:dynamodb:%s:.*table/%s`, acctest.AlternateRegion(), rName)), names.AttrStreamARN: regexache.MustCompile(fmt.Sprintf(`:dynamodb:%s:.*table/%s/stream`, acctest.AlternateRegion(), rName)), @@ -2956,7 +2956,7 @@ func TestAccDynamoDBTable_importTable(t *testing.T) { Config: testAccTableConfig_import(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckInitialTableExists(ctx, resourceName, &conf), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "dynamodb", fmt.Sprintf("table/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "dynamodb", fmt.Sprintf("table/%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "read_capacity", "1"), resource.TestCheckResourceAttr(resourceName, "write_capacity", "1"), From 35dbb147e46936621d4a8b69d2d4ed0f794bf005 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:46 -0500 Subject: [PATCH 059/304] Make 'AWSClient.AccountID' a getter - ec2. --- .../service/ec2/ebs_snapshot_import_test.go | 2 +- internal/service/ec2/ebs_snapshot_test.go | 2 +- internal/service/ec2/ebs_volume.go | 2 +- .../service/ec2/ebs_volume_data_source.go | 2 +- internal/service/ec2/ebs_volume_test.go | 24 ++-- internal/service/ec2/ec2_ami_copy_test.go | 2 +- .../service/ec2/ec2_ami_data_source_test.go | 2 +- .../service/ec2/ec2_ami_from_instance_test.go | 2 +- .../ec2/ec2_ami_launch_permission_test.go | 2 +- internal/service/ec2/ec2_ami_test.go | 6 +- .../ec2_capacity_block_reservation_test.go | 2 +- .../ec2/ec2_capacity_reservation_test.go | 4 +- internal/service/ec2/ec2_fleet.go | 2 +- internal/service/ec2/ec2_fleet_test.go | 2 +- internal/service/ec2/ec2_host_test.go | 12 +- internal/service/ec2/ec2_instance.go | 2 +- .../ec2/ec2_instance_connect_endpoint_test.go | 6 +- .../service/ec2/ec2_instance_data_source.go | 2 +- .../ec2/ec2_instance_metadata_defaults.go | 2 +- internal/service/ec2/ec2_instance_test.go | 4 +- internal/service/ec2/ec2_key_pair.go | 2 +- .../service/ec2/ec2_key_pair_data_source.go | 2 +- internal/service/ec2/ec2_key_pair_test.go | 2 +- internal/service/ec2/ec2_launch_template.go | 2 +- .../ec2/ec2_launch_template_data_source.go | 2 +- .../service/ec2/ec2_launch_template_test.go | 2 +- internal/service/ec2/ec2_placement_group.go | 2 +- .../service/ec2/ec2_placement_group_test.go | 2 +- ..._spot_datafeed_subscription_data_source.go | 2 +- internal/service/ec2/ipam_byoip_test.go | 6 +- .../ipam_organization_admin_account_test.go | 2 +- ...pam_resource_discovery_association_test.go | 4 +- .../ec2/ipam_resource_discovery_test.go | 4 +- .../outposts_coip_pool_data_source_test.go | 2 +- ...outposts_local_gateway_data_source_test.go | 4 +- ...al_gateway_route_table_data_source_test.go | 8 +- ...nsitgateway_attachment_data_source_test.go | 8 +- .../ec2/transitgateway_connect_peer.go | 2 +- ...transitgateway_connect_peer_data_source.go | 2 +- .../transitgateway_multicast_domain_test.go | 4 +- .../ec2/transitgateway_peering_attachment.go | 2 +- ...tgateway_peering_attachment_data_source.go | 2 +- .../transitgateway_peering_attachment_test.go | 4 +- .../ec2/transitgateway_policy_table.go | 2 +- .../ec2/transitgateway_policy_table_test.go | 2 +- ...ansitgateway_prefix_list_reference_test.go | 2 +- .../service/ec2/transitgateway_route_table.go | 2 +- .../transitgateway_route_table_data_source.go | 2 +- .../ec2/transitgateway_route_table_test.go | 2 +- internal/service/ec2/transitgateway_test.go | 4 +- .../service/ec2/verifiedaccess_group_test.go | 6 +- ...ess_instance_logging_configuration_test.go | 4 +- .../ec2/vpc_default_network_acl_test.go | 4 +- .../ec2/vpc_default_route_table_test.go | 20 ++-- .../ec2/vpc_default_security_group_test.go | 9 +- .../service/ec2/vpc_default_subnet_test.go | 10 +- .../ec2/vpc_default_vpc_dhcp_options_test.go | 8 +- internal/service/ec2/vpc_default_vpc_test.go | 12 +- internal/service/ec2/vpc_dhcp_options_test.go | 8 +- internal/service/ec2/vpc_endpoint_service.go | 2 +- .../ec2/vpc_endpoint_service_data_source.go | 2 +- .../vpc_endpoint_service_data_source_test.go | 10 +- .../service/ec2/vpc_endpoint_service_test.go | 2 +- internal/service/ec2/vpc_endpoint_test.go | 36 +++--- internal/service/ec2/vpc_flow_log.go | 2 +- internal/service/ec2/vpc_flow_log_test.go | 8 +- .../service/ec2/vpc_internet_gateway_test.go | 4 +- .../ec2/vpc_managed_prefix_list_test.go | 4 +- internal/service/ec2/vpc_network_acl_test.go | 4 +- .../ec2/vpc_network_insights_analysis_test.go | 6 +- .../ec2/vpc_network_insights_path_test.go | 2 +- .../vpc_network_interface_data_source_test.go | 12 +- .../service/ec2/vpc_network_interface_test.go | 4 +- .../service/ec2/vpc_peering_connection.go | 2 +- .../ec2/vpc_route_table_data_source_test.go | 10 +- internal/service/ec2/vpc_route_table_test.go | 108 +++++++++--------- internal/service/ec2/vpc_route_test.go | 14 +-- .../ec2/vpc_security_group_ingress_rule.go | 2 +- .../vpc_security_group_rule_data_source.go | 2 +- .../service/ec2/vpc_security_group_test.go | 8 +- .../ec2/vpc_subnet_cidr_reservation_test.go | 4 +- internal/service/ec2/vpc_subnet_test.go | 4 +- internal/service/ec2/vpc_test.go | 4 +- .../service/ec2/vpc_traffic_mirror_filter.go | 2 +- .../ec2/vpc_traffic_mirror_filter_rule.go | 2 +- .../vpc_traffic_mirror_filter_rule_test.go | 2 +- .../ec2/vpc_traffic_mirror_filter_test.go | 2 +- .../ec2/vpc_traffic_mirror_session_test.go | 4 +- .../ec2/vpc_traffic_mirror_target_test.go | 4 +- internal/service/ec2/vpnclient_endpoint.go | 2 +- .../ec2/vpnclient_endpoint_data_source.go | 2 +- .../service/ec2/vpnclient_endpoint_test.go | 2 +- internal/service/ec2/vpnsite_connection.go | 2 +- .../service/ec2/vpnsite_connection_test.go | 4 +- .../service/ec2/vpnsite_customer_gateway.go | 2 +- .../vpnsite_customer_gateway_data_source.go | 2 +- .../ec2/vpnsite_customer_gateway_test.go | 4 +- internal/service/ec2/vpnsite_gateway.go | 2 +- .../ec2/vpnsite_gateway_data_source.go | 2 +- internal/service/ec2/vpnsite_gateway_test.go | 2 +- .../ec2/wavelength_carrier_gateway_test.go | 4 +- 101 files changed, 278 insertions(+), 277 deletions(-) diff --git a/internal/service/ec2/ebs_snapshot_import_test.go b/internal/service/ec2/ebs_snapshot_import_test.go index 35ac6a1b25e..03287942b8f 100644 --- a/internal/service/ec2/ebs_snapshot_import_test.go +++ b/internal/service/ec2/ebs_snapshot_import_test.go @@ -38,7 +38,7 @@ func TestAccEC2EBSSnapshotImport_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckSnapshotExists(ctx, resourceName, &v), acctest.MatchResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`snapshot/snap-.+`)), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, diff --git a/internal/service/ec2/ebs_snapshot_test.go b/internal/service/ec2/ebs_snapshot_test.go index 0b9f4efb8d9..a3de6719787 100644 --- a/internal/service/ec2/ebs_snapshot_test.go +++ b/internal/service/ec2/ebs_snapshot_test.go @@ -39,7 +39,7 @@ func TestAccEC2EBSSnapshot_basic(t *testing.T) { acctest.MatchResourceAttrRegionalARNNoAccount(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`snapshot/snap-.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttr(resourceName, "outpost_arn", ""), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "storage_tier", "standard"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), diff --git a/internal/service/ec2/ebs_volume.go b/internal/service/ec2/ebs_volume.go index 693d6adb36b..fcc822a2b5d 100644 --- a/internal/service/ec2/ebs_volume.go +++ b/internal/service/ec2/ebs_volume.go @@ -207,7 +207,7 @@ func resourceEBSVolumeRead(ctx context.Context, d *schema.ResourceData, meta int Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("volume/%s", d.Id()), } d.Set(names.AttrARN, arn.String()) diff --git a/internal/service/ec2/ebs_volume_data_source.go b/internal/service/ec2/ebs_volume_data_source.go index db58735ed49..9b4334111b3 100644 --- a/internal/service/ec2/ebs_volume_data_source.go +++ b/internal/service/ec2/ebs_volume_data_source.go @@ -138,7 +138,7 @@ func dataSourceEBSVolumeRead(ctx context.Context, d *schema.ResourceData, meta i Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("volume/%s", d.Id()), } d.Set(names.AttrARN, arn.String()) diff --git a/internal/service/ec2/ebs_volume_test.go b/internal/service/ec2/ebs_volume_test.go index 3fc7e49d71b..4700439d581 100644 --- a/internal/service/ec2/ebs_volume_test.go +++ b/internal/service/ec2/ebs_volume_test.go @@ -37,7 +37,7 @@ func TestAccEC2EBSVolume_basic(t *testing.T) { Config: testAccEBSVolumeConfig_basic, Check: resource.ComposeTestCheckFunc( testAccCheckVolumeExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`volume/vol-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`volume/vol-.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrEncrypted, acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, names.AttrIOPS, "100"), resource.TestCheckResourceAttr(resourceName, names.AttrKMSKeyID, ""), @@ -536,7 +536,7 @@ func TestAccEC2EBSVolume_GP3_basic(t *testing.T) { Config: testAccEBSVolumeConfig_sizeTypeIOPSThroughput(rName, "10", "gp3", "", ""), Check: resource.ComposeTestCheckFunc( testAccCheckVolumeExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`volume/vol-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`volume/vol-.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrEncrypted, acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, names.AttrIOPS, "3000"), resource.TestCheckResourceAttr(resourceName, names.AttrKMSKeyID, ""), @@ -576,7 +576,7 @@ func TestAccEC2EBSVolume_GP3_iops(t *testing.T) { Config: testAccEBSVolumeConfig_sizeTypeIOPSThroughput(rName, "10", "gp3", "4000", "200"), Check: resource.ComposeTestCheckFunc( testAccCheckVolumeExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`volume/vol-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`volume/vol-.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrEncrypted, acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, names.AttrIOPS, "4000"), resource.TestCheckResourceAttr(resourceName, names.AttrKMSKeyID, ""), @@ -600,7 +600,7 @@ func TestAccEC2EBSVolume_GP3_iops(t *testing.T) { Config: testAccEBSVolumeConfig_sizeTypeIOPSThroughput(rName, "10", "gp3", "5000", "200"), Check: resource.ComposeTestCheckFunc( testAccCheckVolumeExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`volume/vol-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`volume/vol-.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrEncrypted, acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, names.AttrIOPS, "5000"), resource.TestCheckResourceAttr(resourceName, names.AttrKMSKeyID, ""), @@ -634,7 +634,7 @@ func TestAccEC2EBSVolume_GP3_throughput(t *testing.T) { Config: testAccEBSVolumeConfig_sizeTypeIOPSThroughput(rName, "10", "gp3", "", "400"), Check: resource.ComposeTestCheckFunc( testAccCheckVolumeExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`volume/vol-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`volume/vol-.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrEncrypted, acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, names.AttrIOPS, "3000"), resource.TestCheckResourceAttr(resourceName, names.AttrKMSKeyID, ""), @@ -658,7 +658,7 @@ func TestAccEC2EBSVolume_GP3_throughput(t *testing.T) { Config: testAccEBSVolumeConfig_sizeTypeIOPSThroughput(rName, "10", "gp3", "", "600"), Check: resource.ComposeTestCheckFunc( testAccCheckVolumeExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`volume/vol-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`volume/vol-.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrEncrypted, acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, names.AttrIOPS, "3000"), resource.TestCheckResourceAttr(resourceName, names.AttrKMSKeyID, ""), @@ -692,7 +692,7 @@ func TestAccEC2EBSVolume_gp3ToGP2(t *testing.T) { Config: testAccEBSVolumeConfig_sizeTypeIOPSThroughput(rName, "10", "gp3", "3000", "400"), Check: resource.ComposeTestCheckFunc( testAccCheckVolumeExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`volume/vol-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`volume/vol-.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrEncrypted, acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, names.AttrIOPS, "3000"), resource.TestCheckResourceAttr(resourceName, names.AttrKMSKeyID, ""), @@ -716,7 +716,7 @@ func TestAccEC2EBSVolume_gp3ToGP2(t *testing.T) { Config: testAccEBSVolumeConfig_sizeTypeIOPSThroughput(rName, "10", "gp2", "", ""), Check: resource.ComposeTestCheckFunc( testAccCheckVolumeExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`volume/vol-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`volume/vol-.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrEncrypted, acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, names.AttrIOPS, "100"), resource.TestCheckResourceAttr(resourceName, names.AttrKMSKeyID, ""), @@ -750,7 +750,7 @@ func TestAccEC2EBSVolume_io1ToGP3(t *testing.T) { Config: testAccEBSVolumeConfig_sizeTypeIOPSThroughput(rName, "100", "io1", "4000", ""), Check: resource.ComposeTestCheckFunc( testAccCheckVolumeExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`volume/vol-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`volume/vol-.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrEncrypted, acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, names.AttrIOPS, "4000"), resource.TestCheckResourceAttr(resourceName, names.AttrKMSKeyID, ""), @@ -774,7 +774,7 @@ func TestAccEC2EBSVolume_io1ToGP3(t *testing.T) { Config: testAccEBSVolumeConfig_sizeTypeIOPSThroughput(rName, "100", "gp3", "4000", "125"), Check: resource.ComposeTestCheckFunc( testAccCheckVolumeExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`volume/vol-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`volume/vol-.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrEncrypted, acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, names.AttrIOPS, "4000"), resource.TestCheckResourceAttr(resourceName, names.AttrKMSKeyID, ""), @@ -809,7 +809,7 @@ func TestAccEC2EBSVolume_snapshotID(t *testing.T) { Config: testAccEBSVolumeConfig_snapshotID(rName), Check: resource.ComposeTestCheckFunc( testAccCheckVolumeExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`volume/vol-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`volume/vol-.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrEncrypted, acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, names.AttrIOPS, "100"), resource.TestCheckResourceAttr(resourceName, names.AttrKMSKeyID, ""), @@ -850,7 +850,7 @@ func TestAccEC2EBSVolume_snapshotIDAndSize(t *testing.T) { Config: testAccEBSVolumeConfig_snapshotIdAndSize(rName, 20), Check: resource.ComposeTestCheckFunc( testAccCheckVolumeExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`volume/vol-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`volume/vol-.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrEncrypted, acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, names.AttrIOPS, "100"), resource.TestCheckResourceAttr(resourceName, names.AttrKMSKeyID, ""), diff --git a/internal/service/ec2/ec2_ami_copy_test.go b/internal/service/ec2/ec2_ami_copy_test.go index 018c1bf9a19..7cfeee518c9 100644 --- a/internal/service/ec2/ec2_ami_copy_test.go +++ b/internal/service/ec2/ec2_ami_copy_test.go @@ -39,7 +39,7 @@ func TestAccEC2AMICopy_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "platform_details", "Linux/UNIX"), resource.TestCheckResourceAttr(resourceName, "image_type", "machine"), resource.TestCheckResourceAttr(resourceName, "hypervisor", "xen"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), ), }, }, diff --git a/internal/service/ec2/ec2_ami_data_source_test.go b/internal/service/ec2/ec2_ami_data_source_test.go index 86f37b47c27..795cb95926a 100644 --- a/internal/service/ec2/ec2_ami_data_source_test.go +++ b/internal/service/ec2/ec2_ami_data_source_test.go @@ -273,7 +273,7 @@ func TestAccEC2AMIDataSource_gp3BlockDevice(t *testing.T) { resource.TestCheckResourceAttrPair(datasourceName, "block_device_mappings.#", resourceName, "ebs_block_device.#"), resource.TestCheckResourceAttrPair(datasourceName, names.AttrDescription, resourceName, names.AttrDescription), resource.TestCheckResourceAttrPair(datasourceName, "image_id", resourceName, names.AttrID), - acctest.CheckResourceAttrAccountID(datasourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, datasourceName, names.AttrOwnerID), resource.TestCheckResourceAttrPair(datasourceName, "root_device_name", resourceName, "root_device_name"), resource.TestCheckResourceAttr(datasourceName, "root_device_type", "ebs"), resource.TestCheckResourceAttrPair(datasourceName, "root_snapshot_id", resourceName, "root_snapshot_id"), diff --git a/internal/service/ec2/ec2_ami_from_instance_test.go b/internal/service/ec2/ec2_ami_from_instance_test.go index 1b13699b957..1ca427a07c3 100644 --- a/internal/service/ec2/ec2_ami_from_instance_test.go +++ b/internal/service/ec2/ec2_ami_from_instance_test.go @@ -38,7 +38,7 @@ func TestAccEC2AMIFromInstance_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "platform_details", "Linux/UNIX"), resource.TestCheckResourceAttr(resourceName, "image_type", "machine"), resource.TestCheckResourceAttr(resourceName, "hypervisor", "xen"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, diff --git a/internal/service/ec2/ec2_ami_launch_permission_test.go b/internal/service/ec2/ec2_ami_launch_permission_test.go index 46c22471501..6063d87c4a2 100644 --- a/internal/service/ec2/ec2_ami_launch_permission_test.go +++ b/internal/service/ec2/ec2_ami_launch_permission_test.go @@ -33,7 +33,7 @@ func TestAccEC2AMILaunchPermission_basic(t *testing.T) { Config: testAccAMILaunchPermissionConfig_accountID(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAMILaunchPermissionExists(ctx, resourceName), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrAccountID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrAccountID), resource.TestCheckResourceAttr(resourceName, "group", ""), resource.TestCheckResourceAttr(resourceName, "organization_arn", ""), resource.TestCheckResourceAttr(resourceName, "organizational_unit_arn", ""), diff --git a/internal/service/ec2/ec2_ami_test.go b/internal/service/ec2/ec2_ami_test.go index 0c11b40c2d3..2b9fa7204b0 100644 --- a/internal/service/ec2/ec2_ami_test.go +++ b/internal/service/ec2/ec2_ami_test.go @@ -60,7 +60,7 @@ func TestAccEC2AMI_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "imds_support", ""), resource.TestCheckResourceAttr(resourceName, "kernel_id", ""), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "platform_details", "Linux/UNIX"), resource.TestCheckResourceAttr(resourceName, "ramdisk_id", ""), resource.TestCheckResourceAttr(resourceName, "root_device_name", "/dev/sda1"), @@ -262,7 +262,7 @@ func TestAccEC2AMI_ephemeralBlockDevices(t *testing.T) { }), resource.TestCheckResourceAttr(resourceName, "kernel_id", ""), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "ramdisk_id", ""), resource.TestCheckResourceAttr(resourceName, "root_device_name", "/dev/sda1"), resource.TestCheckResourceAttrPair(resourceName, "root_snapshot_id", snapshotResourceName, names.AttrID), @@ -329,7 +329,7 @@ func TestAccEC2AMI_gp3BlockDevice(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "ephemeral_block_device.#", "0"), resource.TestCheckResourceAttr(resourceName, "kernel_id", ""), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "ramdisk_id", ""), resource.TestCheckResourceAttr(resourceName, "root_device_name", "/dev/sda1"), resource.TestCheckResourceAttrPair(resourceName, "root_snapshot_id", snapshotResourceName, names.AttrID), diff --git a/internal/service/ec2/ec2_capacity_block_reservation_test.go b/internal/service/ec2/ec2_capacity_block_reservation_test.go index 91e709ce523..a9e6c766c81 100644 --- a/internal/service/ec2/ec2_capacity_block_reservation_test.go +++ b/internal/service/ec2/ec2_capacity_block_reservation_test.go @@ -44,7 +44,7 @@ func TestAccEC2CapacityBlockReservation_basic(t *testing.T) { Config: testAccCapacityBlockReservationConfig_basic(startDate, endDate), Check: resource.ComposeTestCheckFunc( testAccCheckCapacityBlockReservationExists(ctx, resourceName, &reservation), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`capacity-reservation/cr-:.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`capacity-reservation/cr-:.+`)), resource.TestCheckResourceAttrPair(dataSourceName, names.AttrAvailabilityZone, resourceName, names.AttrAvailabilityZone), resource.TestCheckResourceAttrPair(dataSourceName, "capacity_block_offering_id", resourceName, "capacity_block_offering_id"), resource.TestCheckResourceAttrPair(dataSourceName, "start_date", resourceName, "start_date"), diff --git a/internal/service/ec2/ec2_capacity_reservation_test.go b/internal/service/ec2/ec2_capacity_reservation_test.go index 4ed16d365e0..15ca163d7c1 100644 --- a/internal/service/ec2/ec2_capacity_reservation_test.go +++ b/internal/service/ec2/ec2_capacity_reservation_test.go @@ -39,7 +39,7 @@ func TestAccEC2CapacityReservation_basic(t *testing.T) { Config: testAccCapacityReservationConfig_basic, Check: resource.ComposeTestCheckFunc( testAccCheckCapacityReservationExists(ctx, resourceName, &cr), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`capacity-reservation/cr-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`capacity-reservation/cr-.+`)), resource.TestCheckResourceAttrPair(resourceName, names.AttrAvailabilityZone, availabilityZonesDataSourceName, "names.0"), resource.TestCheckResourceAttr(resourceName, "ebs_optimized", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "end_date", ""), @@ -50,7 +50,7 @@ func TestAccEC2CapacityReservation_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "instance_platform", "Linux/UNIX"), resource.TestCheckResourceAttr(resourceName, names.AttrInstanceType, "t2.micro"), resource.TestCheckResourceAttr(resourceName, "outpost_arn", ""), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "placement_group_arn", ""), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttr(resourceName, "tenancy", "default"), diff --git a/internal/service/ec2/ec2_fleet.go b/internal/service/ec2/ec2_fleet.go index 425faedc1c8..7bb8f015bd4 100644 --- a/internal/service/ec2/ec2_fleet.go +++ b/internal/service/ec2/ec2_fleet.go @@ -810,7 +810,7 @@ func resourceFleetRead(ctx context.Context, d *schema.ResourceData, meta interfa Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("fleet/%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/ec2/ec2_fleet_test.go b/internal/service/ec2/ec2_fleet_test.go index b73c49ec8ae..cddb9fca08a 100644 --- a/internal/service/ec2/ec2_fleet_test.go +++ b/internal/service/ec2/ec2_fleet_test.go @@ -41,7 +41,7 @@ func TestAccEC2Fleet_basic(t *testing.T) { Config: testAccFleetConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckFleetExists(ctx, resourceName, &fleet1), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`fleet/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`fleet/.+`)), resource.TestCheckResourceAttr(resourceName, "context", ""), resource.TestCheckResourceAttr(resourceName, "excess_capacity_termination_policy", "termination"), resource.TestCheckResourceAttr(resourceName, "fleet_state", "active"), diff --git a/internal/service/ec2/ec2_host_test.go b/internal/service/ec2/ec2_host_test.go index a1ce828541d..cbd05987218 100644 --- a/internal/service/ec2/ec2_host_test.go +++ b/internal/service/ec2/ec2_host_test.go @@ -35,13 +35,13 @@ func TestAccEC2Host_basic(t *testing.T) { Config: testAccHostConfig_basic(), Check: resource.ComposeTestCheckFunc( testAccCheckHostExists(ctx, resourceName, &host), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`dedicated-host/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`dedicated-host/.+`)), resource.TestCheckResourceAttr(resourceName, "auto_placement", "on"), resource.TestCheckResourceAttr(resourceName, "host_recovery", "off"), resource.TestCheckResourceAttr(resourceName, "instance_family", ""), resource.TestCheckResourceAttr(resourceName, names.AttrInstanceType, "c8g.large"), resource.TestCheckResourceAttr(resourceName, "outpost_arn", ""), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -93,12 +93,12 @@ func TestAccEC2Host_instanceFamily(t *testing.T) { Config: testAccHostConfig_instanceFamily(rName), Check: resource.ComposeTestCheckFunc( testAccCheckHostExists(ctx, resourceName, &host), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`dedicated-host/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`dedicated-host/.+`)), resource.TestCheckResourceAttr(resourceName, "auto_placement", "off"), resource.TestCheckResourceAttr(resourceName, "host_recovery", "on"), resource.TestCheckResourceAttr(resourceName, "instance_family", "c8g"), resource.TestCheckResourceAttr(resourceName, names.AttrInstanceType, ""), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), resource.TestCheckResourceAttr(resourceName, "tags.Name", rName), ), @@ -112,12 +112,12 @@ func TestAccEC2Host_instanceFamily(t *testing.T) { Config: testAccHostConfig_instanceType(rName), Check: resource.ComposeTestCheckFunc( testAccCheckHostExists(ctx, resourceName, &host), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`dedicated-host/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`dedicated-host/.+`)), resource.TestCheckResourceAttr(resourceName, "auto_placement", "on"), resource.TestCheckResourceAttr(resourceName, "host_recovery", "off"), resource.TestCheckResourceAttr(resourceName, "instance_family", ""), resource.TestCheckResourceAttr(resourceName, names.AttrInstanceType, "c8g.xlarge"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), resource.TestCheckResourceAttr(resourceName, "tags.Name", rName), ), diff --git a/internal/service/ec2/ec2_instance.go b/internal/service/ec2/ec2_instance.go index fb57c559e20..98fb9f0e08a 100644 --- a/internal/service/ec2/ec2_instance.go +++ b/internal/service/ec2/ec2_instance.go @@ -1364,7 +1364,7 @@ func resourceInstanceRead(ctx context.Context, d *schema.ResourceData, meta inte Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, Service: names.EC2, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("instance/%s", d.Id()), } d.Set(names.AttrARN, arn.String()) diff --git a/internal/service/ec2/ec2_instance_connect_endpoint_test.go b/internal/service/ec2/ec2_instance_connect_endpoint_test.go index c9b33040987..0e6668e0fb0 100644 --- a/internal/service/ec2/ec2_instance_connect_endpoint_test.go +++ b/internal/service/ec2/ec2_instance_connect_endpoint_test.go @@ -36,12 +36,12 @@ func TestAccEC2InstanceConnectEndpoint_basic(t *testing.T) { Config: testAccInstanceConnectEndpointConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckInstanceConnectEndpointExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`instance-connect-endpoint/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`instance-connect-endpoint/.+`)), resource.TestCheckResourceAttrSet(resourceName, names.AttrAvailabilityZone), resource.TestCheckResourceAttrSet(resourceName, names.AttrDNSName), resource.TestCheckResourceAttrSet(resourceName, "fips_dns_name"), acctest.CheckResourceAttrGreaterThanOrEqualValue(resourceName, "network_interface_ids.#", 1), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "preserve_client_ip", acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, "security_group_ids.#", "1"), resource.TestCheckResourceAttrPair(resourceName, names.AttrSubnetID, subnetResourceName, names.AttrID), @@ -145,7 +145,7 @@ func TestAccEC2InstanceConnectEndpoint_securityGroupIDs(t *testing.T) { Config: testAccInstanceConnectEndpointConfig_securityGroupIDs(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckInstanceConnectEndpointExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`instance-connect-endpoint/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`instance-connect-endpoint/.+`)), resource.TestCheckResourceAttrSet(resourceName, names.AttrAvailabilityZone), resource.TestCheckResourceAttrSet(resourceName, names.AttrDNSName), resource.TestCheckResourceAttrSet(resourceName, "fips_dns_name"), diff --git a/internal/service/ec2/ec2_instance_data_source.go b/internal/service/ec2/ec2_instance_data_source.go index 0c427dc2116..452009d72c4 100644 --- a/internal/service/ec2/ec2_instance_data_source.go +++ b/internal/service/ec2/ec2_instance_data_source.go @@ -455,7 +455,7 @@ func dataSourceInstanceRead(ctx context.Context, d *schema.ResourceData, meta in Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, Service: names.EC2, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("instance/%s", d.Id()), } d.Set(names.AttrARN, arn.String()) diff --git a/internal/service/ec2/ec2_instance_metadata_defaults.go b/internal/service/ec2/ec2_instance_metadata_defaults.go index 0d24e6f9e61..2f4aff35866 100644 --- a/internal/service/ec2/ec2_instance_metadata_defaults.go +++ b/internal/service/ec2/ec2_instance_metadata_defaults.go @@ -121,7 +121,7 @@ func (r *instanceMetadataDefaultsResource) Create(ctx context.Context, request r } // Set values for unknowns. - data.ID = types.StringValue(r.Meta().AccountID) + data.ID = types.StringValue(r.Meta().AccountID(ctx)) response.Diagnostics.Append(response.State.Set(ctx, data)...) } diff --git a/internal/service/ec2/ec2_instance_test.go b/internal/service/ec2/ec2_instance_test.go index 92345330b68..e3603f77eb4 100644 --- a/internal/service/ec2/ec2_instance_test.go +++ b/internal/service/ec2/ec2_instance_test.go @@ -188,7 +188,7 @@ func TestAccEC2Instance_basic(t *testing.T) { Config: testAccInstanceConfig_basic(), Check: resource.ComposeTestCheckFunc( testAccCheckInstanceExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`instance/i-[0-9a-z]+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`instance/i-[0-9a-z]+`)), resource.TestCheckResourceAttr(resourceName, "instance_initiated_shutdown_behavior", "stop"), ), }, @@ -305,7 +305,7 @@ func TestAccEC2Instance_atLeastOneOtherEBSVolume(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "root_block_device.#", "0"), // This is an instance store AMI resource.TestCheckResourceAttr(resourceName, "ebs_block_device.#", "0"), resource.TestCheckResourceAttr(resourceName, "outpost_arn", ""), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`instance/i-[0-9a-z]+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`instance/i-[0-9a-z]+`)), ), }, { diff --git a/internal/service/ec2/ec2_key_pair.go b/internal/service/ec2/ec2_key_pair.go index 41518a92533..5d8b7d77ef8 100644 --- a/internal/service/ec2/ec2_key_pair.go +++ b/internal/service/ec2/ec2_key_pair.go @@ -141,7 +141,7 @@ func resourceKeyPairRead(ctx context.Context, d *schema.ResourceData, meta inter Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: "key-pair/" + d.Id(), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/ec2/ec2_key_pair_data_source.go b/internal/service/ec2/ec2_key_pair_data_source.go index aab5de4aa2e..42f3f9246ab 100644 --- a/internal/service/ec2/ec2_key_pair_data_source.go +++ b/internal/service/ec2/ec2_key_pair_data_source.go @@ -104,7 +104,7 @@ func dataSourceKeyPairRead(ctx context.Context, d *schema.ResourceData, meta int Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "ec2", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: "key-pair/" + keyName, }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/ec2/ec2_key_pair_test.go b/internal/service/ec2/ec2_key_pair_test.go index 3d01865a7f2..b9b0484dc76 100644 --- a/internal/service/ec2/ec2_key_pair_test.go +++ b/internal/service/ec2/ec2_key_pair_test.go @@ -41,7 +41,7 @@ func TestAccEC2KeyPair_basic(t *testing.T) { Config: testAccKeyPairConfig_basic(rName, publicKey), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckKeyPairExists(ctx, resourceName, &keyPair), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", fmt.Sprintf("key-pair/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", fmt.Sprintf("key-pair/%s", rName)), resource.TestMatchResourceAttr(resourceName, "fingerprint", regexache.MustCompile(`[0-9a-f]{2}(:[0-9a-f]{2}){15}`)), resource.TestCheckResourceAttr(resourceName, "key_name", rName), resource.TestCheckResourceAttr(resourceName, "key_name_prefix", ""), diff --git a/internal/service/ec2/ec2_launch_template.go b/internal/service/ec2/ec2_launch_template.go index 888a47e8da4..031fba2f32c 100644 --- a/internal/service/ec2/ec2_launch_template.go +++ b/internal/service/ec2/ec2_launch_template.go @@ -1055,7 +1055,7 @@ func resourceLaunchTemplateRead(ctx context.Context, d *schema.ResourceData, met Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("launch-template/%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/ec2/ec2_launch_template_data_source.go b/internal/service/ec2/ec2_launch_template_data_source.go index 0c1f17747c5..317b7b67c1e 100644 --- a/internal/service/ec2/ec2_launch_template_data_source.go +++ b/internal/service/ec2/ec2_launch_template_data_source.go @@ -834,7 +834,7 @@ func dataSourceLaunchTemplateRead(ctx context.Context, d *schema.ResourceData, m Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("launch-template/%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/ec2/ec2_launch_template_test.go b/internal/service/ec2/ec2_launch_template_test.go index 316cce1240f..bdf4fc1bb42 100644 --- a/internal/service/ec2/ec2_launch_template_test.go +++ b/internal/service/ec2/ec2_launch_template_test.go @@ -37,7 +37,7 @@ func TestAccEC2LaunchTemplate_basic(t *testing.T) { Config: testAccLaunchTemplateConfig_name(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckLaunchTemplateExists(ctx, resourceName, &template), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`launch-template/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`launch-template/.+`)), resource.TestCheckResourceAttr(resourceName, "block_device_mappings.#", "0"), resource.TestCheckResourceAttr(resourceName, "capacity_reservation_specification.#", "0"), resource.TestCheckResourceAttr(resourceName, "cpu_options.#", "0"), diff --git a/internal/service/ec2/ec2_placement_group.go b/internal/service/ec2/ec2_placement_group.go index 2685ba15ed6..aecd139b771 100644 --- a/internal/service/ec2/ec2_placement_group.go +++ b/internal/service/ec2/ec2_placement_group.go @@ -142,7 +142,7 @@ func resourcePlacementGroupRead(ctx context.Context, d *schema.ResourceData, met Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("placement-group/%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/ec2/ec2_placement_group_test.go b/internal/service/ec2/ec2_placement_group_test.go index 735b355afd3..9aaba95d27e 100644 --- a/internal/service/ec2/ec2_placement_group_test.go +++ b/internal/service/ec2/ec2_placement_group_test.go @@ -35,7 +35,7 @@ func TestAccEC2PlacementGroup_basic(t *testing.T) { Config: testAccPlacementGroupConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckPlacementGroupExists(ctx, resourceName, &pg), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", fmt.Sprintf("placement-group/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", fmt.Sprintf("placement-group/%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "spread_level", ""), resource.TestCheckResourceAttr(resourceName, "strategy", "cluster"), diff --git a/internal/service/ec2/ec2_spot_datafeed_subscription_data_source.go b/internal/service/ec2/ec2_spot_datafeed_subscription_data_source.go index c5b6c58e290..75a66a00cd0 100644 --- a/internal/service/ec2/ec2_spot_datafeed_subscription_data_source.go +++ b/internal/service/ec2/ec2_spot_datafeed_subscription_data_source.go @@ -48,7 +48,7 @@ func (d *dataSourceSpotDataFeedSubscription) Schema(ctx context.Context, req dat func (d *dataSourceSpotDataFeedSubscription) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) { conn := d.Meta().EC2Client(ctx) - accountID := d.Meta().AccountID + accountID := d.Meta().AccountID(ctx) var data dataSourceSpotDataFeedSubscriptionModel resp.Diagnostics.Append(req.Config.Get(ctx, &data)...) diff --git a/internal/service/ec2/ipam_byoip_test.go b/internal/service/ec2/ipam_byoip_test.go index 905cc8285c8..6d8e605954e 100644 --- a/internal/service/ec2/ipam_byoip_test.go +++ b/internal/service/ec2/ipam_byoip_test.go @@ -62,7 +62,7 @@ func TestAccIPAM_byoipIPv6(t *testing.T) { Config: testAccIPAMBYOIPConfig_ipv4IPv6DefaultNetmask(p, m, s), Check: resource.ComposeTestCheckFunc( acctest.CheckVPCExists(ctx, resourceName, &vpc), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`vpc/vpc-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`vpc/vpc-.+`)), resource.TestCheckNoResourceAttr(resourceName, "ipv6_netmask_length"), resource.TestMatchResourceAttr(resourceName, "ipv6_association_id", regexache.MustCompile(`^vpc-cidr-assoc-.+`)), resource.TestMatchResourceAttr(resourceName, "ipv6_cidr_block", regexache.MustCompile(`/56$`)), @@ -79,7 +79,7 @@ func TestAccIPAM_byoipIPv6(t *testing.T) { Config: testAccIPAMBYOIPConfig_ipv6ExplicitNetmask(p, m, s, netmaskLength), Check: resource.ComposeTestCheckFunc( acctest.CheckVPCExists(ctx, resourceName, &vpc), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`vpc/vpc-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`vpc/vpc-.+`)), resource.TestCheckResourceAttr(resourceName, "ipv6_netmask_length", strconv.Itoa(netmaskLength)), resource.TestMatchResourceAttr(resourceName, "ipv6_association_id", regexache.MustCompile(`^vpc-cidr-assoc-.+`)), resource.TestMatchResourceAttr(resourceName, "ipv6_cidr_block", regexache.MustCompile(`/56$`)), @@ -97,7 +97,7 @@ func TestAccIPAM_byoipIPv6(t *testing.T) { SkipFunc: testAccIPAMConfig_ipv6BYOIPSkipExplicitCIDR(t, ipv6CidrVPC), Check: resource.ComposeTestCheckFunc( acctest.CheckVPCExists(ctx, resourceName, &vpc), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`vpc/vpc-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`vpc/vpc-.+`)), resource.TestMatchResourceAttr(resourceName, "ipv6_association_id", regexache.MustCompile(`^vpc-cidr-assoc-.+`)), resource.TestCheckResourceAttr(resourceName, "ipv6_cidr_block", ipv6CidrVPC), ), diff --git a/internal/service/ec2/ipam_organization_admin_account_test.go b/internal/service/ec2/ipam_organization_admin_account_test.go index 652b249827f..12c2b7e9638 100644 --- a/internal/service/ec2/ipam_organization_admin_account_test.go +++ b/internal/service/ec2/ipam_organization_admin_account_test.go @@ -65,7 +65,7 @@ func testAccIPAMOrganizationAdminAccount_basic(t *testing.T) { Config: testAccIPAMOrganizationAdminAccountConfig_basic, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckIPAMOrganizationAdminAccountExists(ctx, resourceName, &organization), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "organizations", regexache.MustCompile("account/.+")), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "organizations", regexache.MustCompile("account/.+")), resource.TestCheckResourceAttrPair(resourceName, names.AttrID, dataSourceIdentity, names.AttrAccountID), resource.TestCheckResourceAttr(resourceName, "service_principal", tfec2.IPAMServicePrincipal), ), diff --git a/internal/service/ec2/ipam_resource_discovery_association_test.go b/internal/service/ec2/ipam_resource_discovery_association_test.go index e35199418e9..0a64e89be69 100644 --- a/internal/service/ec2/ipam_resource_discovery_association_test.go +++ b/internal/service/ec2/ipam_resource_discovery_association_test.go @@ -36,10 +36,10 @@ func testAccIPAMResourceDiscoveryAssociation_basic(t *testing.T) { Config: testAccIPAMResourceDiscoveryAssociationConfig_basic(), Check: resource.ComposeTestCheckFunc( testAccCheckIPAMResourceDiscoveryAssociationExists(ctx, resourceName, &rda), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`ipam-resource-discovery-association/ipam-res-disco-assoc-[0-9a-f]+$`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`ipam-resource-discovery-association/ipam-res-disco-assoc-[0-9a-f]+$`)), resource.TestCheckResourceAttrPair(resourceName, "ipam_id", ipamName, names.AttrID), resource.TestCheckResourceAttrPair(resourceName, "ipam_resource_discovery_id", rdName, names.AttrID), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, diff --git a/internal/service/ec2/ipam_resource_discovery_test.go b/internal/service/ec2/ipam_resource_discovery_test.go index bcb077bbe9d..a89879d07fe 100644 --- a/internal/service/ec2/ipam_resource_discovery_test.go +++ b/internal/service/ec2/ipam_resource_discovery_test.go @@ -55,12 +55,12 @@ func testAccIPAMResourceDiscovery_basic(t *testing.T) { Config: testAccIPAMResourceDiscoveryConfig_base, Check: resource.ComposeTestCheckFunc( testAccCheckIPAMResourceDiscoveryExists(ctx, resourceName, &rd), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`ipam-resource-discovery/ipam-res-disco-[0-9a-f]+$`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`ipam-resource-discovery/ipam-res-disco-[0-9a-f]+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "test"), resource.TestCheckResourceAttrPair(resourceName, "ipam_resource_discovery_region", dataSourceRegion, names.AttrName), resource.TestCheckResourceAttr(resourceName, "is_default", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "operating_regions.#", "1"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, diff --git a/internal/service/ec2/outposts_coip_pool_data_source_test.go b/internal/service/ec2/outposts_coip_pool_data_source_test.go index 0cfb714518c..d911525c1e1 100644 --- a/internal/service/ec2/outposts_coip_pool_data_source_test.go +++ b/internal/service/ec2/outposts_coip_pool_data_source_test.go @@ -47,7 +47,7 @@ func TestAccEC2OutpostsCoIPPoolDataSource_id(t *testing.T) { Check: resource.ComposeTestCheckFunc( resource.TestMatchResourceAttr(dataSourceName, "local_gateway_route_table_id", regexache.MustCompile(`^lgw-rtb-`)), resource.TestMatchResourceAttr(dataSourceName, "pool_id", regexache.MustCompile(`^ipv4pool-coip-`)), - acctest.MatchResourceAttrRegionalARN(dataSourceName, names.AttrARN, "ec2", regexache.MustCompile(`coip-pool/ipv4pool-coip-.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, dataSourceName, names.AttrARN, "ec2", regexache.MustCompile(`coip-pool/ipv4pool-coip-.+$`)), acctest.CheckResourceAttrGreaterThanValue(dataSourceName, "pool_cidrs.#", 0), ), }, diff --git a/internal/service/ec2/outposts_local_gateway_data_source_test.go b/internal/service/ec2/outposts_local_gateway_data_source_test.go index 036257f8d1b..7f5fa176bcb 100644 --- a/internal/service/ec2/outposts_local_gateway_data_source_test.go +++ b/internal/service/ec2/outposts_local_gateway_data_source_test.go @@ -25,8 +25,8 @@ func TestAccEC2OutpostsLocalGatewayDataSource_basic(t *testing.T) { Config: testAccOutpostsLocalGatewayDataSourceConfig_id(), Check: resource.ComposeTestCheckFunc( resource.TestMatchResourceAttr(dataSourceName, names.AttrID, regexache.MustCompile(`^lgw-`)), - acctest.MatchResourceAttrRegionalARN(dataSourceName, "outpost_arn", "outposts", regexache.MustCompile(`outpost/op-.+`)), - acctest.CheckResourceAttrAccountID(dataSourceName, names.AttrOwnerID), + acctest.MatchResourceAttrRegionalARN(ctx, dataSourceName, "outpost_arn", "outposts", regexache.MustCompile(`outpost/op-.+`)), + acctest.CheckResourceAttrAccountID(ctx, dataSourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(dataSourceName, names.AttrState, "available"), ), }, diff --git a/internal/service/ec2/outposts_local_gateway_route_table_data_source_test.go b/internal/service/ec2/outposts_local_gateway_route_table_data_source_test.go index 236151c0981..7bb1d6267bd 100644 --- a/internal/service/ec2/outposts_local_gateway_route_table_data_source_test.go +++ b/internal/service/ec2/outposts_local_gateway_route_table_data_source_test.go @@ -26,7 +26,7 @@ func TestAccEC2OutpostsLocalGatewayRouteTableDataSource_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( resource.TestMatchResourceAttr(dataSourceName, "local_gateway_id", regexache.MustCompile(`^lgw-`)), resource.TestMatchResourceAttr(dataSourceName, "local_gateway_route_table_id", regexache.MustCompile(`^lgw-rtb-`)), - acctest.MatchResourceAttrRegionalARN(dataSourceName, "outpost_arn", "outposts", regexache.MustCompile(`outpost/op-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, dataSourceName, "outpost_arn", "outposts", regexache.MustCompile(`outpost/op-.+`)), resource.TestCheckResourceAttr(dataSourceName, names.AttrState, "available"), ), }, @@ -48,7 +48,7 @@ func TestAccEC2OutpostsLocalGatewayRouteTableDataSource_filter(t *testing.T) { Check: resource.ComposeTestCheckFunc( resource.TestMatchResourceAttr(dataSourceName, "local_gateway_id", regexache.MustCompile(`^lgw-`)), resource.TestMatchResourceAttr(dataSourceName, "local_gateway_route_table_id", regexache.MustCompile(`^lgw-rtb-`)), - acctest.MatchResourceAttrRegionalARN(dataSourceName, "outpost_arn", "outposts", regexache.MustCompile(`outpost/op-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, dataSourceName, "outpost_arn", "outposts", regexache.MustCompile(`outpost/op-.+`)), resource.TestCheckResourceAttr(dataSourceName, names.AttrState, "available"), ), }, @@ -70,7 +70,7 @@ func TestAccEC2OutpostsLocalGatewayRouteTableDataSource_localGatewayID(t *testin Check: resource.ComposeTestCheckFunc( resource.TestMatchResourceAttr(dataSourceName, "local_gateway_id", regexache.MustCompile(`^lgw-`)), resource.TestMatchResourceAttr(dataSourceName, "local_gateway_route_table_id", regexache.MustCompile(`^lgw-rtb-`)), - acctest.MatchResourceAttrRegionalARN(dataSourceName, "outpost_arn", "outposts", regexache.MustCompile(`outpost/op-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, dataSourceName, "outpost_arn", "outposts", regexache.MustCompile(`outpost/op-.+`)), resource.TestCheckResourceAttr(dataSourceName, names.AttrState, "available"), ), }, @@ -92,7 +92,7 @@ func TestAccEC2OutpostsLocalGatewayRouteTableDataSource_outpostARN(t *testing.T) Check: resource.ComposeTestCheckFunc( resource.TestMatchResourceAttr(dataSourceName, "local_gateway_id", regexache.MustCompile(`^lgw-`)), resource.TestMatchResourceAttr(dataSourceName, "local_gateway_route_table_id", regexache.MustCompile(`^lgw-rtb-`)), - acctest.MatchResourceAttrRegionalARN(dataSourceName, "outpost_arn", "outposts", regexache.MustCompile(`outpost/op-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, dataSourceName, "outpost_arn", "outposts", regexache.MustCompile(`outpost/op-.+`)), resource.TestCheckResourceAttr(dataSourceName, names.AttrState, "available"), ), }, diff --git a/internal/service/ec2/transitgateway_attachment_data_source_test.go b/internal/service/ec2/transitgateway_attachment_data_source_test.go index 492b0be5687..3a429505563 100644 --- a/internal/service/ec2/transitgateway_attachment_data_source_test.go +++ b/internal/service/ec2/transitgateway_attachment_data_source_test.go @@ -34,13 +34,13 @@ func testAccTransitGatewayAttachmentDataSource_Filter(t *testing.T, semaphore tf Check: resource.ComposeAggregateTestCheckFunc( resource.TestCheckResourceAttrSet(dataSourceName, names.AttrARN), resource.TestCheckResourceAttrPair(resourceName, names.AttrVPCID, dataSourceName, names.AttrResourceID), - acctest.CheckResourceAttrAccountID(dataSourceName, "resource_owner_id"), + acctest.CheckResourceAttrAccountID(ctx, dataSourceName, "resource_owner_id"), resource.TestCheckResourceAttr(dataSourceName, names.AttrResourceType, "vpc"), resource.TestCheckResourceAttrSet(dataSourceName, names.AttrState), resource.TestCheckResourceAttrPair(resourceName, acctest.CtTagsPercent, dataSourceName, acctest.CtTagsPercent), resource.TestCheckResourceAttrPair(resourceName, names.AttrID, dataSourceName, names.AttrTransitGatewayAttachmentID), resource.TestCheckResourceAttrPair(resourceName, names.AttrTransitGatewayID, dataSourceName, names.AttrTransitGatewayID), - acctest.CheckResourceAttrAccountID(dataSourceName, "transit_gateway_owner_id"), + acctest.CheckResourceAttrAccountID(ctx, dataSourceName, "transit_gateway_owner_id"), resource.TestCheckResourceAttr(dataSourceName, "association_state", "associated"), resource.TestCheckResourceAttrSet(dataSourceName, "association_transit_gateway_route_table_id"), ), @@ -69,13 +69,13 @@ func testAccTransitGatewayAttachmentDataSource_ID(t *testing.T, semaphore tfsync Check: resource.ComposeAggregateTestCheckFunc( resource.TestCheckResourceAttrSet(dataSourceName, names.AttrARN), resource.TestCheckResourceAttrPair(resourceName, names.AttrVPCID, dataSourceName, names.AttrResourceID), - acctest.CheckResourceAttrAccountID(dataSourceName, "resource_owner_id"), + acctest.CheckResourceAttrAccountID(ctx, dataSourceName, "resource_owner_id"), resource.TestCheckResourceAttr(dataSourceName, names.AttrResourceType, "vpc"), resource.TestCheckResourceAttrSet(dataSourceName, names.AttrState), resource.TestCheckResourceAttrPair(resourceName, acctest.CtTagsPercent, dataSourceName, acctest.CtTagsPercent), resource.TestCheckResourceAttrPair(resourceName, names.AttrID, dataSourceName, names.AttrTransitGatewayAttachmentID), resource.TestCheckResourceAttrPair(resourceName, names.AttrTransitGatewayID, dataSourceName, names.AttrTransitGatewayID), - acctest.CheckResourceAttrAccountID(dataSourceName, "transit_gateway_owner_id"), + acctest.CheckResourceAttrAccountID(ctx, dataSourceName, "transit_gateway_owner_id"), resource.TestCheckResourceAttr(dataSourceName, "association_state", "associated"), resource.TestCheckResourceAttrSet(dataSourceName, "association_transit_gateway_route_table_id"), ), diff --git a/internal/service/ec2/transitgateway_connect_peer.go b/internal/service/ec2/transitgateway_connect_peer.go index bda6d95da0e..b1f3852c10a 100644 --- a/internal/service/ec2/transitgateway_connect_peer.go +++ b/internal/service/ec2/transitgateway_connect_peer.go @@ -181,7 +181,7 @@ func resourceTransitGatewayConnectPeerRead(ctx context.Context, d *schema.Resour Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("transit-gateway-connect-peer/%s", d.Id()), }.String() bgpConfigurations := transitGatewayConnectPeer.ConnectPeerConfiguration.BgpConfigurations diff --git a/internal/service/ec2/transitgateway_connect_peer_data_source.go b/internal/service/ec2/transitgateway_connect_peer_data_source.go index dbeaecedb1f..50522bac348 100644 --- a/internal/service/ec2/transitgateway_connect_peer_data_source.go +++ b/internal/service/ec2/transitgateway_connect_peer_data_source.go @@ -106,7 +106,7 @@ func dataSourceTransitGatewayConnectPeerRead(ctx context.Context, d *schema.Reso Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("transit-gateway-connect-peer/%s", d.Id()), }.String() bgpConfigurations := transitGatewayConnectPeer.ConnectPeerConfiguration.BgpConfigurations diff --git a/internal/service/ec2/transitgateway_multicast_domain_test.go b/internal/service/ec2/transitgateway_multicast_domain_test.go index b3b720ab515..4f9f4e12963 100644 --- a/internal/service/ec2/transitgateway_multicast_domain_test.go +++ b/internal/service/ec2/transitgateway_multicast_domain_test.go @@ -41,10 +41,10 @@ func testAccTransitGatewayMulticastDomain_basic(t *testing.T, semaphore tfsync.S Config: testAccTransitGatewayMulticastDomainConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckTransitGatewayMulticastDomainExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`transit-gateway-multicast-domain/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`transit-gateway-multicast-domain/.+`)), resource.TestCheckResourceAttr(resourceName, "auto_accept_shared_associations", "disable"), resource.TestCheckResourceAttr(resourceName, "igmpv2_support", "disable"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "static_sources_support", "disable"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrTransitGatewayID), diff --git a/internal/service/ec2/transitgateway_peering_attachment.go b/internal/service/ec2/transitgateway_peering_attachment.go index a64fa2e0241..112cf0a7ea1 100644 --- a/internal/service/ec2/transitgateway_peering_attachment.go +++ b/internal/service/ec2/transitgateway_peering_attachment.go @@ -91,7 +91,7 @@ func resourceTransitGatewayPeeringAttachmentCreate(ctx context.Context, d *schem var diags diag.Diagnostics conn := meta.(*conns.AWSClient).EC2Client(ctx) - peerAccountID := meta.(*conns.AWSClient).AccountID + peerAccountID := meta.(*conns.AWSClient).AccountID(ctx) if v, ok := d.GetOk("peer_account_id"); ok { peerAccountID = v.(string) } diff --git a/internal/service/ec2/transitgateway_peering_attachment_data_source.go b/internal/service/ec2/transitgateway_peering_attachment_data_source.go index 640f84d91bb..72045042247 100644 --- a/internal/service/ec2/transitgateway_peering_attachment_data_source.go +++ b/internal/service/ec2/transitgateway_peering_attachment_data_source.go @@ -97,7 +97,7 @@ func dataSourceTransitGatewayPeeringAttachmentRead(ctx context.Context, d *schem local := transitGatewayPeeringAttachment.RequesterTgwInfo peer := transitGatewayPeeringAttachment.AccepterTgwInfo - if aws.ToString(transitGatewayPeeringAttachment.AccepterTgwInfo.OwnerId) == meta.(*conns.AWSClient).AccountID && aws.ToString(transitGatewayPeeringAttachment.AccepterTgwInfo.Region) == meta.(*conns.AWSClient).Region { + if aws.ToString(transitGatewayPeeringAttachment.AccepterTgwInfo.OwnerId) == meta.(*conns.AWSClient).AccountID(ctx) && aws.ToString(transitGatewayPeeringAttachment.AccepterTgwInfo.Region) == meta.(*conns.AWSClient).Region { local = transitGatewayPeeringAttachment.AccepterTgwInfo peer = transitGatewayPeeringAttachment.RequesterTgwInfo } diff --git a/internal/service/ec2/transitgateway_peering_attachment_test.go b/internal/service/ec2/transitgateway_peering_attachment_test.go index 91b9d7ffd44..8ea6931e232 100644 --- a/internal/service/ec2/transitgateway_peering_attachment_test.go +++ b/internal/service/ec2/transitgateway_peering_attachment_test.go @@ -44,7 +44,7 @@ func testAccTransitGatewayPeeringAttachment_basic(t *testing.T, semaphore tfsync Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTransitGatewayPeeringAttachmentExists(ctx, resourceName, &transitGatewayPeeringAttachment), resource.TestCheckResourceAttr(resourceName, "options.#", "0"), - acctest.CheckResourceAttrAccountID(resourceName, "peer_account_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "peer_account_id"), resource.TestCheckResourceAttr(resourceName, "peer_region", acctest.AlternateRegion()), resource.TestCheckResourceAttrPair(resourceName, "peer_transit_gateway_id", transitGatewayResourceNamePeer, names.AttrID), resource.TestCheckResourceAttrSet(resourceName, names.AttrState), @@ -206,7 +206,7 @@ func testAccTransitGatewayPeeringAttachment_differentAccount(t *testing.T, semap testAccCheckTransitGatewayPeeringAttachmentExists(ctx, resourceName, &transitGatewayPeeringAttachment), // Test that the peer account ID != the primary (request) account ID func(s *terraform.State) error { - if acctest.CheckResourceAttrAccountID(resourceName, "peer_account_id") == nil { + if acctest.CheckResourceAttrAccountID(ctx, resourceName, "peer_account_id") == nil { return fmt.Errorf("peer_account_id attribute incorrectly to the requester's account ID") } return nil diff --git a/internal/service/ec2/transitgateway_policy_table.go b/internal/service/ec2/transitgateway_policy_table.go index b549fff7c28..6d3d8c1b1e4 100644 --- a/internal/service/ec2/transitgateway_policy_table.go +++ b/internal/service/ec2/transitgateway_policy_table.go @@ -107,7 +107,7 @@ func resourceTransitGatewayPolicyTableRead(ctx context.Context, d *schema.Resour Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("transit-gateway-policy-table/%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/ec2/transitgateway_policy_table_test.go b/internal/service/ec2/transitgateway_policy_table_test.go index f6bbd4d54e8..e5f0243eb08 100644 --- a/internal/service/ec2/transitgateway_policy_table_test.go +++ b/internal/service/ec2/transitgateway_policy_table_test.go @@ -44,7 +44,7 @@ func testAccTransitGatewayPolicyTable_basic(t *testing.T, semaphore tfsync.Semap Config: testAccTransitGatewayPolicyTableConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckTransitGatewayPolicyTableExists(ctx, resourceName, &transitGatewayPolicyTable1), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`transit-gateway-policy-table/tgw-ptb-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`transit-gateway-policy-table/tgw-ptb-.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrState, "available"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrPair(resourceName, names.AttrTransitGatewayID, transitGatewayResourceName, names.AttrID), diff --git a/internal/service/ec2/transitgateway_prefix_list_reference_test.go b/internal/service/ec2/transitgateway_prefix_list_reference_test.go index 0f350d8e545..b9eaa352466 100644 --- a/internal/service/ec2/transitgateway_prefix_list_reference_test.go +++ b/internal/service/ec2/transitgateway_prefix_list_reference_test.go @@ -43,7 +43,7 @@ func testAccTransitGatewayPrefixListReference_basic(t *testing.T, semaphore tfsy testAccTransitGatewayPrefixListReferenceExists(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, "blackhole", acctest.CtTrue), resource.TestCheckResourceAttrPair(resourceName, "prefix_list_id", managedPrefixListResourceName, names.AttrID), - acctest.CheckResourceAttrAccountID(resourceName, "prefix_list_owner_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "prefix_list_owner_id"), resource.TestCheckResourceAttr(resourceName, names.AttrTransitGatewayAttachmentID, ""), resource.TestCheckResourceAttrPair(resourceName, "transit_gateway_route_table_id", transitGatewayResourceName, "association_default_route_table_id"), ), diff --git a/internal/service/ec2/transitgateway_route_table.go b/internal/service/ec2/transitgateway_route_table.go index fc6d6fcf60d..b726fb145b3 100644 --- a/internal/service/ec2/transitgateway_route_table.go +++ b/internal/service/ec2/transitgateway_route_table.go @@ -110,7 +110,7 @@ func resourceTransitGatewayRouteTableRead(ctx context.Context, d *schema.Resourc Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("transit-gateway-route-table/%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/ec2/transitgateway_route_table_data_source.go b/internal/service/ec2/transitgateway_route_table_data_source.go index 7699212ca41..f0a959dc3a5 100644 --- a/internal/service/ec2/transitgateway_route_table_data_source.go +++ b/internal/service/ec2/transitgateway_route_table_data_source.go @@ -89,7 +89,7 @@ func dataSourceTransitGatewayRouteTableRead(ctx context.Context, d *schema.Resou Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("transit-gateway-route-table/%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/ec2/transitgateway_route_table_test.go b/internal/service/ec2/transitgateway_route_table_test.go index 1f2f9dca44f..544d582f4ee 100644 --- a/internal/service/ec2/transitgateway_route_table_test.go +++ b/internal/service/ec2/transitgateway_route_table_test.go @@ -44,7 +44,7 @@ func testAccTransitGatewayRouteTable_basic(t *testing.T, semaphore tfsync.Semaph Config: testAccTransitGatewayRouteTableConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckTransitGatewayRouteTableExists(ctx, resourceName, &transitGatewayRouteTable1), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`transit-gateway-route-table/tgw-rtb-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`transit-gateway-route-table/tgw-rtb-.+`)), resource.TestCheckResourceAttr(resourceName, "default_association_route_table", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "default_propagation_route_table", acctest.CtFalse), resource.TestCheckResourceAttrPair(resourceName, names.AttrTransitGatewayID, transitGatewayResourceName, names.AttrID), diff --git a/internal/service/ec2/transitgateway_test.go b/internal/service/ec2/transitgateway_test.go index 265a78766ff..075bfd9c081 100644 --- a/internal/service/ec2/transitgateway_test.go +++ b/internal/service/ec2/transitgateway_test.go @@ -200,7 +200,7 @@ func testAccTransitGateway_basic(t *testing.T, semaphore tfsync.Semaphore) { Check: resource.ComposeTestCheckFunc( testAccCheckTransitGatewayExists(ctx, resourceName, &transitGateway1), resource.TestCheckResourceAttr(resourceName, "amazon_side_asn", "64512"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`transit-gateway/tgw-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`transit-gateway/tgw-.+`)), resource.TestCheckResourceAttrSet(resourceName, "association_default_route_table_id"), resource.TestCheckResourceAttr(resourceName, "auto_accept_shared_attachments", string(awstypes.AutoAcceptSharedAttachmentsValueDisable)), resource.TestCheckResourceAttr(resourceName, "default_route_table_association", string(awstypes.DefaultRouteTableAssociationValueEnable)), @@ -208,7 +208,7 @@ func testAccTransitGateway_basic(t *testing.T, semaphore tfsync.Semaphore) { resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttr(resourceName, "dns_support", string(awstypes.DnsSupportValueEnable)), resource.TestCheckResourceAttr(resourceName, "multicast_support", string(awstypes.MulticastSupportValueDisable)), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttrSet(resourceName, "propagation_default_route_table_id"), resource.TestCheckResourceAttr(resourceName, "security_group_referencing_support", string(awstypes.SecurityGroupReferencingSupportValueDisable)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), diff --git a/internal/service/ec2/verifiedaccess_group_test.go b/internal/service/ec2/verifiedaccess_group_test.go index 83333f8c432..fd3ce26a8b3 100644 --- a/internal/service/ec2/verifiedaccess_group_test.go +++ b/internal/service/ec2/verifiedaccess_group_test.go @@ -44,7 +44,7 @@ func testAccVerifiedAccessGroup_basic(t *testing.T, semaphore tfsync.Semaphore) resource.TestCheckResourceAttr(resourceName, "deletion_time", ""), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedTime), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwner), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwner), resource.TestCheckResourceAttr(resourceName, "policy_document", ""), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, "verifiedaccess_group_arn"), @@ -125,7 +125,7 @@ func testAccVerifiedAccessGroup_updateKMS(t *testing.T, semaphore tfsync.Semapho resource.TestCheckResourceAttr(resourceName, "deletion_time", ""), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, description), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedTime), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwner), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwner), resource.TestCheckResourceAttr(resourceName, "policy_document", policyDoc), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), resource.TestCheckResourceAttrSet(resourceName, "verifiedaccess_group_arn"), @@ -350,7 +350,7 @@ func testAccVerifiedAccessGroup_setPolicy(t *testing.T, semaphore tfsync.Semapho resource.TestCheckResourceAttr(resourceName, "deletion_time", ""), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedTime), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwner), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwner), resource.TestCheckResourceAttr(resourceName, "policy_document", ""), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, "verifiedaccess_group_arn"), diff --git a/internal/service/ec2/verifiedaccess_instance_logging_configuration_test.go b/internal/service/ec2/verifiedaccess_instance_logging_configuration_test.go index a123d635796..5047831de90 100644 --- a/internal/service/ec2/verifiedaccess_instance_logging_configuration_test.go +++ b/internal/service/ec2/verifiedaccess_instance_logging_configuration_test.go @@ -247,7 +247,7 @@ func testAccVerifiedAccessInstanceLoggingConfiguration_accessLogsS3(t *testing.T resource.TestCheckResourceAttr(resourceName, "access_logs.0.s3.#", "1"), resource.TestCheckResourceAttr(resourceName, "access_logs.0.s3.0.enabled", acctest.CtTrue), resource.TestCheckResourceAttrPair(resourceName, "access_logs.0.s3.0.bucket_name", bucketName, names.AttrID), - acctest.CheckResourceAttrAccountID(resourceName, "access_logs.0.s3.0.bucket_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "access_logs.0.s3.0.bucket_owner"), resource.TestCheckResourceAttr(resourceName, "access_logs.0.s3.0.prefix", prefix_original), resource.TestCheckResourceAttrPair(resourceName, "verifiedaccess_instance_id", instanceResourceName, names.AttrID), ), @@ -266,7 +266,7 @@ func testAccVerifiedAccessInstanceLoggingConfiguration_accessLogsS3(t *testing.T resource.TestCheckResourceAttr(resourceName, "access_logs.0.s3.#", "1"), resource.TestCheckResourceAttr(resourceName, "access_logs.0.s3.0.enabled", acctest.CtTrue), resource.TestCheckResourceAttrPair(resourceName, "access_logs.0.s3.0.bucket_name", bucketName2, names.AttrID), - acctest.CheckResourceAttrAccountID(resourceName, "access_logs.0.s3.0.bucket_owner"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "access_logs.0.s3.0.bucket_owner"), resource.TestCheckResourceAttr(resourceName, "access_logs.0.s3.0.prefix", prefix_updated), resource.TestCheckResourceAttrPair(resourceName, "verifiedaccess_instance_id", instanceResourceName, names.AttrID), ), diff --git a/internal/service/ec2/vpc_default_network_acl_test.go b/internal/service/ec2/vpc_default_network_acl_test.go index 2d207b8d957..21ddf315fe1 100644 --- a/internal/service/ec2/vpc_default_network_acl_test.go +++ b/internal/service/ec2/vpc_default_network_acl_test.go @@ -37,10 +37,10 @@ func TestAccVPCDefaultNetworkACL_basic(t *testing.T) { Config: testAccVPCDefaultNetworkACLConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckDefaultNetworkACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`network-acl/acl-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`network-acl/acl-.+`)), resource.TestCheckResourceAttr(resourceName, "egress.#", "0"), resource.TestCheckResourceAttr(resourceName, "ingress.#", "0"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "subnet_ids.#", "0"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrPair(resourceName, names.AttrVPCID, vpcResourceName, names.AttrID), diff --git a/internal/service/ec2/vpc_default_route_table_test.go b/internal/service/ec2/vpc_default_route_table_test.go index df14c578418..748ddc05f9d 100644 --- a/internal/service/ec2/vpc_default_route_table_test.go +++ b/internal/service/ec2/vpc_default_route_table_test.go @@ -49,8 +49,8 @@ func TestAccVPCDefaultRouteTable_basic(t *testing.T) { Config: testAccVPCDefaultRouteTableConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckRouteTableExists(ctx, resourceName, &routeTable), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "propagating_vgws.#", "0"), resource.TestCheckResourceAttr(resourceName, "route.#", "0"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), @@ -113,8 +113,8 @@ func TestAccVPCDefaultRouteTable_Route_mode(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckRouteTableExists(ctx, resourceName, &routeTable), testAccCheckRouteTableNumberOfRoutes(&routeTable, 2), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "propagating_vgws.#", "0"), resource.TestCheckResourceAttr(resourceName, "route.#", "1"), testAccCheckRouteTableRoute(resourceName, names.AttrCIDRBlock, destinationCidr, "gateway_id", igwResourceName, names.AttrID), @@ -133,8 +133,8 @@ func TestAccVPCDefaultRouteTable_Route_mode(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckRouteTableExists(ctx, resourceName, &routeTable), testAccCheckRouteTableNumberOfRoutes(&routeTable, 2), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "propagating_vgws.#", "0"), // The route block from the previous step should still be // present, because no blocks means "ignore existing blocks". @@ -149,8 +149,8 @@ func TestAccVPCDefaultRouteTable_Route_mode(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckRouteTableExists(ctx, resourceName, &routeTable), testAccCheckRouteTableNumberOfRoutes(&routeTable, 1), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "propagating_vgws.#", "0"), // This config uses attribute syntax to set zero routes // explicitly, so should remove the one we created before. @@ -184,8 +184,8 @@ func TestAccVPCDefaultRouteTable_swap(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckRouteTableExists(ctx, resourceName, &routeTable), testAccCheckRouteTableNumberOfRoutes(&routeTable, 2), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "propagating_vgws.#", "0"), resource.TestCheckResourceAttr(resourceName, "route.#", "1"), testAccCheckRouteTableRoute(resourceName, names.AttrCIDRBlock, destinationCidr1, "gateway_id", igwResourceName, names.AttrID), diff --git a/internal/service/ec2/vpc_default_security_group_test.go b/internal/service/ec2/vpc_default_security_group_test.go index a40757c3ecc..8e12ef25194 100644 --- a/internal/service/ec2/vpc_default_security_group_test.go +++ b/internal/service/ec2/vpc_default_security_group_test.go @@ -4,6 +4,7 @@ package ec2_test import ( + "context" "fmt" "testing" @@ -52,8 +53,8 @@ func TestAccVPCDefaultSecurityGroup_basic(t *testing.T) { "cidr_blocks.#": "1", "cidr_blocks.0": "10.0.0.0/8", }), - testAccCheckDefaultSecurityGroupARN(resourceName, &group), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + testAccCheckDefaultSecurityGroupARN(ctx, resourceName, &group), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -103,9 +104,9 @@ func TestAccVPCDefaultSecurityGroup_empty(t *testing.T) { }) } -func testAccCheckDefaultSecurityGroupARN(resourceName string, group *awstypes.SecurityGroup) resource.TestCheckFunc { +func testAccCheckDefaultSecurityGroupARN(ctx context.Context, resourceName string, group *awstypes.SecurityGroup) resource.TestCheckFunc { return func(s *terraform.State) error { - return acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", fmt.Sprintf("security-group/%s", aws.ToString(group.GroupId)))(s) + return acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", fmt.Sprintf("security-group/%s", aws.ToString(group.GroupId)))(s) } } diff --git a/internal/service/ec2/vpc_default_subnet_test.go b/internal/service/ec2/vpc_default_subnet_test.go index 2fed51345c3..0620343c77f 100644 --- a/internal/service/ec2/vpc_default_subnet_test.go +++ b/internal/service/ec2/vpc_default_subnet_test.go @@ -114,7 +114,7 @@ func testAccDefaultSubnet_Existing_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "map_customer_owned_ip_on_launch", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "map_public_ip_on_launch", acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, "outpost_arn", ""), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttrSet(resourceName, "private_dns_hostname_type_on_launch"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrVPCID), @@ -187,7 +187,7 @@ func testAccDefaultSubnet_Existing_ipv6(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "map_customer_owned_ip_on_launch", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "map_public_ip_on_launch", acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, "outpost_arn", ""), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "private_dns_hostname_type_on_launch", "ip-name"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrVPCID), @@ -234,7 +234,7 @@ func testAccDefaultSubnet_Existing_privateDNSNameOptionsOnLaunch(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "map_customer_owned_ip_on_launch", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "map_public_ip_on_launch", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "outpost_arn", ""), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "private_dns_hostname_type_on_launch", "resource-name"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), resource.TestCheckResourceAttr(resourceName, "tags.Name", rName), @@ -281,7 +281,7 @@ func testAccDefaultSubnet_NotFound_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "map_customer_owned_ip_on_launch", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "map_public_ip_on_launch", acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, "outpost_arn", ""), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttrSet(resourceName, "private_dns_hostname_type_on_launch"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrVPCID), @@ -327,7 +327,7 @@ func testAccDefaultSubnet_NotFound_ipv6Native(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "map_customer_owned_ip_on_launch", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "map_public_ip_on_launch", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "outpost_arn", ""), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttrSet(resourceName, "private_dns_hostname_type_on_launch"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrVPCID), diff --git a/internal/service/ec2/vpc_default_vpc_dhcp_options_test.go b/internal/service/ec2/vpc_default_vpc_dhcp_options_test.go index 8a27ce81e49..bea180b0c99 100644 --- a/internal/service/ec2/vpc_default_vpc_dhcp_options_test.go +++ b/internal/service/ec2/vpc_default_vpc_dhcp_options_test.go @@ -40,10 +40,10 @@ func testAccDefaultVPCDHCPOptions_basic(t *testing.T) { Config: testAccVPCDefaultVPCDHCPOptionsConfig_basic, Check: resource.ComposeTestCheckFunc( testAccCheckDHCPOptionsExists(ctx, resourceName, &d), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`dhcp-options/dopt-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`dhcp-options/dopt-.+`)), resource.TestCheckResourceAttrSet(resourceName, names.AttrDomainName), resource.TestCheckResourceAttr(resourceName, "domain_name_servers", "AmazonProvidedDNS"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), resource.TestCheckResourceAttr(resourceName, "tags.Name", "Default DHCP Option Set"), ), @@ -67,10 +67,10 @@ func testAccDefaultVPCDHCPOptions_owner(t *testing.T) { Config: testAccVPCDefaultVPCDHCPOptionsConfig_owner, Check: resource.ComposeTestCheckFunc( testAccCheckDHCPOptionsExists(ctx, resourceName, &d), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`dhcp-options/dopt-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`dhcp-options/dopt-.+`)), resource.TestCheckResourceAttrSet(resourceName, names.AttrDomainName), resource.TestCheckResourceAttr(resourceName, "domain_name_servers", "AmazonProvidedDNS"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), resource.TestCheckResourceAttr(resourceName, "tags.Name", "Default DHCP Option Set"), ), diff --git a/internal/service/ec2/vpc_default_vpc_test.go b/internal/service/ec2/vpc_default_vpc_test.go index f517c177065..e1ecac7e648 100644 --- a/internal/service/ec2/vpc_default_vpc_test.go +++ b/internal/service/ec2/vpc_default_vpc_test.go @@ -114,7 +114,7 @@ func testAccDefaultVPC_Existing_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "ipv6_ipam_pool_id", ""), resource.TestCheckResourceAttr(resourceName, "ipv6_netmask_length", "0"), resource.TestCheckResourceAttrSet(resourceName, "main_route_table_id"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -161,7 +161,7 @@ func testAccDefaultVPC_Existing_assignGeneratedIPv6CIDRBlock(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "ipv6_ipam_pool_id", ""), resource.TestCheckResourceAttr(resourceName, "ipv6_netmask_length", "0"), resource.TestCheckResourceAttrSet(resourceName, "main_route_table_id"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), resource.TestCheckResourceAttr(resourceName, "tags.Name", rName), ), @@ -236,7 +236,7 @@ func testAccDefaultVPC_NotFound_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "ipv6_ipam_pool_id", ""), resource.TestCheckResourceAttr(resourceName, "ipv6_netmask_length", "0"), resource.TestCheckResourceAttrSet(resourceName, "main_route_table_id"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -283,7 +283,7 @@ func testAccDefaultVPC_NotFound_assignGeneratedIPv6CIDRBlock(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "ipv6_ipam_pool_id", ""), resource.TestCheckResourceAttr(resourceName, "ipv6_netmask_length", "0"), resource.TestCheckResourceAttrSet(resourceName, "main_route_table_id"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), resource.TestCheckResourceAttr(resourceName, "tags.Name", rName), ), @@ -359,7 +359,7 @@ func testAccDefaultVPC_NotFound_assignGeneratedIPv6CIDRBlockAdoption(t *testing. resource.TestCheckResourceAttr(resourceName, "ipv6_ipam_pool_id", ""), resource.TestCheckResourceAttr(resourceName, "ipv6_netmask_length", "0"), resource.TestCheckResourceAttrSet(resourceName, "main_route_table_id"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), resource.TestCheckResourceAttr(resourceName, "tags.Name", rName), ), @@ -401,7 +401,7 @@ func testAccDefaultVPC_NotFound_assignGeneratedIPv6CIDRBlockAdoption(t *testing. resource.TestCheckResourceAttr(resourceName, "ipv6_ipam_pool_id", ""), resource.TestCheckResourceAttr(resourceName, "ipv6_netmask_length", "0"), resource.TestCheckResourceAttrSet(resourceName, "main_route_table_id"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), resource.TestCheckResourceAttr(resourceName, "tags.Name", rName), ), diff --git a/internal/service/ec2/vpc_dhcp_options_test.go b/internal/service/ec2/vpc_dhcp_options_test.go index 59b8eabff09..29a5221b109 100644 --- a/internal/service/ec2/vpc_dhcp_options_test.go +++ b/internal/service/ec2/vpc_dhcp_options_test.go @@ -35,14 +35,14 @@ func TestAccVPCDHCPOptions_basic(t *testing.T) { Config: testAccVPCDHCPOptionsConfig_basic, Check: resource.ComposeTestCheckFunc( testAccCheckDHCPOptionsExists(ctx, resourceName, &d), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`dhcp-options/dopt-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`dhcp-options/dopt-.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrDomainName, ""), resource.TestCheckResourceAttr(resourceName, "domain_name_servers.#", "0"), resource.TestCheckResourceAttr(resourceName, "ipv6_address_preferred_lease_time", ""), resource.TestCheckResourceAttr(resourceName, "netbios_name_servers.#", "0"), resource.TestCheckResourceAttr(resourceName, "netbios_node_type", "1"), resource.TestCheckResourceAttr(resourceName, "ntp_servers.#", "0"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -72,7 +72,7 @@ func TestAccVPCDHCPOptions_full(t *testing.T) { Config: testAccVPCDHCPOptionsConfig_full(rName, domainName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckDHCPOptionsExists(ctx, resourceName, &d), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`dhcp-options/dopt-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`dhcp-options/dopt-.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrDomainName, domainName), resource.TestCheckResourceAttr(resourceName, "domain_name_servers.#", "2"), resource.TestCheckResourceAttr(resourceName, "domain_name_servers.0", "127.0.0.1"), @@ -83,7 +83,7 @@ func TestAccVPCDHCPOptions_full(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "netbios_node_type", "2"), resource.TestCheckResourceAttr(resourceName, "ntp_servers.#", "1"), resource.TestCheckResourceAttr(resourceName, "ntp_servers.0", "127.0.0.1"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), resource.TestCheckResourceAttr(resourceName, "tags.Name", rName), ), diff --git a/internal/service/ec2/vpc_endpoint_service.go b/internal/service/ec2/vpc_endpoint_service.go index 84857044f31..af47ba1f03a 100644 --- a/internal/service/ec2/vpc_endpoint_service.go +++ b/internal/service/ec2/vpc_endpoint_service.go @@ -226,7 +226,7 @@ func resourceVPCEndpointServiceRead(ctx context.Context, d *schema.ResourceData, Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("vpc-endpoint-service/%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/ec2/vpc_endpoint_service_data_source.go b/internal/service/ec2/vpc_endpoint_service_data_source.go index 34a46a402e3..37fcaa83d04 100644 --- a/internal/service/ec2/vpc_endpoint_service_data_source.go +++ b/internal/service/ec2/vpc_endpoint_service_data_source.go @@ -182,7 +182,7 @@ func dataSourceVPCEndpointServiceRead(ctx context.Context, d *schema.ResourceDat Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("vpc-endpoint-service/%s", serviceID), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/ec2/vpc_endpoint_service_data_source_test.go b/internal/service/ec2/vpc_endpoint_service_data_source_test.go index 3b993e710ca..5b31dcd9677 100644 --- a/internal/service/ec2/vpc_endpoint_service_data_source_test.go +++ b/internal/service/ec2/vpc_endpoint_service_data_source_test.go @@ -28,7 +28,7 @@ func TestAccVPCEndpointServiceDataSource_ServiceType_gateway(t *testing.T) { Config: testAccVPCEndpointServiceDataSourceConfig_type("dynamodb", "Gateway"), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr(datasourceName, "acceptance_required", acctest.CtFalse), - acctest.MatchResourceAttrRegionalARN(datasourceName, names.AttrARN, "ec2", regexache.MustCompile(`vpc-endpoint-service/vpce-svc-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, datasourceName, names.AttrARN, "ec2", regexache.MustCompile(`vpc-endpoint-service/vpce-svc-.+`)), acctest.CheckResourceAttrGreaterThanValue(datasourceName, "availability_zones.#", 0), resource.TestCheckResourceAttr(datasourceName, "base_endpoint_dns_names.#", "1"), resource.TestCheckResourceAttr(datasourceName, "manages_vpc_endpoints", acctest.CtFalse), @@ -59,7 +59,7 @@ func TestAccVPCEndpointServiceDataSource_ServiceType_interface(t *testing.T) { Config: testAccVPCEndpointServiceDataSourceConfig_type("ec2", "Interface"), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr(datasourceName, "acceptance_required", acctest.CtFalse), - acctest.MatchResourceAttrRegionalARN(datasourceName, names.AttrARN, "ec2", regexache.MustCompile(`vpc-endpoint-service/vpce-svc-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, datasourceName, names.AttrARN, "ec2", regexache.MustCompile(`vpc-endpoint-service/vpce-svc-.+`)), acctest.CheckResourceAttrGreaterThanValue(datasourceName, "availability_zones.#", 0), resource.TestCheckResourceAttr(datasourceName, "base_endpoint_dns_names.#", "1"), resource.TestCheckResourceAttr(datasourceName, "manages_vpc_endpoints", acctest.CtFalse), @@ -95,7 +95,7 @@ func TestAccVPCEndpointServiceDataSource_custom(t *testing.T) { resource.TestCheckResourceAttrPair(datasourceName, "availability_zones.#", resourceName, "availability_zones.#"), resource.TestCheckResourceAttrPair(datasourceName, "base_endpoint_dns_names.#", resourceName, "base_endpoint_dns_names.#"), resource.TestCheckResourceAttrPair(datasourceName, "manages_vpc_endpoints", resourceName, "manages_vpc_endpoints"), - acctest.CheckResourceAttrAccountID(datasourceName, names.AttrOwner), + acctest.CheckResourceAttrAccountID(ctx, datasourceName, names.AttrOwner), resource.TestCheckResourceAttrPair(datasourceName, "private_dns_name", resourceName, "private_dns_name"), resource.TestCheckResourceAttrPair(datasourceName, "private_dns_names.#", resourceName, "private_dns_names.#"), resource.TestCheckResourceAttr(datasourceName, "service_type", "Interface"), @@ -127,7 +127,7 @@ func TestAccVPCEndpointServiceDataSource_Custom_filter(t *testing.T) { resource.TestCheckResourceAttrPair(datasourceName, "availability_zones.#", resourceName, "availability_zones.#"), resource.TestCheckResourceAttrPair(datasourceName, "base_endpoint_dns_names.#", resourceName, "base_endpoint_dns_names.#"), resource.TestCheckResourceAttrPair(datasourceName, "manages_vpc_endpoints", resourceName, "manages_vpc_endpoints"), - acctest.CheckResourceAttrAccountID(datasourceName, names.AttrOwner), + acctest.CheckResourceAttrAccountID(ctx, datasourceName, names.AttrOwner), resource.TestCheckResourceAttrPair(datasourceName, "private_dns_name", resourceName, "private_dns_name"), resource.TestCheckResourceAttrPair(datasourceName, "private_dns_names.#", resourceName, "private_dns_names.#"), resource.TestCheckResourceAttr(datasourceName, "service_type", "Interface"), @@ -159,7 +159,7 @@ func TestAccVPCEndpointServiceDataSource_CustomFilter_tags(t *testing.T) { resource.TestCheckResourceAttrPair(datasourceName, "availability_zones.#", resourceName, "availability_zones.#"), resource.TestCheckResourceAttrPair(datasourceName, "base_endpoint_dns_names.#", resourceName, "base_endpoint_dns_names.#"), resource.TestCheckResourceAttrPair(datasourceName, "manages_vpc_endpoints", resourceName, "manages_vpc_endpoints"), - acctest.CheckResourceAttrAccountID(datasourceName, names.AttrOwner), + acctest.CheckResourceAttrAccountID(ctx, datasourceName, names.AttrOwner), resource.TestCheckResourceAttrPair(datasourceName, "private_dns_name", resourceName, "private_dns_name"), resource.TestCheckResourceAttrPair(datasourceName, "private_dns_names.#", resourceName, "private_dns_names.#"), resource.TestCheckResourceAttr(datasourceName, "service_type", "Interface"), diff --git a/internal/service/ec2/vpc_endpoint_service_test.go b/internal/service/ec2/vpc_endpoint_service_test.go index 85704b96ecf..7db4dd55eaf 100644 --- a/internal/service/ec2/vpc_endpoint_service_test.go +++ b/internal/service/ec2/vpc_endpoint_service_test.go @@ -38,7 +38,7 @@ func TestAccVPCEndpointService_basic(t *testing.T) { testAccCheckVPCEndpointServiceExists(ctx, resourceName, &svcCfg), resource.TestCheckResourceAttr(resourceName, "acceptance_required", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "allowed_principals.#", "0"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`vpc-endpoint-service/vpce-svc-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`vpc-endpoint-service/vpce-svc-.+`)), acctest.CheckResourceAttrGreaterThanValue(resourceName, "availability_zones.#", 0), acctest.CheckResourceAttrGreaterThanValue(resourceName, "base_endpoint_dns_names.#", 0), resource.TestCheckResourceAttr(resourceName, "gateway_load_balancer_arns.#", "0"), diff --git a/internal/service/ec2/vpc_endpoint_test.go b/internal/service/ec2/vpc_endpoint_test.go index bb691885b70..1394f190b7c 100644 --- a/internal/service/ec2/vpc_endpoint_test.go +++ b/internal/service/ec2/vpc_endpoint_test.go @@ -36,13 +36,13 @@ func TestAccVPCEndpoint_gatewayBasic(t *testing.T) { Config: testAccVPCEndpointConfig_gatewayBasic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckVPCEndpointExists(ctx, resourceName, &endpoint), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`vpc-endpoint/vpce-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`vpc-endpoint/vpce-.+`)), acctest.CheckResourceAttrGreaterThanValue(resourceName, "cidr_blocks.#", 0), resource.TestCheckResourceAttr(resourceName, "dns_entry.#", "0"), resource.TestCheckResourceAttr(resourceName, "dns_options.#", "0"), resource.TestCheckResourceAttr(resourceName, names.AttrIPAddressType, ""), resource.TestCheckResourceAttr(resourceName, "network_interface_ids.#", "0"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttrSet(resourceName, names.AttrPolicy), resource.TestCheckResourceAttrSet(resourceName, "prefix_list_id"), resource.TestCheckResourceAttr(resourceName, "private_dns_enabled", acctest.CtFalse), @@ -79,7 +79,7 @@ func TestAccVPCEndpoint_interfaceBasic(t *testing.T) { Config: testAccVPCEndpointConfig_interfaceBasic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckVPCEndpointExists(ctx, resourceName, &endpoint), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`vpc-endpoint/vpce-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`vpc-endpoint/vpce-.+`)), resource.TestCheckResourceAttr(resourceName, "cidr_blocks.#", "0"), resource.TestCheckResourceAttr(resourceName, "dns_entry.#", "0"), resource.TestCheckResourceAttr(resourceName, "dns_options.#", "1"), @@ -87,7 +87,7 @@ func TestAccVPCEndpoint_interfaceBasic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "dns_options.0.private_dns_only_for_inbound_resolver_endpoint", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, names.AttrIPAddressType, "ipv4"), resource.TestCheckResourceAttr(resourceName, "network_interface_ids.#", "0"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttrSet(resourceName, names.AttrPolicy), resource.TestCheckNoResourceAttr(resourceName, "prefix_list_id"), resource.TestCheckResourceAttr(resourceName, "private_dns_enabled", acctest.CtFalse), @@ -123,7 +123,7 @@ func TestAccVPCEndpoint_interfaceNoPrivateDNS(t *testing.T) { Config: testAccVPCEndpointConfig_interfaceNoPrivateDNS(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckVPCEndpointExists(ctx, resourceName, &endpoint), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`vpc-endpoint/vpce-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`vpc-endpoint/vpce-.+`)), resource.TestCheckResourceAttr(resourceName, "cidr_blocks.#", "0"), resource.TestCheckResourceAttr(resourceName, "dns_entry.#", "0"), resource.TestCheckResourceAttr(resourceName, "dns_options.#", "1"), @@ -131,7 +131,7 @@ func TestAccVPCEndpoint_interfaceNoPrivateDNS(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "dns_options.0.private_dns_only_for_inbound_resolver_endpoint", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, names.AttrIPAddressType, "ipv4"), resource.TestCheckResourceAttr(resourceName, "network_interface_ids.#", "0"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttrSet(resourceName, names.AttrPolicy), resource.TestCheckNoResourceAttr(resourceName, "prefix_list_id"), resource.TestCheckResourceAttr(resourceName, "private_dns_enabled", acctest.CtFalse), @@ -606,7 +606,7 @@ func TestAccVPCEndpoint_interfaceUserDefinedIPv4(t *testing.T) { Config: testAccVPCEndpointConfig_interfaceUserDefinedIPv4(rName, ipv4Address1, ipv4Address2), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckVPCEndpointExists(ctx, resourceName, &endpoint), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`vpc-endpoint/vpce-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`vpc-endpoint/vpce-.+`)), resource.TestCheckResourceAttr(resourceName, "cidr_blocks.#", "0"), resource.TestCheckResourceAttr(resourceName, "dns_entry.#", "3"), resource.TestCheckResourceAttr(resourceName, "dns_options.#", "1"), @@ -614,7 +614,7 @@ func TestAccVPCEndpoint_interfaceUserDefinedIPv4(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "dns_options.0.private_dns_only_for_inbound_resolver_endpoint", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, names.AttrIPAddressType, "ipv4"), resource.TestCheckResourceAttr(resourceName, "network_interface_ids.#", "2"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttrSet(resourceName, names.AttrPolicy), resource.TestCheckNoResourceAttr(resourceName, "prefix_list_id"), resource.TestCheckResourceAttr(resourceName, "private_dns_enabled", acctest.CtFalse), @@ -642,7 +642,7 @@ func TestAccVPCEndpoint_interfaceUserDefinedIPv4(t *testing.T) { Config: testAccVPCEndpointConfig_interfaceUserDefinedIPv4(rName, ipv4Address1Updated, ipv4Address2Updated), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckVPCEndpointExists(ctx, resourceName, &endpoint), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`vpc-endpoint/vpce-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`vpc-endpoint/vpce-.+`)), resource.TestCheckResourceAttr(resourceName, "cidr_blocks.#", "0"), resource.TestCheckResourceAttr(resourceName, "dns_entry.#", "3"), resource.TestCheckResourceAttr(resourceName, "dns_options.#", "1"), @@ -650,7 +650,7 @@ func TestAccVPCEndpoint_interfaceUserDefinedIPv4(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "dns_options.0.private_dns_only_for_inbound_resolver_endpoint", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, names.AttrIPAddressType, "ipv4"), resource.TestCheckResourceAttr(resourceName, "network_interface_ids.#", "2"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttrSet(resourceName, names.AttrPolicy), resource.TestCheckNoResourceAttr(resourceName, "prefix_list_id"), resource.TestCheckResourceAttr(resourceName, "private_dns_enabled", acctest.CtFalse), @@ -691,7 +691,7 @@ func TestAccVPCEndpoint_interfaceUserDefinedIPv6(t *testing.T) { Config: testAccVPCEndpointConfig_interfaceUserDefinedIPv6(rName, ipv6HostNum1), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckVPCEndpointExists(ctx, resourceName, &endpoint), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`vpc-endpoint/vpce-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`vpc-endpoint/vpce-.+`)), resource.TestCheckResourceAttr(resourceName, "cidr_blocks.#", "0"), resource.TestCheckResourceAttr(resourceName, "dns_entry.#", "3"), resource.TestCheckResourceAttr(resourceName, "dns_options.#", "1"), @@ -699,7 +699,7 @@ func TestAccVPCEndpoint_interfaceUserDefinedIPv6(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "dns_options.0.private_dns_only_for_inbound_resolver_endpoint", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, names.AttrIPAddressType, "ipv6"), resource.TestCheckResourceAttr(resourceName, "network_interface_ids.#", "2"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttrSet(resourceName, names.AttrPolicy), resource.TestCheckNoResourceAttr(resourceName, "prefix_list_id"), resource.TestCheckResourceAttr(resourceName, "private_dns_enabled", acctest.CtFalse), @@ -721,7 +721,7 @@ func TestAccVPCEndpoint_interfaceUserDefinedIPv6(t *testing.T) { Config: testAccVPCEndpointConfig_interfaceUserDefinedIPv6(rName, ipv6HostNum2), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckVPCEndpointExists(ctx, resourceName, &endpoint), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`vpc-endpoint/vpce-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`vpc-endpoint/vpce-.+`)), resource.TestCheckResourceAttr(resourceName, "cidr_blocks.#", "0"), resource.TestCheckResourceAttr(resourceName, "dns_entry.#", "3"), resource.TestCheckResourceAttr(resourceName, "dns_options.#", "1"), @@ -729,7 +729,7 @@ func TestAccVPCEndpoint_interfaceUserDefinedIPv6(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "dns_options.0.private_dns_only_for_inbound_resolver_endpoint", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, names.AttrIPAddressType, "ipv6"), resource.TestCheckResourceAttr(resourceName, "network_interface_ids.#", "2"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttrSet(resourceName, names.AttrPolicy), resource.TestCheckNoResourceAttr(resourceName, "prefix_list_id"), resource.TestCheckResourceAttr(resourceName, "private_dns_enabled", acctest.CtFalse), @@ -768,14 +768,14 @@ func TestAccVPCEndpoint_interfaceUserDefinedDualstack(t *testing.T) { Config: testAccVPCEndpointConfig_interfaceUserDefinedDualstackCombined(rName, ipv4Address1, ipv4Address2, ipv6HostNum1), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckVPCEndpointExists(ctx, resourceName, &endpoint), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`vpc-endpoint/vpce-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`vpc-endpoint/vpce-.+`)), resource.TestCheckResourceAttr(resourceName, "cidr_blocks.#", "0"), resource.TestCheckResourceAttr(resourceName, "dns_entry.#", "3"), resource.TestCheckResourceAttr(resourceName, "dns_options.#", "1"), resource.TestCheckResourceAttr(resourceName, "dns_options.0.dns_record_ip_type", "dualstack"), resource.TestCheckResourceAttr(resourceName, names.AttrIPAddressType, "dualstack"), resource.TestCheckResourceAttr(resourceName, "network_interface_ids.#", "2"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttrSet(resourceName, names.AttrPolicy), resource.TestCheckNoResourceAttr(resourceName, "prefix_list_id"), resource.TestCheckResourceAttr(resourceName, "private_dns_enabled", acctest.CtFalse), @@ -803,14 +803,14 @@ func TestAccVPCEndpoint_interfaceUserDefinedDualstack(t *testing.T) { Config: testAccVPCEndpointConfig_interfaceUserDefinedDualstackCombined(rName, ipv4Address1Updated, ipv4Address2Updated, ipv6HostNum2), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckVPCEndpointExists(ctx, resourceName, &endpoint), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`vpc-endpoint/vpce-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`vpc-endpoint/vpce-.+`)), resource.TestCheckResourceAttr(resourceName, "cidr_blocks.#", "0"), resource.TestCheckResourceAttr(resourceName, "dns_entry.#", "3"), resource.TestCheckResourceAttr(resourceName, "dns_options.#", "1"), resource.TestCheckResourceAttr(resourceName, "dns_options.0.dns_record_ip_type", "dualstack"), resource.TestCheckResourceAttr(resourceName, names.AttrIPAddressType, "dualstack"), resource.TestCheckResourceAttr(resourceName, "network_interface_ids.#", "2"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttrSet(resourceName, names.AttrPolicy), resource.TestCheckNoResourceAttr(resourceName, "prefix_list_id"), resource.TestCheckResourceAttr(resourceName, "private_dns_enabled", acctest.CtFalse), diff --git a/internal/service/ec2/vpc_flow_log.go b/internal/service/ec2/vpc_flow_log.go index bc810a3afcb..497fceedc0e 100644 --- a/internal/service/ec2/vpc_flow_log.go +++ b/internal/service/ec2/vpc_flow_log.go @@ -285,7 +285,7 @@ func resourceLogFlowRead(ctx context.Context, d *schema.ResourceData, meta inter Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("vpc-flow-log/%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/ec2/vpc_flow_log_test.go b/internal/service/ec2/vpc_flow_log_test.go index cfd722dbb09..cfa708c3687 100644 --- a/internal/service/ec2/vpc_flow_log_test.go +++ b/internal/service/ec2/vpc_flow_log_test.go @@ -39,7 +39,7 @@ func TestAccVPCFlowLog_basic(t *testing.T) { Config: testAccVPCFlowLogConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckFlowLogExists(ctx, resourceName, &flowLog), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`vpc-flow-log/fl-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`vpc-flow-log/fl-.+`)), resource.TestCheckResourceAttr(resourceName, "deliver_cross_account_role", ""), resource.TestCheckResourceAttrPair(resourceName, names.AttrIAMRoleARN, iamRoleResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "log_destination", ""), @@ -145,7 +145,7 @@ func TestAccVPCFlowLog_transitGatewayID(t *testing.T) { Config: testAccVPCFlowLogConfig_transitGatewayID(rName), Check: resource.ComposeTestCheckFunc( testAccCheckFlowLogExists(ctx, resourceName, &flowLog), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`vpc-flow-log/fl-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`vpc-flow-log/fl-.+`)), resource.TestCheckResourceAttrPair(resourceName, names.AttrIAMRoleARN, iamRoleResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "log_destination", ""), resource.TestCheckResourceAttr(resourceName, "log_destination_type", "cloud-watch-logs"), @@ -182,7 +182,7 @@ func TestAccVPCFlowLog_transitGatewayAttachmentID(t *testing.T) { Config: testAccVPCFlowLogConfig_transitGatewayAttachmentID(rName), Check: resource.ComposeTestCheckFunc( testAccCheckFlowLogExists(ctx, resourceName, &flowLog), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`vpc-flow-log/fl-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`vpc-flow-log/fl-.+`)), resource.TestCheckResourceAttrPair(resourceName, names.AttrIAMRoleARN, iamRoleResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "log_destination", ""), resource.TestCheckResourceAttr(resourceName, "log_destination_type", "cloud-watch-logs"), @@ -218,7 +218,7 @@ func TestAccVPCFlowLog_LogDestinationType_cloudWatchLogs(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckFlowLogExists(ctx, resourceName, &flowLog), // We automatically trim :* from ARNs if present - acctest.CheckResourceAttrRegionalARN(resourceName, "log_destination", "logs", fmt.Sprintf("log-group:%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, "log_destination", "logs", fmt.Sprintf("log-group:%s", rName)), resource.TestCheckResourceAttr(resourceName, "log_destination_type", "cloud-watch-logs"), resource.TestCheckResourceAttrPair(resourceName, names.AttrLogGroupName, cloudwatchLogGroupResourceName, names.AttrName), ), diff --git a/internal/service/ec2/vpc_internet_gateway_test.go b/internal/service/ec2/vpc_internet_gateway_test.go index c8d83bc6626..93a5cd80f01 100644 --- a/internal/service/ec2/vpc_internet_gateway_test.go +++ b/internal/service/ec2/vpc_internet_gateway_test.go @@ -35,8 +35,8 @@ func TestAccVPCInternetGateway_basic(t *testing.T) { Config: testAccVPCInternetGatewayConfig_basic, Check: resource.ComposeTestCheckFunc( testAccCheckInternetGatewayExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`internet-gateway/igw-.+`)), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`internet-gateway/igw-.+`)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttr(resourceName, names.AttrVPCID, ""), ), diff --git a/internal/service/ec2/vpc_managed_prefix_list_test.go b/internal/service/ec2/vpc_managed_prefix_list_test.go index 149dd749e9e..6f4bb689429 100644 --- a/internal/service/ec2/vpc_managed_prefix_list_test.go +++ b/internal/service/ec2/vpc_managed_prefix_list_test.go @@ -37,11 +37,11 @@ func TestAccVPCManagedPrefixList_basic(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccManagedPrefixListExists(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, "address_family", "IPv4"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`prefix-list/pl-[[:xdigit:]]+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`prefix-list/pl-[[:xdigit:]]+`)), resource.TestCheckResourceAttr(resourceName, "entry.#", "0"), resource.TestCheckResourceAttr(resourceName, "max_entries", "1"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttr(resourceName, names.AttrVersion, "1"), ), diff --git a/internal/service/ec2/vpc_network_acl_test.go b/internal/service/ec2/vpc_network_acl_test.go index 93b41ef600b..77762c18fba 100644 --- a/internal/service/ec2/vpc_network_acl_test.go +++ b/internal/service/ec2/vpc_network_acl_test.go @@ -37,10 +37,10 @@ func TestAccVPCNetworkACL_basic(t *testing.T) { Config: testAccVPCNetworkACLConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckNetworkACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`network-acl/acl-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`network-acl/acl-.+`)), resource.TestCheckResourceAttr(resourceName, "egress.#", "0"), resource.TestCheckResourceAttr(resourceName, "ingress.#", "0"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "subnet_ids.#", "0"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrPair(resourceName, names.AttrVPCID, vpcResourceName, names.AttrID), diff --git a/internal/service/ec2/vpc_network_insights_analysis_test.go b/internal/service/ec2/vpc_network_insights_analysis_test.go index dd9ec23b203..b3eeb8278a6 100644 --- a/internal/service/ec2/vpc_network_insights_analysis_test.go +++ b/internal/service/ec2/vpc_network_insights_analysis_test.go @@ -34,7 +34,7 @@ func TestAccVPCNetworkInsightsAnalysis_basic(t *testing.T) { Config: testAccVPCNetworkInsightsAnalysisConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckNetworkInsightsAnalysisExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`network-insights-analysis/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`network-insights-analysis/.+$`)), resource.TestCheckResourceAttr(resourceName, "filter_in_arns.#", "0"), resource.TestCheckResourceAttrPair(resourceName, "network_insights_path_id", "aws_ec2_network_insights_path.test", names.AttrID), resource.TestCheckResourceAttr(resourceName, "path_found", acctest.CtTrue), @@ -138,7 +138,7 @@ func TestAccVPCNetworkInsightsAnalysis_filterInARNs(t *testing.T) { Config: testAccVPCNetworkInsightsAnalysisConfig_filterInARNs(rName, "vpc-peering-connection/pcx-fakearn1"), Check: resource.ComposeTestCheckFunc( testAccCheckNetworkInsightsAnalysisExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, "filter_in_arns.0", "ec2", regexache.MustCompile(`vpc-peering-connection/pcx-fakearn1$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "filter_in_arns.0", "ec2", regexache.MustCompile(`vpc-peering-connection/pcx-fakearn1$`)), ), }, { @@ -151,7 +151,7 @@ func TestAccVPCNetworkInsightsAnalysis_filterInARNs(t *testing.T) { Config: testAccVPCNetworkInsightsAnalysisConfig_filterInARNs(rName, "vpc-peering-connection/pcx-fakearn2"), Check: resource.ComposeTestCheckFunc( testAccCheckNetworkInsightsAnalysisExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, "filter_in_arns.0", "ec2", regexache.MustCompile(`vpc-peering-connection/pcx-fakearn2$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "filter_in_arns.0", "ec2", regexache.MustCompile(`vpc-peering-connection/pcx-fakearn2$`)), ), }, }, diff --git a/internal/service/ec2/vpc_network_insights_path_test.go b/internal/service/ec2/vpc_network_insights_path_test.go index 15b459caeb1..51e83052c09 100644 --- a/internal/service/ec2/vpc_network_insights_path_test.go +++ b/internal/service/ec2/vpc_network_insights_path_test.go @@ -34,7 +34,7 @@ func TestAccVPCNetworkInsightsPath_basic(t *testing.T) { Config: testAccVPCNetworkInsightsPathConfig_basic(rName, "tcp"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckNetworkInsightsPathExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`network-insights-path/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`network-insights-path/.+$`)), resource.TestCheckResourceAttrPair(resourceName, names.AttrDestination, "aws_network_interface.test.1", names.AttrID), resource.TestCheckResourceAttrPair(resourceName, names.AttrDestinationARN, "aws_network_interface.test.1", names.AttrARN), resource.TestCheckResourceAttr(resourceName, "destination_ip", ""), diff --git a/internal/service/ec2/vpc_network_interface_data_source_test.go b/internal/service/ec2/vpc_network_interface_data_source_test.go index ee469861aa1..1014bb9b20f 100644 --- a/internal/service/ec2/vpc_network_interface_data_source_test.go +++ b/internal/service/ec2/vpc_network_interface_data_source_test.go @@ -89,7 +89,7 @@ func TestAccVPCNetworkInterfaceDataSource_carrierIPAssociation(t *testing.T) { resource.TestCheckResourceAttrPair(datasourceName, "association.0.association_id", eipAssociationResourceName, names.AttrID), resource.TestCheckResourceAttrPair(datasourceName, "association.0.carrier_ip", eipResourceName, "carrier_ip"), resource.TestCheckResourceAttr(datasourceName, "association.0.customer_owned_ip", ""), - acctest.CheckResourceAttrAccountID(datasourceName, "association.0.ip_owner_id"), + acctest.CheckResourceAttrAccountID(ctx, datasourceName, "association.0.ip_owner_id"), resource.TestCheckResourceAttr(datasourceName, "association.0.public_dns_name", ""), resource.TestCheckResourceAttr(datasourceName, "association.0.public_ip", ""), resource.TestCheckResourceAttr(datasourceName, "attachment.#", "0"), @@ -99,7 +99,7 @@ func TestAccVPCNetworkInterfaceDataSource_carrierIPAssociation(t *testing.T) { resource.TestCheckResourceAttr(datasourceName, "ipv6_addresses.#", "0"), resource.TestCheckResourceAttrSet(datasourceName, "mac_address"), resource.TestCheckResourceAttr(datasourceName, "outpost_arn", ""), - acctest.CheckResourceAttrAccountID(datasourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, datasourceName, names.AttrOwnerID), resource.TestCheckResourceAttrPair(datasourceName, "private_dns_name", resourceName, "private_dns_name"), resource.TestCheckResourceAttrPair(datasourceName, "private_ip", resourceName, "private_ip"), resource.TestCheckResourceAttrPair(datasourceName, "private_ips.#", resourceName, "private_ips.#"), @@ -138,7 +138,7 @@ func TestAccVPCNetworkInterfaceDataSource_publicIPAssociation(t *testing.T) { resource.TestCheckResourceAttrPair(datasourceName, "association.0.association_id", eipAssociationResourceName, names.AttrID), resource.TestCheckResourceAttr(datasourceName, "association.0.carrier_ip", ""), resource.TestCheckResourceAttr(datasourceName, "association.0.customer_owned_ip", ""), - acctest.CheckResourceAttrAccountID(datasourceName, "association.0.ip_owner_id"), + acctest.CheckResourceAttrAccountID(ctx, datasourceName, "association.0.ip_owner_id"), // Public DNS name is not set by the EC2 API. resource.TestCheckResourceAttr(datasourceName, "association.0.public_dns_name", ""), resource.TestCheckResourceAttrPair(datasourceName, "association.0.public_ip", eipResourceName, "public_ip"), @@ -149,7 +149,7 @@ func TestAccVPCNetworkInterfaceDataSource_publicIPAssociation(t *testing.T) { resource.TestCheckResourceAttr(datasourceName, "ipv6_addresses.#", "0"), resource.TestCheckResourceAttrSet(datasourceName, "mac_address"), resource.TestCheckResourceAttr(datasourceName, "outpost_arn", ""), - acctest.CheckResourceAttrAccountID(datasourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, datasourceName, names.AttrOwnerID), resource.TestCheckResourceAttrPair(datasourceName, "private_dns_name", resourceName, "private_dns_name"), resource.TestCheckResourceAttrPair(datasourceName, "private_ip", resourceName, "private_ip"), resource.TestCheckResourceAttrPair(datasourceName, "private_ips.#", resourceName, "private_ips.#"), @@ -184,14 +184,14 @@ func TestAccVPCNetworkInterfaceDataSource_attachment(t *testing.T) { resource.TestCheckResourceAttr(datasourceName, "attachment.#", "1"), resource.TestCheckResourceAttr(datasourceName, "attachment.0.device_index", "1"), resource.TestCheckResourceAttrPair(datasourceName, "attachment.0.instance_id", instanceResourceName, names.AttrID), - acctest.CheckResourceAttrAccountID(datasourceName, "attachment.0.instance_owner_id"), + acctest.CheckResourceAttrAccountID(ctx, datasourceName, "attachment.0.instance_owner_id"), resource.TestCheckResourceAttrSet(datasourceName, names.AttrAvailabilityZone), resource.TestCheckResourceAttrPair(datasourceName, names.AttrDescription, resourceName, names.AttrDescription), resource.TestCheckResourceAttr(datasourceName, "interface_type", "interface"), resource.TestCheckResourceAttr(datasourceName, "ipv6_addresses.#", "0"), resource.TestCheckResourceAttrSet(datasourceName, "mac_address"), resource.TestCheckResourceAttr(datasourceName, "outpost_arn", ""), - acctest.CheckResourceAttrAccountID(datasourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, datasourceName, names.AttrOwnerID), resource.TestCheckResourceAttrPair(datasourceName, "private_dns_name", resourceName, "private_dns_name"), resource.TestCheckResourceAttrPair(datasourceName, "private_ip", resourceName, "private_ip"), resource.TestCheckResourceAttrPair(datasourceName, "private_ips.#", resourceName, "private_ips.#"), diff --git a/internal/service/ec2/vpc_network_interface_test.go b/internal/service/ec2/vpc_network_interface_test.go index d36e127b519..69842021b5f 100644 --- a/internal/service/ec2/vpc_network_interface_test.go +++ b/internal/service/ec2/vpc_network_interface_test.go @@ -42,7 +42,7 @@ func TestAccVPCNetworkInterface_basic(t *testing.T) { Config: testAccVPCNetworkInterfaceConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckENIExists(ctx, resourceName, &conf), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`network-interface/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`network-interface/.+$`)), resource.TestCheckResourceAttr(resourceName, "attachment.#", "0"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttr(resourceName, "interface_type", "interface"), @@ -50,7 +50,7 @@ func TestAccVPCNetworkInterface_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "ipv6_addresses.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "mac_address"), resource.TestCheckResourceAttr(resourceName, "outpost_arn", ""), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), checkResourceAttrPrivateDNSName(resourceName, "private_dns_name", &conf.PrivateIpAddress), resource.TestCheckResourceAttrSet(resourceName, "private_ip"), resource.TestCheckResourceAttr(resourceName, "private_ips.#", "1"), diff --git a/internal/service/ec2/vpc_peering_connection.go b/internal/service/ec2/vpc_peering_connection.go index fa5fcf69f46..63a97cde073 100644 --- a/internal/service/ec2/vpc_peering_connection.go +++ b/internal/service/ec2/vpc_peering_connection.go @@ -174,7 +174,7 @@ func resourceVPCPeeringConnectionRead(ctx context.Context, d *schema.ResourceDat d.Set("accept_status", vpcPeeringConnection.Status.Code) d.Set("peer_region", vpcPeeringConnection.AccepterVpcInfo.Region) - if accountID := meta.(*conns.AWSClient).AccountID; accountID == aws.ToString(vpcPeeringConnection.AccepterVpcInfo.OwnerId) && accountID != aws.ToString(vpcPeeringConnection.RequesterVpcInfo.OwnerId) { + if accountID := meta.(*conns.AWSClient).AccountID(ctx); accountID == aws.ToString(vpcPeeringConnection.AccepterVpcInfo.OwnerId) && accountID != aws.ToString(vpcPeeringConnection.RequesterVpcInfo.OwnerId) { // We're the accepter. d.Set("peer_owner_id", vpcPeeringConnection.RequesterVpcInfo.OwnerId) d.Set("peer_vpc_id", vpcPeeringConnection.RequesterVpcInfo.VpcId) diff --git a/internal/service/ec2/vpc_route_table_data_source_test.go b/internal/service/ec2/vpc_route_table_data_source_test.go index 97bbd92168e..2bdfdf4136d 100644 --- a/internal/service/ec2/vpc_route_table_data_source_test.go +++ b/internal/service/ec2/vpc_route_table_data_source_test.go @@ -37,7 +37,7 @@ func TestAccVPCRouteTableDataSource_basic(t *testing.T) { Config: testAccVPCRouteTableDataSourceConfig_basic(rName), Check: resource.ComposeTestCheckFunc( // By tags. - acctest.MatchResourceAttrRegionalARN(datasource1Name, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, datasource1Name, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), resource.TestCheckResourceAttrPair(datasource1Name, names.AttrID, rtResourceName, names.AttrID), resource.TestCheckResourceAttrPair(datasource1Name, "route_table_id", rtResourceName, names.AttrID), resource.TestCheckResourceAttrPair(datasource1Name, names.AttrOwnerID, rtResourceName, names.AttrOwnerID), @@ -49,7 +49,7 @@ func TestAccVPCRouteTableDataSource_basic(t *testing.T) { testAccCheckListHasSomeElementAttrPair(datasource1Name, "associations", "gateway_id", igwResourceName, names.AttrID), resource.TestCheckResourceAttr(datasource1Name, "tags.Name", rName), // By filter. - acctest.MatchResourceAttrRegionalARN(datasource2Name, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, datasource2Name, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), resource.TestCheckResourceAttrPair(datasource2Name, names.AttrID, rtResourceName, names.AttrID), resource.TestCheckResourceAttrPair(datasource2Name, "route_table_id", rtResourceName, names.AttrID), resource.TestCheckResourceAttrPair(datasource2Name, names.AttrOwnerID, rtResourceName, names.AttrOwnerID), @@ -61,7 +61,7 @@ func TestAccVPCRouteTableDataSource_basic(t *testing.T) { testAccCheckListHasSomeElementAttrPair(datasource2Name, "associations", "gateway_id", igwResourceName, names.AttrID), resource.TestCheckResourceAttr(datasource2Name, "tags.Name", rName), // By subnet ID. - acctest.MatchResourceAttrRegionalARN(datasource3Name, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, datasource3Name, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), resource.TestCheckResourceAttrPair(datasource3Name, names.AttrID, rtResourceName, names.AttrID), resource.TestCheckResourceAttrPair(datasource3Name, "route_table_id", rtResourceName, names.AttrID), resource.TestCheckResourceAttrPair(datasource3Name, names.AttrOwnerID, rtResourceName, names.AttrOwnerID), @@ -73,7 +73,7 @@ func TestAccVPCRouteTableDataSource_basic(t *testing.T) { testAccCheckListHasSomeElementAttrPair(datasource3Name, "associations", "gateway_id", igwResourceName, names.AttrID), resource.TestCheckResourceAttr(datasource3Name, "tags.Name", rName), // By route table ID. - acctest.MatchResourceAttrRegionalARN(datasource4Name, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, datasource4Name, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), resource.TestCheckResourceAttrPair(datasource4Name, names.AttrID, rtResourceName, names.AttrID), resource.TestCheckResourceAttrPair(datasource4Name, "route_table_id", rtResourceName, names.AttrID), resource.TestCheckResourceAttrPair(datasource4Name, names.AttrOwnerID, rtResourceName, names.AttrOwnerID), @@ -85,7 +85,7 @@ func TestAccVPCRouteTableDataSource_basic(t *testing.T) { testAccCheckListHasSomeElementAttrPair(datasource4Name, "associations", "gateway_id", igwResourceName, names.AttrID), resource.TestCheckResourceAttr(datasource4Name, "tags.Name", rName), // By gateway ID. - acctest.MatchResourceAttrRegionalARN(datasource5Name, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, datasource5Name, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), resource.TestCheckResourceAttrPair(datasource5Name, names.AttrID, rtResourceName, names.AttrID), resource.TestCheckResourceAttrPair(datasource5Name, "route_table_id", rtResourceName, names.AttrID), resource.TestCheckResourceAttrPair(datasource5Name, names.AttrOwnerID, rtResourceName, names.AttrOwnerID), diff --git a/internal/service/ec2/vpc_route_table_test.go b/internal/service/ec2/vpc_route_table_test.go index 37ad6a86c06..ba51a02c37a 100644 --- a/internal/service/ec2/vpc_route_table_test.go +++ b/internal/service/ec2/vpc_route_table_test.go @@ -41,8 +41,8 @@ func TestAccVPCRouteTable_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckRouteTableExists(ctx, resourceName, &routeTable), testAccCheckRouteTableNumberOfRoutes(&routeTable, 1), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "propagating_vgws.#", "0"), resource.TestCheckResourceAttr(resourceName, "route.#", "0"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), @@ -126,8 +126,8 @@ func TestAccVPCRouteTable_ipv4ToInternetGateway(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckRouteTableExists(ctx, resourceName, &routeTable), testAccCheckRouteTableNumberOfRoutes(&routeTable, 3), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "propagating_vgws.#", "0"), resource.TestCheckResourceAttr(resourceName, "route.#", "2"), testAccCheckRouteTableRoute(resourceName, names.AttrCIDRBlock, destinationCidr1, "gateway_id", igwResourceName, names.AttrID), @@ -141,8 +141,8 @@ func TestAccVPCRouteTable_ipv4ToInternetGateway(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckRouteTableExists(ctx, resourceName, &routeTable), testAccCheckRouteTableNumberOfRoutes(&routeTable, 3), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "propagating_vgws.#", "0"), resource.TestCheckResourceAttr(resourceName, "route.#", "2"), testAccCheckRouteTableRoute(resourceName, names.AttrCIDRBlock, destinationCidr2, "gateway_id", igwResourceName, names.AttrID), @@ -174,8 +174,8 @@ func TestAccVPCRouteTable_ipv4ToInstance(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckRouteTableExists(ctx, resourceName, &routeTable), testAccCheckRouteTableNumberOfRoutes(&routeTable, 2), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "propagating_vgws.#", "0"), resource.TestCheckResourceAttr(resourceName, "route.#", "1"), testAccCheckRouteTableRoute(resourceName, names.AttrCIDRBlock, destinationCidr, names.AttrNetworkInterfaceID, instanceResourceName, "primary_network_interface_id"), @@ -211,8 +211,8 @@ func TestAccVPCRouteTable_ipv6ToEgressOnlyInternetGateway(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckRouteTableExists(ctx, resourceName, &routeTable), testAccCheckRouteTableNumberOfRoutes(&routeTable, 3), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "propagating_vgws.#", "0"), resource.TestCheckResourceAttr(resourceName, "route.#", "1"), testAccCheckRouteTableRoute(resourceName, "ipv6_cidr_block", destinationCidr, "egress_only_gateway_id", eoigwResourceName, names.AttrID), @@ -294,8 +294,8 @@ func TestAccVPCRouteTable_Route_mode(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckRouteTableExists(ctx, resourceName, &routeTable), testAccCheckRouteTableNumberOfRoutes(&routeTable, 3), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "propagating_vgws.#", "0"), resource.TestCheckResourceAttr(resourceName, "route.#", "2"), testAccCheckRouteTableRoute(resourceName, names.AttrCIDRBlock, destinationCidr1, "gateway_id", igwResourceName, names.AttrID), @@ -314,8 +314,8 @@ func TestAccVPCRouteTable_Route_mode(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckRouteTableExists(ctx, resourceName, &routeTable), testAccCheckRouteTableNumberOfRoutes(&routeTable, 3), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "propagating_vgws.#", "0"), resource.TestCheckResourceAttr(resourceName, "route.#", "2"), testAccCheckRouteTableRoute(resourceName, names.AttrCIDRBlock, destinationCidr1, "gateway_id", igwResourceName, names.AttrID), @@ -334,8 +334,8 @@ func TestAccVPCRouteTable_Route_mode(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckRouteTableExists(ctx, resourceName, &routeTable), testAccCheckRouteTableNumberOfRoutes(&routeTable, 1), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "propagating_vgws.#", "0"), resource.TestCheckResourceAttr(resourceName, "route.#", "0"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), @@ -374,8 +374,8 @@ func TestAccVPCRouteTable_ipv4ToTransitGateway(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckRouteTableExists(ctx, resourceName, &routeTable), testAccCheckRouteTableNumberOfRoutes(&routeTable, 2), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "propagating_vgws.#", "0"), resource.TestCheckResourceAttr(resourceName, "route.#", "1"), testAccCheckRouteTableRoute(resourceName, names.AttrCIDRBlock, destinationCidr, names.AttrTransitGatewayID, tgwResourceName, names.AttrID), @@ -415,8 +415,8 @@ func TestAccVPCRouteTable_ipv4ToVPCEndpoint(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckRouteTableExists(ctx, resourceName, &routeTable), testAccCheckRouteTableNumberOfRoutes(&routeTable, 2), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "propagating_vgws.#", "0"), resource.TestCheckResourceAttr(resourceName, "route.#", "1"), testAccCheckRouteTableRoute(resourceName, names.AttrCIDRBlock, destinationCidr, names.AttrVPCEndpointID, vpceResourceName, names.AttrID), @@ -452,8 +452,8 @@ func TestAccVPCRouteTable_ipv4ToCarrierGateway(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckRouteTableExists(ctx, resourceName, &routeTable), testAccCheckRouteTableNumberOfRoutes(&routeTable, 2), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "propagating_vgws.#", "0"), resource.TestCheckResourceAttr(resourceName, "route.#", "1"), testAccCheckRouteTableRoute(resourceName, names.AttrCIDRBlock, destinationCidr, "carrier_gateway_id", cgwResourceName, names.AttrID), @@ -489,8 +489,8 @@ func TestAccVPCRouteTable_ipv4ToLocalGateway(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckRouteTableExists(ctx, resourceName, &routeTable), testAccCheckRouteTableNumberOfRoutes(&routeTable, 2), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "propagating_vgws.#", "0"), resource.TestCheckResourceAttr(resourceName, "route.#", "1"), testAccCheckRouteTableRoute(resourceName, names.AttrCIDRBlock, destinationCidr, "local_gateway_id", lgwDataSourceName, names.AttrID), @@ -526,8 +526,8 @@ func TestAccVPCRouteTable_ipv4ToVPCPeeringConnection(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckRouteTableExists(ctx, resourceName, &routeTable), testAccCheckRouteTableNumberOfRoutes(&routeTable, 2), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "propagating_vgws.#", "0"), resource.TestCheckResourceAttr(resourceName, "route.#", "1"), testAccCheckRouteTableRoute(resourceName, names.AttrCIDRBlock, destinationCidr, "vpc_peering_connection_id", pcxResourceName, names.AttrID), @@ -563,8 +563,8 @@ func TestAccVPCRouteTable_vgwRoutePropagation(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckRouteTableExists(ctx, resourceName, &routeTable), testAccCheckRouteTableNumberOfRoutes(&routeTable, 1), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "propagating_vgws.#", "1"), resource.TestCheckTypeSetElemAttrPair(resourceName, "propagating_vgws.*", vgwResourceName1, names.AttrID), resource.TestCheckResourceAttr(resourceName, "route.#", "0"), @@ -577,8 +577,8 @@ func TestAccVPCRouteTable_vgwRoutePropagation(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckRouteTableExists(ctx, resourceName, &routeTable), testAccCheckRouteTableNumberOfRoutes(&routeTable, 1), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "propagating_vgws.#", "1"), resource.TestCheckTypeSetElemAttrPair(resourceName, "propagating_vgws.*", vgwResourceName2, names.AttrID), resource.TestCheckResourceAttr(resourceName, "route.#", "0"), @@ -652,8 +652,8 @@ func TestAccVPCRouteTable_ipv4ToNatGateway(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckRouteTableExists(ctx, resourceName, &routeTable), testAccCheckRouteTableNumberOfRoutes(&routeTable, 2), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "propagating_vgws.#", "0"), resource.TestCheckResourceAttr(resourceName, "route.#", "1"), testAccCheckRouteTableRoute(resourceName, names.AttrCIDRBlock, destinationCidr, "nat_gateway_id", ngwResourceName, names.AttrID), @@ -689,8 +689,8 @@ func TestAccVPCRouteTable_IPv6ToNetworkInterface_unattached(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckRouteTableExists(ctx, resourceName, &routeTable), testAccCheckRouteTableNumberOfRoutes(&routeTable, 3), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "propagating_vgws.#", "0"), resource.TestCheckResourceAttr(resourceName, "route.#", "1"), testAccCheckRouteTableRoute(resourceName, "ipv6_cidr_block", destinationCidr, names.AttrNetworkInterfaceID, eniResourceName, names.AttrID), @@ -728,8 +728,8 @@ func TestAccVPCRouteTable_IPv4ToNetworkInterfaces_unattached(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckRouteTableExists(ctx, resourceName, &routeTable), testAccCheckRouteTableNumberOfRoutes(&routeTable, 1), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "propagating_vgws.#", "0"), resource.TestCheckResourceAttr(resourceName, "route.#", "0"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), @@ -740,8 +740,8 @@ func TestAccVPCRouteTable_IPv4ToNetworkInterfaces_unattached(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckRouteTableExists(ctx, resourceName, &routeTable), testAccCheckRouteTableNumberOfRoutes(&routeTable, 3), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "propagating_vgws.#", "0"), resource.TestCheckResourceAttr(resourceName, "route.#", "2"), testAccCheckRouteTableRoute(resourceName, names.AttrCIDRBlock, destinationCidr1, names.AttrNetworkInterfaceID, eni1ResourceName, names.AttrID), @@ -760,8 +760,8 @@ func TestAccVPCRouteTable_IPv4ToNetworkInterfaces_unattached(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckRouteTableExists(ctx, resourceName, &routeTable), testAccCheckRouteTableNumberOfRoutes(&routeTable, 3), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "propagating_vgws.#", "0"), resource.TestCheckResourceAttr(resourceName, "route.#", "2"), testAccCheckRouteTableRoute(resourceName, names.AttrCIDRBlock, destinationCidr2, names.AttrNetworkInterfaceID, eni1ResourceName, names.AttrID), @@ -775,8 +775,8 @@ func TestAccVPCRouteTable_IPv4ToNetworkInterfaces_unattached(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckRouteTableExists(ctx, resourceName, &routeTable), testAccCheckRouteTableNumberOfRoutes(&routeTable, 1), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "propagating_vgws.#", "0"), resource.TestCheckResourceAttr(resourceName, "route.#", "0"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), @@ -804,8 +804,8 @@ func TestAccVPCRouteTable_vpcMultipleCIDRs(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckRouteTableExists(ctx, resourceName, &routeTable), testAccCheckRouteTableNumberOfRoutes(&routeTable, 2), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "propagating_vgws.#", "0"), resource.TestCheckResourceAttr(resourceName, "route.#", "0"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), @@ -844,8 +844,8 @@ func TestAccVPCRouteTable_gatewayVPCEndpoint(t *testing.T) { // Refresh the route table once the VPC endpoint route is present. testAccCheckRouteTableExists(ctx, resourceName, &routeTable), testAccCheckRouteTableNumberOfRoutes(&routeTable, 2), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "propagating_vgws.#", "0"), resource.TestCheckResourceAttr(resourceName, "route.#", "0"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), @@ -889,8 +889,8 @@ func TestAccVPCRouteTable_multipleRoutes(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckRouteTableExists(ctx, resourceName, &routeTable), testAccCheckRouteTableNumberOfRoutes(&routeTable, 5), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "propagating_vgws.#", "0"), resource.TestCheckResourceAttr(resourceName, "route.#", "3"), testAccCheckRouteTableRoute(resourceName, names.AttrCIDRBlock, destinationCidr1, "gateway_id", igwResourceName, names.AttrID), @@ -908,8 +908,8 @@ func TestAccVPCRouteTable_multipleRoutes(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckRouteTableExists(ctx, resourceName, &routeTable), testAccCheckRouteTableNumberOfRoutes(&routeTable, 5), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "propagating_vgws.#", "0"), resource.TestCheckResourceAttr(resourceName, "route.#", "3"), testAccCheckRouteTableRoute(resourceName, names.AttrCIDRBlock, destinationCidr1, "vpc_peering_connection_id", pcxResourceName, names.AttrID), @@ -927,8 +927,8 @@ func TestAccVPCRouteTable_multipleRoutes(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckRouteTableExists(ctx, resourceName, &routeTable), testAccCheckRouteTableNumberOfRoutes(&routeTable, 5), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "propagating_vgws.#", "0"), resource.TestCheckResourceAttr(resourceName, "route.#", "3"), testAccCheckRouteTableRoute(resourceName, "ipv6_cidr_block", destinationCidr4, "vpc_peering_connection_id", pcxResourceName, names.AttrID), @@ -966,8 +966,8 @@ func TestAccVPCRouteTable_prefixListToInternetGateway(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckRouteTableExists(ctx, resourceName, &routeTable), testAccCheckRouteTableNumberOfRoutes(&routeTable, 2), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`route-table/.+$`)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "propagating_vgws.#", "0"), resource.TestCheckResourceAttr(resourceName, "route.#", "1"), testAccCheckRouteTablePrefixListRoute(resourceName, plResourceName, "gateway_id", igwResourceName, names.AttrID), diff --git a/internal/service/ec2/vpc_route_test.go b/internal/service/ec2/vpc_route_test.go index 0e7e035ed6e..9ef47dfaaa0 100644 --- a/internal/service/ec2/vpc_route_test.go +++ b/internal/service/ec2/vpc_route_test.go @@ -249,7 +249,7 @@ func TestAccVPCRoute_ipv6ToInstance(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "egress_only_gateway_id", ""), resource.TestCheckResourceAttr(resourceName, "gateway_id", ""), resource.TestCheckResourceAttrPair(resourceName, names.AttrInstanceID, instanceResourceName, names.AttrID), - acctest.CheckResourceAttrAccountID(resourceName, "instance_owner_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "instance_owner_id"), resource.TestCheckResourceAttr(resourceName, "local_gateway_id", ""), resource.TestCheckResourceAttr(resourceName, "nat_gateway_id", ""), resource.TestCheckResourceAttrPair(resourceName, names.AttrNetworkInterfaceID, instanceResourceName, "primary_network_interface_id"), @@ -484,7 +484,7 @@ func TestAccVPCRoute_ipv4ToInstance(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "egress_only_gateway_id", ""), resource.TestCheckResourceAttr(resourceName, "gateway_id", ""), resource.TestCheckResourceAttrPair(resourceName, names.AttrInstanceID, instanceResourceName, names.AttrID), - acctest.CheckResourceAttrAccountID(resourceName, "instance_owner_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "instance_owner_id"), resource.TestCheckResourceAttr(resourceName, "local_gateway_id", ""), resource.TestCheckResourceAttr(resourceName, "nat_gateway_id", ""), resource.TestCheckResourceAttrPair(resourceName, names.AttrNetworkInterfaceID, instanceResourceName, "primary_network_interface_id"), @@ -579,7 +579,7 @@ func TestAccVPCRoute_IPv4ToNetworkInterface_attached(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "egress_only_gateway_id", ""), resource.TestCheckResourceAttr(resourceName, "gateway_id", ""), resource.TestCheckResourceAttrPair(resourceName, names.AttrInstanceID, instanceResourceName, names.AttrID), - acctest.CheckResourceAttrAccountID(resourceName, "instance_owner_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "instance_owner_id"), resource.TestCheckResourceAttr(resourceName, "local_gateway_id", ""), resource.TestCheckResourceAttr(resourceName, "nat_gateway_id", ""), resource.TestCheckResourceAttrPair(resourceName, names.AttrNetworkInterfaceID, eniResourceName, names.AttrID), @@ -628,7 +628,7 @@ func TestAccVPCRoute_IPv4ToNetworkInterface_twoAttachments(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "egress_only_gateway_id", ""), resource.TestCheckResourceAttr(resourceName, "gateway_id", ""), resource.TestCheckResourceAttrPair(resourceName, names.AttrInstanceID, instanceResourceName, names.AttrID), - acctest.CheckResourceAttrAccountID(resourceName, "instance_owner_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "instance_owner_id"), resource.TestCheckResourceAttr(resourceName, "local_gateway_id", ""), resource.TestCheckResourceAttr(resourceName, "nat_gateway_id", ""), resource.TestCheckResourceAttrPair(resourceName, names.AttrNetworkInterfaceID, eni1ResourceName, names.AttrID), @@ -651,7 +651,7 @@ func TestAccVPCRoute_IPv4ToNetworkInterface_twoAttachments(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "egress_only_gateway_id", ""), resource.TestCheckResourceAttr(resourceName, "gateway_id", ""), resource.TestCheckResourceAttrPair(resourceName, names.AttrInstanceID, instanceResourceName, names.AttrID), - acctest.CheckResourceAttrAccountID(resourceName, "instance_owner_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "instance_owner_id"), resource.TestCheckResourceAttr(resourceName, "local_gateway_id", ""), resource.TestCheckResourceAttr(resourceName, "nat_gateway_id", ""), resource.TestCheckResourceAttrPair(resourceName, names.AttrNetworkInterfaceID, eni2ResourceName, names.AttrID), @@ -1826,7 +1826,7 @@ func TestAccVPCRoute_prefixListToInstance(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "egress_only_gateway_id", ""), resource.TestCheckResourceAttr(resourceName, "gateway_id", ""), resource.TestCheckResourceAttrPair(resourceName, names.AttrInstanceID, instanceResourceName, names.AttrID), - acctest.CheckResourceAttrAccountID(resourceName, "instance_owner_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "instance_owner_id"), resource.TestCheckResourceAttr(resourceName, "local_gateway_id", ""), resource.TestCheckResourceAttr(resourceName, "nat_gateway_id", ""), resource.TestCheckResourceAttrPair(resourceName, names.AttrNetworkInterfaceID, instanceResourceName, "primary_network_interface_id"), @@ -1921,7 +1921,7 @@ func TestAccVPCRoute_PrefixListToNetworkInterface_attached(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "egress_only_gateway_id", ""), resource.TestCheckResourceAttr(resourceName, "gateway_id", ""), resource.TestCheckResourceAttrPair(resourceName, names.AttrInstanceID, instanceResourceName, names.AttrID), - acctest.CheckResourceAttrAccountID(resourceName, "instance_owner_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "instance_owner_id"), resource.TestCheckResourceAttr(resourceName, "local_gateway_id", ""), resource.TestCheckResourceAttr(resourceName, "nat_gateway_id", ""), resource.TestCheckResourceAttrPair(resourceName, names.AttrNetworkInterfaceID, eniResourceName, names.AttrID), diff --git a/internal/service/ec2/vpc_security_group_ingress_rule.go b/internal/service/ec2/vpc_security_group_ingress_rule.go index ffecce97926..7f4a4c5f043 100644 --- a/internal/service/ec2/vpc_security_group_ingress_rule.go +++ b/internal/service/ec2/vpc_security_group_ingress_rule.go @@ -296,7 +296,7 @@ func (r *securityGroupRuleResource) Read(ctx context.Context, request resource.R data.Description = fwflex.StringToFramework(ctx, output.Description) data.IPProtocol = fwflex.StringToFrameworkValuable[ipProtocol](ctx, output.IpProtocol) data.PrefixListID = fwflex.StringToFramework(ctx, output.PrefixListId) - data.ReferencedSecurityGroupID = flattenReferencedSecurityGroup(ctx, output.ReferencedGroupInfo, r.Meta().AccountID) + data.ReferencedSecurityGroupID = flattenReferencedSecurityGroup(ctx, output.ReferencedGroupInfo, r.Meta().AccountID(ctx)) data.SecurityGroupID = fwflex.StringToFramework(ctx, output.GroupId) data.SecurityGroupRuleID = fwflex.StringToFramework(ctx, output.SecurityGroupRuleId) diff --git a/internal/service/ec2/vpc_security_group_rule_data_source.go b/internal/service/ec2/vpc_security_group_rule_data_source.go index 260b6f4b678..8c068accacb 100644 --- a/internal/service/ec2/vpc_security_group_rule_data_source.go +++ b/internal/service/ec2/vpc_security_group_rule_data_source.go @@ -122,7 +122,7 @@ func (d *securityGroupRuleDataSource) Read(ctx context.Context, request datasour data.IPProtocol = flex.StringToFramework(ctx, output.IpProtocol) data.IsEgress = flex.BoolToFramework(ctx, output.IsEgress) data.PrefixListID = flex.StringToFramework(ctx, output.PrefixListId) - data.ReferencedSecurityGroupID = flattenReferencedSecurityGroup(ctx, output.ReferencedGroupInfo, d.Meta().AccountID) + data.ReferencedSecurityGroupID = flattenReferencedSecurityGroup(ctx, output.ReferencedGroupInfo, d.Meta().AccountID(ctx)) data.SecurityGroupID = flex.StringToFramework(ctx, output.GroupId) data.SecurityGroupRuleID = flex.StringToFramework(ctx, output.SecurityGroupRuleId) data.Tags = tftags.FlattenStringValueMap(ctx, keyValueTags(ctx, output.Tags).IgnoreAWS().IgnoreConfig(ignoreTagsConfig).Map()) diff --git a/internal/service/ec2/vpc_security_group_test.go b/internal/service/ec2/vpc_security_group_test.go index 87737290f62..62c6d45bffc 100644 --- a/internal/service/ec2/vpc_security_group_test.go +++ b/internal/service/ec2/vpc_security_group_test.go @@ -890,13 +890,13 @@ func TestAccVPCSecurityGroup_basic(t *testing.T) { Config: testAccVPCSecurityGroupConfig_name(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSecurityGroupExists(ctx, resourceName, &group), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`security-group/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`security-group/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Managed by Terraform"), resource.TestCheckResourceAttr(resourceName, "egress.#", "0"), resource.TestCheckResourceAttr(resourceName, "ingress.#", "0"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrNamePrefix, ""), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "revoke_rules_on_delete", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrPair(resourceName, names.AttrVPCID, "aws_vpc.test", names.AttrID), @@ -2667,10 +2667,10 @@ func TestAccVPCSecurityGroup_emrDependencyViolation(t *testing.T) { Config: testAccVPCSecurityGroupConfig_emrLinkedRulesDestroy(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSecurityGroupExists(ctx, resourceName, &group), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`security-group/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`security-group/.+$`)), resource.TestCheckResourceAttr(resourceName, "egress.#", "1"), resource.TestCheckResourceAttr(resourceName, "ingress.#", "1"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "revoke_rules_on_delete", acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), resource.TestCheckResourceAttrPair(resourceName, names.AttrVPCID, "aws_vpc.test", names.AttrID), diff --git a/internal/service/ec2/vpc_subnet_cidr_reservation_test.go b/internal/service/ec2/vpc_subnet_cidr_reservation_test.go index d3d552ad080..68b92d5b18d 100644 --- a/internal/service/ec2/vpc_subnet_cidr_reservation_test.go +++ b/internal/service/ec2/vpc_subnet_cidr_reservation_test.go @@ -38,7 +38,7 @@ func TestAccVPCSubnetCIDRReservation_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrCIDRBlock, "10.1.1.16/28"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "test"), resource.TestCheckResourceAttr(resourceName, "reservation_type", names.AttrPrefix), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), ), }, { @@ -68,7 +68,7 @@ func TestAccVPCSubnetCIDRReservation_ipv6(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckSubnetCIDRReservationExists(ctx, resourceName, &res), resource.TestCheckResourceAttr(resourceName, "reservation_type", "explicit"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), ), }, { diff --git a/internal/service/ec2/vpc_subnet_test.go b/internal/service/ec2/vpc_subnet_test.go index 20bc2c065a6..7eb4ab20631 100644 --- a/internal/service/ec2/vpc_subnet_test.go +++ b/internal/service/ec2/vpc_subnet_test.go @@ -37,7 +37,7 @@ func TestAccVPCSubnet_basic(t *testing.T) { Config: testAccVPCSubnetConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckSubnetExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`subnet/subnet-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`subnet/subnet-.+`)), resource.TestCheckResourceAttrSet(resourceName, names.AttrAvailabilityZone), resource.TestCheckResourceAttrSet(resourceName, "availability_zone_id"), resource.TestCheckResourceAttr(resourceName, names.AttrCIDRBlock, "10.1.1.0/24"), @@ -50,7 +50,7 @@ func TestAccVPCSubnet_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "map_customer_owned_ip_on_launch", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "map_public_ip_on_launch", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "outpost_arn", ""), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "private_dns_hostname_type_on_launch", "ip-name"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), diff --git a/internal/service/ec2/vpc_test.go b/internal/service/ec2/vpc_test.go index 2a14439c450..7ced27a1a0b 100644 --- a/internal/service/ec2/vpc_test.go +++ b/internal/service/ec2/vpc_test.go @@ -38,7 +38,7 @@ func TestAccVPC_basic(t *testing.T) { Config: testAccVPCConfig_basic, Check: resource.ComposeAggregateTestCheckFunc( acctest.CheckVPCExists(ctx, resourceName, &vpc), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`vpc/vpc-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`vpc/vpc-.+`)), resource.TestCheckResourceAttr(resourceName, "assign_generated_ipv6_cidr_block", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, names.AttrCIDRBlock, "10.1.0.0/16"), resource.TestCheckResourceAttrSet(resourceName, "default_network_acl_id"), @@ -57,7 +57,7 @@ func TestAccVPC_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "ipv6_ipam_pool_id", ""), resource.TestCheckResourceAttr(resourceName, "ipv6_netmask_length", "0"), resource.TestCheckResourceAttrSet(resourceName, "main_route_table_id"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, diff --git a/internal/service/ec2/vpc_traffic_mirror_filter.go b/internal/service/ec2/vpc_traffic_mirror_filter.go index ccb2f9b1bc8..41af526b5c9 100644 --- a/internal/service/ec2/vpc_traffic_mirror_filter.go +++ b/internal/service/ec2/vpc_traffic_mirror_filter.go @@ -126,7 +126,7 @@ func resourceTrafficMirrorFilterRead(ctx context.Context, d *schema.ResourceData Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "ec2", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: "traffic-mirror-filter/" + d.Id(), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/ec2/vpc_traffic_mirror_filter_rule.go b/internal/service/ec2/vpc_traffic_mirror_filter_rule.go index 62ac5c27649..18e5f15734b 100644 --- a/internal/service/ec2/vpc_traffic_mirror_filter_rule.go +++ b/internal/service/ec2/vpc_traffic_mirror_filter_rule.go @@ -183,7 +183,7 @@ func resourceTrafficMirrorFilterRuleRead(ctx context.Context, d *schema.Resource Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "ec2", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: "traffic-mirror-filter-rule/" + d.Id(), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/ec2/vpc_traffic_mirror_filter_rule_test.go b/internal/service/ec2/vpc_traffic_mirror_filter_rule_test.go index ee54face730..51a5f915a27 100644 --- a/internal/service/ec2/vpc_traffic_mirror_filter_rule_test.go +++ b/internal/service/ec2/vpc_traffic_mirror_filter_rule_test.go @@ -50,7 +50,7 @@ func TestAccVPCTrafficMirrorFilterRule_basic(t *testing.T) { Config: testAccVPCTrafficMirrorFilterRuleConfig_basic(dstCidr, srcCidr, action, direction, ruleNum1), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTrafficMirrorFilterRuleExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`traffic-mirror-filter-rule/tmfr-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`traffic-mirror-filter-rule/tmfr-.+`)), resource.TestMatchResourceAttr(resourceName, "traffic_mirror_filter_id", regexache.MustCompile("tmf-.*")), resource.TestCheckResourceAttr(resourceName, "destination_cidr_block", dstCidr), resource.TestCheckResourceAttr(resourceName, "rule_action", action), diff --git a/internal/service/ec2/vpc_traffic_mirror_filter_test.go b/internal/service/ec2/vpc_traffic_mirror_filter_test.go index e758525f138..2b2f7b2a542 100644 --- a/internal/service/ec2/vpc_traffic_mirror_filter_test.go +++ b/internal/service/ec2/vpc_traffic_mirror_filter_test.go @@ -40,7 +40,7 @@ func TestAccVPCTrafficMirrorFilter_basic(t *testing.T) { Config: testAccVPCTrafficMirrorFilterConfig_basic(description), Check: resource.ComposeTestCheckFunc( testAccCheckTrafficMirrorFilterExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`traffic-mirror-filter/tmf-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`traffic-mirror-filter/tmf-.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, description), resource.TestCheckResourceAttr(resourceName, "network_services.#", "1"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), diff --git a/internal/service/ec2/vpc_traffic_mirror_session_test.go b/internal/service/ec2/vpc_traffic_mirror_session_test.go index f1acc8f766d..cd420103a90 100644 --- a/internal/service/ec2/vpc_traffic_mirror_session_test.go +++ b/internal/service/ec2/vpc_traffic_mirror_session_test.go @@ -52,8 +52,8 @@ func TestAccVPCTrafficMirrorSession_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "session_number", strconv.Itoa(session)), resource.TestMatchResourceAttr(resourceName, "virtual_network_id", regexache.MustCompile(`\d+`)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`traffic-mirror-session/tms-.+`)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`traffic-mirror-session/tms-.+`)), ), }, // update of description, packet length and VNI diff --git a/internal/service/ec2/vpc_traffic_mirror_target_test.go b/internal/service/ec2/vpc_traffic_mirror_target_test.go index f38d257a1bf..0307e950e7d 100644 --- a/internal/service/ec2/vpc_traffic_mirror_target_test.go +++ b/internal/service/ec2/vpc_traffic_mirror_target_test.go @@ -41,8 +41,8 @@ func TestAccVPCTrafficMirrorTarget_nlb(t *testing.T) { Config: testAccVPCTrafficMirrorTargetConfig_nlb(rName, description), Check: resource.ComposeTestCheckFunc( testAccCheckTrafficMirrorTargetExists(ctx, resourceName, &v), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`traffic-mirror-target/tmt-.+`)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`traffic-mirror-target/tmt-.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, description), resource.TestCheckResourceAttrPair(resourceName, "network_load_balancer_arn", "aws_lb.test", names.AttrARN), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), diff --git a/internal/service/ec2/vpnclient_endpoint.go b/internal/service/ec2/vpnclient_endpoint.go index 3b6ba76279c..43d5677a10c 100644 --- a/internal/service/ec2/vpnclient_endpoint.go +++ b/internal/service/ec2/vpnclient_endpoint.go @@ -316,7 +316,7 @@ func resourceClientVPNEndpointRead(ctx context.Context, d *schema.ResourceData, Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("client-vpn-endpoint/%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/ec2/vpnclient_endpoint_data_source.go b/internal/service/ec2/vpnclient_endpoint_data_source.go index 8e88dad91a5..f96e2538557 100644 --- a/internal/service/ec2/vpnclient_endpoint_data_source.go +++ b/internal/service/ec2/vpnclient_endpoint_data_source.go @@ -215,7 +215,7 @@ func dataSourceClientVPNEndpointRead(ctx context.Context, d *schema.ResourceData Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("client-vpn-endpoint/%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/ec2/vpnclient_endpoint_test.go b/internal/service/ec2/vpnclient_endpoint_test.go index 556f995138f..6109f3180e7 100644 --- a/internal/service/ec2/vpnclient_endpoint_test.go +++ b/internal/service/ec2/vpnclient_endpoint_test.go @@ -40,7 +40,7 @@ func testAccClientVPNEndpoint_basic(t *testing.T, semaphore tfsync.Semaphore) { Config: testAccClientVPNEndpointConfig_basic(t, rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckClientVPNEndpointExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`client-vpn-endpoint/cvpn-endpoint-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`client-vpn-endpoint/cvpn-endpoint-.+`)), resource.TestCheckResourceAttr(resourceName, "authentication_options.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "authentication_options.*", map[string]string{ names.AttrType: "certificate-authentication", diff --git a/internal/service/ec2/vpnsite_connection.go b/internal/service/ec2/vpnsite_connection.go index eaa9d44ab95..4e85b346c0a 100644 --- a/internal/service/ec2/vpnsite_connection.go +++ b/internal/service/ec2/vpnsite_connection.go @@ -733,7 +733,7 @@ func resourceVPNConnectionRead(ctx context.Context, d *schema.ResourceData, meta Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("vpn-connection/%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/ec2/vpnsite_connection_test.go b/internal/service/ec2/vpnsite_connection_test.go index f45b55f6edf..24ee784b702 100644 --- a/internal/service/ec2/vpnsite_connection_test.go +++ b/internal/service/ec2/vpnsite_connection_test.go @@ -171,7 +171,7 @@ func TestAccSiteVPNConnection_basic(t *testing.T) { Config: testAccSiteVPNConnectionConfig_basic(rName, rBgpAsn), Check: resource.ComposeAggregateTestCheckFunc( testAccVPNConnectionExists(ctx, resourceName, &vpn), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`vpn-connection/vpn-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`vpn-connection/vpn-.+`)), resource.TestCheckResourceAttr(resourceName, "core_network_arn", ""), resource.TestCheckResourceAttr(resourceName, "core_network_attachment_arn", ""), resource.TestCheckResourceAttrSet(resourceName, "customer_gateway_configuration"), @@ -268,7 +268,7 @@ func TestAccSiteVPNConnection_withoutTGWorVGW(t *testing.T) { Config: testAccSiteVPNConnectionConfig_withoutTGWorVGW(rName, rBgpAsn), Check: resource.ComposeAggregateTestCheckFunc( testAccVPNConnectionExists(ctx, resourceName, &vpn), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`vpn-connection/vpn-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`vpn-connection/vpn-.+`)), resource.TestCheckResourceAttr(resourceName, "core_network_arn", ""), resource.TestCheckResourceAttr(resourceName, "core_network_attachment_arn", ""), resource.TestCheckResourceAttrSet(resourceName, "customer_gateway_configuration"), diff --git a/internal/service/ec2/vpnsite_customer_gateway.go b/internal/service/ec2/vpnsite_customer_gateway.go index 5e96bf56527..e4ab9439869 100644 --- a/internal/service/ec2/vpnsite_customer_gateway.go +++ b/internal/service/ec2/vpnsite_customer_gateway.go @@ -167,7 +167,7 @@ func resourceCustomerGatewayRead(ctx context.Context, d *schema.ResourceData, me Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("customer-gateway/%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/ec2/vpnsite_customer_gateway_data_source.go b/internal/service/ec2/vpnsite_customer_gateway_data_source.go index b1eeee18d11..4a51dbefeaa 100644 --- a/internal/service/ec2/vpnsite_customer_gateway_data_source.go +++ b/internal/service/ec2/vpnsite_customer_gateway_data_source.go @@ -98,7 +98,7 @@ func dataSourceCustomerGatewayRead(ctx context.Context, d *schema.ResourceData, Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("customer-gateway/%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/ec2/vpnsite_customer_gateway_test.go b/internal/service/ec2/vpnsite_customer_gateway_test.go index 0c4d6b8ed65..e4408075aa4 100644 --- a/internal/service/ec2/vpnsite_customer_gateway_test.go +++ b/internal/service/ec2/vpnsite_customer_gateway_test.go @@ -38,7 +38,7 @@ func TestAccSiteVPNCustomerGateway_basic(t *testing.T) { Config: testAccSiteVPNCustomerGatewayConfig_basic(rBgpAsn), Check: resource.ComposeTestCheckFunc( testAccCheckCustomerGatewayExists(ctx, resourceName, &gateway), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`customer-gateway/cgw-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`customer-gateway/cgw-.+`)), resource.TestCheckResourceAttr(resourceName, "bgp_asn", strconv.Itoa(rBgpAsn)), resource.TestCheckResourceAttr(resourceName, names.AttrCertificateARN, ""), resource.TestCheckResourceAttr(resourceName, names.AttrDeviceName, ""), @@ -72,7 +72,7 @@ func TestAccSiteVPNCustomerGateway_bgpASNExtended(t *testing.T) { Config: testAccSiteVPNCustomerGatewayConfig_bgpASNExtended(rBgpAsnExtended), Check: resource.ComposeTestCheckFunc( testAccCheckCustomerGatewayExists(ctx, resourceName, &gateway), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`customer-gateway/cgw-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`customer-gateway/cgw-.+`)), resource.TestCheckResourceAttr(resourceName, "bgp_asn_extended", strconv.Itoa(rBgpAsnExtended)), resource.TestCheckResourceAttr(resourceName, names.AttrCertificateARN, ""), resource.TestCheckResourceAttr(resourceName, names.AttrDeviceName, ""), diff --git a/internal/service/ec2/vpnsite_gateway.go b/internal/service/ec2/vpnsite_gateway.go index b72acdb4b32..0698446f2a2 100644 --- a/internal/service/ec2/vpnsite_gateway.go +++ b/internal/service/ec2/vpnsite_gateway.go @@ -129,7 +129,7 @@ func resourceVPNGatewayRead(ctx context.Context, d *schema.ResourceData, meta in Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("vpn-gateway/%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/ec2/vpnsite_gateway_data_source.go b/internal/service/ec2/vpnsite_gateway_data_source.go index 4535fd23e2c..7bfd1dc5200 100644 --- a/internal/service/ec2/vpnsite_gateway_data_source.go +++ b/internal/service/ec2/vpnsite_gateway_data_source.go @@ -124,7 +124,7 @@ func dataSourceVPNGatewayRead(ctx context.Context, d *schema.ResourceData, meta Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("vpn-gateway/%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/ec2/vpnsite_gateway_test.go b/internal/service/ec2/vpnsite_gateway_test.go index f4512be41c4..1c5f6c571b4 100644 --- a/internal/service/ec2/vpnsite_gateway_test.go +++ b/internal/service/ec2/vpnsite_gateway_test.go @@ -54,7 +54,7 @@ func TestAccSiteVPNGateway_basic(t *testing.T) { Config: testAccSiteVPNGatewayConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckVPNGatewayExists(ctx, resourceName, &v1), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`vpn-gateway/vgw-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`vpn-gateway/vgw-.+`)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, diff --git a/internal/service/ec2/wavelength_carrier_gateway_test.go b/internal/service/ec2/wavelength_carrier_gateway_test.go index fb0c42953c9..0f3b1f41d69 100644 --- a/internal/service/ec2/wavelength_carrier_gateway_test.go +++ b/internal/service/ec2/wavelength_carrier_gateway_test.go @@ -38,8 +38,8 @@ func TestAccWavelengthCarrierGateway_basic(t *testing.T) { Config: testAccWavelengthCarrierGatewayConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckCarrierGatewayExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ec2", regexache.MustCompile(`carrier-gateway/cagw-.+`)), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ec2", regexache.MustCompile(`carrier-gateway/cagw-.+`)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrPair(resourceName, names.AttrVPCID, vpcResourceName, names.AttrID), ), From 9d60ade2c585fbcaaf8473811bc57677a954c0ea Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:46 -0500 Subject: [PATCH 060/304] Make 'AWSClient.AccountID' a getter - ecr. --- ...ull_through_cache_rule_data_source_test.go | 6 +++--- .../ecr/pull_through_cache_rule_test.go | 6 +++--- internal/service/ecr/registry_policy_test.go | 4 ++-- .../ecr/registry_scanning_configuration.go | 2 +- .../registry_scanning_configuration_test.go | 6 +++--- .../service/ecr/replication_configuration.go | 2 +- .../ecr/replication_configuration_test.go | 20 +++++++++---------- ...tory_creation_template_data_source_test.go | 2 +- .../ecr/repository_creation_template_test.go | 6 +++--- .../service/ecr/repository_policy_test.go | 4 ++-- internal/service/ecr/repository_test.go | 16 +++++++-------- 11 files changed, 37 insertions(+), 37 deletions(-) diff --git a/internal/service/ecr/pull_through_cache_rule_data_source_test.go b/internal/service/ecr/pull_through_cache_rule_data_source_test.go index 9e8f5143c8f..4581c08c7f6 100644 --- a/internal/service/ecr/pull_through_cache_rule_data_source_test.go +++ b/internal/service/ecr/pull_through_cache_rule_data_source_test.go @@ -25,7 +25,7 @@ func TestAccECRPullThroughCacheRuleDataSource_basic(t *testing.T) { { Config: testAccPullThroughCacheRuleDataSourceConfig_basic(), Check: resource.ComposeAggregateTestCheckFunc( - acctest.CheckResourceAttrAccountID(dataSource, "registry_id"), + acctest.CheckResourceAttrAccountID(ctx, dataSource, "registry_id"), resource.TestCheckResourceAttr(dataSource, "upstream_registry_url", "public.ecr.aws"), ), }, @@ -47,7 +47,7 @@ func TestAccECRPullThroughCacheRuleDataSource_repositoryPrefixWithSlash(t *testi { Config: testAccPullThroughCacheRuleDataSourceConfig_repositoryPrefixWithSlash(repositoryPrefix), Check: resource.ComposeAggregateTestCheckFunc( - acctest.CheckResourceAttrAccountID(dataSource, "registry_id"), + acctest.CheckResourceAttrAccountID(ctx, dataSource, "registry_id"), resource.TestCheckResourceAttr(dataSource, "upstream_registry_url", "public.ecr.aws"), ), }, @@ -69,7 +69,7 @@ func TestAccECRPullThroughCacheRuleDataSource_credential(t *testing.T) { Config: testAccPullThroughCacheRuleDataSourceConfig_credentialARN(repositoryPrefix), Check: resource.ComposeAggregateTestCheckFunc( resource.TestCheckResourceAttrSet(dataSource, "credential_arn"), - acctest.CheckResourceAttrAccountID(dataSource, "registry_id"), + acctest.CheckResourceAttrAccountID(ctx, dataSource, "registry_id"), resource.TestCheckResourceAttr(dataSource, "upstream_registry_url", "registry-1.docker.io"), ), }, diff --git a/internal/service/ecr/pull_through_cache_rule_test.go b/internal/service/ecr/pull_through_cache_rule_test.go index 4ed53ccf239..ca216eb8a8f 100644 --- a/internal/service/ecr/pull_through_cache_rule_test.go +++ b/internal/service/ecr/pull_through_cache_rule_test.go @@ -36,7 +36,7 @@ func TestAccECRPullThroughCacheRule_basic(t *testing.T) { testAccCheckPullThroughCacheRuleExists(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, "credential_arn", ""), resource.TestCheckResourceAttr(resourceName, "ecr_repository_prefix", repositoryPrefix), - acctest.CheckResourceAttrAccountID(resourceName, "registry_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "registry_id"), resource.TestCheckResourceAttr(resourceName, "upstream_registry_url", "public.ecr.aws"), ), }, @@ -66,7 +66,7 @@ func TestAccECRPullThroughCacheRule_credentialARN(t *testing.T) { testAccCheckPullThroughCacheRuleExists(ctx, resourceName), resource.TestCheckResourceAttrSet(resourceName, "credential_arn"), resource.TestCheckResourceAttr(resourceName, "ecr_repository_prefix", repositoryPrefix), - acctest.CheckResourceAttrAccountID(resourceName, "registry_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "registry_id"), resource.TestCheckResourceAttr(resourceName, "upstream_registry_url", "registry-1.docker.io"), ), }, @@ -144,7 +144,7 @@ func TestAccECRPullThroughCacheRule_repositoryPrefixWithSlash(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckPullThroughCacheRuleExists(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, "ecr_repository_prefix", repositoryPrefix), - acctest.CheckResourceAttrAccountID(resourceName, "registry_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "registry_id"), resource.TestCheckResourceAttr(resourceName, "upstream_registry_url", "public.ecr.aws"), ), }, diff --git a/internal/service/ecr/registry_policy_test.go b/internal/service/ecr/registry_policy_test.go index a3a74d9e6c9..73a28db6701 100644 --- a/internal/service/ecr/registry_policy_test.go +++ b/internal/service/ecr/registry_policy_test.go @@ -46,7 +46,7 @@ func testAccRegistryPolicy_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckRegistryPolicyExists(ctx, resourceName, &v), resource.TestMatchResourceAttr(resourceName, names.AttrPolicy, regexache.MustCompile(`"ecr:ReplicateImage".+`)), - acctest.CheckResourceAttrAccountID(resourceName, "registry_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "registry_id"), ), }, { @@ -60,7 +60,7 @@ func testAccRegistryPolicy_basic(t *testing.T) { testAccCheckRegistryPolicyExists(ctx, resourceName, &v), resource.TestMatchResourceAttr(resourceName, names.AttrPolicy, regexache.MustCompile(`"ecr:ReplicateImage".+`)), resource.TestMatchResourceAttr(resourceName, names.AttrPolicy, regexache.MustCompile(`"ecr:CreateRepository".+`)), - acctest.CheckResourceAttrAccountID(resourceName, "registry_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "registry_id"), ), }, }, diff --git a/internal/service/ecr/registry_scanning_configuration.go b/internal/service/ecr/registry_scanning_configuration.go index 53afcc00709..eda745c32c3 100644 --- a/internal/service/ecr/registry_scanning_configuration.go +++ b/internal/service/ecr/registry_scanning_configuration.go @@ -100,7 +100,7 @@ func resourceRegistryScanningConfigurationPut(ctx context.Context, d *schema.Res } if d.IsNewResource() { - d.SetId(meta.(*conns.AWSClient).AccountID) + d.SetId(meta.(*conns.AWSClient).AccountID(ctx)) } return append(diags, resourceRegistryScanningConfigurationRead(ctx, d, meta)...) diff --git a/internal/service/ecr/registry_scanning_configuration_test.go b/internal/service/ecr/registry_scanning_configuration_test.go index c296e8beb26..ba2ddaeb221 100644 --- a/internal/service/ecr/registry_scanning_configuration_test.go +++ b/internal/service/ecr/registry_scanning_configuration_test.go @@ -43,7 +43,7 @@ func testAccRegistryScanningConfiguration_basic(t *testing.T) { Config: testAccRegistryScanningConfigurationConfig_basic(), Check: resource.ComposeTestCheckFunc( testAccRegistryScanningConfigurationExists(ctx, resourceName, &v), - acctest.CheckResourceAttrAccountID(resourceName, "registry_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "registry_id"), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "0"), resource.TestCheckResourceAttr(resourceName, "scan_type", "BASIC"), ), @@ -72,7 +72,7 @@ func testAccRegistryScanningConfiguration_update(t *testing.T) { Config: testAccRegistryScanningConfigurationConfig_oneRule(), Check: resource.ComposeTestCheckFunc( testAccRegistryScanningConfigurationExists(ctx, resourceName, &v), - acctest.CheckResourceAttrAccountID(resourceName, "registry_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "registry_id"), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "scan_frequency": "SCAN_ON_PUSH", @@ -115,7 +115,7 @@ func testAccRegistryScanningConfiguration_update(t *testing.T) { Config: testAccRegistryScanningConfigurationConfig_basic(), Check: resource.ComposeTestCheckFunc( testAccRegistryScanningConfigurationExists(ctx, resourceName, &v), - acctest.CheckResourceAttrAccountID(resourceName, "registry_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "registry_id"), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "0"), resource.TestCheckResourceAttr(resourceName, "scan_type", "BASIC"), ), diff --git a/internal/service/ecr/replication_configuration.go b/internal/service/ecr/replication_configuration.go index 58e55b777bd..096b2466a89 100644 --- a/internal/service/ecr/replication_configuration.go +++ b/internal/service/ecr/replication_configuration.go @@ -112,7 +112,7 @@ func resourceReplicationConfigurationPut(ctx context.Context, d *schema.Resource } if d.IsNewResource() { - d.SetId(meta.(*conns.AWSClient).AccountID) + d.SetId(meta.(*conns.AWSClient).AccountID(ctx)) } return append(diags, resourceReplicationConfigurationRead(ctx, d, meta)...) diff --git a/internal/service/ecr/replication_configuration_test.go b/internal/service/ecr/replication_configuration_test.go index ed5da6a6b79..30244fc0858 100644 --- a/internal/service/ecr/replication_configuration_test.go +++ b/internal/service/ecr/replication_configuration_test.go @@ -43,12 +43,12 @@ func testAccReplicationConfiguration_basic(t *testing.T) { Config: testAccReplicationConfigurationConfig_basic(acctest.AlternateRegion()), Check: resource.ComposeTestCheckFunc( testAccCheckReplicationConfigurationExists(ctx, resourceName), - acctest.CheckResourceAttrAccountID(resourceName, "registry_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "registry_id"), resource.TestCheckResourceAttr(resourceName, "replication_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "replication_configuration.0.rule.#", "1"), resource.TestCheckResourceAttr(resourceName, "replication_configuration.0.rule.0.destination.#", "1"), resource.TestCheckResourceAttr(resourceName, "replication_configuration.0.rule.0.destination.0.region", acctest.AlternateRegion()), - acctest.CheckResourceAttrAccountID(resourceName, "replication_configuration.0.rule.0.destination.0.registry_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "replication_configuration.0.rule.0.destination.0.registry_id"), resource.TestCheckResourceAttr(resourceName, "replication_configuration.0.rule.0.repository_filter.#", "0"), ), }, @@ -61,14 +61,14 @@ func testAccReplicationConfiguration_basic(t *testing.T) { Config: testAccReplicationConfigurationConfig_multipleRegion(acctest.AlternateRegion(), acctest.ThirdRegion()), Check: resource.ComposeTestCheckFunc( testAccCheckReplicationConfigurationExists(ctx, resourceName), - acctest.CheckResourceAttrAccountID(resourceName, "registry_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "registry_id"), resource.TestCheckResourceAttr(resourceName, "replication_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "replication_configuration.0.rule.#", "1"), resource.TestCheckResourceAttr(resourceName, "replication_configuration.0.rule.0.destination.#", "2"), resource.TestCheckResourceAttr(resourceName, "replication_configuration.0.rule.0.destination.0.region", acctest.AlternateRegion()), - acctest.CheckResourceAttrAccountID(resourceName, "replication_configuration.0.rule.0.destination.0.registry_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "replication_configuration.0.rule.0.destination.0.registry_id"), resource.TestCheckResourceAttr(resourceName, "replication_configuration.0.rule.0.destination.1.region", acctest.ThirdRegion()), - acctest.CheckResourceAttrAccountID(resourceName, "replication_configuration.0.rule.0.destination.1.registry_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "replication_configuration.0.rule.0.destination.1.registry_id"), resource.TestCheckResourceAttr(resourceName, "replication_configuration.0.rule.0.repository_filter.#", "0"), ), }, @@ -76,12 +76,12 @@ func testAccReplicationConfiguration_basic(t *testing.T) { Config: testAccReplicationConfigurationConfig_basic(acctest.AlternateRegion()), Check: resource.ComposeTestCheckFunc( testAccCheckReplicationConfigurationExists(ctx, resourceName), - acctest.CheckResourceAttrAccountID(resourceName, "registry_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "registry_id"), resource.TestCheckResourceAttr(resourceName, "replication_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "replication_configuration.0.rule.#", "1"), resource.TestCheckResourceAttr(resourceName, "replication_configuration.0.rule.0.destination.#", "1"), resource.TestCheckResourceAttr(resourceName, "replication_configuration.0.rule.0.destination.0.region", acctest.AlternateRegion()), - acctest.CheckResourceAttrAccountID(resourceName, "replication_configuration.0.rule.0.destination.0.registry_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "replication_configuration.0.rule.0.destination.0.registry_id"), resource.TestCheckResourceAttr(resourceName, "replication_configuration.0.rule.0.repository_filter.#", "0"), ), }, @@ -125,7 +125,7 @@ func testAccReplicationConfiguration_repositoryFilter(t *testing.T) { Config: testAccReplicationConfigurationConfig_repositoryFilter(acctest.AlternateRegion()), Check: resource.ComposeTestCheckFunc( testAccCheckReplicationConfigurationExists(ctx, resourceName), - acctest.CheckResourceAttrAccountID(resourceName, "registry_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "registry_id"), resource.TestCheckResourceAttr(resourceName, "replication_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "replication_configuration.0.rule.#", "1"), resource.TestCheckResourceAttr(resourceName, "replication_configuration.0.rule.0.destination.#", "1"), @@ -143,7 +143,7 @@ func testAccReplicationConfiguration_repositoryFilter(t *testing.T) { Config: testAccReplicationConfigurationConfig_repositoryFilterMultiple(acctest.AlternateRegion()), Check: resource.ComposeTestCheckFunc( testAccCheckReplicationConfigurationExists(ctx, resourceName), - acctest.CheckResourceAttrAccountID(resourceName, "registry_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "registry_id"), resource.TestCheckResourceAttr(resourceName, "replication_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "replication_configuration.0.rule.#", "1"), resource.TestCheckResourceAttr(resourceName, "replication_configuration.0.rule.0.repository_filter.#", "2"), @@ -157,7 +157,7 @@ func testAccReplicationConfiguration_repositoryFilter(t *testing.T) { Config: testAccReplicationConfigurationConfig_repositoryFilter(acctest.AlternateRegion()), Check: resource.ComposeTestCheckFunc( testAccCheckReplicationConfigurationExists(ctx, resourceName), - acctest.CheckResourceAttrAccountID(resourceName, "registry_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "registry_id"), resource.TestCheckResourceAttr(resourceName, "replication_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "replication_configuration.0.rule.#", "1"), resource.TestCheckResourceAttr(resourceName, "replication_configuration.0.rule.0.destination.#", "1"), diff --git a/internal/service/ecr/repository_creation_template_data_source_test.go b/internal/service/ecr/repository_creation_template_data_source_test.go index 230bef64e64..c404088f4a0 100644 --- a/internal/service/ecr/repository_creation_template_data_source_test.go +++ b/internal/service/ecr/repository_creation_template_data_source_test.go @@ -27,7 +27,7 @@ func TestAccECRRepositoryCreationTemplateDataSource_basic(t *testing.T) { { Config: testAccRepositoryCreationTemplateDataSourceConfig_basic(repositoryPrefix), Check: resource.ComposeAggregateTestCheckFunc( - acctest.CheckResourceAttrAccountID(dataSource, "registry_id"), + acctest.CheckResourceAttrAccountID(ctx, dataSource, "registry_id"), resource.TestCheckResourceAttr(dataSource, "applied_for.#", "1"), resource.TestCheckTypeSetElemAttr(dataSource, "applied_for.*", string(types.RCTAppliedForPullThroughCache)), resource.TestCheckResourceAttr(dataSource, "custom_role_arn", ""), diff --git a/internal/service/ecr/repository_creation_template_test.go b/internal/service/ecr/repository_creation_template_test.go index dea4bdbbf92..e9c9d50c203 100644 --- a/internal/service/ecr/repository_creation_template_test.go +++ b/internal/service/ecr/repository_creation_template_test.go @@ -49,7 +49,7 @@ func TestAccECRRepositoryCreationTemplate_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "repository_policy", ""), resource.TestCheckResourceAttr(resourceName, "resource_tags.%", "1"), resource.TestCheckResourceAttr(resourceName, "resource_tags.Foo", "Bar"), - acctest.CheckResourceAttrAccountID(resourceName, "registry_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "registry_id"), ), }, { @@ -147,7 +147,7 @@ func TestAccECRRepositoryCreationTemplate_repository(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckRepositoryCreationTemplateExists(ctx, resourceName), resource.TestMatchResourceAttr(resourceName, "repository_policy", regexache.MustCompile(repositoryPrefix)), - acctest.CheckResourceAttrAccountID(resourceName, "registry_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "registry_id"), ), }, { @@ -161,7 +161,7 @@ func TestAccECRRepositoryCreationTemplate_repository(t *testing.T) { testAccCheckRepositoryCreationTemplateExists(ctx, resourceName), resource.TestMatchResourceAttr(resourceName, "repository_policy", regexache.MustCompile(repositoryPrefix)), resource.TestMatchResourceAttr(resourceName, "repository_policy", regexache.MustCompile("ecr:DescribeImages")), - acctest.CheckResourceAttrAccountID(resourceName, "registry_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "registry_id"), ), }, }, diff --git a/internal/service/ecr/repository_policy_test.go b/internal/service/ecr/repository_policy_test.go index 7237e8aac20..902c1cfa0b1 100644 --- a/internal/service/ecr/repository_policy_test.go +++ b/internal/service/ecr/repository_policy_test.go @@ -36,7 +36,7 @@ func TestAccECRRepositoryPolicy_basic(t *testing.T) { testAccCheckRepositoryPolicyExists(ctx, resourceName), resource.TestCheckResourceAttrPair(resourceName, "repository", "aws_ecr_repository.test", names.AttrName), resource.TestMatchResourceAttr(resourceName, names.AttrPolicy, regexache.MustCompile(rName)), - acctest.CheckResourceAttrAccountID(resourceName, "registry_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "registry_id"), ), }, { @@ -51,7 +51,7 @@ func TestAccECRRepositoryPolicy_basic(t *testing.T) { resource.TestCheckResourceAttrPair(resourceName, "repository", "aws_ecr_repository.test", names.AttrName), resource.TestMatchResourceAttr(resourceName, names.AttrPolicy, regexache.MustCompile(rName)), resource.TestMatchResourceAttr(resourceName, names.AttrPolicy, regexache.MustCompile("ecr:DescribeImages")), - acctest.CheckResourceAttrAccountID(resourceName, "registry_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "registry_id"), ), }, }, diff --git a/internal/service/ecr/repository_test.go b/internal/service/ecr/repository_test.go index 218e85eeae8..34997ad6d07 100644 --- a/internal/service/ecr/repository_test.go +++ b/internal/service/ecr/repository_test.go @@ -38,10 +38,10 @@ func TestAccECRRepository_basic(t *testing.T) { Config: testAccRepositoryConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckRepositoryExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "ecr", fmt.Sprintf("repository/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ecr", fmt.Sprintf("repository/%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), - testAccCheckRepositoryRegistryID(resourceName), - testAccCheckRepositoryRepositoryURL(resourceName, rName), + testAccCheckRepositoryRegistryID(ctx, resourceName), + testAccCheckRepositoryRepositoryURL(ctx, resourceName, rName), resource.TestCheckResourceAttr(resourceName, "encryption_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "encryption_configuration.0.encryption_type", string(types.EncryptionTypeAes256)), resource.TestCheckResourceAttr(resourceName, "encryption_configuration.0.kms_key", ""), @@ -226,7 +226,7 @@ func TestAccECRRepository_Encryption_kms(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "encryption_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "encryption_configuration.0.encryption_type", string(types.EncryptionTypeKms)), // This will be the default ECR service KMS key. We don't currently have a way to look this up. - acctest.MatchResourceAttrRegionalARN(resourceName, "encryption_configuration.0.kms_key", "kms", regexache.MustCompile(fmt.Sprintf("key/%s$", verify.UUIDRegexPattern))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "encryption_configuration.0.kms_key", "kms", regexache.MustCompile(fmt.Sprintf("key/%s$", verify.UUIDRegexPattern))), ), }, { @@ -346,16 +346,16 @@ func testAccCheckRepositoryExists(ctx context.Context, n string, v *types.Reposi } } -func testAccCheckRepositoryRegistryID(resourceName string) resource.TestCheckFunc { +func testAccCheckRepositoryRegistryID(ctx context.Context, resourceName string) resource.TestCheckFunc { return func(s *terraform.State) error { - attributeValue := acctest.AccountID() + attributeValue := acctest.AccountID(ctx) return resource.TestCheckResourceAttr(resourceName, "registry_id", attributeValue)(s) } } -func testAccCheckRepositoryRepositoryURL(resourceName, repositoryName string) resource.TestCheckFunc { +func testAccCheckRepositoryRepositoryURL(ctx context.Context, resourceName, repositoryName string) resource.TestCheckFunc { return func(s *terraform.State) error { - attributeValue := fmt.Sprintf("%s.dkr.ecr.%s.amazonaws.com/%s", acctest.AccountID(), acctest.Region(), repositoryName) + attributeValue := fmt.Sprintf("%s.dkr.ecr.%s.amazonaws.com/%s", acctest.AccountID(ctx), acctest.Region(), repositoryName) return resource.TestCheckResourceAttr(resourceName, "repository_url", attributeValue)(s) } } From dc3fa16f5042d6f8e107cb89bea9a1d756d75321 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:47 -0500 Subject: [PATCH 061/304] Make 'AWSClient.AccountID' a getter - ecrpublic. --- internal/service/ecrpublic/repository_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/ecrpublic/repository_test.go b/internal/service/ecrpublic/repository_test.go index 8bac56b643e..ef457eb2de7 100644 --- a/internal/service/ecrpublic/repository_test.go +++ b/internal/service/ecrpublic/repository_test.go @@ -38,8 +38,8 @@ func TestAccECRPublicRepository_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckRepositoryExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, names.AttrRepositoryName, rName), - acctest.CheckResourceAttrAccountID(resourceName, "registry_id"), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrARN, "ecr-public", "repository/"+rName), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "registry_id"), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "ecr-public", "repository/"+rName), ), }, { @@ -329,8 +329,8 @@ func TestAccECRPublicRepository_Basic_forceDestroy(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckRepositoryExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, names.AttrRepositoryName, rName), - acctest.CheckResourceAttrAccountID(resourceName, "registry_id"), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrARN, "ecr-public", "repository/"+rName), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "registry_id"), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "ecr-public", "repository/"+rName), ), }, { From 0f039bcc9318f2b1f366d81defe2ab0f786e5cd4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:47 -0500 Subject: [PATCH 062/304] Make 'AWSClient.AccountID' a getter - ecs. --- internal/service/ecs/account_setting_default.go | 2 +- internal/service/ecs/account_setting_default_test.go | 12 ++++++------ internal/service/ecs/capacity_provider.go | 2 +- internal/service/ecs/capacity_provider_test.go | 2 +- internal/service/ecs/cluster.go | 2 +- internal/service/ecs/cluster_test.go | 6 +++--- internal/service/ecs/service.go | 2 +- internal/service/ecs/task_definition_test.go | 12 ++++++------ internal/service/ecs/task_set_test.go | 2 +- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/internal/service/ecs/account_setting_default.go b/internal/service/ecs/account_setting_default.go index 8fdabc2cddc..aec510de905 100644 --- a/internal/service/ecs/account_setting_default.go +++ b/internal/service/ecs/account_setting_default.go @@ -141,7 +141,7 @@ func resourceAccountSettingDefaultImport(ctx context.Context, d *schema.Resource d.SetId(arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Service: names.ECSEndpointID, Resource: "cluster/" + d.Id(), }.String()) diff --git a/internal/service/ecs/account_setting_default_test.go b/internal/service/ecs/account_setting_default_test.go index 82086f0c3ec..3d600ef0714 100644 --- a/internal/service/ecs/account_setting_default_test.go +++ b/internal/service/ecs/account_setting_default_test.go @@ -52,7 +52,7 @@ func testAccAccountSettingDefault_containerInstanceLongARNFormat(t *testing.T) { testAccCheckAccountSettingDefaultExists(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, names.AttrName, settingName), resource.TestCheckResourceAttr(resourceName, names.AttrValue, names.AttrEnabled), - acctest.MatchResourceAttrGlobalARN(resourceName, "principal_arn", "iam", regexache.MustCompile("root")), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, "principal_arn", "iam", regexache.MustCompile("root")), ), }, { @@ -82,7 +82,7 @@ func testAccAccountSettingDefault_serviceLongARNFormat(t *testing.T) { testAccCheckAccountSettingDefaultExists(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, names.AttrName, settingName), resource.TestCheckResourceAttr(resourceName, names.AttrValue, names.AttrEnabled), - acctest.MatchResourceAttrGlobalARN(resourceName, "principal_arn", "iam", regexache.MustCompile("root")), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, "principal_arn", "iam", regexache.MustCompile("root")), ), }, { @@ -112,7 +112,7 @@ func testAccAccountSettingDefault_taskLongARNFormat(t *testing.T) { testAccCheckAccountSettingDefaultExists(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, names.AttrName, settingName), resource.TestCheckResourceAttr(resourceName, names.AttrValue, names.AttrEnabled), - acctest.MatchResourceAttrGlobalARN(resourceName, "principal_arn", "iam", regexache.MustCompile("root")), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, "principal_arn", "iam", regexache.MustCompile("root")), ), }, { @@ -142,7 +142,7 @@ func testAccAccountSettingDefault_vpcTrunking(t *testing.T) { testAccCheckAccountSettingDefaultExists(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, names.AttrName, settingName), resource.TestCheckResourceAttr(resourceName, names.AttrValue, names.AttrEnabled), - acctest.MatchResourceAttrGlobalARN(resourceName, "principal_arn", "iam", regexache.MustCompile("root")), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, "principal_arn", "iam", regexache.MustCompile("root")), ), }, { @@ -172,7 +172,7 @@ func testAccAccountSettingDefault_containerInsights(t *testing.T) { testAccCheckAccountSettingDefaultExists(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, names.AttrName, settingName), resource.TestCheckResourceAttr(resourceName, names.AttrValue, names.AttrEnabled), - acctest.MatchResourceAttrGlobalARN(resourceName, "principal_arn", "iam", regexache.MustCompile("root")), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, "principal_arn", "iam", regexache.MustCompile("root")), ), }, { @@ -202,7 +202,7 @@ func testAccAccountSettingDefault_fargateTaskRetirementWaitPeriod(t *testing.T) testAccCheckAccountSettingDefaultExists(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, names.AttrName, "fargateTaskRetirementWaitPeriod"), resource.TestCheckResourceAttr(resourceName, names.AttrValue, "14"), - acctest.MatchResourceAttrGlobalARN(resourceName, "principal_arn", "iam", regexache.MustCompile("root")), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, "principal_arn", "iam", regexache.MustCompile("root")), ), }, { diff --git a/internal/service/ecs/capacity_provider.go b/internal/service/ecs/capacity_provider.go index daf72621f7f..5326965d2ab 100644 --- a/internal/service/ecs/capacity_provider.go +++ b/internal/service/ecs/capacity_provider.go @@ -258,7 +258,7 @@ func resourceCapacityProviderImport(ctx context.Context, d *schema.ResourceData, d.SetId(arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Service: "ecs", Resource: "capacity-provider/" + d.Id(), }.String()) diff --git a/internal/service/ecs/capacity_provider_test.go b/internal/service/ecs/capacity_provider_test.go index 7d1e8412bae..a9e8bbce13f 100644 --- a/internal/service/ecs/capacity_provider_test.go +++ b/internal/service/ecs/capacity_provider_test.go @@ -45,7 +45,7 @@ func TestAccECSCapacityProvider_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "auto_scaling_group_provider.0.managed_scaling.0.status", "DISABLED"), resource.TestCheckResourceAttr(resourceName, "auto_scaling_group_provider.0.managed_scaling.0.target_capacity", "100"), resource.TestCheckResourceAttr(resourceName, "auto_scaling_group_provider.0.managed_termination_protection", "DISABLED"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrID, "ecs", fmt.Sprintf("capacity-provider/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrID, "ecs", fmt.Sprintf("capacity-provider/%s", rName)), resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), diff --git a/internal/service/ecs/cluster.go b/internal/service/ecs/cluster.go index db25c78e3e3..29258041a38 100644 --- a/internal/service/ecs/cluster.go +++ b/internal/service/ecs/cluster.go @@ -334,7 +334,7 @@ func resourceClusterImport(ctx context.Context, d *schema.ResourceData, meta int d.SetId(arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Service: "ecs", Resource: "cluster/" + d.Id(), }.String()) diff --git a/internal/service/ecs/cluster_test.go b/internal/service/ecs/cluster_test.go index c108bf2739b..e21b7cce64c 100644 --- a/internal/service/ecs/cluster_test.go +++ b/internal/service/ecs/cluster_test.go @@ -35,7 +35,7 @@ func TestAccECSCluster_basic(t *testing.T) { Config: testAccClusterConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckClusterExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "ecs", fmt.Sprintf("cluster/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ecs", fmt.Sprintf("cluster/%s", rName)), resource.TestCheckResourceAttr(resourceName, "configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "default_capacity_provider_strategy.#", "0"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), @@ -186,14 +186,14 @@ func TestAccECSCluster_containerInsights(t *testing.T) { Config: testAccClusterConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckClusterExists(ctx, resourceName, &cluster1), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "ecs", fmt.Sprintf("cluster/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ecs", fmt.Sprintf("cluster/%s", rName)), ), }, { Config: testAccClusterConfig_containerInsights(rName, names.AttrEnabled), Check: resource.ComposeTestCheckFunc( testAccCheckClusterExists(ctx, resourceName, &cluster1), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "ecs", fmt.Sprintf("cluster/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ecs", fmt.Sprintf("cluster/%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "setting.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "setting.*", map[string]string{ diff --git a/internal/service/ecs/service.go b/internal/service/ecs/service.go index 6be00068661..511980c4920 100644 --- a/internal/service/ecs/service.go +++ b/internal/service/ecs/service.go @@ -1694,7 +1694,7 @@ func resourceServiceImport(ctx context.Context, d *schema.ResourceData, meta int Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, Service: "ecs", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("cluster/%s", cluster), }.String() d.Set("cluster", clusterArn) diff --git a/internal/service/ecs/task_definition_test.go b/internal/service/ecs/task_definition_test.go index 67f7bae7ed1..e89c4f3228c 100644 --- a/internal/service/ecs/task_definition_test.go +++ b/internal/service/ecs/task_definition_test.go @@ -108,8 +108,8 @@ func TestAccECSTaskDefinition_basic(t *testing.T) { Config: testAccTaskDefinitionConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTaskDefinitionExists(ctx, resourceName, &def), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ecs", regexache.MustCompile(fmt.Sprintf(`task-definition/%s:%s$`, rName, "1"))), - acctest.MatchResourceAttrRegionalARN(resourceName, "arn_without_revision", "ecs", regexache.MustCompile(fmt.Sprintf(`task-definition/%s$`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ecs", regexache.MustCompile(fmt.Sprintf(`task-definition/%s:%s$`, rName, "1"))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "arn_without_revision", "ecs", regexache.MustCompile(fmt.Sprintf(`task-definition/%s$`, rName))), acctest.CheckResourceAttrJMESNotExists(resourceName, "container_definitions", "[0].versionConsistency"), resource.TestCheckResourceAttr(resourceName, "revision", "1"), resource.TestCheckResourceAttr(resourceName, "track_latest", acctest.CtFalse), @@ -119,8 +119,8 @@ func TestAccECSTaskDefinition_basic(t *testing.T) { Config: testAccTaskDefinitionConfig_modified(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTaskDefinitionExists(ctx, resourceName, &def), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ecs", regexache.MustCompile(fmt.Sprintf(`task-definition/%s:%s$`, rName, "2"))), - acctest.MatchResourceAttrRegionalARN(resourceName, "arn_without_revision", "ecs", regexache.MustCompile(fmt.Sprintf(`task-definition/%s$`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ecs", regexache.MustCompile(fmt.Sprintf(`task-definition/%s:%s$`, rName, "2"))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "arn_without_revision", "ecs", regexache.MustCompile(fmt.Sprintf(`task-definition/%s$`, rName))), acctest.CheckResourceAttrJMESNotExists(resourceName, "container_definitions", "[0].versionConsistency"), resource.TestCheckResourceAttr(resourceName, "revision", "2"), ), @@ -1207,8 +1207,8 @@ func TestAccECSTaskDefinition_trackLatest(t *testing.T) { Config: testAccTaskDefinitionConfig_trackLatest(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTaskDefinitionExists(ctx, resourceName, &def), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ecs", regexache.MustCompile(`task-definition/.+`)), - acctest.MatchResourceAttrRegionalARN(resourceName, "arn_without_revision", "ecs", regexache.MustCompile(`task-definition/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ecs", regexache.MustCompile(`task-definition/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "arn_without_revision", "ecs", regexache.MustCompile(`task-definition/.+`)), resource.TestCheckResourceAttr(resourceName, "track_latest", acctest.CtTrue), ), }, diff --git a/internal/service/ecs/task_set_test.go b/internal/service/ecs/task_set_test.go index bb1e5a4189c..8086c9d43d3 100644 --- a/internal/service/ecs/task_set_test.go +++ b/internal/service/ecs/task_set_test.go @@ -35,7 +35,7 @@ func TestAccECSTaskSet_basic(t *testing.T) { Config: testAccTaskSetConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckTaskSetExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ecs", regexache.MustCompile(fmt.Sprintf("task-set/%[1]s/%[1]s/ecs-svc/.+", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ecs", regexache.MustCompile(fmt.Sprintf("task-set/%[1]s/%[1]s/ecs-svc/.+", rName))), resource.TestCheckResourceAttr(resourceName, "service_registries.#", "0"), resource.TestCheckResourceAttr(resourceName, "load_balancer.#", "0"), ), From 4758e20186c50bf2449e3c429a87874b9aadb9b5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:47 -0500 Subject: [PATCH 063/304] Make 'AWSClient.AccountID' a getter - efs. --- internal/service/efs/access_point.go | 2 +- internal/service/efs/access_point_data_source.go | 2 +- internal/service/efs/access_point_test.go | 2 +- internal/service/efs/file_system_test.go | 2 +- internal/service/efs/mount_target.go | 2 +- internal/service/efs/mount_target_data_source.go | 2 +- internal/service/efs/mount_target_test.go | 4 ++-- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/service/efs/access_point.go b/internal/service/efs/access_point.go index 92c02e0451b..85b28bcc664 100644 --- a/internal/service/efs/access_point.go +++ b/internal/service/efs/access_point.go @@ -187,7 +187,7 @@ func resourceAccessPointRead(ctx context.Context, d *schema.ResourceData, meta i d.Set(names.AttrARN, ap.AccessPointArn) fsID := aws.ToString(ap.FileSystemId) fsARN := arn.ARN{ - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, Resource: "file-system/" + fsID, diff --git a/internal/service/efs/access_point_data_source.go b/internal/service/efs/access_point_data_source.go index 7a7d68691c1..405c2fbb4a1 100644 --- a/internal/service/efs/access_point_data_source.go +++ b/internal/service/efs/access_point_data_source.go @@ -117,7 +117,7 @@ func dataSourceAccessPointRead(ctx context.Context, d *schema.ResourceData, meta d.Set(names.AttrARN, ap.AccessPointArn) fsID := aws.ToString(ap.FileSystemId) fsARN := arn.ARN{ - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, Resource: "file-system/" + fsID, diff --git a/internal/service/efs/access_point_test.go b/internal/service/efs/access_point_test.go index 9cf83476587..4377bc59e91 100644 --- a/internal/service/efs/access_point_test.go +++ b/internal/service/efs/access_point_test.go @@ -39,7 +39,7 @@ func TestAccEFSAccessPoint_basic(t *testing.T) { testAccCheckAccessPointExists(ctx, resourceName, &ap), resource.TestCheckResourceAttrPair(resourceName, "file_system_arn", fsResourceName, names.AttrARN), resource.TestCheckResourceAttrPair(resourceName, names.AttrFileSystemID, fsResourceName, names.AttrID), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticfilesystem", regexache.MustCompile(`access-point/fsap-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticfilesystem", regexache.MustCompile(`access-point/fsap-.+`)), resource.TestCheckResourceAttrSet(resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "tags.#", "0"), resource.TestCheckResourceAttr(resourceName, "posix_user.#", "0"), diff --git a/internal/service/efs/file_system_test.go b/internal/service/efs/file_system_test.go index 24cf0ab7d0c..08c48d6b9aa 100644 --- a/internal/service/efs/file_system_test.go +++ b/internal/service/efs/file_system_test.go @@ -35,7 +35,7 @@ func TestAccEFSFileSystem_basic(t *testing.T) { Config: testAccFileSystemConfig_basic, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckFileSystem(ctx, resourceName, &desc), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticfilesystem", regexache.MustCompile(`file-system/fs-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticfilesystem", regexache.MustCompile(`file-system/fs-.+`)), resource.TestCheckResourceAttrSet(resourceName, "creation_token"), acctest.MatchResourceAttrRegionalHostname(resourceName, names.AttrDNSName, "efs", regexache.MustCompile(`fs-[^.]+`)), resource.TestCheckResourceAttr(resourceName, names.AttrEncrypted, acctest.CtFalse), diff --git a/internal/service/efs/mount_target.go b/internal/service/efs/mount_target.go index fe73c5b5bbf..50d80940dd2 100644 --- a/internal/service/efs/mount_target.go +++ b/internal/service/efs/mount_target.go @@ -168,7 +168,7 @@ func resourceMountTargetRead(ctx context.Context, d *schema.ResourceData, meta i fsID := aws.ToString(mt.FileSystemId) fsARN := arn.ARN{ - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, Resource: "file-system/" + fsID, diff --git a/internal/service/efs/mount_target_data_source.go b/internal/service/efs/mount_target_data_source.go index 2d7cd9a313d..44ec84cef5b 100644 --- a/internal/service/efs/mount_target_data_source.go +++ b/internal/service/efs/mount_target_data_source.go @@ -111,7 +111,7 @@ func dataSourceMountTargetRead(ctx context.Context, d *schema.ResourceData, meta d.SetId(aws.ToString(mt.MountTargetId)) fsID := aws.ToString(mt.FileSystemId) fsARN := arn.ARN{ - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, Resource: "file-system/" + fsID, diff --git a/internal/service/efs/mount_target_test.go b/internal/service/efs/mount_target_test.go index 953555803a9..9aea3dbd894 100644 --- a/internal/service/efs/mount_target_test.go +++ b/internal/service/efs/mount_target_test.go @@ -40,11 +40,11 @@ func TestAccEFSMountTarget_basic(t *testing.T) { resource.TestCheckResourceAttrSet(resourceName, "availability_zone_id"), resource.TestCheckResourceAttrSet(resourceName, "availability_zone_name"), acctest.MatchResourceAttrRegionalHostname(resourceName, names.AttrDNSName, "efs", regexache.MustCompile(`fs-[^.]+`)), - acctest.MatchResourceAttrRegionalARN(resourceName, "file_system_arn", "elasticfilesystem", regexache.MustCompile(`file-system/fs-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "file_system_arn", "elasticfilesystem", regexache.MustCompile(`file-system/fs-.+`)), resource.TestMatchResourceAttr(resourceName, names.AttrIPAddress, regexache.MustCompile(`\d+\.\d+\.\d+\.\d+`)), resource.TestCheckResourceAttrSet(resourceName, "mount_target_dns_name"), resource.TestCheckResourceAttrSet(resourceName, names.AttrNetworkInterfaceID), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), ), }, { From 69af5e98af953ccb2db83139504cdb3bcd4b3925 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:47 -0500 Subject: [PATCH 064/304] Make 'AWSClient.AccountID' a getter - eks. --- internal/service/eks/addon_test.go | 2 +- internal/service/eks/cluster_test.go | 2 +- internal/service/eks/fargate_profile_test.go | 2 +- internal/service/eks/identity_provider_config_test.go | 2 +- internal/service/eks/node_group_test.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/service/eks/addon_test.go b/internal/service/eks/addon_test.go index 9af708b35ad..9a4c98bca8e 100644 --- a/internal/service/eks/addon_test.go +++ b/internal/service/eks/addon_test.go @@ -41,7 +41,7 @@ func TestAccEKSAddon_basic(t *testing.T) { testAccCheckAddonExists(ctx, addonResourceName, &addon), resource.TestCheckResourceAttr(addonResourceName, "addon_name", addonName), resource.TestCheckResourceAttrSet(addonResourceName, "addon_version"), - acctest.MatchResourceAttrRegionalARN(addonResourceName, names.AttrARN, "eks", regexache.MustCompile(fmt.Sprintf("addon/%s/%s/.+$", rName, addonName))), + acctest.MatchResourceAttrRegionalARN(ctx, addonResourceName, names.AttrARN, "eks", regexache.MustCompile(fmt.Sprintf("addon/%s/%s/.+$", rName, addonName))), resource.TestCheckResourceAttrPair(addonResourceName, names.AttrClusterName, clusterResourceName, names.AttrName), resource.TestCheckResourceAttr(addonResourceName, "configuration_values", ""), resource.TestCheckResourceAttr(addonResourceName, "pod_identity_association.#", "0"), diff --git a/internal/service/eks/cluster_test.go b/internal/service/eks/cluster_test.go index 753da1a8e69..b22afd547ad 100644 --- a/internal/service/eks/cluster_test.go +++ b/internal/service/eks/cluster_test.go @@ -47,7 +47,7 @@ func TestAccEKSCluster_basic(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckClusterExists(ctx, resourceName, &cluster), resource.TestCheckResourceAttr(resourceName, "access_config.#", "1"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "eks", regexache.MustCompile(fmt.Sprintf("cluster/%s$", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "eks", regexache.MustCompile(fmt.Sprintf("cluster/%s$", rName))), resource.TestCheckResourceAttr(resourceName, "bootstrap_self_managed_addons", acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, "certificate_authority.#", "1"), resource.TestCheckResourceAttrSet(resourceName, "certificate_authority.0.data"), diff --git a/internal/service/eks/fargate_profile_test.go b/internal/service/eks/fargate_profile_test.go index a4bc88602ce..3f9eb41aead 100644 --- a/internal/service/eks/fargate_profile_test.go +++ b/internal/service/eks/fargate_profile_test.go @@ -43,7 +43,7 @@ func TestAccEKSFargateProfile_basic(t *testing.T) { Config: testAccFargateProfileConfig_name(rName), Check: resource.ComposeTestCheckFunc( testAccCheckFargateProfileExists(ctx, resourceName, &fargateProfile), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "eks", regexache.MustCompile(fmt.Sprintf("fargateprofile/%[1]s/%[1]s/.+", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "eks", regexache.MustCompile(fmt.Sprintf("fargateprofile/%[1]s/%[1]s/.+", rName))), resource.TestCheckResourceAttrPair(resourceName, names.AttrClusterName, eksClusterResourceName, names.AttrName), resource.TestCheckResourceAttr(resourceName, "fargate_profile_name", rName), resource.TestCheckResourceAttrPair(resourceName, "pod_execution_role_arn", iamRoleResourceName, names.AttrARN), diff --git a/internal/service/eks/identity_provider_config_test.go b/internal/service/eks/identity_provider_config_test.go index 8f82243063e..2571c7368fb 100644 --- a/internal/service/eks/identity_provider_config_test.go +++ b/internal/service/eks/identity_provider_config_test.go @@ -41,7 +41,7 @@ func TestAccEKSIdentityProviderConfig_basic(t *testing.T) { Config: testAccIdentityProviderConfigConfig_name(rName), Check: resource.ComposeTestCheckFunc( testAccCheckIdentityProviderExistsConfig(ctx, resourceName, &config), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "eks", regexache.MustCompile(fmt.Sprintf("identityproviderconfig/%[1]s/oidc/%[1]s/.+", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "eks", regexache.MustCompile(fmt.Sprintf("identityproviderconfig/%[1]s/oidc/%[1]s/.+", rName))), resource.TestCheckResourceAttrPair(resourceName, names.AttrClusterName, eksClusterResourceName, names.AttrName), resource.TestCheckResourceAttr(resourceName, "oidc.#", "1"), resource.TestCheckResourceAttr(resourceName, "oidc.0.client_id", "example.net"), diff --git a/internal/service/eks/node_group_test.go b/internal/service/eks/node_group_test.go index 43c14a5c22a..cda03d5e304 100644 --- a/internal/service/eks/node_group_test.go +++ b/internal/service/eks/node_group_test.go @@ -44,7 +44,7 @@ func TestAccEKSNodeGroup_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckNodeGroupExists(ctx, resourceName, &nodeGroup), resource.TestCheckResourceAttr(resourceName, "ami_type", string(types.AMITypesAl2X8664)), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "eks", regexache.MustCompile(fmt.Sprintf("nodegroup/%[1]s/%[1]s/.+", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "eks", regexache.MustCompile(fmt.Sprintf("nodegroup/%[1]s/%[1]s/.+", rName))), resource.TestCheckResourceAttrPair(resourceName, names.AttrClusterName, eksClusterResourceName, names.AttrName), resource.TestCheckResourceAttr(resourceName, "capacity_type", string(types.CapacityTypesOnDemand)), resource.TestCheckResourceAttr(resourceName, "disk_size", "20"), From 8a06d2f7cd81a88bab506816a5c0df989ca8384c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:47 -0500 Subject: [PATCH 065/304] Make 'AWSClient.AccountID' a getter - elasticache. --- internal/service/elasticache/global_replication_group_test.go | 4 ++-- internal/service/elasticache/replication_group_test.go | 4 ++-- internal/service/elasticache/reserved_cache_node_test.go | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/elasticache/global_replication_group_test.go b/internal/service/elasticache/global_replication_group_test.go index 494ff6748a8..b6aead6a81a 100644 --- a/internal/service/elasticache/global_replication_group_test.go +++ b/internal/service/elasticache/global_replication_group_test.go @@ -52,7 +52,7 @@ func TestAccElastiCacheGlobalReplicationGroup_Redis_basic(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGlobalReplicationGroupExists(ctx, resourceName, &globalReplicationGroup), testAccCheckReplicationGroupExists(ctx, primaryReplicationGroupResourceName, &primaryReplicationGroup), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "elasticache", regexache.MustCompile(`globalreplicationgroup:`+tfelasticache.GlobalReplicationGroupRegionPrefixFormat+rName)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "elasticache", regexache.MustCompile(`globalreplicationgroup:`+tfelasticache.GlobalReplicationGroupRegionPrefixFormat+rName)), resource.TestCheckResourceAttrPair(resourceName, "at_rest_encryption_enabled", primaryReplicationGroupResourceName, "at_rest_encryption_enabled"), resource.TestCheckResourceAttr(resourceName, "auth_token_enabled", acctest.CtFalse), resource.TestCheckResourceAttrPair(resourceName, "automatic_failover_enabled", primaryReplicationGroupResourceName, "automatic_failover_enabled"), @@ -106,7 +106,7 @@ func TestAccElastiCacheGlobalReplicationGroup_Valkey_basic(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGlobalReplicationGroupExists(ctx, resourceName, &globalReplicationGroup), testAccCheckReplicationGroupExists(ctx, primaryReplicationGroupResourceName, &primaryReplicationGroup), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "elasticache", regexache.MustCompile(`globalreplicationgroup:`+tfelasticache.GlobalReplicationGroupRegionPrefixFormat+rName)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "elasticache", regexache.MustCompile(`globalreplicationgroup:`+tfelasticache.GlobalReplicationGroupRegionPrefixFormat+rName)), resource.TestCheckResourceAttrPair(resourceName, "at_rest_encryption_enabled", primaryReplicationGroupResourceName, "at_rest_encryption_enabled"), resource.TestCheckResourceAttr(resourceName, "auth_token_enabled", acctest.CtFalse), resource.TestCheckResourceAttrPair(resourceName, "automatic_failover_enabled", primaryReplicationGroupResourceName, "automatic_failover_enabled"), diff --git a/internal/service/elasticache/replication_group_test.go b/internal/service/elasticache/replication_group_test.go index 5a6091ee86a..e812f105ee4 100644 --- a/internal/service/elasticache/replication_group_test.go +++ b/internal/service/elasticache/replication_group_test.go @@ -52,7 +52,7 @@ func TestAccElastiCacheReplicationGroup_Redis_basic(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckReplicationGroupExists(ctx, resourceName, &rg), resource.TestCheckResourceAttr(resourceName, names.AttrEngine, "redis"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticache", fmt.Sprintf("replicationgroup:%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticache", fmt.Sprintf("replicationgroup:%s", rName)), resource.TestCheckResourceAttr(resourceName, "num_cache_clusters", "1"), resource.TestCheckResourceAttr(resourceName, "multi_az_enabled", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "automatic_failover_enabled", acctest.CtFalse), @@ -133,7 +133,7 @@ func TestAccElastiCacheReplicationGroup_Valkey_basic(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckReplicationGroupExists(ctx, resourceName, &rg), resource.TestCheckResourceAttr(resourceName, names.AttrEngine, "valkey"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticache", fmt.Sprintf("replicationgroup:%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticache", fmt.Sprintf("replicationgroup:%s", rName)), resource.TestCheckResourceAttr(resourceName, "num_cache_clusters", "1"), resource.TestCheckResourceAttr(resourceName, "multi_az_enabled", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "automatic_failover_enabled", acctest.CtFalse), diff --git a/internal/service/elasticache/reserved_cache_node_test.go b/internal/service/elasticache/reserved_cache_node_test.go index 62be0a38848..87bd8c9cf06 100644 --- a/internal/service/elasticache/reserved_cache_node_test.go +++ b/internal/service/elasticache/reserved_cache_node_test.go @@ -43,7 +43,7 @@ func TestAccElastiCacheReservedCacheNode_Redis_basic(t *testing.T) { Config: testAccReservedInstanceConfig_Redis_basic(), Check: resource.ComposeTestCheckFunc( testAccReservedInstanceExists(ctx, resourceName, &reservation), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticache", regexache.MustCompile(`reserved-instance:.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticache", regexache.MustCompile(`reserved-instance:.+`)), resource.TestCheckResourceAttr(resourceName, "cache_node_count", "1"), resource.TestCheckResourceAttrPair(dataSourceName, "cache_node_type", resourceName, "cache_node_type"), resource.TestCheckResourceAttrPair(dataSourceName, names.AttrDuration, resourceName, names.AttrDuration), @@ -86,7 +86,7 @@ func TestAccElastiCacheReservedCacheNode_Valkey_basic(t *testing.T) { Config: testAccReservedInstanceConfig_Valkey_basic(), Check: resource.ComposeTestCheckFunc( testAccReservedInstanceExists(ctx, resourceName, &reservation), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticache", regexache.MustCompile(`reserved-instance:.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticache", regexache.MustCompile(`reserved-instance:.+`)), resource.TestCheckResourceAttr(resourceName, "cache_node_count", "1"), resource.TestCheckResourceAttrPair(dataSourceName, "cache_node_type", resourceName, "cache_node_type"), resource.TestCheckResourceAttrPair(dataSourceName, names.AttrDuration, resourceName, names.AttrDuration), From 71106b5ba3fd03471f64c912966e211936b315b4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:47 -0500 Subject: [PATCH 066/304] Make 'AWSClient.AccountID' a getter - elasticbeanstalk. --- internal/service/elasticbeanstalk/environment_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/elasticbeanstalk/environment_test.go b/internal/service/elasticbeanstalk/environment_test.go index b7a80208a05..99b561e28c8 100644 --- a/internal/service/elasticbeanstalk/environment_test.go +++ b/internal/service/elasticbeanstalk/environment_test.go @@ -47,7 +47,7 @@ func TestAccElasticBeanstalkEnvironment_basic(t *testing.T) { Config: testAccEnvironmentConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckEnvironmentExists(ctx, resourceName, &app), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticbeanstalk", fmt.Sprintf("environment/%s/%s", rName, rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticbeanstalk", fmt.Sprintf("environment/%s/%s", rName, rName)), resource.TestMatchResourceAttr(resourceName, "autoscaling_groups.0", beanstalkAsgNameRegexp), resource.TestMatchResourceAttr(resourceName, "endpoint_url", beanstalkEndpointURL), resource.TestMatchResourceAttr(resourceName, "instances.0", beanstalkInstancesNameRegexp), From 445b87446b7014be2b98e312483dbf4e75711ef6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:47 -0500 Subject: [PATCH 067/304] Make 'AWSClient.AccountID' a getter - elasticsearch. --- internal/service/elasticsearch/domain_policy_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/elasticsearch/domain_policy_test.go b/internal/service/elasticsearch/domain_policy_test.go index a6e4cb5d9e1..949a367178b 100644 --- a/internal/service/elasticsearch/domain_policy_test.go +++ b/internal/service/elasticsearch/domain_policy_test.go @@ -63,7 +63,7 @@ func TestAccElasticsearchDomainPolicy_basic(t *testing.T) { resource.TestCheckResourceAttr("aws_elasticsearch_domain.example", "elasticsearch_version", "2.3"), func(s *terraform.State) error { awsClient := acctest.Provider.Meta().(*conns.AWSClient) - expectedArn, err := buildDomainARN(name, awsClient.Partition(ctx), awsClient.AccountID, awsClient.Region) + expectedArn, err := buildDomainARN(name, awsClient.Partition(ctx), awsClient.AccountID(ctx), awsClient.Region) if err != nil { return err } From ee15e487f6b8b3147145d01a0f78735c196ac58e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:47 -0500 Subject: [PATCH 068/304] Make 'AWSClient.AccountID' a getter - elastictranscoder. --- internal/service/elastictranscoder/pipeline_test.go | 2 +- internal/service/elastictranscoder/preset_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/elastictranscoder/pipeline_test.go b/internal/service/elastictranscoder/pipeline_test.go index 405168d0c8f..8fdd0653b72 100644 --- a/internal/service/elastictranscoder/pipeline_test.go +++ b/internal/service/elastictranscoder/pipeline_test.go @@ -40,7 +40,7 @@ func TestAccElasticTranscoderPipeline_basic(t *testing.T) { Config: testAccPipelineConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckPipelineExists(ctx, resourceName, pipeline), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elastictranscoder", regexache.MustCompile(`pipeline/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elastictranscoder", regexache.MustCompile(`pipeline/.+`)), ), }, { diff --git a/internal/service/elastictranscoder/preset_test.go b/internal/service/elastictranscoder/preset_test.go index 5401ea12be9..627aa94b6a9 100644 --- a/internal/service/elastictranscoder/preset_test.go +++ b/internal/service/elastictranscoder/preset_test.go @@ -38,7 +38,7 @@ func TestAccElasticTranscoderPreset_basic(t *testing.T) { Config: testAccPresetConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckPresetExists(ctx, resourceName, &preset), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elastictranscoder", regexache.MustCompile(`preset/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elastictranscoder", regexache.MustCompile(`preset/.+`)), ), }, { From 6068560587691dba3c872811dd40df2ebbae176c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:47 -0500 Subject: [PATCH 069/304] Make 'AWSClient.AccountID' a getter - elb. --- internal/service/elb/load_balancer.go | 2 +- internal/service/elb/load_balancer_data_source.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/elb/load_balancer.go b/internal/service/elb/load_balancer.go index ae656c9df66..704a1b54fa8 100644 --- a/internal/service/elb/load_balancer.go +++ b/internal/service/elb/load_balancer.go @@ -344,7 +344,7 @@ func resourceLoadBalancerRead(ctx context.Context, d *schema.ResourceData, meta Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, Service: "elasticloadbalancing", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: "loadbalancer/" + d.Id(), } d.Set(names.AttrARN, arn.String()) diff --git a/internal/service/elb/load_balancer_data_source.go b/internal/service/elb/load_balancer_data_source.go index c4cd2fe1243..81e54e9f6ba 100644 --- a/internal/service/elb/load_balancer_data_source.go +++ b/internal/service/elb/load_balancer_data_source.go @@ -232,7 +232,7 @@ func dataSourceLoadBalancerRead(ctx context.Context, d *schema.ResourceData, met Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, Service: "elasticloadbalancing", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("loadbalancer/%s", d.Id()), } d.Set(names.AttrARN, arn.String()) From bd0354a245572b2d59954df6472dca1aa350f90b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:47 -0500 Subject: [PATCH 070/304] Make 'AWSClient.AccountID' a getter - elbv2. --- internal/service/elbv2/listener_rule_test.go | 48 ++++++++++---------- internal/service/elbv2/listener_test.go | 34 +++++++------- internal/service/elbv2/load_balancer_test.go | 12 ++--- internal/service/elbv2/trust_store_test.go | 2 +- 4 files changed, 48 insertions(+), 48 deletions(-) diff --git a/internal/service/elbv2/listener_rule_test.go b/internal/service/elbv2/listener_rule_test.go index efacc9aca08..1e5374036a7 100644 --- a/internal/service/elbv2/listener_rule_test.go +++ b/internal/service/elbv2/listener_rule_test.go @@ -86,7 +86,7 @@ func TestAccELBV2ListenerRule_basic(t *testing.T) { Config: testAccListenerRuleConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckListenerRuleExists(ctx, resourceName, &conf), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf(`listener-rule/app/%s/.+$`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf(`listener-rule/app/%s/.+$`, rName))), resource.TestCheckResourceAttrPair(resourceName, "listener_arn", listenerResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrPriority, "100"), resource.TestCheckResourceAttr(resourceName, "action.#", "1"), @@ -213,7 +213,7 @@ func TestAccELBV2ListenerRule_forwardWeighted(t *testing.T) { Config: testAccListenerRuleConfig_forwardWeighted(lbName, targetGroupName1, targetGroupName2), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckListenerRuleExists(ctx, resourceName, &conf), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf(`listener-rule/app/%s/.+$`, lbName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf(`listener-rule/app/%s/.+$`, lbName))), resource.TestCheckResourceAttrPair(resourceName, "listener_arn", frontEndListenerResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrPriority, "100"), resource.TestCheckResourceAttr(resourceName, "action.#", "1"), @@ -234,7 +234,7 @@ func TestAccELBV2ListenerRule_forwardWeighted(t *testing.T) { Config: testAccListenerRuleConfig_changeForwardWeightedStickiness(lbName, targetGroupName1, targetGroupName2), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckListenerRuleExists(ctx, resourceName, &conf), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf(`listener-rule/app/%s/.+$`, lbName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf(`listener-rule/app/%s/.+$`, lbName))), resource.TestCheckResourceAttrPair(resourceName, "listener_arn", frontEndListenerResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrPriority, "100"), resource.TestCheckResourceAttr(resourceName, "action.#", "1"), @@ -255,7 +255,7 @@ func TestAccELBV2ListenerRule_forwardWeighted(t *testing.T) { Config: testAccListenerRuleConfig_changeForwardWeightedToBasic(lbName, targetGroupName1, targetGroupName2), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckListenerRuleExists(ctx, resourceName, &conf), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf(`listener-rule/app/%s/.+$`, lbName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf(`listener-rule/app/%s/.+$`, lbName))), resource.TestCheckResourceAttrPair(resourceName, "listener_arn", frontEndListenerResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrPriority, "100"), resource.TestCheckResourceAttr(resourceName, "action.#", "1"), @@ -841,7 +841,7 @@ func TestAccELBV2ListenerRule_backwardsCompatibility(t *testing.T) { Config: testAccListenerRuleConfig_backwardsCompatibility(lbName, targetGroupName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckListenerRuleExists(ctx, resourceName, &conf), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf(`listener-rule/app/%s/.+$`, lbName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf(`listener-rule/app/%s/.+$`, lbName))), resource.TestCheckResourceAttrPair(resourceName, "listener_arn", frontEndListenerResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrPriority, "100"), resource.TestCheckResourceAttr(resourceName, "action.#", "1"), @@ -887,7 +887,7 @@ func TestAccELBV2ListenerRule_redirect(t *testing.T) { Config: testAccListenerRuleConfig_redirect(lbName, "null"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckListenerRuleExists(ctx, resourceName, &conf), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf(`listener-rule/app/%s/.+$`, lbName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf(`listener-rule/app/%s/.+$`, lbName))), resource.TestCheckResourceAttrPair(resourceName, "listener_arn", frontEndListenerResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrPriority, "100"), resource.TestCheckResourceAttr(resourceName, "action.#", "1"), @@ -911,7 +911,7 @@ func TestAccELBV2ListenerRule_redirect(t *testing.T) { Config: testAccListenerRuleConfig_redirect(lbName, "param1=value1"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckListenerRuleExists(ctx, resourceName, &conf), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf(`listener-rule/app/%s/.+$`, lbName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf(`listener-rule/app/%s/.+$`, lbName))), resource.TestCheckResourceAttrPair(resourceName, "listener_arn", frontEndListenerResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrPriority, "100"), resource.TestCheckResourceAttr(resourceName, "action.#", "1"), @@ -935,7 +935,7 @@ func TestAccELBV2ListenerRule_redirect(t *testing.T) { Config: testAccListenerRuleConfig_redirect(lbName, ""), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckListenerRuleExists(ctx, resourceName, &conf), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf(`listener-rule/app/%s/.+$`, lbName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf(`listener-rule/app/%s/.+$`, lbName))), resource.TestCheckResourceAttrPair(resourceName, "listener_arn", frontEndListenerResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrPriority, "100"), resource.TestCheckResourceAttr(resourceName, "action.#", "1"), @@ -977,7 +977,7 @@ func TestAccELBV2ListenerRule_fixedResponse(t *testing.T) { Config: testAccListenerRuleConfig_fixedResponse(lbName, "Fixed response content"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckListenerRuleExists(ctx, resourceName, &conf), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf(`listener-rule/app/%s/.+$`, lbName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf(`listener-rule/app/%s/.+$`, lbName))), resource.TestCheckResourceAttrPair(resourceName, "listener_arn", frontEndListenerResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrPriority, "100"), resource.TestCheckResourceAttr(resourceName, "action.#", "1"), @@ -1208,7 +1208,7 @@ func TestAccELBV2ListenerRule_cognito(t *testing.T) { Config: testAccListenerRuleConfig_cognito(rName, key, certificate), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckListenerRuleExists(ctx, resourceName, &conf), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf(`listener-rule/app/%s/.+$`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf(`listener-rule/app/%s/.+$`, rName))), resource.TestCheckResourceAttrPair(resourceName, "listener_arn", listenerResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrPriority, "100"), resource.TestCheckResourceAttr(resourceName, "action.#", "2"), @@ -1253,7 +1253,7 @@ func TestAccELBV2ListenerRule_oidc(t *testing.T) { Config: testAccListenerRuleConfig_oidc(rName, key, certificate), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckListenerRuleExists(ctx, resourceName, &conf), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf(`listener-rule/app/%s/.+$`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf(`listener-rule/app/%s/.+$`, rName))), resource.TestCheckResourceAttrPair(resourceName, "listener_arn", listenerResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrPriority, "100"), resource.TestCheckResourceAttr(resourceName, "action.#", "2"), @@ -1477,7 +1477,7 @@ func TestAccELBV2ListenerRule_redirectWithTargetGroupARN(t *testing.T) { Config: testAccListenerRuleConfig_redirectWithTargetGroupARN(lbName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckListenerRuleExists(ctx, resourceName, &conf), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf(`listener-rule/app/%s/.+$`, lbName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf(`listener-rule/app/%s/.+$`, lbName))), resource.TestCheckResourceAttrPair(resourceName, "listener_arn", frontEndListenerResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "action.#", "1"), resource.TestCheckResourceAttr(resourceName, "action.0.type", "redirect"), @@ -1553,7 +1553,7 @@ func TestAccELBV2ListenerRule_conditionHostHeader(t *testing.T) { Config: testAccListenerRuleConfig_conditionHostHeader(lbName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckListenerRuleExists(ctx, resourceName, &conf), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf(`listener-rule/app/%s/.+$`, lbName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf(`listener-rule/app/%s/.+$`, lbName))), resource.TestCheckResourceAttrPair(resourceName, "listener_arn", frontEndListenerResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrPriority, "100"), resource.TestCheckResourceAttr(resourceName, "action.#", "1"), @@ -1593,7 +1593,7 @@ func TestAccELBV2ListenerRule_conditionHTTPHeader(t *testing.T) { Config: testAccListenerRuleConfig_conditionHTTPHeader(lbName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckListenerRuleExists(ctx, resourceName, &conf), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf(`listener-rule/app/%s/.+$`, lbName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf(`listener-rule/app/%s/.+$`, lbName))), resource.TestCheckResourceAttrPair(resourceName, "listener_arn", frontEndListenerResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrPriority, "100"), resource.TestCheckResourceAttr(resourceName, "action.#", "1"), @@ -1661,7 +1661,7 @@ func TestAccELBV2ListenerRule_conditionHTTPRequestMethod(t *testing.T) { Config: testAccListenerRuleConfig_conditionHTTPRequestMethod(lbName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckListenerRuleExists(ctx, resourceName, &conf), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf(`listener-rule/app/%s/.+$`, lbName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf(`listener-rule/app/%s/.+$`, lbName))), resource.TestCheckResourceAttrPair(resourceName, "listener_arn", frontEndListenerResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrPriority, "100"), resource.TestCheckResourceAttr(resourceName, "action.#", "1"), @@ -1701,7 +1701,7 @@ func TestAccELBV2ListenerRule_conditionPathPattern(t *testing.T) { Config: testAccListenerRuleConfig_conditionPathPattern(lbName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckListenerRuleExists(ctx, resourceName, &conf), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf(`listener-rule/app/%s/.+$`, lbName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf(`listener-rule/app/%s/.+$`, lbName))), resource.TestCheckResourceAttrPair(resourceName, "listener_arn", frontEndListenerResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrPriority, "100"), resource.TestCheckResourceAttr(resourceName, "action.#", "1"), @@ -1741,7 +1741,7 @@ func TestAccELBV2ListenerRule_conditionQueryString(t *testing.T) { Config: testAccListenerRuleConfig_conditionQueryString(lbName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckListenerRuleExists(ctx, resourceName, &conf), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf(`listener-rule/app/%s/.+$`, lbName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf(`listener-rule/app/%s/.+$`, lbName))), resource.TestCheckResourceAttrPair(resourceName, "listener_arn", frontEndListenerResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrPriority, "100"), resource.TestCheckResourceAttr(resourceName, "action.#", "1"), @@ -1805,7 +1805,7 @@ func TestAccELBV2ListenerRule_conditionSourceIP(t *testing.T) { Config: testAccListenerRuleConfig_conditionSourceIP(lbName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckListenerRuleExists(ctx, resourceName, &conf), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf(`listener-rule/app/%s/.+$`, lbName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf(`listener-rule/app/%s/.+$`, lbName))), resource.TestCheckResourceAttrPair(resourceName, "listener_arn", frontEndListenerResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrPriority, "100"), resource.TestCheckResourceAttr(resourceName, "action.#", "1"), @@ -1849,7 +1849,7 @@ func TestAccELBV2ListenerRule_conditionUpdateMixed(t *testing.T) { Config: testAccListenerRuleConfig_conditionMixed(lbName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckListenerRuleExists(ctx, resourceName, &conf), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf(`listener-rule/app/%s/.+$`, lbName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf(`listener-rule/app/%s/.+$`, lbName))), resource.TestCheckResourceAttrPair(resourceName, "listener_arn", frontEndListenerResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "action.#", "1"), resource.TestCheckResourceAttr(resourceName, "condition.#", "2"), @@ -1868,7 +1868,7 @@ func TestAccELBV2ListenerRule_conditionUpdateMixed(t *testing.T) { Config: testAccListenerRuleConfig_conditionMixedUpdated(lbName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckListenerRuleExists(ctx, resourceName, &conf), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf(`listener-rule/app/%s/.+$`, lbName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf(`listener-rule/app/%s/.+$`, lbName))), resource.TestCheckResourceAttrPair(resourceName, "listener_arn", frontEndListenerResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "action.#", "1"), resource.TestCheckResourceAttr(resourceName, "condition.#", "2"), @@ -1887,7 +1887,7 @@ func TestAccELBV2ListenerRule_conditionUpdateMixed(t *testing.T) { Config: testAccListenerRuleConfig_conditionMixedUpdated2(lbName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckListenerRuleExists(ctx, resourceName, &conf), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf(`listener-rule/app/%s/.+$`, lbName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf(`listener-rule/app/%s/.+$`, lbName))), resource.TestCheckResourceAttrPair(resourceName, "listener_arn", frontEndListenerResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "action.#", "1"), resource.TestCheckResourceAttr(resourceName, "condition.#", "2"), @@ -1924,7 +1924,7 @@ func TestAccELBV2ListenerRule_conditionMultiple(t *testing.T) { Config: testAccListenerRuleConfig_conditionMultiple(lbName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckListenerRuleExists(ctx, resourceName, &conf), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf(`listener-rule/app/%s/.+$`, lbName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf(`listener-rule/app/%s/.+$`, lbName))), resource.TestCheckResourceAttrPair(resourceName, "listener_arn", frontEndListenerResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrPriority, "100"), resource.TestCheckResourceAttr(resourceName, "action.#", "1"), @@ -2008,7 +2008,7 @@ func TestAccELBV2ListenerRule_conditionUpdateMultiple(t *testing.T) { Config: testAccListenerRuleConfig_conditionMultiple(lbName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckListenerRuleExists(ctx, resourceName, &conf), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf(`listener-rule/app/%s/.+$`, lbName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf(`listener-rule/app/%s/.+$`, lbName))), resource.TestCheckResourceAttrPair(resourceName, "listener_arn", frontEndListenerResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "action.#", "1"), resource.TestCheckResourceAttr(resourceName, "condition.#", "5"), @@ -2048,7 +2048,7 @@ func TestAccELBV2ListenerRule_conditionUpdateMultiple(t *testing.T) { Config: testAccListenerRuleConfig_conditionMultipleUpdated(lbName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckListenerRuleExists(ctx, resourceName, &conf), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf(`listener-rule/app/%s/.+$`, lbName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf(`listener-rule/app/%s/.+$`, lbName))), resource.TestCheckResourceAttrPair(resourceName, "listener_arn", frontEndListenerResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "action.#", "1"), resource.TestCheckResourceAttr(resourceName, "condition.#", "5"), diff --git a/internal/service/elbv2/listener_test.go b/internal/service/elbv2/listener_test.go index cd55a5274dc..8a15fd5a625 100644 --- a/internal/service/elbv2/listener_test.go +++ b/internal/service/elbv2/listener_test.go @@ -44,7 +44,7 @@ func TestAccELBV2Listener_Application_basic(t *testing.T) { testAccCheckListenerExists(ctx, resourceName, &conf), resource.TestCheckResourceAttr("aws_lb.test", "load_balancer_type", "application"), resource.TestCheckResourceAttrPair(resourceName, "load_balancer_arn", "aws_lb.test", names.AttrARN), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile("listener/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile("listener/.+$")), resource.TestCheckNoResourceAttr(resourceName, "alpn_policy"), resource.TestCheckNoResourceAttr(resourceName, names.AttrCertificateARN), resource.TestCheckResourceAttr(resourceName, "default_action.#", "1"), @@ -97,7 +97,7 @@ func TestAccELBV2Listener_Network_basic(t *testing.T) { testAccCheckListenerExists(ctx, resourceName, &conf), resource.TestCheckResourceAttr("aws_lb.test", "load_balancer_type", "network"), resource.TestCheckResourceAttrPair(resourceName, "load_balancer_arn", "aws_lb.test", names.AttrARN), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile("listener/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile("listener/.+$")), resource.TestCheckNoResourceAttr(resourceName, "alpn_policy"), resource.TestCheckNoResourceAttr(resourceName, names.AttrCertificateARN), resource.TestCheckResourceAttr(resourceName, "default_action.#", "1"), @@ -149,7 +149,7 @@ func TestAccELBV2Listener_Gateway_basic(t *testing.T) { testAccCheckListenerExists(ctx, resourceName, &conf), resource.TestCheckResourceAttr("aws_lb.test", "load_balancer_type", "gateway"), resource.TestCheckResourceAttrPair(resourceName, "load_balancer_arn", "aws_lb.test", names.AttrARN), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile("listener/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile("listener/.+$")), resource.TestCheckNoResourceAttr(resourceName, "alpn_policy"), resource.TestCheckNoResourceAttr(resourceName, names.AttrCertificateARN), resource.TestCheckResourceAttr(resourceName, "default_action.#", "1"), @@ -370,7 +370,7 @@ func TestAccELBV2Listener_Forward_weighted(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckListenerExists(ctx, resourceName, &conf), resource.TestCheckResourceAttrPair(resourceName, "load_balancer_arn", "aws_lb.test", names.AttrARN), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile("listener/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile("listener/.+$")), resource.TestCheckResourceAttr(resourceName, names.AttrProtocol, "HTTP"), resource.TestCheckResourceAttr(resourceName, names.AttrPort, "80"), resource.TestCheckResourceAttr(resourceName, "default_action.#", "1"), @@ -393,7 +393,7 @@ func TestAccELBV2Listener_Forward_weighted(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckListenerExists(ctx, resourceName, &conf), resource.TestCheckResourceAttrPair(resourceName, "load_balancer_arn", "aws_lb.test", names.AttrARN), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile("listener/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile("listener/.+$")), resource.TestCheckResourceAttr(resourceName, names.AttrProtocol, "HTTP"), resource.TestCheckResourceAttr(resourceName, names.AttrPort, "80"), resource.TestCheckResourceAttr(resourceName, "default_action.#", "1"), @@ -416,7 +416,7 @@ func TestAccELBV2Listener_Forward_weighted(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckListenerExists(ctx, resourceName, &conf), resource.TestCheckResourceAttrPair(resourceName, "load_balancer_arn", "aws_lb.test", names.AttrARN), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile("listener/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile("listener/.+$")), resource.TestCheckResourceAttr(resourceName, names.AttrProtocol, "HTTP"), resource.TestCheckResourceAttr(resourceName, names.AttrPort, "80"), resource.TestCheckResourceAttr(resourceName, "default_action.#", "1"), @@ -987,7 +987,7 @@ func TestAccELBV2Listener_Forward_ignoreFields(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckListenerExists(ctx, resourceName, &conf), resource.TestCheckResourceAttrPair(resourceName, "load_balancer_arn", "aws_lb.test", names.AttrARN), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile("listener/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile("listener/.+$")), resource.TestCheckResourceAttr(resourceName, names.AttrProtocol, "HTTPS"), resource.TestCheckResourceAttr(resourceName, names.AttrPort, "440"), resource.TestCheckResourceAttr(resourceName, "default_action.#", "1"), @@ -1124,7 +1124,7 @@ func TestAccELBV2Listener_Protocol_upd(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckListenerExists(ctx, resourceName, &conf), resource.TestCheckResourceAttrPair(resourceName, "load_balancer_arn", "aws_lb.test", names.AttrARN), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile("listener/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile("listener/.+$")), resource.TestCheckResourceAttr(resourceName, names.AttrProtocol, "UDP"), resource.TestCheckResourceAttr(resourceName, names.AttrPort, "514"), resource.TestCheckResourceAttr(resourceName, "default_action.#", "1"), @@ -1164,7 +1164,7 @@ func TestAccELBV2Listener_backwardsCompatibility(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckListenerExists(ctx, resourceName, &conf), resource.TestCheckResourceAttrPair(resourceName, "load_balancer_arn", "aws_alb.test", names.AttrARN), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile("listener/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile("listener/.+$")), resource.TestCheckResourceAttr(resourceName, names.AttrProtocol, "HTTP"), resource.TestCheckResourceAttr(resourceName, names.AttrPort, "80"), resource.TestCheckResourceAttr(resourceName, "default_action.#", "1"), @@ -1208,7 +1208,7 @@ func TestAccELBV2Listener_Protocol_https(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckListenerExists(ctx, resourceName, &conf), resource.TestCheckResourceAttrPair(resourceName, "load_balancer_arn", "aws_lb.test", names.AttrARN), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile("listener/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile("listener/.+$")), resource.TestCheckResourceAttr(resourceName, names.AttrProtocol, "HTTPS"), resource.TestCheckResourceAttr(resourceName, names.AttrPort, "443"), resource.TestCheckResourceAttr(resourceName, "default_action.#", "1"), @@ -1259,7 +1259,7 @@ func TestAccELBV2Listener_mutualAuthentication(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "mutual_authentication.0.ignore_client_certificate_expiry", acctest.CtFalse), resource.TestCheckResourceAttrPair(resourceName, "mutual_authentication.0.trust_store_arn", "aws_lb_trust_store.test", names.AttrARN), resource.TestCheckResourceAttrPair(resourceName, "load_balancer_arn", "aws_lb.test", names.AttrARN), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile("listener/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile("listener/.+$")), resource.TestCheckResourceAttr(resourceName, names.AttrProtocol, "HTTPS"), resource.TestCheckResourceAttr(resourceName, names.AttrPort, "443"), resource.TestCheckResourceAttr(resourceName, "default_action.#", "1"), @@ -1306,7 +1306,7 @@ func TestAccELBV2Listener_mutualAuthenticationPassthrough(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "mutual_authentication.0.ignore_client_certificate_expiry", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "mutual_authentication.0.trust_store_arn", ""), resource.TestCheckResourceAttrPair(resourceName, "load_balancer_arn", "aws_lb.test", names.AttrARN), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile("listener/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile("listener/.+$")), resource.TestCheckResourceAttr(resourceName, names.AttrProtocol, "HTTPS"), resource.TestCheckResourceAttr(resourceName, names.AttrPort, "443"), resource.TestCheckResourceAttr(resourceName, "default_action.#", "1"), @@ -1419,7 +1419,7 @@ func TestAccELBV2Listener_redirect(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckListenerExists(ctx, resourceName, &conf), resource.TestCheckResourceAttrPair(resourceName, "load_balancer_arn", "aws_lb.test", names.AttrARN), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile("listener/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile("listener/.+$")), resource.TestCheckResourceAttr(resourceName, names.AttrProtocol, "HTTP"), resource.TestCheckResourceAttr(resourceName, names.AttrPort, "80"), resource.TestCheckResourceAttr(resourceName, "default_action.#", "1"), @@ -1461,7 +1461,7 @@ func TestAccELBV2Listener_fixedResponse(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckListenerExists(ctx, resourceName, &conf), resource.TestCheckResourceAttrPair(resourceName, "load_balancer_arn", "aws_lb.test", names.AttrARN), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile("listener/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile("listener/.+$")), resource.TestCheckResourceAttr(resourceName, names.AttrProtocol, "HTTP"), resource.TestCheckResourceAttr(resourceName, names.AttrPort, "80"), resource.TestCheckResourceAttr(resourceName, "default_action.#", "1"), @@ -1502,7 +1502,7 @@ func TestAccELBV2Listener_cognito(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckListenerExists(ctx, resourceName, &conf), resource.TestCheckResourceAttrPair(resourceName, "load_balancer_arn", "aws_lb.test", names.AttrARN), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile("listener/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile("listener/.+$")), resource.TestCheckResourceAttr(resourceName, names.AttrProtocol, "HTTPS"), resource.TestCheckResourceAttr(resourceName, names.AttrPort, "443"), resource.TestCheckResourceAttr(resourceName, "default_action.#", "2"), @@ -1548,7 +1548,7 @@ func TestAccELBV2Listener_oidc(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckListenerExists(ctx, resourceName, &conf), resource.TestCheckResourceAttrPair(resourceName, "load_balancer_arn", "aws_lb.test", names.AttrARN), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile("listener/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile("listener/.+$")), resource.TestCheckResourceAttr(resourceName, names.AttrProtocol, "HTTPS"), resource.TestCheckResourceAttr(resourceName, names.AttrPort, "443"), resource.TestCheckResourceAttr(resourceName, "default_action.#", "2"), @@ -1785,7 +1785,7 @@ func TestAccELBV2Listener_redirectWithTargetGroupARN(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckListenerExists(ctx, resourceName, &conf), resource.TestCheckResourceAttrPair(resourceName, "load_balancer_arn", "aws_lb.test", names.AttrARN), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile("listener/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile("listener/.+$")), resource.TestCheckResourceAttr(resourceName, names.AttrProtocol, "HTTP"), resource.TestCheckResourceAttr(resourceName, names.AttrPort, "80"), resource.TestCheckResourceAttr(resourceName, "default_action.#", "1"), diff --git a/internal/service/elbv2/load_balancer_test.go b/internal/service/elbv2/load_balancer_test.go index 8b58c6b83e5..fac3d5ec986 100644 --- a/internal/service/elbv2/load_balancer_test.go +++ b/internal/service/elbv2/load_balancer_test.go @@ -88,7 +88,7 @@ func TestAccELBV2LoadBalancer_ALB_basic(t *testing.T) { testAccCheckLoadBalancerExists(ctx, resourceName, &conf), resource.TestCheckResourceAttr(resourceName, "access_logs.#", "1"), resource.TestCheckResourceAttr(resourceName, "access_logs.0.enabled", acctest.CtFalse), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("loadbalancer/app/%s/.+", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("loadbalancer/app/%s/.+", rName))), resource.TestCheckResourceAttr(resourceName, "connection_logs.#", "1"), resource.TestCheckResourceAttr(resourceName, "connection_logs.0.enabled", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "desync_mitigation_mode", "defensive"), @@ -133,7 +133,7 @@ func TestAccELBV2LoadBalancer_NLB_basic(t *testing.T) { testAccCheckLoadBalancerExists(ctx, resourceName, &conf), resource.TestCheckResourceAttr(resourceName, "access_logs.#", "1"), resource.TestCheckResourceAttr(resourceName, "access_logs.0.enabled", acctest.CtFalse), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("loadbalancer/net/%s/.+", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("loadbalancer/net/%s/.+", rName))), resource.TestCheckNoResourceAttr(resourceName, "connection_logs.#"), resource.TestCheckResourceAttrSet(resourceName, names.AttrDNSName), resource.TestCheckResourceAttr(resourceName, "dns_record_client_routing_policy", "any_availability_zone"), @@ -171,7 +171,7 @@ func TestAccELBV2LoadBalancer_LoadBalancerType_gateway(t *testing.T) { Config: testAccLoadBalancerConfig_typeGateway(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckLoadBalancerExists(ctx, resourceName, &conf), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("loadbalancer/gwy/%s/.+", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("loadbalancer/gwy/%s/.+", rName))), resource.TestCheckResourceAttr(resourceName, "load_balancer_type", string(awstypes.LoadBalancerTypeEnumGateway)), ), }, @@ -392,7 +392,7 @@ func TestAccELBV2LoadBalancer_LoadBalancerTypeGateway_enableCrossZoneLoadBalanci Config: testAccLoadBalancerConfig_typeGatewayEnableCrossZoneBalancing(rName, true), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckLoadBalancerExists(ctx, resourceName, &conf), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("loadbalancer/gwy/%s/.+", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("loadbalancer/gwy/%s/.+", rName))), resource.TestCheckResourceAttr(resourceName, "load_balancer_type", string(awstypes.LoadBalancerTypeEnumGateway)), resource.TestCheckResourceAttr(resourceName, "enable_cross_zone_load_balancing", acctest.CtTrue), ), @@ -412,7 +412,7 @@ func TestAccELBV2LoadBalancer_LoadBalancerTypeGateway_enableCrossZoneLoadBalanci Config: testAccLoadBalancerConfig_typeGatewayEnableCrossZoneBalancing(rName, false), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckLoadBalancerExists(ctx, resourceName, &conf), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("loadbalancer/gwy/%s/.+", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("loadbalancer/gwy/%s/.+", rName))), resource.TestCheckResourceAttr(resourceName, "load_balancer_type", string(awstypes.LoadBalancerTypeEnumGateway)), resource.TestCheckResourceAttr(resourceName, "enable_cross_zone_load_balancing", acctest.CtFalse), ), @@ -439,7 +439,7 @@ func TestAccELBV2LoadBalancer_ALB_outpost(t *testing.T) { testAccCheckLoadBalancerExists(ctx, resourceName, &conf), resource.TestCheckResourceAttr(resourceName, "access_logs.#", "1"), resource.TestCheckResourceAttr(resourceName, "access_logs.0.enabled", acctest.CtFalse), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("loadbalancer/app/%s/.+", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile(fmt.Sprintf("loadbalancer/app/%s/.+", rName))), resource.TestCheckResourceAttrSet(resourceName, names.AttrDNSName), resource.TestCheckResourceAttr(resourceName, "enable_deletion_protection", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "idle_timeout", "30"), diff --git a/internal/service/elbv2/trust_store_test.go b/internal/service/elbv2/trust_store_test.go index f6e03e5a44c..634304f7b6b 100644 --- a/internal/service/elbv2/trust_store_test.go +++ b/internal/service/elbv2/trust_store_test.go @@ -36,7 +36,7 @@ func TestAccELBV2TrustStore_basic(t *testing.T) { Config: testAccTrustStoreConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTrustStoreExists(ctx, resourceName, &conf), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile("truststore/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticloadbalancing", regexache.MustCompile("truststore/.+$")), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrNamePrefix, ""), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), From 9df8ca183f7fd371d29116e272461b41068156e6 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:47 -0500 Subject: [PATCH 071/304] Make 'AWSClient.AccountID' a getter - emr. --- internal/service/emr/cluster_test.go | 4 ++-- internal/service/emr/studio_test.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/emr/cluster_test.go b/internal/service/emr/cluster_test.go index 75a94fa366f..2bff75ff391 100644 --- a/internal/service/emr/cluster_test.go +++ b/internal/service/emr/cluster_test.go @@ -42,7 +42,7 @@ func TestAccEMRCluster_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckClusterExists(ctx, resourceName, &cluster), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticmapreduce", regexache.MustCompile("cluster/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticmapreduce", regexache.MustCompile("cluster/.+$")), resource.TestCheckResourceAttr(resourceName, "release_label", "emr-4.6.0"), resource.TestCheckResourceAttr(resourceName, "applications.#", "1"), resource.TestCheckTypeSetElemAttr(resourceName, "applications.*", "Spark"), @@ -1389,7 +1389,7 @@ func TestAccEMRCluster_s3LogEncryption(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckClusterExists(ctx, resourceName, &cluster), resource.TestCheckResourceAttr(resourceName, "log_uri", bucketName), - acctest.MatchResourceAttrRegionalARN(resourceName, "log_encryption_kms_key_id", "kms", regexache.MustCompile(`key/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "log_encryption_kms_key_id", "kms", regexache.MustCompile(`key/.+`)), ), }, { diff --git a/internal/service/emr/studio_test.go b/internal/service/emr/studio_test.go index 29e61dd5fd8..16e50fbfb5a 100644 --- a/internal/service/emr/studio_test.go +++ b/internal/service/emr/studio_test.go @@ -37,7 +37,7 @@ func TestAccEMRStudio_sso(t *testing.T) { Config: testAccStudioConfig_sso(rName1, rName1), Check: resource.ComposeTestCheckFunc( testAccCheckStudioExists(ctx, resourceName, &studio), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticmapreduce", regexache.MustCompile(`studio/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticmapreduce", regexache.MustCompile(`studio/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName1), resource.TestCheckResourceAttr(resourceName, "auth_mode", "SSO"), resource.TestCheckResourceAttrSet(resourceName, names.AttrURL), @@ -59,7 +59,7 @@ func TestAccEMRStudio_sso(t *testing.T) { Config: testAccStudioConfig_sso(rName1, rName2), Check: resource.ComposeTestCheckFunc( testAccCheckStudioExists(ctx, resourceName, &studio), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "elasticmapreduce", regexache.MustCompile(`studio/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "elasticmapreduce", regexache.MustCompile(`studio/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName2), resource.TestCheckResourceAttr(resourceName, "auth_mode", "SSO"), resource.TestCheckResourceAttrSet(resourceName, names.AttrURL), From 2d4a431b6c113a7b3a29f9ede0fc1638e761649c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:48 -0500 Subject: [PATCH 072/304] Make 'AWSClient.AccountID' a getter - emrserverless. --- internal/service/emrserverless/application_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/emrserverless/application_test.go b/internal/service/emrserverless/application_test.go index 55bc71e1501..999450310b4 100644 --- a/internal/service/emrserverless/application_test.go +++ b/internal/service/emrserverless/application_test.go @@ -36,7 +36,7 @@ func TestAccEMRServerlessApplication_basic(t *testing.T) { Config: testAccApplicationConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &application), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "emr-serverless", regexache.MustCompile(`/applications/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "emr-serverless", regexache.MustCompile(`/applications/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrType, "hive"), resource.TestCheckResourceAttr(resourceName, "architecture", "X86_64"), From 7b03cf5b27e33ff16d0d848811d3cc32b63ecf60 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:48 -0500 Subject: [PATCH 073/304] Make 'AWSClient.AccountID' a getter - events. --- internal/service/events/api_destination_test.go | 4 ++-- internal/service/events/archive_test.go | 4 ++-- internal/service/events/bus_test.go | 6 +++--- internal/service/events/connection_test.go | 6 +++--- internal/service/events/endpoint_test.go | 12 ++++++------ internal/service/events/rule_test.go | 14 +++++++------- internal/service/events/target_test.go | 4 ++-- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/internal/service/events/api_destination_test.go b/internal/service/events/api_destination_test.go index 224bea24d9d..c4b0e4df177 100644 --- a/internal/service/events/api_destination_test.go +++ b/internal/service/events/api_destination_test.go @@ -52,7 +52,7 @@ func TestAccEventsAPIDestination_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAPIDestinationExists(ctx, resourceName, &v1), resource.TestCheckResourceAttr(resourceName, names.AttrName, name), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "events", regexache.MustCompile(fmt.Sprintf("api-destination/%s/%s", name, uuidRegex))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "events", regexache.MustCompile(fmt.Sprintf("api-destination/%s/%s", name, uuidRegex))), resource.TestCheckResourceAttr(resourceName, "http_method", httpMethod), resource.TestCheckResourceAttr(resourceName, "invocation_endpoint", invocationEndpoint), ), @@ -71,7 +71,7 @@ func TestAccEventsAPIDestination_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAPIDestinationExists(ctx, resourceName, &v2), resource.TestCheckResourceAttr(resourceName, names.AttrName, nameModified), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "events", regexache.MustCompile(fmt.Sprintf("api-destination/%s/%s", nameModified, uuidRegex))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "events", regexache.MustCompile(fmt.Sprintf("api-destination/%s/%s", nameModified, uuidRegex))), testAccCheckAPIDestinationRecreated(&v1, &v2), resource.TestCheckResourceAttr(resourceName, "http_method", httpMethodModified), resource.TestCheckResourceAttr(resourceName, "invocation_endpoint", invocationEndpointModified), diff --git a/internal/service/events/archive_test.go b/internal/service/events/archive_test.go index b90a8f7445d..dd23f07fb97 100644 --- a/internal/service/events/archive_test.go +++ b/internal/service/events/archive_test.go @@ -37,7 +37,7 @@ func TestAccEventsArchive_basic(t *testing.T) { testAccCheckArchiveExists(ctx, resourceName, &v1), resource.TestCheckResourceAttr(resourceName, names.AttrName, archiveName), resource.TestCheckResourceAttr(resourceName, "retention_days", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "events", fmt.Sprintf("archive/%s", archiveName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "events", fmt.Sprintf("archive/%s", archiveName)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttr(resourceName, "event_pattern", ""), ), @@ -171,7 +171,7 @@ func TestAccEventsArchive_retentionSetOnCreation(t *testing.T) { testAccCheckArchiveExists(ctx, resourceName, &v1), resource.TestCheckResourceAttr(resourceName, names.AttrName, archiveName), resource.TestCheckResourceAttr(resourceName, "retention_days", "1"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "events", fmt.Sprintf("archive/%s", archiveName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "events", fmt.Sprintf("archive/%s", archiveName)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttr(resourceName, "event_pattern", ""), ), diff --git a/internal/service/events/bus_test.go b/internal/service/events/bus_test.go index c7519fe6401..f8f75b0f73d 100644 --- a/internal/service/events/bus_test.go +++ b/internal/service/events/bus_test.go @@ -40,7 +40,7 @@ func TestAccEventsBus_basic(t *testing.T) { Config: testAccBusConfig_basic(busName), Check: resource.ComposeTestCheckFunc( testAccCheckBusExists(ctx, resourceName, &v1), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "events", fmt.Sprintf("event-bus/%s", busName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "events", fmt.Sprintf("event-bus/%s", busName)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckNoResourceAttr(resourceName, "event_source_name"), resource.TestCheckResourceAttr(resourceName, names.AttrName, busName), @@ -73,7 +73,7 @@ func TestAccEventsBus_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckBusExists(ctx, resourceName, &v4), testAccCheckBusRecreated(&v3, &v4), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "events", fmt.Sprintf("event-bus/%s", busNameModified)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "events", fmt.Sprintf("event-bus/%s", busNameModified)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckNoResourceAttr(resourceName, "event_source_name"), resource.TestCheckResourceAttr(resourceName, names.AttrName, busNameModified), @@ -239,7 +239,7 @@ func TestAccEventsBus_partnerEventSource(t *testing.T) { Config: testAccBusConfig_partnerSource(busName), Check: resource.ComposeTestCheckFunc( testAccCheckBusExists(ctx, resourceName, &busOutput), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "events", fmt.Sprintf("event-bus/%s", busName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "events", fmt.Sprintf("event-bus/%s", busName)), resource.TestCheckResourceAttr(resourceName, "event_source_name", busName), resource.TestCheckResourceAttr(resourceName, names.AttrName, busName), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), diff --git a/internal/service/events/connection_test.go b/internal/service/events/connection_test.go index 05fe334612d..05cfe366b76 100644 --- a/internal/service/events/connection_test.go +++ b/internal/service/events/connection_test.go @@ -76,7 +76,7 @@ func TestAccEventsConnection_apiKey(t *testing.T) { ), Check: resource.ComposeTestCheckFunc( testAccCheckConnectionExists(ctx, resourceName, &v2), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "events", regexache.MustCompile(fmt.Sprintf("connection/%s/%s", nameModified, uuidRegex))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "events", regexache.MustCompile(fmt.Sprintf("connection/%s/%s", nameModified, uuidRegex))), testAccCheckConnectionRecreated(&v1, &v2), resource.TestCheckResourceAttr(resourceName, names.AttrName, nameModified), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, descriptionModified), @@ -159,7 +159,7 @@ func TestAccEventsConnection_basic(t *testing.T) { ), Check: resource.ComposeTestCheckFunc( testAccCheckConnectionExists(ctx, resourceName, &v2), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "events", regexache.MustCompile(fmt.Sprintf("connection/%s/%s", nameModified, uuidRegex))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "events", regexache.MustCompile(fmt.Sprintf("connection/%s/%s", nameModified, uuidRegex))), testAccCheckConnectionRecreated(&v1, &v2), resource.TestCheckResourceAttr(resourceName, names.AttrName, nameModified), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, descriptionModified), @@ -324,7 +324,7 @@ func TestAccEventsConnection_oAuth(t *testing.T) { ), Check: resource.ComposeTestCheckFunc( testAccCheckConnectionExists(ctx, resourceName, &v2), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "events", regexache.MustCompile(fmt.Sprintf("connection/%s/%s", nameModified, uuidRegex))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "events", regexache.MustCompile(fmt.Sprintf("connection/%s/%s", nameModified, uuidRegex))), testAccCheckConnectionRecreated(&v1, &v2), resource.TestCheckResourceAttr(resourceName, names.AttrName, nameModified), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, descriptionModified), diff --git a/internal/service/events/endpoint_test.go b/internal/service/events/endpoint_test.go index 652f98597bd..1f0f000514c 100644 --- a/internal/service/events/endpoint_test.go +++ b/internal/service/events/endpoint_test.go @@ -37,7 +37,7 @@ func TestAccEventsEndpoint_basic(t *testing.T) { Config: testAccEndpointConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckEndpointExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "events", fmt.Sprintf("endpoint/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "events", fmt.Sprintf("endpoint/%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttrSet(resourceName, "endpoint_url"), resource.TestCheckResourceAttr(resourceName, "event_bus.#", "2"), @@ -106,7 +106,7 @@ func TestAccEventsEndpoint_roleARN(t *testing.T) { Config: testAccEndpointConfig_roleARN(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckEndpointExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "events", fmt.Sprintf("endpoint/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "events", fmt.Sprintf("endpoint/%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttrSet(resourceName, "endpoint_url"), resource.TestCheckResourceAttr(resourceName, "event_bus.#", "2"), @@ -150,7 +150,7 @@ func TestAccEventsEndpoint_description(t *testing.T) { Config: testAccEndpointConfig_description(rName, "description 1"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckEndpointExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "events", fmt.Sprintf("endpoint/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "events", fmt.Sprintf("endpoint/%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "description 1"), resource.TestCheckResourceAttrSet(resourceName, "endpoint_url"), resource.TestCheckResourceAttr(resourceName, "event_bus.#", "2"), @@ -177,7 +177,7 @@ func TestAccEventsEndpoint_description(t *testing.T) { Config: testAccEndpointConfig_description(rName, "description 2"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckEndpointExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "events", fmt.Sprintf("endpoint/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "events", fmt.Sprintf("endpoint/%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "description 2"), resource.TestCheckResourceAttrSet(resourceName, "endpoint_url"), resource.TestCheckResourceAttr(resourceName, "event_bus.#", "2"), @@ -216,7 +216,7 @@ func TestAccEventsEndpoint_updateRoutingConfig(t *testing.T) { Config: testAccEndpointConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckEndpointExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "events", fmt.Sprintf("endpoint/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "events", fmt.Sprintf("endpoint/%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttrSet(resourceName, "endpoint_url"), resource.TestCheckResourceAttr(resourceName, "event_bus.#", "2"), @@ -238,7 +238,7 @@ func TestAccEventsEndpoint_updateRoutingConfig(t *testing.T) { Config: testAccEndpointConfig_updateRoutingConfig(rName), Check: resource.ComposeTestCheckFunc( testAccCheckEndpointExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "events", fmt.Sprintf("endpoint/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "events", fmt.Sprintf("endpoint/%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttrSet(resourceName, "endpoint_url"), resource.TestCheckResourceAttr(resourceName, "event_bus.#", "2"), diff --git a/internal/service/events/rule_test.go b/internal/service/events/rule_test.go index 089dddce8dd..86449d2dc6e 100644 --- a/internal/service/events/rule_test.go +++ b/internal/service/events/rule_test.go @@ -210,7 +210,7 @@ func TestAccEventsRule_basic(t *testing.T) { Config: testAccRuleConfig_basic(rName1), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckRuleExists(ctx, resourceName, &v1), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "events", regexache.MustCompile(fmt.Sprintf(`rule/%s$`, rName1))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "events", regexache.MustCompile(fmt.Sprintf(`rule/%s$`, rName1))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName1), resource.TestCheckResourceAttr(resourceName, names.AttrNamePrefix, ""), resource.TestCheckResourceAttr(resourceName, names.AttrScheduleExpression, "rate(1 hour)"), @@ -242,7 +242,7 @@ func TestAccEventsRule_basic(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckRuleExists(ctx, resourceName, &v2), testAccCheckRuleRecreated(&v1, &v2), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "events", regexache.MustCompile(fmt.Sprintf(`rule/%s$`, rName2))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "events", regexache.MustCompile(fmt.Sprintf(`rule/%s$`, rName2))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName2), resource.TestCheckResourceAttr(resourceName, "event_bus_name", "default"), resource.TestCheckResourceAttr(resourceName, names.AttrScheduleExpression, "rate(1 hour)"), @@ -257,7 +257,7 @@ func TestAccEventsRule_basic(t *testing.T) { Config: testAccRuleConfig_defaultBusName(rName2), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckRuleExists(ctx, resourceName, &v3), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "events", regexache.MustCompile(fmt.Sprintf(`rule/%s$`, rName2))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "events", regexache.MustCompile(fmt.Sprintf(`rule/%s$`, rName2))), testAccCheckRuleNotRecreated(&v2, &v3), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName2), resource.TestCheckResourceAttr(resourceName, "event_bus_name", "default"), @@ -288,7 +288,7 @@ func TestAccEventsRule_eventBusName(t *testing.T) { testAccCheckRuleExists(ctx, resourceName, &v1), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName1), resource.TestCheckResourceAttr(resourceName, "event_bus_name", busName1), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "events", regexache.MustCompile(fmt.Sprintf(`rule/%s/%s$`, busName1, rName1))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "events", regexache.MustCompile(fmt.Sprintf(`rule/%s/%s$`, busName1, rName1))), ), }, { @@ -313,7 +313,7 @@ func TestAccEventsRule_eventBusName(t *testing.T) { testAccCheckRuleRecreated(&v2, &v3), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName2), resource.TestCheckResourceAttr(resourceName, "event_bus_name", busName2), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "events", regexache.MustCompile(fmt.Sprintf(`rule/%s/%s$`, busName2, rName2))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "events", regexache.MustCompile(fmt.Sprintf(`rule/%s/%s$`, busName2, rName2))), ), }, }, @@ -713,7 +713,7 @@ func TestAccEventsRule_partnerEventBus(t *testing.T) { Config: testAccRuleConfig_partnerBus(rName, busName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckRuleExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "events", regexache.MustCompile(fmt.Sprintf(`rule/%s/%s$`, busName, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "events", regexache.MustCompile(fmt.Sprintf(`rule/%s/%s$`, busName, rName))), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttr(resourceName, "event_bus_name", busName), acctest.CheckResourceAttrEquivalentJSON(resourceName, "event_pattern", "{\"source\":[\"aws.ec2\"]}"), @@ -752,7 +752,7 @@ func TestAccEventsRule_eventBusARN(t *testing.T) { Config: testAccRuleConfig_busARN(rName, eventBusName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckRuleExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "events", regexache.MustCompile(fmt.Sprintf(`rule/%s/%s$`, eventBusName, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "events", regexache.MustCompile(fmt.Sprintf(`rule/%s/%s$`, eventBusName, rName))), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttrPair(resourceName, "event_bus_name", "aws_cloudwatch_event_bus.test", names.AttrARN), acctest.CheckResourceAttrEquivalentJSON(resourceName, "event_pattern", "{\"source\":[\"aws.ec2\"]}"), diff --git a/internal/service/events/target_test.go b/internal/service/events/target_test.go index f74ad80cda0..7d5af4f9c8a 100644 --- a/internal/service/events/target_test.go +++ b/internal/service/events/target_test.go @@ -327,8 +327,8 @@ func TestAccEventsTarget_eventBusARN(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckTargetExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, names.AttrRule, ruleName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "events", regexache.MustCompile(fmt.Sprintf("event-bus/%s", destinationEventBusName))), - acctest.MatchResourceAttrRegionalARN(resourceName, "event_bus_name", "events", regexache.MustCompile(fmt.Sprintf("event-bus/%s", originEventBusName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "events", regexache.MustCompile(fmt.Sprintf("event-bus/%s", destinationEventBusName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "event_bus_name", "events", regexache.MustCompile(fmt.Sprintf("event-bus/%s", originEventBusName))), resource.TestCheckResourceAttr(resourceName, "target_id", targetID), ), }, From 6aec0f8a3629a514dd261115402f28242e7593ea Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:48 -0500 Subject: [PATCH 074/304] Make 'AWSClient.AccountID' a getter - evidently. --- internal/service/evidently/feature_test.go | 2 +- internal/service/evidently/launch_test.go | 2 +- internal/service/evidently/project_test.go | 4 ++-- internal/service/evidently/segment_test.go | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/evidently/feature_test.go b/internal/service/evidently/feature_test.go index 7e625505fca..395d4842f0f 100644 --- a/internal/service/evidently/feature_test.go +++ b/internal/service/evidently/feature_test.go @@ -41,7 +41,7 @@ func TestAccEvidentlyFeature_basic(t *testing.T) { Config: testAccFeatureConfig_basic(rName, rName2), Check: resource.ComposeTestCheckFunc( testAccCheckFeatureExists(ctx, resourceName, &feature), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "evidently", fmt.Sprintf("project/%s/feature/%s", rName, rName2)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "evidently", fmt.Sprintf("project/%s/feature/%s", rName, rName2)), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedTime), resource.TestCheckResourceAttr(resourceName, "default_variation", "Variation1"), resource.TestCheckResourceAttr(resourceName, "entity_overrides.%", "0"), diff --git a/internal/service/evidently/launch_test.go b/internal/service/evidently/launch_test.go index f372d9ad26a..dc993ade750 100644 --- a/internal/service/evidently/launch_test.go +++ b/internal/service/evidently/launch_test.go @@ -43,7 +43,7 @@ func TestAccEvidentlyLaunch_basic(t *testing.T) { Config: testAccLaunchConfig_basic(rName, rName2, rName3, startTime), Check: resource.ComposeTestCheckFunc( testAccCheckLaunchExists(ctx, resourceName, &launch), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "evidently", fmt.Sprintf("project/%s/launch/%s", rName, rName3)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "evidently", fmt.Sprintf("project/%s/launch/%s", rName, rName3)), acctest.CheckResourceAttrRFC3339(resourceName, names.AttrCreatedTime), // not returned at create time // resource.TestCheckResourceAttr(resourceName, "execution.#", "1"), diff --git a/internal/service/evidently/project_test.go b/internal/service/evidently/project_test.go index 2ab1c51c917..05421c2d842 100644 --- a/internal/service/evidently/project_test.go +++ b/internal/service/evidently/project_test.go @@ -43,7 +43,7 @@ func TestAccEvidentlyProject_basic(t *testing.T) { testAccCheckProjectExists(ctx, resourceName, &project), resource.TestCheckResourceAttrSet(resourceName, "active_experiment_count"), resource.TestCheckResourceAttrSet(resourceName, "active_launch_count"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "evidently", fmt.Sprintf("project/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "evidently", fmt.Sprintf("project/%s", rName)), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedTime), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, originalDescription), resource.TestCheckResourceAttrSet(resourceName, "experiment_count"), @@ -66,7 +66,7 @@ func TestAccEvidentlyProject_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet(resourceName, "active_experiment_count"), resource.TestCheckResourceAttrSet(resourceName, "active_launch_count"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "evidently", fmt.Sprintf("project/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "evidently", fmt.Sprintf("project/%s", rName)), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedTime), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, updatedDescription), resource.TestCheckResourceAttrSet(resourceName, "experiment_count"), diff --git a/internal/service/evidently/segment_test.go b/internal/service/evidently/segment_test.go index 5b546e70cd3..2cce5befb67 100644 --- a/internal/service/evidently/segment_test.go +++ b/internal/service/evidently/segment_test.go @@ -40,10 +40,10 @@ func TestAccEvidentlySegment_basic(t *testing.T) { Config: testAccSegmentConfig_basic(rName, pattern), Check: resource.ComposeTestCheckFunc( testAccCheckSegmentExists(ctx, resourceName, &segment), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "evidently", fmt.Sprintf("segment/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "evidently", fmt.Sprintf("segment/%s", rName)), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedTime), resource.TestCheckResourceAttrSet(resourceName, "experiment_count"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrID, "evidently", fmt.Sprintf("segment/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrID, "evidently", fmt.Sprintf("segment/%s", rName)), resource.TestCheckResourceAttrSet(resourceName, names.AttrLastUpdatedTime), resource.TestCheckResourceAttrSet(resourceName, "launch_count"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), From 2eb91ed88298eeeb0417e107d7134b9e574c76a3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:48 -0500 Subject: [PATCH 075/304] Make 'AWSClient.AccountID' a getter - finspace. --- internal/service/finspace/kx_dataview.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/finspace/kx_dataview.go b/internal/service/finspace/kx_dataview.go index 1e048f3190e..7e0cb066042 100644 --- a/internal/service/finspace/kx_dataview.go +++ b/internal/service/finspace/kx_dataview.go @@ -252,7 +252,7 @@ func resourceKxDataviewRead(ctx context.Context, d *schema.ResourceData, meta in Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, Service: names.FinSpace, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("kxEnvironment/%s/kxDatabase/%s/kxDataview/%s", aws.ToString(out.EnvironmentId), aws.ToString(out.DatabaseName), aws.ToString(out.DataviewName)), }.String() d.Set(names.AttrARN, dataviewARN) From 3cd0139acc468fd3c16f5c45baff568bad99f1c9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:48 -0500 Subject: [PATCH 076/304] Make 'AWSClient.AccountID' a getter - fis. --- internal/service/fis/experiment_template_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/fis/experiment_template_test.go b/internal/service/fis/experiment_template_test.go index cfbbe36e362..b486f9030c3 100644 --- a/internal/service/fis/experiment_template_test.go +++ b/internal/service/fis/experiment_template_test.go @@ -385,7 +385,7 @@ func TestAccFISExperimentTemplate_loggingConfiguration(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccExperimentTemplateExists(ctx, resourceName, &conf), resource.TestCheckResourceAttr(resourceName, "log_configuration.0.log_schema_version", "2"), - acctest.CheckResourceAttrRegionalARN(resourceName, "log_configuration.0.cloudwatch_logs_configuration.0.log_group_arn", "logs", fmt.Sprintf("log-group:%s:*", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, "log_configuration.0.cloudwatch_logs_configuration.0.log_group_arn", "logs", fmt.Sprintf("log-group:%s:*", rName)), ), }, // Delete Logging From b5577cae4db7cd2c2cc4bf32cda62c9feaf7306a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:48 -0500 Subject: [PATCH 077/304] Make 'AWSClient.AccountID' a getter - fms. --- internal/service/fms/admin_account.go | 2 +- internal/service/fms/admin_account_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/service/fms/admin_account.go b/internal/service/fms/admin_account.go index 4644f021819..198fb788acd 100644 --- a/internal/service/fms/admin_account.go +++ b/internal/service/fms/admin_account.go @@ -63,7 +63,7 @@ func resourceAdminAccountCreate(ctx context.Context, d *schema.ResourceData, met return sdkdiag.AppendErrorf(diags, "FMS Admin Account (%s) already associated: import this Terraform resource to manage", aws.ToString(output.AdminAccount)) } - accountID := meta.(*conns.AWSClient).AccountID + accountID := meta.(*conns.AWSClient).AccountID(ctx) if v, ok := d.GetOk(names.AttrAccountID); ok { accountID = v.(string) } diff --git a/internal/service/fms/admin_account_test.go b/internal/service/fms/admin_account_test.go index f88640cc821..595cd2f1679 100644 --- a/internal/service/fms/admin_account_test.go +++ b/internal/service/fms/admin_account_test.go @@ -36,7 +36,7 @@ func testAccAdminAccount_basic(t *testing.T) { Config: testAccAdminAccountConfig_basic, Check: resource.ComposeAggregateTestCheckFunc( testAccAdminAccountExists(ctx, resourceName), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrAccountID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrAccountID), ), }, }, @@ -62,7 +62,7 @@ func testAccAdminAccount_disappears(t *testing.T) { Config: testAccAdminAccountConfig_basic, Check: resource.ComposeTestCheckFunc( testAccAdminAccountExists(ctx, resourceName), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrAccountID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrAccountID), acctest.CheckResourceDisappears(ctx, acctest.Provider, tffms.ResourceAdminAccount(), resourceName), ), ExpectNonEmptyPlan: true, From 328a1c1f40245d4412d982900a2e8a6f572173f0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:48 -0500 Subject: [PATCH 078/304] Make 'AWSClient.AccountID' a getter - fsx. --- internal/service/fsx/backup_test.go | 16 ++++++++-------- .../fsx/data_repository_association_test.go | 2 +- internal/service/fsx/file_cache_test.go | 4 ++-- .../service/fsx/lustre_file_system_test.go | 8 ++++---- internal/service/fsx/ontap_file_system_test.go | 4 ++-- .../fsx/ontap_storage_virtual_machine_test.go | 4 ++-- internal/service/fsx/ontap_volume_test.go | 2 +- .../service/fsx/openzfs_file_system_test.go | 8 ++++---- internal/service/fsx/openzfs_snapshot_test.go | 4 ++-- internal/service/fsx/openzfs_volume_test.go | 6 +++--- .../service/fsx/windows_file_system_test.go | 18 +++++++++--------- 11 files changed, 38 insertions(+), 38 deletions(-) diff --git a/internal/service/fsx/backup_test.go b/internal/service/fsx/backup_test.go index 61e2234385f..b4020c35a89 100644 --- a/internal/service/fsx/backup_test.go +++ b/internal/service/fsx/backup_test.go @@ -37,8 +37,8 @@ func TestAccFSxBackup_basic(t *testing.T) { Config: testAccBackupConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckBackupExists(ctx, resourceName, &backup), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "fsx", regexache.MustCompile(`backup/.+`)), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "fsx", regexache.MustCompile(`backup/.+`)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), ), }, @@ -69,8 +69,8 @@ func TestAccFSxBackup_ontapBasic(t *testing.T) { Config: testAccBackupConfig_ontapBasic(rName, vName), Check: resource.ComposeTestCheckFunc( testAccCheckBackupExists(ctx, resourceName, &backup), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "fsx", regexache.MustCompile(`backup/.+`)), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "fsx", regexache.MustCompile(`backup/.+`)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), ), }, @@ -99,8 +99,8 @@ func TestAccFSxBackup_openzfsBasic(t *testing.T) { Config: testAccBackupConfig_openZFSBasic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckBackupExists(ctx, resourceName, &backup), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "fsx", regexache.MustCompile(`backup/.+`)), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "fsx", regexache.MustCompile(`backup/.+`)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), ), }, @@ -130,8 +130,8 @@ func TestAccFSxBackup_windowsBasic(t *testing.T) { Config: testAccBackupConfig_windowsBasic(rName, domainName), Check: resource.ComposeTestCheckFunc( testAccCheckBackupExists(ctx, resourceName, &backup), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "fsx", regexache.MustCompile(`backup/.+`)), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "fsx", regexache.MustCompile(`backup/.+`)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), ), }, diff --git a/internal/service/fsx/data_repository_association_test.go b/internal/service/fsx/data_repository_association_test.go index 9374fefc65a..1e3180b6bf6 100644 --- a/internal/service/fsx/data_repository_association_test.go +++ b/internal/service/fsx/data_repository_association_test.go @@ -46,7 +46,7 @@ func TestAccFSxDataRepositoryAssociation_basic(t *testing.T) { Config: testAccDataRepositoryAssociationConfig_fileSystemPath(rName, rName, fileSystemPath), Check: resource.ComposeTestCheckFunc( testAccCheckDataRepositoryAssociationExists(ctx, resourceName, &association), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "fsx", regexache.MustCompile(`association/fs-.+/dra-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "fsx", regexache.MustCompile(`association/fs-.+/dra-.+`)), resource.TestCheckResourceAttr(resourceName, "batch_import_meta_data_on_create", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "data_repository_path", bucketPath), resource.TestMatchResourceAttr(resourceName, names.AttrFileSystemID, regexache.MustCompile(`fs-.+`)), diff --git a/internal/service/fsx/file_cache_test.go b/internal/service/fsx/file_cache_test.go index 5993f81aa32..87a10f26f9c 100644 --- a/internal/service/fsx/file_cache_test.go +++ b/internal/service/fsx/file_cache_test.go @@ -64,11 +64,11 @@ func testAccFileCache_basic(t *testing.T) { Config: testAccFileCacheConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckFileCacheExists(ctx, resourceName, &filecache), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "fsx", regexache.MustCompile(`file-cache/fc-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "fsx", regexache.MustCompile(`file-cache/fc-.+`)), resource.TestCheckResourceAttr(resourceName, "file_cache_type", "LUSTRE"), resource.TestCheckResourceAttr(resourceName, "file_cache_type_version", "2.12"), resource.TestMatchResourceAttr(resourceName, names.AttrID, regexache.MustCompile(`fc-.+`)), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrKMSKeyID, "kms", regexache.MustCompile(`key\/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrKMSKeyID, "kms", regexache.MustCompile(`key\/.+`)), resource.TestCheckResourceAttr(resourceName, "lustre_configuration.0.deployment_type", "CACHE_1"), resource.TestCheckResourceAttr(resourceName, "lustre_configuration.0.metadata_configuration.0.storage_capacity", "2400"), resource.TestCheckResourceAttr(resourceName, "lustre_configuration.0.per_unit_storage_throughput", "1000"), diff --git a/internal/service/fsx/lustre_file_system_test.go b/internal/service/fsx/lustre_file_system_test.go index 94d295281ee..207dbf0dad2 100644 --- a/internal/service/fsx/lustre_file_system_test.go +++ b/internal/service/fsx/lustre_file_system_test.go @@ -42,7 +42,7 @@ func TestAccFSxLustreFileSystem_basic(t *testing.T) { Config: testAccLustreFileSystemConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckLustreFileSystemExists(ctx, resourceName, &filesystem), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "fsx", regexache.MustCompile(`file-system/fs-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "fsx", regexache.MustCompile(`file-system/fs-.+`)), resource.TestCheckResourceAttr(resourceName, "automatic_backup_retention_days", "0"), resource.TestCheckResourceAttr(resourceName, "copy_tags_to_backups", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "data_compression_type", string(awstypes.DataCompressionTypeNone)), @@ -56,7 +56,7 @@ func TestAccFSxLustreFileSystem_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "metadata_configuration.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "mount_name"), resource.TestCheckResourceAttr(resourceName, "network_interface_ids.#", "2"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "security_group_ids.#", "0"), resource.TestCheckResourceAttr(resourceName, "skip_final_backup", acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, "storage_capacity", "1200"), @@ -692,7 +692,7 @@ func TestAccFSxLustreFileSystem_deploymentTypePersistent1(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "per_unit_storage_throughput", "50"), resource.TestCheckResourceAttr(resourceName, "deployment_type", string(awstypes.LustreDeploymentTypePersistent1)), resource.TestCheckResourceAttr(resourceName, "automatic_backup_retention_days", "0"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrKMSKeyID, "kms", regexache.MustCompile(`key/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrKMSKeyID, "kms", regexache.MustCompile(`key/.+`)), // We don't know the randomly generated mount_name ahead of time like for SCRATCH_1 deployment types. resource.TestCheckResourceAttrSet(resourceName, "mount_name"), ), @@ -774,7 +774,7 @@ func TestAccFSxLustreFileSystem_deploymentTypePersistent2(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "per_unit_storage_throughput", "125"), resource.TestCheckResourceAttr(resourceName, "deployment_type", string(awstypes.LustreDeploymentTypePersistent2)), resource.TestCheckResourceAttr(resourceName, "automatic_backup_retention_days", "0"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrKMSKeyID, "kms", regexache.MustCompile(`key/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrKMSKeyID, "kms", regexache.MustCompile(`key/.+`)), // We don't know the randomly generated mount_name ahead of time like for SCRATCH_1 deployment types. resource.TestCheckResourceAttrSet(resourceName, "mount_name"), ), diff --git a/internal/service/fsx/ontap_file_system_test.go b/internal/service/fsx/ontap_file_system_test.go index e6781e0c519..88a0c89551b 100644 --- a/internal/service/fsx/ontap_file_system_test.go +++ b/internal/service/fsx/ontap_file_system_test.go @@ -38,7 +38,7 @@ func TestAccFSxONTAPFileSystem_basic(t *testing.T) { Config: testAccONTAPFileSystemConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckONTAPFileSystemExists(ctx, resourceName, &filesystem), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "fsx", regexache.MustCompile(`file-system/fs-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "fsx", regexache.MustCompile(`file-system/fs-.+`)), resource.TestCheckResourceAttr(resourceName, "automatic_backup_retention_days", "0"), resource.TestCheckResourceAttr(resourceName, "deployment_type", string(awstypes.OntapDeploymentTypeMultiAz1)), resource.TestCheckResourceAttr(resourceName, "disk_iops_configuration.#", "1"), @@ -53,7 +53,7 @@ func TestAccFSxONTAPFileSystem_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "ha_pairs", "1"), resource.TestCheckResourceAttrSet(resourceName, names.AttrKMSKeyID), resource.TestCheckResourceAttr(resourceName, "network_interface_ids.#", "2"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttrPair(resourceName, "preferred_subnet_id", "aws_subnet.test.0", names.AttrID), resource.TestCheckResourceAttr(resourceName, "route_table_ids.#", "1"), resource.TestCheckTypeSetElemAttrPair(resourceName, "route_table_ids.*", "aws_vpc.test", "default_route_table_id"), diff --git a/internal/service/fsx/ontap_storage_virtual_machine_test.go b/internal/service/fsx/ontap_storage_virtual_machine_test.go index 55d59892361..6543e5329a9 100644 --- a/internal/service/fsx/ontap_storage_virtual_machine_test.go +++ b/internal/service/fsx/ontap_storage_virtual_machine_test.go @@ -38,7 +38,7 @@ func TestAccFSxONTAPStorageVirtualMachine_basic(t *testing.T) { Config: testAccONTAPStorageVirtualMachineConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckONTAPStorageVirtualMachineExists(ctx, resourceName, &storageVirtualMachine), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "fsx", regexache.MustCompile(`storage-virtual-machine/fs-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "fsx", regexache.MustCompile(`storage-virtual-machine/fs-.+`)), resource.TestCheckResourceAttr(resourceName, "endpoints.#", "1"), resource.TestCheckResourceAttr(resourceName, "endpoints.0.iscsi.#", "1"), resource.TestCheckResourceAttrSet(resourceName, "endpoints.0.iscsi.0.dns_name"), @@ -78,7 +78,7 @@ func TestAccFSxONTAPStorageVirtualMachine_rootVolumeSecurityStyle(t *testing.T) Config: testAccONTAPStorageVirtualMachineConfig_rootVolumeSecurityStyle(rName), Check: resource.ComposeTestCheckFunc( testAccCheckONTAPStorageVirtualMachineExists(ctx, resourceName, &storageVirtualMachine), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "fsx", regexache.MustCompile(`storage-virtual-machine/fs-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "fsx", regexache.MustCompile(`storage-virtual-machine/fs-.+`)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttr(resourceName, "endpoints.#", "1"), resource.TestCheckResourceAttr(resourceName, "endpoints.0.iscsi.#", "1"), diff --git a/internal/service/fsx/ontap_volume_test.go b/internal/service/fsx/ontap_volume_test.go index 0c835191e7e..3811b77783d 100644 --- a/internal/service/fsx/ontap_volume_test.go +++ b/internal/service/fsx/ontap_volume_test.go @@ -38,7 +38,7 @@ func TestAccFSxONTAPVolume_basic(t *testing.T) { Config: testAccONTAPVolumeConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckONTAPVolumeExists(ctx, resourceName, &volume), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "fsx", regexache.MustCompile(`volume/fs-.+/fsvol-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "fsx", regexache.MustCompile(`volume/fs-.+/fsvol-.+`)), resource.TestCheckResourceAttr(resourceName, "bypass_snaplock_enterprise_retention", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "copy_tags_to_backups", acctest.CtFalse), resource.TestCheckResourceAttrSet(resourceName, names.AttrFileSystemID), diff --git a/internal/service/fsx/openzfs_file_system_test.go b/internal/service/fsx/openzfs_file_system_test.go index db436c8d35c..f9712d6cd1b 100644 --- a/internal/service/fsx/openzfs_file_system_test.go +++ b/internal/service/fsx/openzfs_file_system_test.go @@ -49,7 +49,7 @@ func TestAccFSxOpenZFSFileSystem_basic(t *testing.T) { Config: testAccOpenZFSFileSystemConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckOpenZFSFileSystemExists(ctx, resourceName, &filesystem), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "fsx", regexache.MustCompile(`file-system/fs-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "fsx", regexache.MustCompile(`file-system/fs-.+`)), resource.TestCheckResourceAttr(resourceName, "automatic_backup_retention_days", "0"), resource.TestCheckNoResourceAttr(resourceName, "backup_id"), resource.TestCheckResourceAttr(resourceName, "copy_tags_to_backups", acctest.CtFalse), @@ -64,7 +64,7 @@ func TestAccFSxOpenZFSFileSystem_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "endpoint_ip_address_range", ""), resource.TestCheckResourceAttrSet(resourceName, names.AttrKMSKeyID), resource.TestCheckResourceAttr(resourceName, "network_interface_ids.#", "1"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "preferred_subnet_id", ""), resource.TestCheckResourceAttr(resourceName, "root_volume_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "root_volume_configuration.0.data_compression_type", "NONE"), @@ -901,7 +901,7 @@ func TestAccFSxOpenZFSFileSystem_multiAZ(t *testing.T) { Config: testAccOpenZFSFileSystemConfig_multiAZ(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckOpenZFSFileSystemExists(ctx, resourceName, &filesystem), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "fsx", regexache.MustCompile(`file-system/fs-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "fsx", regexache.MustCompile(`file-system/fs-.+`)), resource.TestCheckResourceAttr(resourceName, "automatic_backup_retention_days", "0"), resource.TestCheckNoResourceAttr(resourceName, "backup_id"), resource.TestCheckResourceAttr(resourceName, "copy_tags_to_backups", acctest.CtFalse), @@ -916,7 +916,7 @@ func TestAccFSxOpenZFSFileSystem_multiAZ(t *testing.T) { resource.TestCheckResourceAttrSet(resourceName, "endpoint_ip_address_range"), resource.TestCheckResourceAttrSet(resourceName, names.AttrKMSKeyID), resource.TestCheckResourceAttr(resourceName, "network_interface_ids.#", "2"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttrPair(resourceName, "preferred_subnet_id", "aws_subnet.test.0", names.AttrID), resource.TestCheckResourceAttr(resourceName, "root_volume_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "root_volume_configuration.0.data_compression_type", "NONE"), diff --git a/internal/service/fsx/openzfs_snapshot_test.go b/internal/service/fsx/openzfs_snapshot_test.go index 7d811b5675e..1e214cbbf9f 100644 --- a/internal/service/fsx/openzfs_snapshot_test.go +++ b/internal/service/fsx/openzfs_snapshot_test.go @@ -37,7 +37,7 @@ func TestAccFSxOpenZFSSnapshot_basic(t *testing.T) { Config: testAccOpenZFSSnapshotConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckOpenZFSSnapshotExists(ctx, resourceName, &snapshot), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "fsx", regexache.MustCompile(`snapshot/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "fsx", regexache.MustCompile(`snapshot/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttrSet(resourceName, "volume_id"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreationTime), @@ -176,7 +176,7 @@ func TestAccFSxOpenZFSSnapshot_childVolume(t *testing.T) { Config: testAccOpenZFSSnapshotConfig_childVolume(rName), Check: resource.ComposeTestCheckFunc( testAccCheckOpenZFSSnapshotExists(ctx, resourceName, &snapshot), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "fsx", regexache.MustCompile(`snapshot/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "fsx", regexache.MustCompile(`snapshot/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), diff --git a/internal/service/fsx/openzfs_volume_test.go b/internal/service/fsx/openzfs_volume_test.go index 9f24c1b437a..77f59f72b18 100644 --- a/internal/service/fsx/openzfs_volume_test.go +++ b/internal/service/fsx/openzfs_volume_test.go @@ -37,7 +37,7 @@ func TestAccFSxOpenZFSVolume_basic(t *testing.T) { Config: testAccOpenZFSVolumeConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckOpenZFSVolumeExists(ctx, resourceName, &volume), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "fsx", regexache.MustCompile(`volume/fs-.+/fsvol-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "fsx", regexache.MustCompile(`volume/fs-.+/fsvol-.+`)), resource.TestCheckResourceAttr(resourceName, "copy_tags_to_snapshots", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "data_compression_type", "NONE"), resource.TestCheckResourceAttr(resourceName, "delete_volume_options.#", "0"), @@ -105,8 +105,8 @@ func TestAccFSxOpenZFSVolume_parentVolume(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckOpenZFSVolumeExists(ctx, resourceName, &volume), testAccCheckOpenZFSVolumeExists(ctx, resourceName2, &volume2), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "fsx", regexache.MustCompile(`volume/fs-.+/fsvol-.+`)), - acctest.MatchResourceAttrRegionalARN(resourceName2, names.AttrARN, "fsx", regexache.MustCompile(`volume/fs-.+/fsvol-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "fsx", regexache.MustCompile(`volume/fs-.+/fsvol-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName2, names.AttrARN, "fsx", regexache.MustCompile(`volume/fs-.+/fsvol-.+`)), resource.TestCheckResourceAttrPair(resourceName2, "parent_volume_id", resourceName, names.AttrID), ), }, diff --git a/internal/service/fsx/windows_file_system_test.go b/internal/service/fsx/windows_file_system_test.go index c34077e1be2..3735d784b5f 100644 --- a/internal/service/fsx/windows_file_system_test.go +++ b/internal/service/fsx/windows_file_system_test.go @@ -38,7 +38,7 @@ func TestAccFSxWindowsFileSystem_basic(t *testing.T) { Config: testAccWindowsFileSystemConfig_basic(rName, domainName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckWindowsFileSystemExists(ctx, resourceName, &filesystem), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "fsx", regexache.MustCompile(`file-system/fs-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "fsx", regexache.MustCompile(`file-system/fs-.+`)), resource.TestCheckResourceAttr(resourceName, "aliases.#", "0"), resource.TestCheckResourceAttr(resourceName, "audit_log_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "audit_log_configuration.0.file_access_audit_log_level", "DISABLED"), @@ -51,9 +51,9 @@ func TestAccFSxWindowsFileSystem_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "disk_iops_configuration.0.iops", "96"), resource.TestCheckResourceAttr(resourceName, "disk_iops_configuration.0.mode", "AUTOMATIC"), resource.TestMatchResourceAttr(resourceName, names.AttrDNSName, regexache.MustCompile(`fs-.+\..+`)), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrKMSKeyID, "kms", regexache.MustCompile(`key/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrKMSKeyID, "kms", regexache.MustCompile(`key/.+`)), resource.TestCheckResourceAttr(resourceName, "network_interface_ids.#", "1"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "security_group_ids.#", "0"), resource.TestCheckResourceAttr(resourceName, "self_managed_active_directory.#", "0"), resource.TestCheckResourceAttr(resourceName, "skip_final_backup", acctest.CtTrue), @@ -122,16 +122,16 @@ func TestAccFSxWindowsFileSystem_singleAz2(t *testing.T) { Config: testAccWindowsFileSystemConfig_subnetIDs1SingleType(rName, domainName, "SINGLE_AZ_2"), Check: resource.ComposeTestCheckFunc( testAccCheckWindowsFileSystemExists(ctx, resourceName, &filesystem), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "fsx", regexache.MustCompile(`file-system/fs-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "fsx", regexache.MustCompile(`file-system/fs-.+`)), resource.TestCheckResourceAttr(resourceName, "aliases.#", "0"), resource.TestCheckResourceAttr(resourceName, "automatic_backup_retention_days", "7"), resource.TestCheckResourceAttr(resourceName, "copy_tags_to_backups", acctest.CtFalse), resource.TestMatchResourceAttr(resourceName, "daily_automatic_backup_start_time", regexache.MustCompile(`^\d\d:\d\d$`)), resource.TestCheckResourceAttr(resourceName, "deployment_type", "SINGLE_AZ_2"), resource.TestMatchResourceAttr(resourceName, names.AttrDNSName, regexache.MustCompile(`^amznfsx\w{8}\.\w{8}\.test$`)), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrKMSKeyID, "kms", regexache.MustCompile(`key/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrKMSKeyID, "kms", regexache.MustCompile(`key/.+`)), resource.TestCheckResourceAttr(resourceName, "network_interface_ids.#", "1"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "security_group_ids.#", "0"), resource.TestCheckResourceAttr(resourceName, "self_managed_active_directory.#", "0"), resource.TestCheckResourceAttr(resourceName, "skip_final_backup", acctest.CtTrue), @@ -209,16 +209,16 @@ func TestAccFSxWindowsFileSystem_multiAz(t *testing.T) { Config: testAccWindowsFileSystemConfig_subnetIDs2(rName, domainName), Check: resource.ComposeTestCheckFunc( testAccCheckWindowsFileSystemExists(ctx, resourceName, &filesystem), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "fsx", regexache.MustCompile(`file-system/fs-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "fsx", regexache.MustCompile(`file-system/fs-.+`)), resource.TestCheckResourceAttr(resourceName, "aliases.#", "0"), resource.TestCheckResourceAttr(resourceName, "automatic_backup_retention_days", "7"), resource.TestCheckResourceAttr(resourceName, "copy_tags_to_backups", acctest.CtFalse), resource.TestMatchResourceAttr(resourceName, "daily_automatic_backup_start_time", regexache.MustCompile(`^\d\d:\d\d$`)), resource.TestCheckResourceAttr(resourceName, "deployment_type", "MULTI_AZ_1"), resource.TestMatchResourceAttr(resourceName, names.AttrDNSName, regexache.MustCompile(`^amznfsx\w{8}\.\w{8}\.test$`)), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrKMSKeyID, "kms", regexache.MustCompile(`key/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrKMSKeyID, "kms", regexache.MustCompile(`key/.+`)), resource.TestCheckResourceAttr(resourceName, "network_interface_ids.#", "2"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "self_managed_active_directory.#", "0"), resource.TestCheckResourceAttr(resourceName, "skip_final_backup", acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, "storage_capacity", "32"), From 526091d71a22a8cdc524bdf80e3b181159160756 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:48 -0500 Subject: [PATCH 079/304] Make 'AWSClient.AccountID' a getter - gamelift. --- internal/service/gamelift/build_test.go | 4 ++-- internal/service/gamelift/fleet_test.go | 10 +++++----- internal/service/gamelift/game_server_group_test.go | 8 ++++---- internal/service/gamelift/game_session_queue_test.go | 4 ++-- internal/service/gamelift/script_test.go | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/internal/service/gamelift/build_test.go b/internal/service/gamelift/build_test.go index 9ed91bd7761..801c6361e38 100644 --- a/internal/service/gamelift/build_test.go +++ b/internal/service/gamelift/build_test.go @@ -61,7 +61,7 @@ func TestAccGameLiftBuild_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckBuildExists(ctx, resourceName, &conf), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "gamelift", regexache.MustCompile(`build/build-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "gamelift", regexache.MustCompile(`build/build-.+`)), resource.TestCheckResourceAttr(resourceName, "operating_system", "WINDOWS_2016"), resource.TestCheckResourceAttr(resourceName, "storage_location.#", "1"), resource.TestCheckResourceAttr(resourceName, "storage_location.0.bucket", bucketName), @@ -81,7 +81,7 @@ func TestAccGameLiftBuild_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckBuildExists(ctx, resourceName, &conf), resource.TestCheckResourceAttr(resourceName, names.AttrName, rNameUpdated), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "gamelift", regexache.MustCompile(`build/build-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "gamelift", regexache.MustCompile(`build/build-.+`)), resource.TestCheckResourceAttr(resourceName, "operating_system", "WINDOWS_2016"), resource.TestCheckResourceAttr(resourceName, "storage_location.#", "1"), resource.TestCheckResourceAttr(resourceName, "storage_location.0.bucket", bucketName), diff --git a/internal/service/gamelift/fleet_test.go b/internal/service/gamelift/fleet_test.go index ce36bead9ca..d9172ba4b1a 100644 --- a/internal/service/gamelift/fleet_test.go +++ b/internal/service/gamelift/fleet_test.go @@ -204,7 +204,7 @@ func TestAccGameLiftFleet_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckFleetExists(ctx, resourceName, &conf), resource.TestCheckResourceAttrPair(resourceName, "build_id", "aws_gamelift_build.test", names.AttrID), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "gamelift", regexache.MustCompile(`fleet/fleet-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "gamelift", regexache.MustCompile(`fleet/fleet-.+`)), resource.TestCheckResourceAttr(resourceName, "certificate_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "certificate_configuration.0.certificate_type", "DISABLED"), resource.TestCheckResourceAttr(resourceName, "ec2_instance_type", "c4.large"), @@ -232,7 +232,7 @@ func TestAccGameLiftFleet_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckFleetExists(ctx, resourceName, &conf), resource.TestCheckResourceAttrPair(resourceName, "build_id", "aws_gamelift_build.test", names.AttrID), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "gamelift", regexache.MustCompile(`fleet/fleet-.+`)), resource.TestCheckResourceAttr(resourceName, "ec2_instance_type", "c4.large"), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "gamelift", regexache.MustCompile(`fleet/fleet-.+`)), resource.TestCheckResourceAttr(resourceName, "ec2_instance_type", "c4.large"), resource.TestCheckResourceAttr(resourceName, "log_paths.#", "0"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rNameUpdated), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, rNameUpdated), @@ -379,7 +379,7 @@ func TestAccGameLiftFleet_allFields(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckFleetExists(ctx, resourceName, &conf), resource.TestCheckResourceAttrPair(resourceName, "build_id", "aws_gamelift_build.test", names.AttrID), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "gamelift", regexache.MustCompile(`fleet/fleet-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "gamelift", regexache.MustCompile(`fleet/fleet-.+`)), resource.TestCheckResourceAttr(resourceName, "ec2_instance_type", "c4.large"), resource.TestCheckResourceAttr(resourceName, "fleet_type", "ON_DEMAND"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), @@ -431,7 +431,7 @@ func TestAccGameLiftFleet_allFields(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckFleetExists(ctx, resourceName, &conf), resource.TestCheckResourceAttrPair(resourceName, "build_id", "aws_gamelift_build.test", names.AttrID), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "gamelift", regexache.MustCompile(`fleet/fleet-.+`)), resource.TestCheckResourceAttr(resourceName, "ec2_instance_type", "c4.large"), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "gamelift", regexache.MustCompile(`fleet/fleet-.+`)), resource.TestCheckResourceAttr(resourceName, "ec2_instance_type", "c4.large"), resource.TestCheckResourceAttr(resourceName, "fleet_type", "ON_DEMAND"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rNameUpdated), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, desc), @@ -560,7 +560,7 @@ func TestAccGameLiftFleet_script(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckFleetExists(ctx, resourceName, &conf), resource.TestCheckResourceAttrPair(resourceName, "script_id", "aws_gamelift_script.test", names.AttrID), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "gamelift", regexache.MustCompile(`fleet/fleet-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "gamelift", regexache.MustCompile(`fleet/fleet-.+`)), resource.TestCheckResourceAttr(resourceName, "certificate_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "certificate_configuration.0.certificate_type", "DISABLED"), resource.TestCheckResourceAttr(resourceName, "ec2_instance_type", "t2.micro"), diff --git a/internal/service/gamelift/game_server_group_test.go b/internal/service/gamelift/game_server_group_test.go index 130d49016d9..2b141a0ccc7 100644 --- a/internal/service/gamelift/game_server_group_test.go +++ b/internal/service/gamelift/game_server_group_test.go @@ -39,8 +39,8 @@ func TestAccGameLiftGameServerGroup_basic(t *testing.T) { Config: testAccGameServerGroupConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckGameServerGroupExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "gamelift", regexache.MustCompile(`gameservergroup/.+`)), - acctest.MatchResourceAttrRegionalARN(resourceName, "auto_scaling_group_arn", "autoscaling", regexache.MustCompile(`autoScalingGroup:.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "gamelift", regexache.MustCompile(`gameservergroup/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "auto_scaling_group_arn", "autoscaling", regexache.MustCompile(`autoScalingGroup:.+`)), resource.TestCheckResourceAttr(resourceName, "auto_scaling_policy.#", "0"), resource.TestCheckResourceAttr(resourceName, "balancing_strategy", string(awstypes.BalancingStrategySpotPreferred)), resource.TestCheckResourceAttr(resourceName, "game_server_protection_policy", string(awstypes.GameServerProtectionPolicyNoProtection)), @@ -520,7 +520,7 @@ func TestAccGameLiftGameServerGroup_roleARN(t *testing.T) { Config: testAccGameServerGroupConfig_roleARN(rName, "test1"), Check: resource.ComposeTestCheckFunc( testAccCheckGameServerGroupExists(ctx, resourceName), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrRoleARN, "iam", fmt.Sprintf(`role/%s-test1`, rName)), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrRoleARN, "iam", fmt.Sprintf(`role/%s-test1`, rName)), resource.TestCheckResourceAttrPair(resourceName, names.AttrRoleARN, "aws_iam_role.test1", names.AttrARN), ), }, @@ -534,7 +534,7 @@ func TestAccGameLiftGameServerGroup_roleARN(t *testing.T) { Config: testAccGameServerGroupConfig_roleARN(rName, "test2"), Check: resource.ComposeTestCheckFunc( testAccCheckGameServerGroupExists(ctx, resourceName), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrRoleARN, "iam", fmt.Sprintf(`role/%s-test2`, rName)), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrRoleARN, "iam", fmt.Sprintf(`role/%s-test2`, rName)), resource.TestCheckResourceAttrPair(resourceName, names.AttrRoleARN, "aws_iam_role.test2", names.AttrARN), ), }, diff --git a/internal/service/gamelift/game_session_queue_test.go b/internal/service/gamelift/game_session_queue_test.go index 34f66437b34..19ca5111532 100644 --- a/internal/service/gamelift/game_session_queue_test.go +++ b/internal/service/gamelift/game_session_queue_test.go @@ -70,7 +70,7 @@ func TestAccGameLiftGameSessionQueue_basic(t *testing.T) { playerLatencyPolicies, timeoutInSeconds, "Custom Event Data"), Check: resource.ComposeTestCheckFunc( testAccCheckGameSessionQueueExists(ctx, resourceName, &conf), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "gamelift", regexache.MustCompile(`gamesessionqueue/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "gamelift", regexache.MustCompile(`gamesessionqueue/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, queueName), resource.TestCheckResourceAttr(resourceName, "destinations.#", "0"), resource.TestCheckResourceAttr(resourceName, "notification_target", ""), @@ -91,7 +91,7 @@ func TestAccGameLiftGameSessionQueue_basic(t *testing.T) { Config: testAccGameSessionQueueConfig_basic(uQueueName, uPlayerLatencyPolicies, uTimeoutInSeconds, "Custom Event Data"), Check: resource.ComposeTestCheckFunc( testAccCheckGameSessionQueueExists(ctx, resourceName, &conf), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "gamelift", regexache.MustCompile(`gamesessionqueue/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "gamelift", regexache.MustCompile(`gamesessionqueue/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, uQueueName), resource.TestCheckResourceAttr(resourceName, "destinations.#", "0"), resource.TestCheckResourceAttr(resourceName, "notification_target", ""), diff --git a/internal/service/gamelift/script_test.go b/internal/service/gamelift/script_test.go index 18dbf2c2e76..696182c9fb2 100644 --- a/internal/service/gamelift/script_test.go +++ b/internal/service/gamelift/script_test.go @@ -44,7 +44,7 @@ func TestAccGameLiftScript_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckScriptExists(ctx, resourceName, &conf), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "gamelift", regexache.MustCompile(`script/script-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "gamelift", regexache.MustCompile(`script/script-.+`)), resource.TestCheckResourceAttr(resourceName, "storage_location.#", "1"), resource.TestCheckResourceAttr(resourceName, "storage_location.0.bucket", fmt.Sprintf("prod-gamescale-scripts-%s", region)), resource.TestCheckResourceAttrSet(resourceName, "storage_location.0.key"), @@ -62,7 +62,7 @@ func TestAccGameLiftScript_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckScriptExists(ctx, resourceName, &conf), resource.TestCheckResourceAttr(resourceName, names.AttrName, rNameUpdated), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "gamelift", regexache.MustCompile(`script/script-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "gamelift", regexache.MustCompile(`script/script-.+`)), resource.TestCheckResourceAttr(resourceName, "storage_location.#", "1"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), From e748f3ed54878e9fbb81b319aba452a9dfc80166 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:48 -0500 Subject: [PATCH 080/304] Make 'AWSClient.AccountID' a getter - glacier. --- internal/service/glacier/vault.go | 2 +- internal/service/glacier/vault_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/service/glacier/vault.go b/internal/service/glacier/vault.go index e455ddfd405..0de519dae88 100644 --- a/internal/service/glacier/vault.go +++ b/internal/service/glacier/vault.go @@ -179,7 +179,7 @@ func resourceVaultRead(ctx context.Context, d *schema.ResourceData, meta interfa d.Set("access_policy", nil) d.Set(names.AttrARN, output.VaultARN) - d.Set(names.AttrLocation, fmt.Sprintf("/%s/vaults/%s", meta.(*conns.AWSClient).AccountID, d.Id())) + d.Set(names.AttrLocation, fmt.Sprintf("/%s/vaults/%s", meta.(*conns.AWSClient).AccountID(ctx), d.Id())) d.Set(names.AttrName, output.VaultName) d.Set("notification", nil) diff --git a/internal/service/glacier/vault_test.go b/internal/service/glacier/vault_test.go index 734a9eae9fe..650dd8a98af 100644 --- a/internal/service/glacier/vault_test.go +++ b/internal/service/glacier/vault_test.go @@ -38,7 +38,7 @@ func TestAccGlacierVault_basic(t *testing.T) { testAccCheckVaultExists(ctx, resourceName, &vault), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "glacier", regexache.MustCompile(`vaults/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "glacier", regexache.MustCompile(`vaults/.+`)), resource.TestCheckResourceAttr(resourceName, "notification.#", "0"), resource.TestCheckResourceAttr(resourceName, "access_policy", ""), ), @@ -231,7 +231,7 @@ func TestAccGlacierVault_ignoreEquivalent(t *testing.T) { testAccCheckVaultExists(ctx, resourceName, &vault), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "glacier", regexache.MustCompile(`vaults/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "glacier", regexache.MustCompile(`vaults/.+`)), resource.TestCheckResourceAttr(resourceName, "notification.#", "0"), resource.TestMatchResourceAttr(resourceName, "access_policy", regexache.MustCompile(fmt.Sprintf(`"Sid":"%s"`, rName))), ), From b2d5bbc39f19847ae5cd9bdc6cea24c458bf29bb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:48 -0500 Subject: [PATCH 081/304] Make 'AWSClient.AccountID' a getter - globalaccelerator. --- .../globalaccelerator/endpoint_group_test.go | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/internal/service/globalaccelerator/endpoint_group_test.go b/internal/service/globalaccelerator/endpoint_group_test.go index 77509bf2a51..a03a938fd3f 100644 --- a/internal/service/globalaccelerator/endpoint_group_test.go +++ b/internal/service/globalaccelerator/endpoint_group_test.go @@ -39,14 +39,14 @@ func TestAccGlobalAcceleratorEndpointGroup_basic(t *testing.T) { Config: testAccEndpointGroupConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckEndpointGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "globalaccelerator", regexache.MustCompile(`accelerator/[^/]+/listener/[^/]+/endpoint-group/[^/]+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "globalaccelerator", regexache.MustCompile(`accelerator/[^/]+/listener/[^/]+/endpoint-group/[^/]+`)), resource.TestCheckResourceAttr(resourceName, "endpoint_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "endpoint_group_region", acctest.Region()), resource.TestCheckResourceAttr(resourceName, "health_check_interval_seconds", "30"), resource.TestCheckResourceAttr(resourceName, "health_check_path", ""), resource.TestCheckResourceAttr(resourceName, "health_check_port", "80"), resource.TestCheckResourceAttr(resourceName, "health_check_protocol", "TCP"), - acctest.MatchResourceAttrGlobalARN(resourceName, "listener_arn", "globalaccelerator", regexache.MustCompile(`accelerator/[^/]+/listener/[^/]+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, "listener_arn", "globalaccelerator", regexache.MustCompile(`accelerator/[^/]+/listener/[^/]+`)), resource.TestCheckResourceAttr(resourceName, "port_override.#", "0"), resource.TestCheckResourceAttr(resourceName, "threshold_count", "3"), resource.TestCheckResourceAttr(resourceName, "traffic_dial_percentage", "100"), @@ -104,7 +104,7 @@ func TestAccGlobalAcceleratorEndpointGroup_ALBEndpoint_clientIP(t *testing.T) { Config: testAccEndpointGroupConfig_albClientIP(rName, false, 20), Check: resource.ComposeTestCheckFunc( testAccCheckEndpointGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "globalaccelerator", regexache.MustCompile(`accelerator/[^/]+/listener/[^/]+/endpoint-group/[^/]+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "globalaccelerator", regexache.MustCompile(`accelerator/[^/]+/listener/[^/]+/endpoint-group/[^/]+`)), resource.TestCheckResourceAttr(resourceName, "endpoint_configuration.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "endpoint_configuration.*", map[string]string{ "attachment_arn": "", @@ -117,7 +117,7 @@ func TestAccGlobalAcceleratorEndpointGroup_ALBEndpoint_clientIP(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "health_check_path", "/"), resource.TestCheckResourceAttr(resourceName, "health_check_port", "80"), resource.TestCheckResourceAttr(resourceName, "health_check_protocol", "HTTP"), - acctest.MatchResourceAttrGlobalARN(resourceName, "listener_arn", "globalaccelerator", regexache.MustCompile(`accelerator/[^/]+/listener/[^/]+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, "listener_arn", "globalaccelerator", regexache.MustCompile(`accelerator/[^/]+/listener/[^/]+`)), resource.TestCheckResourceAttr(resourceName, "port_override.#", "0"), resource.TestCheckResourceAttr(resourceName, "threshold_count", "3"), resource.TestCheckResourceAttr(resourceName, "traffic_dial_percentage", "100"), @@ -132,7 +132,7 @@ func TestAccGlobalAcceleratorEndpointGroup_ALBEndpoint_clientIP(t *testing.T) { Config: testAccEndpointGroupConfig_albClientIP(rName, true, 0), Check: resource.ComposeTestCheckFunc( testAccCheckEndpointGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "globalaccelerator", regexache.MustCompile(`accelerator/[^/]+/listener/[^/]+/endpoint-group/[^/]+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "globalaccelerator", regexache.MustCompile(`accelerator/[^/]+/listener/[^/]+/endpoint-group/[^/]+`)), resource.TestCheckResourceAttr(resourceName, "endpoint_configuration.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "endpoint_configuration.*", map[string]string{ "client_ip_preservation_enabled": acctest.CtTrue, @@ -144,7 +144,7 @@ func TestAccGlobalAcceleratorEndpointGroup_ALBEndpoint_clientIP(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "health_check_path", "/"), resource.TestCheckResourceAttr(resourceName, "health_check_port", "80"), resource.TestCheckResourceAttr(resourceName, "health_check_protocol", "HTTP"), - acctest.MatchResourceAttrGlobalARN(resourceName, "listener_arn", "globalaccelerator", regexache.MustCompile(`accelerator/[^/]+/listener/[^/]+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, "listener_arn", "globalaccelerator", regexache.MustCompile(`accelerator/[^/]+/listener/[^/]+`)), resource.TestCheckResourceAttr(resourceName, "port_override.#", "0"), resource.TestCheckResourceAttr(resourceName, "threshold_count", "3"), resource.TestCheckResourceAttr(resourceName, "traffic_dial_percentage", "100"), @@ -180,7 +180,7 @@ func TestAccGlobalAcceleratorEndpointGroup_instanceEndpoint(t *testing.T) { Config: testAccEndpointGroupConfig_instance(rName), Check: resource.ComposeTestCheckFunc( testAccCheckEndpointGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "globalaccelerator", regexache.MustCompile(`accelerator/[^/]+/listener/[^/]+/endpoint-group/[^/]+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "globalaccelerator", regexache.MustCompile(`accelerator/[^/]+/listener/[^/]+/endpoint-group/[^/]+`)), resource.TestCheckResourceAttr(resourceName, "endpoint_configuration.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "endpoint_configuration.*", map[string]string{ "client_ip_preservation_enabled": acctest.CtTrue, @@ -192,7 +192,7 @@ func TestAccGlobalAcceleratorEndpointGroup_instanceEndpoint(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "health_check_path", "/"), resource.TestCheckResourceAttr(resourceName, "health_check_port", "80"), resource.TestCheckResourceAttr(resourceName, "health_check_protocol", "HTTP"), - acctest.MatchResourceAttrGlobalARN(resourceName, "listener_arn", "globalaccelerator", regexache.MustCompile(`accelerator/[^/]+/listener/[^/]+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, "listener_arn", "globalaccelerator", regexache.MustCompile(`accelerator/[^/]+/listener/[^/]+`)), resource.TestCheckResourceAttr(resourceName, "port_override.#", "0"), resource.TestCheckResourceAttr(resourceName, "threshold_count", "3"), resource.TestCheckResourceAttr(resourceName, "traffic_dial_percentage", "100"), @@ -231,7 +231,7 @@ func TestAccGlobalAcceleratorEndpointGroup_multiRegion(t *testing.T) { Config: testAccEndpointGroupConfig_multiRegion(rName), Check: resource.ComposeTestCheckFunc( testAccCheckEndpointGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "globalaccelerator", regexache.MustCompile(`accelerator/[^/]+/listener/[^/]+/endpoint-group/[^/]+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "globalaccelerator", regexache.MustCompile(`accelerator/[^/]+/listener/[^/]+/endpoint-group/[^/]+`)), resource.TestCheckResourceAttr(resourceName, "endpoint_configuration.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "endpoint_configuration.*", map[string]string{ "client_ip_preservation_enabled": acctest.CtFalse, @@ -243,7 +243,7 @@ func TestAccGlobalAcceleratorEndpointGroup_multiRegion(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "health_check_path", "/foo"), resource.TestCheckResourceAttr(resourceName, "health_check_port", "8080"), resource.TestCheckResourceAttr(resourceName, "health_check_protocol", "HTTPS"), - acctest.MatchResourceAttrGlobalARN(resourceName, "listener_arn", "globalaccelerator", regexache.MustCompile(`accelerator/[^/]+/listener/[^/]+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, "listener_arn", "globalaccelerator", regexache.MustCompile(`accelerator/[^/]+/listener/[^/]+`)), resource.TestCheckResourceAttr(resourceName, "port_override.#", "0"), resource.TestCheckResourceAttr(resourceName, "threshold_count", "1"), resource.TestCheckResourceAttr(resourceName, "traffic_dial_percentage", "0"), @@ -274,14 +274,14 @@ func TestAccGlobalAcceleratorEndpointGroup_portOverrides(t *testing.T) { Config: testAccEndpointGroupConfig_portOverrides(rName), Check: resource.ComposeTestCheckFunc( testAccCheckEndpointGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "globalaccelerator", regexache.MustCompile(`accelerator/[^/]+/listener/[^/]+/endpoint-group/[^/]+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "globalaccelerator", regexache.MustCompile(`accelerator/[^/]+/listener/[^/]+/endpoint-group/[^/]+`)), resource.TestCheckResourceAttr(resourceName, "endpoint_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "endpoint_group_region", acctest.Region()), resource.TestCheckResourceAttr(resourceName, "health_check_interval_seconds", "30"), resource.TestCheckResourceAttr(resourceName, "health_check_path", ""), resource.TestCheckResourceAttr(resourceName, "health_check_port", "80"), resource.TestCheckResourceAttr(resourceName, "health_check_protocol", "TCP"), - acctest.MatchResourceAttrGlobalARN(resourceName, "listener_arn", "globalaccelerator", regexache.MustCompile(`accelerator/[^/]+/listener/[^/]+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, "listener_arn", "globalaccelerator", regexache.MustCompile(`accelerator/[^/]+/listener/[^/]+`)), resource.TestCheckResourceAttr(resourceName, "port_override.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "port_override.*", map[string]string{ "endpoint_port": "8081", @@ -295,14 +295,14 @@ func TestAccGlobalAcceleratorEndpointGroup_portOverrides(t *testing.T) { Config: testAccEndpointGroupConfig_portOverridesUpdated(rName), Check: resource.ComposeTestCheckFunc( testAccCheckEndpointGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "globalaccelerator", regexache.MustCompile(`accelerator/[^/]+/listener/[^/]+/endpoint-group/[^/]+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "globalaccelerator", regexache.MustCompile(`accelerator/[^/]+/listener/[^/]+/endpoint-group/[^/]+`)), resource.TestCheckResourceAttr(resourceName, "endpoint_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "endpoint_group_region", acctest.Region()), resource.TestCheckResourceAttr(resourceName, "health_check_interval_seconds", "30"), resource.TestCheckResourceAttr(resourceName, "health_check_path", ""), resource.TestCheckResourceAttr(resourceName, "health_check_port", "80"), resource.TestCheckResourceAttr(resourceName, "health_check_protocol", "TCP"), - acctest.MatchResourceAttrGlobalARN(resourceName, "listener_arn", "globalaccelerator", regexache.MustCompile(`accelerator/[^/]+/listener/[^/]+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, "listener_arn", "globalaccelerator", regexache.MustCompile(`accelerator/[^/]+/listener/[^/]+`)), resource.TestCheckResourceAttr(resourceName, "port_override.#", "2"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "port_override.*", map[string]string{ "endpoint_port": "8081", @@ -342,7 +342,7 @@ func TestAccGlobalAcceleratorEndpointGroup_tcpHealthCheckProtocol(t *testing.T) Config: testAccEndpointGroupConfig_tcpHealthCheckProtocol(rName), Check: resource.ComposeTestCheckFunc( testAccCheckEndpointGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "globalaccelerator", regexache.MustCompile(`accelerator/[^/]+/listener/[^/]+/endpoint-group/[^/]+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "globalaccelerator", regexache.MustCompile(`accelerator/[^/]+/listener/[^/]+/endpoint-group/[^/]+`)), resource.TestCheckResourceAttr(resourceName, "endpoint_configuration.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "endpoint_configuration.*", map[string]string{ "client_ip_preservation_enabled": acctest.CtFalse, @@ -354,7 +354,7 @@ func TestAccGlobalAcceleratorEndpointGroup_tcpHealthCheckProtocol(t *testing.T) resource.TestCheckResourceAttr(resourceName, "health_check_interval_seconds", "30"), resource.TestCheckResourceAttr(resourceName, "health_check_port", "1234"), resource.TestCheckResourceAttr(resourceName, "health_check_protocol", "TCP"), - acctest.MatchResourceAttrGlobalARN(resourceName, "listener_arn", "globalaccelerator", regexache.MustCompile(`accelerator/[^/]+/listener/[^/]+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, "listener_arn", "globalaccelerator", regexache.MustCompile(`accelerator/[^/]+/listener/[^/]+`)), resource.TestCheckResourceAttr(resourceName, "port_override.#", "0"), resource.TestCheckResourceAttr(resourceName, "threshold_count", "3"), resource.TestCheckResourceAttr(resourceName, "traffic_dial_percentage", "100"), @@ -386,14 +386,14 @@ func TestAccGlobalAcceleratorEndpointGroup_update(t *testing.T) { Config: testAccEndpointGroupConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckEndpointGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "globalaccelerator", regexache.MustCompile(`accelerator/[^/]+/listener/[^/]+/endpoint-group/[^/]+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "globalaccelerator", regexache.MustCompile(`accelerator/[^/]+/listener/[^/]+/endpoint-group/[^/]+`)), resource.TestCheckResourceAttr(resourceName, "endpoint_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "endpoint_group_region", acctest.Region()), resource.TestCheckResourceAttr(resourceName, "health_check_interval_seconds", "30"), resource.TestCheckResourceAttr(resourceName, "health_check_path", ""), resource.TestCheckResourceAttr(resourceName, "health_check_port", "80"), resource.TestCheckResourceAttr(resourceName, "health_check_protocol", "TCP"), - acctest.MatchResourceAttrGlobalARN(resourceName, "listener_arn", "globalaccelerator", regexache.MustCompile(`accelerator/[^/]+/listener/[^/]+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, "listener_arn", "globalaccelerator", regexache.MustCompile(`accelerator/[^/]+/listener/[^/]+`)), resource.TestCheckResourceAttr(resourceName, "port_override.#", "0"), resource.TestCheckResourceAttr(resourceName, "threshold_count", "3"), resource.TestCheckResourceAttr(resourceName, "traffic_dial_percentage", "100"), @@ -403,7 +403,7 @@ func TestAccGlobalAcceleratorEndpointGroup_update(t *testing.T) { Config: testAccEndpointGroupConfig_updated(rName), Check: resource.ComposeTestCheckFunc( testAccCheckEndpointGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "globalaccelerator", regexache.MustCompile(`accelerator/[^/]+/listener/[^/]+/endpoint-group/[^/]+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "globalaccelerator", regexache.MustCompile(`accelerator/[^/]+/listener/[^/]+/endpoint-group/[^/]+`)), resource.TestCheckResourceAttr(resourceName, "endpoint_configuration.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "endpoint_configuration.*", map[string]string{ "client_ip_preservation_enabled": acctest.CtFalse, @@ -415,7 +415,7 @@ func TestAccGlobalAcceleratorEndpointGroup_update(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "health_check_path", "/foo"), resource.TestCheckResourceAttr(resourceName, "health_check_port", "8080"), resource.TestCheckResourceAttr(resourceName, "health_check_protocol", "HTTPS"), - acctest.MatchResourceAttrGlobalARN(resourceName, "listener_arn", "globalaccelerator", regexache.MustCompile(`accelerator/[^/]+/listener/[^/]+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, "listener_arn", "globalaccelerator", regexache.MustCompile(`accelerator/[^/]+/listener/[^/]+`)), resource.TestCheckResourceAttr(resourceName, "port_override.#", "0"), resource.TestCheckResourceAttr(resourceName, "threshold_count", "1"), resource.TestCheckResourceAttr(resourceName, "traffic_dial_percentage", "0"), @@ -451,7 +451,7 @@ func TestAccGlobalAcceleratorEndpointGroup_crossAccountAttachment(t *testing.T) Config: testAccEndpointGroupConfig_crossAccountAttachement(rName), Check: resource.ComposeTestCheckFunc( testAccCheckEndpointGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "globalaccelerator", regexache.MustCompile(`accelerator/[^/]+/listener/[^/]+/endpoint-group/[^/]+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "globalaccelerator", regexache.MustCompile(`accelerator/[^/]+/listener/[^/]+/endpoint-group/[^/]+`)), resource.TestCheckResourceAttr(resourceName, "endpoint_configuration.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "endpoint_configuration.*", map[string]string{ "client_ip_preservation_enabled": acctest.CtFalse, From 5701704f2a3412138d7c01817890a16faafff583 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:48 -0500 Subject: [PATCH 082/304] Make 'AWSClient.AccountID' a getter - glue. --- internal/service/glue/catalog_database.go | 4 +- .../service/glue/catalog_database_test.go | 6 +-- internal/service/glue/catalog_table.go | 4 +- .../service/glue/catalog_table_data_source.go | 4 +- .../glue/catalog_table_optimizer_test.go | 6 +-- internal/service/glue/catalog_table_test.go | 8 +-- internal/service/glue/connection.go | 4 +- .../service/glue/connection_data_source.go | 2 +- internal/service/glue/connection_test.go | 2 +- internal/service/glue/crawler.go | 2 +- internal/service/glue/crawler_test.go | 54 +++++++++---------- .../glue/data_catalog_encryption_settings.go | 2 +- internal/service/glue/data_quality_ruleset.go | 2 +- .../service/glue/data_quality_ruleset_test.go | 2 +- internal/service/glue/dev_endpoint.go | 2 +- internal/service/glue/dev_endpoint_test.go | 2 +- internal/service/glue/job.go | 2 +- internal/service/glue/job_test.go | 4 +- internal/service/glue/ml_transform.go | 2 +- internal/service/glue/ml_transform_test.go | 2 +- internal/service/glue/partition.go | 2 +- internal/service/glue/partition_index.go | 2 +- internal/service/glue/partition_test.go | 2 +- internal/service/glue/registry_test.go | 2 +- internal/service/glue/resource_policy_test.go | 6 +-- internal/service/glue/schema_test.go | 2 +- internal/service/glue/sweep.go | 2 +- internal/service/glue/trigger.go | 2 +- internal/service/glue/trigger_test.go | 2 +- .../service/glue/user_defined_function.go | 4 +- .../glue/user_defined_function_test.go | 2 +- internal/service/glue/workflow.go | 2 +- internal/service/glue/workflow_test.go | 2 +- 33 files changed, 74 insertions(+), 74 deletions(-) diff --git a/internal/service/glue/catalog_database.go b/internal/service/glue/catalog_database.go index 40af7a2b187..5a8c7ad7a40 100644 --- a/internal/service/glue/catalog_database.go +++ b/internal/service/glue/catalog_database.go @@ -155,7 +155,7 @@ func ResourceCatalogDatabase() *schema.Resource { func resourceCatalogDatabaseCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).GlueClient(ctx) - catalogID := createCatalogID(d, meta.(*conns.AWSClient).AccountID) + catalogID := createCatalogID(d, meta.(*conns.AWSClient).AccountID(ctx)) name := d.Get(names.AttrName).(string) dbInput := &awstypes.DatabaseInput{ @@ -276,7 +276,7 @@ func resourceCatalogDatabaseRead(ctx context.Context, d *schema.ResourceData, me Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "glue", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("database/%s", aws.ToString(database.Name)), }.String() d.Set(names.AttrARN, databaseArn) diff --git a/internal/service/glue/catalog_database_test.go b/internal/service/glue/catalog_database_test.go index a3dcdd0e096..dee18fa6751 100644 --- a/internal/service/glue/catalog_database_test.go +++ b/internal/service/glue/catalog_database_test.go @@ -36,7 +36,7 @@ func TestAccGlueCatalogDatabase_full(t *testing.T) { Destroy: false, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCatalogDatabaseExists(ctx, resourceName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "glue", fmt.Sprintf("database/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "glue", fmt.Sprintf("database/%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttr(resourceName, "location_uri", ""), @@ -212,10 +212,10 @@ func TestAccGlueCatalogDatabase_federatedDatabase(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCatalogDatabaseExists(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "glue", fmt.Sprintf("database/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "glue", fmt.Sprintf("database/%s", rName)), resource.TestCheckResourceAttr(resourceName, "federated_database.#", "1"), resource.TestCheckResourceAttr(resourceName, "federated_database.0.connection_name", "aws:redshift"), - acctest.MatchResourceAttrRegionalARN(resourceName, "federated_database.0.identifier", "redshift", regexache.MustCompile(`datashare:+.`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "federated_database.0.identifier", "redshift", regexache.MustCompile(`datashare:+.`)), ), }, { diff --git a/internal/service/glue/catalog_table.go b/internal/service/glue/catalog_table.go index 5f8cce445d1..e71da935f04 100644 --- a/internal/service/glue/catalog_table.go +++ b/internal/service/glue/catalog_table.go @@ -407,7 +407,7 @@ func ReadTableID(id string) (string, string, string, error) { func resourceCatalogTableCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).GlueClient(ctx) - catalogID := createCatalogID(d, meta.(*conns.AWSClient).AccountID) + catalogID := createCatalogID(d, meta.(*conns.AWSClient).AccountID(ctx)) dbName := d.Get(names.AttrDatabaseName).(string) name := d.Get(names.AttrName).(string) @@ -454,7 +454,7 @@ func resourceCatalogTableRead(ctx context.Context, d *schema.ResourceData, meta Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "glue", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("table/%s/%s", dbName, aws.ToString(table.Name)), }.String() d.Set(names.AttrARN, tableArn) diff --git a/internal/service/glue/catalog_table_data_source.go b/internal/service/glue/catalog_table_data_source.go index 3fea41664b8..e0aeee85bd7 100644 --- a/internal/service/glue/catalog_table_data_source.go +++ b/internal/service/glue/catalog_table_data_source.go @@ -335,7 +335,7 @@ func dataSourceCatalogTableRead(ctx context.Context, d *schema.ResourceData, met conn := meta.(*conns.AWSClient).GlueClient(ctx) - catalogID := createCatalogID(d, meta.(*conns.AWSClient).AccountID) + catalogID := createCatalogID(d, meta.(*conns.AWSClient).AccountID(ctx)) dbName := d.Get(names.AttrDatabaseName).(string) name := d.Get(names.AttrName).(string) @@ -370,7 +370,7 @@ func dataSourceCatalogTableRead(ctx context.Context, d *schema.ResourceData, met Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "glue", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("table/%s/%s", dbName, aws.ToString(table.Name)), }.String() d.Set(names.AttrARN, tableArn) diff --git a/internal/service/glue/catalog_table_optimizer_test.go b/internal/service/glue/catalog_table_optimizer_test.go index 45956ceb5dd..44bc1a611d7 100644 --- a/internal/service/glue/catalog_table_optimizer_test.go +++ b/internal/service/glue/catalog_table_optimizer_test.go @@ -39,7 +39,7 @@ func testAccCatalogTableOptimizer_basic(t *testing.T) { Config: testAccCatalogTableOptimizerConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckCatalogTableOptimizerExists(ctx, resourceName, &catalogTableOptimizer), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrCatalogID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrCatalogID), resource.TestCheckResourceAttr(resourceName, names.AttrDatabaseName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrTableName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrType, "compaction"), @@ -75,7 +75,7 @@ func testAccCatalogTableOptimizer_update(t *testing.T) { Config: testAccCatalogTableOptimizerConfig_update(rName, true), Check: resource.ComposeTestCheckFunc( testAccCheckCatalogTableOptimizerExists(ctx, resourceName, &catalogTableOptimizer), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrCatalogID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrCatalogID), resource.TestCheckResourceAttr(resourceName, names.AttrDatabaseName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrTableName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrType, "compaction"), @@ -86,7 +86,7 @@ func testAccCatalogTableOptimizer_update(t *testing.T) { Config: testAccCatalogTableOptimizerConfig_update(rName, false), Check: resource.ComposeTestCheckFunc( testAccCheckCatalogTableOptimizerExists(ctx, resourceName, &catalogTableOptimizer), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrCatalogID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrCatalogID), resource.TestCheckResourceAttr(resourceName, names.AttrDatabaseName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrTableName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrType, "compaction"), diff --git a/internal/service/glue/catalog_table_test.go b/internal/service/glue/catalog_table_test.go index d2df7a739de..4bbdf86541b 100644 --- a/internal/service/glue/catalog_table_test.go +++ b/internal/service/glue/catalog_table_test.go @@ -44,12 +44,12 @@ func TestAccGlueCatalogTable_basic(t *testing.T) { Destroy: false, Check: resource.ComposeTestCheckFunc( testAccCheckCatalogTableExists(ctx, resourceName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "glue", fmt.Sprintf("table/%s/%s", rName, rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "glue", fmt.Sprintf("table/%s/%s", rName, rName)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrDatabaseName, rName), resource.TestCheckResourceAttr(resourceName, "partition_keys.#", "0"), resource.TestCheckResourceAttr(resourceName, "target_table.#", "0"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrCatalogID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrCatalogID), resource.TestCheckResourceAttr(resourceName, "storage_descriptor.#", "0"), resource.TestCheckResourceAttr(resourceName, "partition_index.#", "0"), ), @@ -553,7 +553,7 @@ func TestAccGlueCatalogTable_partitionIndexesSingle(t *testing.T) { Destroy: false, Check: resource.ComposeTestCheckFunc( testAccCheckCatalogTableExists(ctx, resourceName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "glue", fmt.Sprintf("table/%s/%s", rName, rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "glue", fmt.Sprintf("table/%s/%s", rName, rName)), resource.TestCheckResourceAttr(resourceName, "partition_index.#", "1"), resource.TestCheckResourceAttr(resourceName, "partition_index.0.index_name", rName), resource.TestCheckResourceAttr(resourceName, "partition_index.0.index_status", "ACTIVE"), @@ -585,7 +585,7 @@ func TestAccGlueCatalogTable_partitionIndexesMultiple(t *testing.T) { Destroy: false, Check: resource.ComposeTestCheckFunc( testAccCheckCatalogTableExists(ctx, resourceName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "glue", fmt.Sprintf("table/%s/%s", rName, rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "glue", fmt.Sprintf("table/%s/%s", rName, rName)), resource.TestCheckResourceAttr(resourceName, "partition_index.#", "2"), resource.TestCheckResourceAttr(resourceName, "partition_index.0.index_name", rName), resource.TestCheckResourceAttr(resourceName, "partition_index.0.index_status", "ACTIVE"), diff --git a/internal/service/glue/connection.go b/internal/service/glue/connection.go index 23f0e216b2f..fe1bc663231 100644 --- a/internal/service/glue/connection.go +++ b/internal/service/glue/connection.go @@ -122,7 +122,7 @@ func resourceConnectionCreate(ctx context.Context, d *schema.ResourceData, meta if v, ok := d.GetOkExists(names.AttrCatalogID); ok { catalogID = v.(string) } else { - catalogID = meta.(*conns.AWSClient).AccountID + catalogID = meta.(*conns.AWSClient).AccountID(ctx) } name := d.Get(names.AttrName).(string) @@ -167,7 +167,7 @@ func resourceConnectionRead(ctx context.Context, d *schema.ResourceData, meta in Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "glue", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("connection/%s", connectionName), }.String() d.Set(names.AttrARN, connectionArn) diff --git a/internal/service/glue/connection_data_source.go b/internal/service/glue/connection_data_source.go index acfc199fde6..b192fe5bba0 100644 --- a/internal/service/glue/connection_data_source.go +++ b/internal/service/glue/connection_data_source.go @@ -118,7 +118,7 @@ func dataSourceConnectionRead(ctx context.Context, d *schema.ResourceData, meta Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "glue", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("connection/%s", connectionName), }.String() d.Set(names.AttrARN, connectionArn) diff --git a/internal/service/glue/connection_test.go b/internal/service/glue/connection_test.go index 538774ca147..53fb59592db 100644 --- a/internal/service/glue/connection_test.go +++ b/internal/service/glue/connection_test.go @@ -39,7 +39,7 @@ func TestAccGlueConnection_basic(t *testing.T) { Config: testAccConnectionConfig_required(rName, jdbcConnectionUrl), Check: resource.ComposeTestCheckFunc( testAccCheckConnectionExists(ctx, resourceName, &connection), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "glue", fmt.Sprintf("connection/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "glue", fmt.Sprintf("connection/%s", rName)), resource.TestCheckResourceAttr(resourceName, "connection_properties.%", "3"), resource.TestCheckResourceAttr(resourceName, "connection_properties.JDBC_CONNECTION_URL", jdbcConnectionUrl), resource.TestCheckResourceAttr(resourceName, "connection_properties.PASSWORD", "testpassword"), diff --git a/internal/service/glue/crawler.go b/internal/service/glue/crawler.go index daa062f28fd..d37b89d9e57 100644 --- a/internal/service/glue/crawler.go +++ b/internal/service/glue/crawler.go @@ -501,7 +501,7 @@ func resourceCrawlerRead(ctx context.Context, d *schema.ResourceData, meta inter Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "glue", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("crawler/%s", d.Id()), }.String() d.Set(names.AttrARN, crawlerARN) diff --git a/internal/service/glue/crawler_test.go b/internal/service/glue/crawler_test.go index a810ecbe7d2..b319da2ddfe 100644 --- a/internal/service/glue/crawler_test.go +++ b/internal/service/glue/crawler_test.go @@ -41,7 +41,7 @@ func TestAccGlueCrawler_dynamoDBTarget(t *testing.T) { Config: testAccCrawlerConfig_dynamoDBTarget(rName, "table1"), Check: resource.ComposeTestCheckFunc( testAccCheckCrawlerExists(ctx, resourceName, &crawler), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), resource.TestCheckResourceAttr(resourceName, "classifiers.#", "0"), resource.TestCheckResourceAttr(resourceName, names.AttrConfiguration, ""), resource.TestCheckResourceAttr(resourceName, names.AttrDatabaseName, rName), @@ -65,7 +65,7 @@ func TestAccGlueCrawler_dynamoDBTarget(t *testing.T) { Config: testAccCrawlerConfig_dynamoDBTarget(rName, "table2"), Check: resource.ComposeTestCheckFunc( testAccCheckCrawlerExists(ctx, resourceName, &crawler), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), resource.TestCheckResourceAttr(resourceName, "classifiers.#", "0"), resource.TestCheckResourceAttr(resourceName, names.AttrConfiguration, ""), resource.TestCheckResourceAttr(resourceName, names.AttrDatabaseName, rName), @@ -202,7 +202,7 @@ func TestAccGlueCrawler_jdbcTarget(t *testing.T) { Config: testAccCrawlerConfig_jdbcTarget(rName, jdbcConnectionUrl, "database-name/%"), Check: resource.ComposeTestCheckFunc( testAccCheckCrawlerExists(ctx, resourceName, &crawler), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), resource.TestCheckResourceAttr(resourceName, "classifiers.#", "0"), resource.TestCheckResourceAttr(resourceName, names.AttrConfiguration, ""), resource.TestCheckResourceAttr(resourceName, names.AttrDatabaseName, rName), @@ -228,7 +228,7 @@ func TestAccGlueCrawler_jdbcTarget(t *testing.T) { Config: testAccCrawlerConfig_jdbcTarget(rName, jdbcConnectionUrl, "database-name/table-name"), Check: resource.ComposeTestCheckFunc( testAccCheckCrawlerExists(ctx, resourceName, &crawler), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), resource.TestCheckResourceAttr(resourceName, "classifiers.#", "0"), resource.TestCheckResourceAttr(resourceName, names.AttrConfiguration, ""), resource.TestCheckResourceAttr(resourceName, names.AttrDatabaseName, rName), @@ -259,7 +259,7 @@ func TestAccGlueCrawler_jdbcTarget(t *testing.T) { Config: testAccCrawlerConfig_jdbcTargetMetadata(rName, jdbcConnectionUrl, "database-name/table-name"), Check: resource.ComposeTestCheckFunc( testAccCheckCrawlerExists(ctx, resourceName, &crawler), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), resource.TestCheckResourceAttr(resourceName, "classifiers.#", "0"), resource.TestCheckResourceAttr(resourceName, names.AttrConfiguration, ""), resource.TestCheckResourceAttr(resourceName, names.AttrDatabaseName, rName), @@ -303,7 +303,7 @@ func TestAccGlueCrawler_JDBCTarget_exclusions(t *testing.T) { Config: testAccCrawlerConfig_jdbcTargetExclusions2(rName, jdbcConnectionUrl, "exclusion1", "exclusion2"), Check: resource.ComposeTestCheckFunc( testAccCheckCrawlerExists(ctx, resourceName, &crawler), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), resource.TestCheckResourceAttr(resourceName, "jdbc_target.#", "1"), resource.TestCheckResourceAttr(resourceName, "jdbc_target.0.exclusions.#", "2"), resource.TestCheckResourceAttr(resourceName, "jdbc_target.0.exclusions.0", "exclusion1"), @@ -314,7 +314,7 @@ func TestAccGlueCrawler_JDBCTarget_exclusions(t *testing.T) { Config: testAccCrawlerConfig_jdbcTargetExclusions1(rName, jdbcConnectionUrl, "exclusion1"), Check: resource.ComposeTestCheckFunc( testAccCheckCrawlerExists(ctx, resourceName, &crawler), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), resource.TestCheckResourceAttr(resourceName, "jdbc_target.#", "1"), resource.TestCheckResourceAttr(resourceName, "jdbc_target.0.exclusions.#", "1"), resource.TestCheckResourceAttr(resourceName, "jdbc_target.0.exclusions.0", "exclusion1"), @@ -346,7 +346,7 @@ func TestAccGlueCrawler_JDBCTarget_multiple(t *testing.T) { Config: testAccCrawlerConfig_jdbcTargetMultiple(rName, jdbcConnectionUrl, "database-name/table1", "database-name/table2"), Check: resource.ComposeTestCheckFunc( testAccCheckCrawlerExists(ctx, resourceName, &crawler), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), resource.TestCheckResourceAttr(resourceName, "jdbc_target.#", "2"), resource.TestCheckResourceAttr(resourceName, "jdbc_target.0.connection_name", rName), resource.TestCheckResourceAttr(resourceName, "jdbc_target.0.exclusions.#", "0"), @@ -360,7 +360,7 @@ func TestAccGlueCrawler_JDBCTarget_multiple(t *testing.T) { Config: testAccCrawlerConfig_jdbcTarget(rName, jdbcConnectionUrl, "database-name/table1"), Check: resource.ComposeTestCheckFunc( testAccCheckCrawlerExists(ctx, resourceName, &crawler), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), resource.TestCheckResourceAttr(resourceName, "jdbc_target.#", "1"), resource.TestCheckResourceAttr(resourceName, "jdbc_target.0.connection_name", rName), resource.TestCheckResourceAttr(resourceName, "jdbc_target.0.exclusions.#", "0"), @@ -372,7 +372,7 @@ func TestAccGlueCrawler_JDBCTarget_multiple(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckCrawlerExists(ctx, resourceName, &crawler), resource.TestCheckResourceAttr(resourceName, "jdbc_target.#", "2"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), resource.TestCheckResourceAttr(resourceName, "jdbc_target.0.connection_name", rName), resource.TestCheckResourceAttr(resourceName, "jdbc_target.0.exclusions.#", "0"), resource.TestCheckResourceAttr(resourceName, "jdbc_target.0.path", "database-name/table1"), @@ -692,7 +692,7 @@ func TestAccGlueCrawler_s3Target(t *testing.T) { Config: testAccCrawlerConfig_s3Target(rName, "bucket1"), Check: resource.ComposeTestCheckFunc( testAccCheckCrawlerExists(ctx, resourceName, &crawler), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), resource.TestCheckResourceAttr(resourceName, "classifiers.#", "0"), resource.TestCheckResourceAttr(resourceName, names.AttrConfiguration, ""), resource.TestCheckResourceAttr(resourceName, names.AttrDatabaseName, rName), @@ -716,7 +716,7 @@ func TestAccGlueCrawler_s3Target(t *testing.T) { Config: testAccCrawlerConfig_s3Target(rName, "bucket2"), Check: resource.ComposeTestCheckFunc( testAccCheckCrawlerExists(ctx, resourceName, &crawler), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), resource.TestCheckResourceAttr(resourceName, "classifiers.#", "0"), resource.TestCheckResourceAttr(resourceName, names.AttrConfiguration, ""), resource.TestCheckResourceAttr(resourceName, names.AttrDatabaseName, rName), @@ -762,7 +762,7 @@ func TestAccGlueCrawler_S3Target_connectionName(t *testing.T) { Config: testAccCrawlerConfig_s3TargetConnectionName(rName), Check: resource.ComposeTestCheckFunc( testAccCheckCrawlerExists(ctx, resourceName, &crawler), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), resource.TestCheckResourceAttr(resourceName, "s3_target.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "s3_target.0.connection_name", connectionName, names.AttrName), ), @@ -829,7 +829,7 @@ func TestAccGlueCrawler_S3Target_exclusions(t *testing.T) { Config: testAccCrawlerConfig_s3TargetExclusions2(rName, "exclusion1", "exclusion2"), Check: resource.ComposeTestCheckFunc( testAccCheckCrawlerExists(ctx, resourceName, &crawler), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), resource.TestCheckResourceAttr(resourceName, "s3_target.#", "1"), resource.TestCheckResourceAttr(resourceName, "s3_target.0.exclusions.#", "2"), resource.TestCheckResourceAttr(resourceName, "s3_target.0.exclusions.0", "exclusion1"), @@ -840,7 +840,7 @@ func TestAccGlueCrawler_S3Target_exclusions(t *testing.T) { Config: testAccCrawlerConfig_s3TargetExclusions1(rName, "exclusion1"), Check: resource.ComposeTestCheckFunc( testAccCheckCrawlerExists(ctx, resourceName, &crawler), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), resource.TestCheckResourceAttr(resourceName, "s3_target.#", "1"), resource.TestCheckResourceAttr(resourceName, "s3_target.0.exclusions.#", "1"), resource.TestCheckResourceAttr(resourceName, "s3_target.0.exclusions.0", "exclusion1"), @@ -871,9 +871,9 @@ func TestAccGlueCrawler_S3Target_eventqueue(t *testing.T) { Config: testAccCrawlerConfig_s3TargetEventQueue(rName), Check: resource.ComposeTestCheckFunc( testAccCheckCrawlerExists(ctx, resourceName, &crawler), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), resource.TestCheckResourceAttr(resourceName, "s3_target.#", "1"), - acctest.CheckResourceAttrRegionalARN(resourceName, "s3_target.0.event_queue_arn", "sqs", rName), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, "s3_target.0.event_queue_arn", "sqs", rName), resource.TestCheckResourceAttr(resourceName, "recrawl_policy.0.recrawl_behavior", "CRAWL_EVENT_MODE"), ), }, @@ -902,7 +902,7 @@ func TestAccGlueCrawler_CatalogTarget_dlqeventqueue(t *testing.T) { Config: testAccCrawlerConfig_catalogTargetDlqEventQueue(rName), Check: resource.ComposeTestCheckFunc( testAccCheckCrawlerExists(ctx, resourceName, &crawler), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), resource.TestCheckResourceAttr(resourceName, "catalog_target.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "catalog_target.0.event_queue_arn", "aws_sqs_queue.test", names.AttrARN), resource.TestCheckResourceAttrPair(resourceName, "catalog_target.0.dlq_event_queue_arn", "aws_sqs_queue.test_dlq", names.AttrARN), @@ -933,7 +933,7 @@ func TestAccGlueCrawler_S3Target_dlqeventqueue(t *testing.T) { Config: testAccCrawlerConfig_s3TargetDlqEventQueue(rName), Check: resource.ComposeTestCheckFunc( testAccCheckCrawlerExists(ctx, resourceName, &crawler), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), resource.TestCheckResourceAttr(resourceName, "s3_target.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "s3_target.0.event_queue_arn", "aws_sqs_queue.test", names.AttrARN), resource.TestCheckResourceAttrPair(resourceName, "s3_target.0.dlq_event_queue_arn", "aws_sqs_queue.test_dlq", names.AttrARN), @@ -965,7 +965,7 @@ func TestAccGlueCrawler_S3Target_multiple(t *testing.T) { Config: testAccCrawlerConfig_s3TargetMultiple(rName, "bucket1", "bucket2"), Check: resource.ComposeTestCheckFunc( testAccCheckCrawlerExists(ctx, resourceName, &crawler), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), resource.TestCheckResourceAttr(resourceName, "s3_target.#", "2"), resource.TestCheckResourceAttr(resourceName, "s3_target.0.exclusions.#", "0"), resource.TestCheckResourceAttr(resourceName, "s3_target.0.path", fmt.Sprintf("s3://%s-bucket1", rName)), @@ -977,7 +977,7 @@ func TestAccGlueCrawler_S3Target_multiple(t *testing.T) { Config: testAccCrawlerConfig_s3Target(rName, "bucket1"), Check: resource.ComposeTestCheckFunc( testAccCheckCrawlerExists(ctx, resourceName, &crawler), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), resource.TestCheckResourceAttr(resourceName, "s3_target.#", "1"), resource.TestCheckResourceAttr(resourceName, "s3_target.0.exclusions.#", "0"), resource.TestCheckResourceAttr(resourceName, "s3_target.0.path", fmt.Sprintf("s3://%s-bucket1", rName)), @@ -987,7 +987,7 @@ func TestAccGlueCrawler_S3Target_multiple(t *testing.T) { Config: testAccCrawlerConfig_s3TargetMultiple(rName, "bucket1", "bucket2"), Check: resource.ComposeTestCheckFunc( testAccCheckCrawlerExists(ctx, resourceName, &crawler), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), resource.TestCheckResourceAttr(resourceName, "s3_target.#", "2"), resource.TestCheckResourceAttr(resourceName, "s3_target.0.exclusions.#", "0"), resource.TestCheckResourceAttr(resourceName, "s3_target.0.path", fmt.Sprintf("s3://%s-bucket1", rName)), @@ -1020,7 +1020,7 @@ func TestAccGlueCrawler_catalogTarget(t *testing.T) { Config: testAccCrawlerConfig_catalogTarget(rName, 1), Check: resource.ComposeTestCheckFunc( testAccCheckCrawlerExists(ctx, resourceName, &crawler), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), resource.TestCheckResourceAttr(resourceName, "classifiers.#", "0"), resource.TestCheckResourceAttr(resourceName, names.AttrDatabaseName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -1046,7 +1046,7 @@ func TestAccGlueCrawler_catalogTarget(t *testing.T) { Config: testAccCrawlerConfig_catalogTarget(rName, 2), Check: resource.ComposeTestCheckFunc( testAccCheckCrawlerExists(ctx, resourceName, &crawler), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), resource.TestCheckResourceAttr(resourceName, "classifiers.#", "0"), resource.TestCheckResourceAttr(resourceName, names.AttrDatabaseName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -1094,7 +1094,7 @@ func TestAccGlueCrawler_CatalogTarget_multiple(t *testing.T) { Config: testAccCrawlerConfig_catalogTarget(rName, 1), Check: resource.ComposeTestCheckFunc( testAccCheckCrawlerExists(ctx, resourceName, &crawler), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), resource.TestCheckResourceAttr(resourceName, "catalog_target.#", "1"), resource.TestCheckResourceAttr(resourceName, "catalog_target.0.database_name", rName), resource.TestCheckResourceAttr(resourceName, "catalog_target.0.tables.#", "1"), @@ -1105,7 +1105,7 @@ func TestAccGlueCrawler_CatalogTarget_multiple(t *testing.T) { Config: testAccCrawlerConfig_catalogTargetMultiple(rName), Check: resource.ComposeTestCheckFunc( testAccCheckCrawlerExists(ctx, resourceName, &crawler), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), resource.TestCheckResourceAttr(resourceName, "catalog_target.#", "2"), resource.TestCheckResourceAttr(resourceName, "catalog_target.0.database_name", fmt.Sprintf("%s_database_0", rName)), resource.TestCheckResourceAttr(resourceName, "catalog_target.1.database_name", fmt.Sprintf("%s_database_1", rName)), @@ -1119,7 +1119,7 @@ func TestAccGlueCrawler_CatalogTarget_multiple(t *testing.T) { Config: testAccCrawlerConfig_catalogTarget(rName, 1), Check: resource.ComposeTestCheckFunc( testAccCheckCrawlerExists(ctx, resourceName, &crawler), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "glue", fmt.Sprintf("crawler/%s", rName)), resource.TestCheckResourceAttr(resourceName, "catalog_target.#", "1"), resource.TestCheckResourceAttr(resourceName, "catalog_target.0.database_name", rName), resource.TestCheckResourceAttr(resourceName, "catalog_target.0.tables.#", "1"), diff --git a/internal/service/glue/data_catalog_encryption_settings.go b/internal/service/glue/data_catalog_encryption_settings.go index 041660597b4..fefb6188fed 100644 --- a/internal/service/glue/data_catalog_encryption_settings.go +++ b/internal/service/glue/data_catalog_encryption_settings.go @@ -96,7 +96,7 @@ func resourceDataCatalogEncryptionSettingsPut(ctx context.Context, d *schema.Res var diags diag.Diagnostics conn := meta.(*conns.AWSClient).GlueClient(ctx) - catalogID := createCatalogID(d, meta.(*conns.AWSClient).AccountID) + catalogID := createCatalogID(d, meta.(*conns.AWSClient).AccountID(ctx)) input := &glue.PutDataCatalogEncryptionSettingsInput{ CatalogId: aws.String(catalogID), } diff --git a/internal/service/glue/data_quality_ruleset.go b/internal/service/glue/data_quality_ruleset.go index 05b19e9145e..c162b91f316 100644 --- a/internal/service/glue/data_quality_ruleset.go +++ b/internal/service/glue/data_quality_ruleset.go @@ -156,7 +156,7 @@ func resourceDataQualityRulesetRead(ctx context.Context, d *schema.ResourceData, Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "glue", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("dataQualityRuleset/%s", aws.ToString(dataQualityRuleset.Name)), }.String() diff --git a/internal/service/glue/data_quality_ruleset_test.go b/internal/service/glue/data_quality_ruleset_test.go index ce8ef63c8a8..530abb9d861 100644 --- a/internal/service/glue/data_quality_ruleset_test.go +++ b/internal/service/glue/data_quality_ruleset_test.go @@ -36,7 +36,7 @@ func TestAccGlueDataQualityRuleset_basic(t *testing.T) { Config: testAccDataQualityRulesetConfig_basic(rName, ruleset), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckDataQualityRulesetExists(ctx, resourceName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "glue", fmt.Sprintf("dataQualityRuleset/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "glue", fmt.Sprintf("dataQualityRuleset/%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttrSet(resourceName, "created_on"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), diff --git a/internal/service/glue/dev_endpoint.go b/internal/service/glue/dev_endpoint.go index 68fe18adbce..0ea96012994 100644 --- a/internal/service/glue/dev_endpoint.go +++ b/internal/service/glue/dev_endpoint.go @@ -293,7 +293,7 @@ func resourceDevEndpointRead(ctx context.Context, d *schema.ResourceData, meta i Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "glue", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("devEndpoint/%s", d.Id()), }.String() diff --git a/internal/service/glue/dev_endpoint_test.go b/internal/service/glue/dev_endpoint_test.go index ae55ca845e6..8f10637fb4a 100644 --- a/internal/service/glue/dev_endpoint_test.go +++ b/internal/service/glue/dev_endpoint_test.go @@ -37,7 +37,7 @@ func TestAccGlueDevEndpoint_basic(t *testing.T) { Config: testAccDevEndpointConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckDevEndpointExists(ctx, resourceName, &endpoint), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "glue", fmt.Sprintf("devEndpoint/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "glue", fmt.Sprintf("devEndpoint/%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttrPair(resourceName, names.AttrRoleARN, "aws_iam_role.test", names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrStatus, "READY"), diff --git a/internal/service/glue/job.go b/internal/service/glue/job.go index d57e628b6a0..4c0b89c4098 100644 --- a/internal/service/glue/job.go +++ b/internal/service/glue/job.go @@ -304,7 +304,7 @@ func resourceJobRead(ctx context.Context, d *schema.ResourceData, meta interface Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "glue", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("job/%s", d.Id()), }.String() d.Set(names.AttrARN, jobARN) diff --git a/internal/service/glue/job_test.go b/internal/service/glue/job_test.go index 6076ea9b3d6..dc4bfccab2c 100644 --- a/internal/service/glue/job_test.go +++ b/internal/service/glue/job_test.go @@ -37,7 +37,7 @@ func TestAccGlueJob_basic(t *testing.T) { Config: testAccJobConfig_required(rName), Check: resource.ComposeTestCheckFunc( testAccCheckJobExists(ctx, resourceName, &job), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "glue", fmt.Sprintf("job/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "glue", fmt.Sprintf("job/%s", rName)), resource.TestCheckResourceAttr(resourceName, "command.#", "1"), resource.TestCheckResourceAttr(resourceName, "command.0.script_location", "testscriptlocation"), resource.TestCheckResourceAttr(resourceName, "default_arguments.%", "0"), @@ -99,7 +99,7 @@ func TestAccGlueJob_basicStreaming(t *testing.T) { Config: testAccJobConfig_requiredStreaming(rName), Check: resource.ComposeTestCheckFunc( testAccCheckJobExists(ctx, resourceName, &job), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "glue", fmt.Sprintf("job/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "glue", fmt.Sprintf("job/%s", rName)), resource.TestCheckResourceAttr(resourceName, "command.#", "1"), resource.TestCheckResourceAttr(resourceName, "command.0.name", "gluestreaming"), resource.TestCheckResourceAttr(resourceName, "command.0.script_location", "testscriptlocation"), diff --git a/internal/service/glue/ml_transform.go b/internal/service/glue/ml_transform.go index 660acf3993d..55839c4272e 100644 --- a/internal/service/glue/ml_transform.go +++ b/internal/service/glue/ml_transform.go @@ -272,7 +272,7 @@ func resourceMLTransformRead(ctx context.Context, d *schema.ResourceData, meta i Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "glue", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("mlTransform/%s", d.Id()), }.String() d.Set(names.AttrARN, mlTransformArn) diff --git a/internal/service/glue/ml_transform_test.go b/internal/service/glue/ml_transform_test.go index 869358a90cd..2cf8db2af48 100644 --- a/internal/service/glue/ml_transform_test.go +++ b/internal/service/glue/ml_transform_test.go @@ -41,7 +41,7 @@ func TestAccGlueMlTransform_basic(t *testing.T) { Config: testAccMLTransformConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckMLTransformExists(ctx, resourceName, &transform), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "glue", regexache.MustCompile(`mlTransform/tfm-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "glue", regexache.MustCompile(`mlTransform/tfm-.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttrPair(resourceName, names.AttrRoleARN, roleResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), diff --git a/internal/service/glue/partition.go b/internal/service/glue/partition.go index f078d8833a9..8a63275eabc 100644 --- a/internal/service/glue/partition.go +++ b/internal/service/glue/partition.go @@ -209,7 +209,7 @@ func ResourcePartition() *schema.Resource { func resourcePartitionCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).GlueClient(ctx) - catalogID := createCatalogID(d, meta.(*conns.AWSClient).AccountID) + catalogID := createCatalogID(d, meta.(*conns.AWSClient).AccountID(ctx)) dbName := d.Get(names.AttrDatabaseName).(string) tableName := d.Get(names.AttrTableName).(string) values := d.Get("partition_values").([]interface{}) diff --git a/internal/service/glue/partition_index.go b/internal/service/glue/partition_index.go index 348c697c6e5..6d0a7371430 100644 --- a/internal/service/glue/partition_index.go +++ b/internal/service/glue/partition_index.go @@ -88,7 +88,7 @@ func ResourcePartitionIndex() *schema.Resource { func resourcePartitionIndexCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).GlueClient(ctx) - catalogID := createCatalogID(d, meta.(*conns.AWSClient).AccountID) + catalogID := createCatalogID(d, meta.(*conns.AWSClient).AccountID(ctx)) dbName := d.Get(names.AttrDatabaseName).(string) tableName := d.Get(names.AttrTableName).(string) diff --git a/internal/service/glue/partition_test.go b/internal/service/glue/partition_test.go index 910094b62e2..6ea93967ca5 100644 --- a/internal/service/glue/partition_test.go +++ b/internal/service/glue/partition_test.go @@ -35,7 +35,7 @@ func TestAccGluePartition_basic(t *testing.T) { Config: testAccPartitionConfig_basic(rName, parValue), Check: resource.ComposeTestCheckFunc( testAccCheckPartitionExists(ctx, resourceName), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrCatalogID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrCatalogID), resource.TestCheckResourceAttr(resourceName, names.AttrDatabaseName, rName), resource.TestCheckResourceAttr(resourceName, "partition_values.#", "1"), resource.TestCheckResourceAttr(resourceName, "partition_values.0", parValue), diff --git a/internal/service/glue/registry_test.go b/internal/service/glue/registry_test.go index 187806c8ebb..3076c4fee56 100644 --- a/internal/service/glue/registry_test.go +++ b/internal/service/glue/registry_test.go @@ -38,7 +38,7 @@ func TestAccGlueRegistry_basic(t *testing.T) { Config: testAccRegistryConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckRegistryExists(ctx, resourceName, ®istry), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "glue", fmt.Sprintf("registry/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "glue", fmt.Sprintf("registry/%s", rName)), resource.TestCheckResourceAttr(resourceName, "registry_name", rName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), diff --git a/internal/service/glue/resource_policy_test.go b/internal/service/glue/resource_policy_test.go index 062dd75f71c..8f7cc290274 100644 --- a/internal/service/glue/resource_policy_test.go +++ b/internal/service/glue/resource_policy_test.go @@ -178,7 +178,7 @@ func testAccResourcePolicy(ctx context.Context, n string, action string) resourc actualPolicyText := aws.ToString(policy.PolicyInJson) - expectedPolicy := CreateTablePolicy(action) + expectedPolicy := CreateTablePolicy(ctx, action) equivalent, err := awspolicy.PoliciesAreEquivalent(actualPolicyText, expectedPolicy) if err != nil { return fmt.Errorf("Error testing policy equivalence: %s", err) @@ -212,7 +212,7 @@ func testAccCheckResourcePolicyDestroy(ctx context.Context) resource.TestCheckFu } } -func CreateTablePolicy(action string) string { +func CreateTablePolicy(ctx context.Context, action string) string { return fmt.Sprintf(`{ "Version" : "2012-10-17", "Statement" : [ @@ -227,7 +227,7 @@ func CreateTablePolicy(action string) string { "Resource" : "arn:%s:glue:%s:%s:*" } ] -}`, action, acctest.Partition(), acctest.Region(), acctest.AccountID()) +}`, action, acctest.Partition(), acctest.Region(), acctest.AccountID(ctx)) } func testAccResourcePolicyConfig_required(action string) string { diff --git a/internal/service/glue/schema_test.go b/internal/service/glue/schema_test.go index 5489cb7f017..f67c59fcff5 100644 --- a/internal/service/glue/schema_test.go +++ b/internal/service/glue/schema_test.go @@ -40,7 +40,7 @@ func TestAccGlueSchema_basic(t *testing.T) { Config: testAccSchemaConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckSchemaExists(ctx, resourceName, &schema), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "glue", fmt.Sprintf("schema/%s/%s", rName, rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "glue", fmt.Sprintf("schema/%s/%s", rName, rName)), resource.TestCheckResourceAttr(resourceName, "schema_name", rName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttr(resourceName, "compatibility", "NONE"), diff --git a/internal/service/glue/sweep.go b/internal/service/glue/sweep.go index ec8f7a144c3..168e0cd9d6d 100644 --- a/internal/service/glue/sweep.go +++ b/internal/service/glue/sweep.go @@ -193,7 +193,7 @@ func sweepConnections(region string) error { return fmt.Errorf("error getting client: %s", err) } conn := client.GlueClient(ctx) - catalogID := client.AccountID + catalogID := client.AccountID(ctx) sweepResources := make([]sweep.Sweepable, 0) var sweeperErrs *multierror.Error diff --git a/internal/service/glue/trigger.go b/internal/service/glue/trigger.go index 8a3ab610298..a312a3f05f4 100644 --- a/internal/service/glue/trigger.go +++ b/internal/service/glue/trigger.go @@ -340,7 +340,7 @@ func resourceTriggerRead(ctx context.Context, d *schema.ResourceData, meta inter Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "glue", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("trigger/%s", d.Id()), }.String() d.Set(names.AttrARN, triggerARN) diff --git a/internal/service/glue/trigger_test.go b/internal/service/glue/trigger_test.go index 3a5abb48bcc..a45d39306fb 100644 --- a/internal/service/glue/trigger_test.go +++ b/internal/service/glue/trigger_test.go @@ -41,7 +41,7 @@ func TestAccGlueTrigger_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "actions.#", "1"), resource.TestCheckResourceAttr(resourceName, "actions.0.job_name", rName), resource.TestCheckResourceAttr(resourceName, "actions.0.notification_property.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "glue", fmt.Sprintf("trigger/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "glue", fmt.Sprintf("trigger/%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttr(resourceName, names.AttrEnabled, acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), diff --git a/internal/service/glue/user_defined_function.go b/internal/service/glue/user_defined_function.go index 8c20d5dbb11..9e3ccd2cb79 100644 --- a/internal/service/glue/user_defined_function.go +++ b/internal/service/glue/user_defined_function.go @@ -101,7 +101,7 @@ func ResourceUserDefinedFunction() *schema.Resource { func resourceUserDefinedFunctionCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).GlueClient(ctx) - catalogID := createCatalogID(d, meta.(*conns.AWSClient).AccountID) + catalogID := createCatalogID(d, meta.(*conns.AWSClient).AccountID(ctx)) dbName := d.Get(names.AttrDatabaseName).(string) funcName := d.Get(names.AttrName).(string) @@ -176,7 +176,7 @@ func resourceUserDefinedFunctionRead(ctx context.Context, d *schema.ResourceData Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "glue", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("userDefinedFunction/%s/%s", dbName, aws.ToString(udf.FunctionName)), }.String() diff --git a/internal/service/glue/user_defined_function_test.go b/internal/service/glue/user_defined_function_test.go index 15326e95d91..e37617b549b 100644 --- a/internal/service/glue/user_defined_function_test.go +++ b/internal/service/glue/user_defined_function_test.go @@ -36,7 +36,7 @@ func TestAccGlueUserDefinedFunction_basic(t *testing.T) { Config: testAccUserDefinedFunctionConfig_basic(rName, rName), Check: resource.ComposeTestCheckFunc( testAccCheckUserDefinedFunctionExists(ctx, resourceName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "glue", fmt.Sprintf("userDefinedFunction/%s/%s", rName, rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "glue", fmt.Sprintf("userDefinedFunction/%s/%s", rName, rName)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "class_name", rName), resource.TestCheckResourceAttr(resourceName, "owner_name", rName), diff --git a/internal/service/glue/workflow.go b/internal/service/glue/workflow.go index 82837cf081e..8c1ccc49f19 100644 --- a/internal/service/glue/workflow.go +++ b/internal/service/glue/workflow.go @@ -130,7 +130,7 @@ func resourceWorkflowRead(ctx context.Context, d *schema.ResourceData, meta inte Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "glue", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("workflow/%s", d.Id()), }.String() d.Set(names.AttrARN, workFlowArn) diff --git a/internal/service/glue/workflow_test.go b/internal/service/glue/workflow_test.go index 0ac686d43dd..44c883fbb9c 100644 --- a/internal/service/glue/workflow_test.go +++ b/internal/service/glue/workflow_test.go @@ -39,7 +39,7 @@ func TestAccGlueWorkflow_basic(t *testing.T) { Config: testAccWorkflowConfig_required(rName), Check: resource.ComposeTestCheckFunc( testAccCheckWorkflowExists(ctx, resourceName, &workflow), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "glue", fmt.Sprintf("workflow/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "glue", fmt.Sprintf("workflow/%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), From 10c7e2fd78cbf53caf9cbf9693a5ead6a8248128 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:49 -0500 Subject: [PATCH 083/304] Make 'AWSClient.AccountID' a getter - grafana. --- internal/service/grafana/workspace.go | 2 +- internal/service/grafana/workspace_data_source.go | 2 +- internal/service/grafana/workspace_test.go | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/service/grafana/workspace.go b/internal/service/grafana/workspace.go index 3e887ab0c74..5f03e2a0d0c 100644 --- a/internal/service/grafana/workspace.go +++ b/internal/service/grafana/workspace.go @@ -288,7 +288,7 @@ func resourceWorkspaceRead(ctx context.Context, d *schema.ResourceData, meta int Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "grafana", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("/workspaces/%s", d.Id()), }.String() d.Set(names.AttrARN, workspaceARN) diff --git a/internal/service/grafana/workspace_data_source.go b/internal/service/grafana/workspace_data_source.go index d11e6fdc9b0..53347694653 100644 --- a/internal/service/grafana/workspace_data_source.go +++ b/internal/service/grafana/workspace_data_source.go @@ -127,7 +127,7 @@ func dataSourceWorkspaceRead(ctx context.Context, d *schema.ResourceData, meta i Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "grafana", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("/workspaces/%s", d.Id()), }.String() d.Set(names.AttrARN, workspaceARN) diff --git a/internal/service/grafana/workspace_test.go b/internal/service/grafana/workspace_test.go index 3ba2b863cd1..9bab24909ab 100644 --- a/internal/service/grafana/workspace_test.go +++ b/internal/service/grafana/workspace_test.go @@ -39,7 +39,7 @@ func testAccWorkspace_saml(t *testing.T) { Config: testAccWorkspaceConfig_authenticationProvider(rName, "SAML"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckWorkspaceExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "grafana", regexache.MustCompile(`/workspaces/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "grafana", regexache.MustCompile(`/workspaces/.+`)), resource.TestCheckResourceAttr(resourceName, "account_access_type", string(awstypes.AccountAccessTypeCurrentAccount)), resource.TestCheckResourceAttr(resourceName, "authentication_providers.#", "1"), resource.TestCheckResourceAttr(resourceName, "authentication_providers.0", string(awstypes.AuthenticationProviderTypesSaml)), @@ -136,7 +136,7 @@ func testAccWorkspace_sso(t *testing.T) { Config: testAccWorkspaceConfig_authenticationProvider(rName, "AWS_SSO"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckWorkspaceExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "grafana", regexache.MustCompile(`/workspaces/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "grafana", regexache.MustCompile(`/workspaces/.+`)), resource.TestCheckResourceAttr(resourceName, "account_access_type", string(awstypes.AccountAccessTypeCurrentAccount)), resource.TestCheckResourceAttr(resourceName, "authentication_providers.#", "1"), resource.TestCheckResourceAttr(resourceName, "authentication_providers.0", string(awstypes.AuthenticationProviderTypesAwsSso)), @@ -288,7 +288,7 @@ func testAccWorkspace_dataSources(t *testing.T) { Config: testAccWorkspaceConfig_dataSources(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckWorkspaceExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "grafana", regexache.MustCompile(`/workspaces/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "grafana", regexache.MustCompile(`/workspaces/.+`)), resource.TestCheckResourceAttr(resourceName, "account_access_type", string(awstypes.AccountAccessTypeCurrentAccount)), resource.TestCheckResourceAttr(resourceName, "authentication_providers.#", "1"), resource.TestCheckResourceAttr(resourceName, "authentication_providers.0", string(awstypes.AuthenticationProviderTypesSaml)), From 244c35758cdcdca78a0f9de602ee8e58fe282032 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:49 -0500 Subject: [PATCH 084/304] Make 'AWSClient.AccountID' a getter - guardduty. --- internal/service/guardduty/detector.go | 4 ++-- internal/service/guardduty/detector_data_source_test.go | 4 ++-- internal/service/guardduty/detector_test.go | 2 +- internal/service/guardduty/filter.go | 2 +- internal/service/guardduty/filter_test.go | 2 +- internal/service/guardduty/ipset.go | 2 +- internal/service/guardduty/ipset_test.go | 2 +- internal/service/guardduty/organization_admin_account_test.go | 2 +- internal/service/guardduty/threatintelset.go | 2 +- internal/service/guardduty/threatintelset_test.go | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/internal/service/guardduty/detector.go b/internal/service/guardduty/detector.go index d437b675b8e..1b3765c264a 100644 --- a/internal/service/guardduty/detector.go +++ b/internal/service/guardduty/detector.go @@ -189,12 +189,12 @@ func resourceDetectorRead(ctx context.Context, d *schema.ResourceData, meta inte return sdkdiag.AppendErrorf(diags, "reading GuardDuty Detector (%s): %s", d.Id(), err) } - d.Set(names.AttrAccountID, meta.(*conns.AWSClient).AccountID) + d.Set(names.AttrAccountID, meta.(*conns.AWSClient).AccountID(ctx)) arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, Service: "guardduty", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("detector/%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/guardduty/detector_data_source_test.go b/internal/service/guardduty/detector_data_source_test.go index d85e82e9d2a..4a7ba9a1d18 100644 --- a/internal/service/guardduty/detector_data_source_test.go +++ b/internal/service/guardduty/detector_data_source_test.go @@ -31,7 +31,7 @@ func testAccDetectorDataSource_basic(t *testing.T) { acctest.CheckResourceAttrGreaterThanValue(datasourceName, "features.#", 0), resource.TestCheckResourceAttrPair(datasourceName, "finding_publishing_frequency", resourceName, "finding_publishing_frequency"), resource.TestCheckResourceAttrPair(datasourceName, names.AttrID, resourceName, names.AttrID), - acctest.CheckResourceAttrGlobalARN(datasourceName, names.AttrServiceRoleARN, "iam", "role/aws-service-role/guardduty.amazonaws.com/AWSServiceRoleForAmazonGuardDuty"), + acctest.CheckResourceAttrGlobalARN(ctx, datasourceName, names.AttrServiceRoleARN, "iam", "role/aws-service-role/guardduty.amazonaws.com/AWSServiceRoleForAmazonGuardDuty"), resource.TestCheckResourceAttr(datasourceName, names.AttrStatus, "ENABLED"), ), }, @@ -58,7 +58,7 @@ func testAccDetectorDataSource_ID(t *testing.T) { acctest.CheckResourceAttrGreaterThanValue(datasourceName, "features.#", 0), resource.TestCheckResourceAttrPair(datasourceName, "finding_publishing_frequency", resourceName, "finding_publishing_frequency"), resource.TestCheckResourceAttrPair(datasourceName, names.AttrID, resourceName, names.AttrID), - acctest.CheckResourceAttrGlobalARN(datasourceName, names.AttrServiceRoleARN, "iam", "role/aws-service-role/guardduty.amazonaws.com/AWSServiceRoleForAmazonGuardDuty"), + acctest.CheckResourceAttrGlobalARN(ctx, datasourceName, names.AttrServiceRoleARN, "iam", "role/aws-service-role/guardduty.amazonaws.com/AWSServiceRoleForAmazonGuardDuty"), resource.TestCheckResourceAttr(datasourceName, names.AttrStatus, "ENABLED"), ), }, diff --git a/internal/service/guardduty/detector_test.go b/internal/service/guardduty/detector_test.go index 6488c532559..6af85fb2fae 100644 --- a/internal/service/guardduty/detector_test.go +++ b/internal/service/guardduty/detector_test.go @@ -36,7 +36,7 @@ func testAccDetector_basic(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckDetectorExists(ctx, resourceName), resource.TestCheckResourceAttrSet(resourceName, names.AttrAccountID), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "guardduty", regexache.MustCompile("detector/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "guardduty", regexache.MustCompile("detector/.+$")), resource.TestCheckResourceAttr(resourceName, "enable", acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, "datasources.#", "1"), resource.TestCheckResourceAttr(resourceName, "datasources.0.s3_logs.0.enable", acctest.CtTrue), diff --git a/internal/service/guardduty/filter.go b/internal/service/guardduty/filter.go index 6ba9cf36e7e..ed29396c860 100644 --- a/internal/service/guardduty/filter.go +++ b/internal/service/guardduty/filter.go @@ -206,7 +206,7 @@ func resourceFilterRead(ctx context.Context, d *schema.ResourceData, meta interf Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, Service: "guardduty", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("detector/%s/filter/%s", detectorID, name), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/guardduty/filter_test.go b/internal/service/guardduty/filter_test.go index feff284877b..7eb8dbf8e60 100644 --- a/internal/service/guardduty/filter_test.go +++ b/internal/service/guardduty/filter_test.go @@ -50,7 +50,7 @@ func testAccFilter_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrAction, "ARCHIVE"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttr(resourceName, "rank", "1"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "guardduty", regexache.MustCompile("detector/[0-9a-z]{32}/filter/test-filter$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "guardduty", regexache.MustCompile("detector/[0-9a-z]{32}/filter/test-filter$")), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttr(resourceName, "finding_criteria.#", "1"), resource.TestCheckResourceAttr(resourceName, "finding_criteria.0.criterion.#", "3"), diff --git a/internal/service/guardduty/ipset.go b/internal/service/guardduty/ipset.go index 8eae9e67568..3e4706ebabc 100644 --- a/internal/service/guardduty/ipset.go +++ b/internal/service/guardduty/ipset.go @@ -139,7 +139,7 @@ func resourceIPSetRead(ctx context.Context, d *schema.ResourceData, meta interfa Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, Service: "guardduty", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("detector/%s/ipset/%s", detectorId, ipSetId), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/guardduty/ipset_test.go b/internal/service/guardduty/ipset_test.go index 1406aa52267..b11a7d8aa16 100644 --- a/internal/service/guardduty/ipset_test.go +++ b/internal/service/guardduty/ipset_test.go @@ -44,7 +44,7 @@ func testAccIPSet_basic(t *testing.T) { Config: testAccIPSetConfig_basic(bucketName, keyName1, ipsetName1, true), Check: resource.ComposeTestCheckFunc( testAccCheckIPSetExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "guardduty", regexache.MustCompile("detector/.+/ipset/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "guardduty", regexache.MustCompile("detector/.+/ipset/.+$")), resource.TestCheckResourceAttr(resourceName, names.AttrName, ipsetName1), resource.TestCheckResourceAttr(resourceName, "activate", acctest.CtTrue), resource.TestMatchResourceAttr(resourceName, names.AttrLocation, regexache.MustCompile(fmt.Sprintf("%s/%s$", bucketName, keyName1))), diff --git a/internal/service/guardduty/organization_admin_account_test.go b/internal/service/guardduty/organization_admin_account_test.go index 71205e9f663..dc4b7460faa 100644 --- a/internal/service/guardduty/organization_admin_account_test.go +++ b/internal/service/guardduty/organization_admin_account_test.go @@ -36,7 +36,7 @@ func testAccOrganizationAdminAccount_basic(t *testing.T) { Config: testAccOrganizationAdminAccountConfig_self(), Check: resource.ComposeTestCheckFunc( testAccCheckOrganizationAdminAccountExists(ctx, resourceName), - acctest.CheckResourceAttrAccountID(resourceName, "admin_account_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "admin_account_id"), ), }, { diff --git a/internal/service/guardduty/threatintelset.go b/internal/service/guardduty/threatintelset.go index 85a96f0dd4f..1a3564c7fc8 100644 --- a/internal/service/guardduty/threatintelset.go +++ b/internal/service/guardduty/threatintelset.go @@ -139,7 +139,7 @@ func resourceThreatIntelSetRead(ctx context.Context, d *schema.ResourceData, met Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, Service: "guardduty", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("detector/%s/threatintelset/%s", detectorId, threatIntelSetId), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/guardduty/threatintelset_test.go b/internal/service/guardduty/threatintelset_test.go index da79476e01c..a4edfccbe15 100644 --- a/internal/service/guardduty/threatintelset_test.go +++ b/internal/service/guardduty/threatintelset_test.go @@ -44,7 +44,7 @@ func testAccThreatIntelSet_basic(t *testing.T) { Config: testAccThreatIntelSetConfig_basic(bucketName, keyName1, threatintelsetName1, true), Check: resource.ComposeTestCheckFunc( testAccCheckThreatIntelSetExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "guardduty", regexache.MustCompile("detector/.+/threatintelset/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "guardduty", regexache.MustCompile("detector/.+/threatintelset/.+$")), resource.TestCheckResourceAttr(resourceName, names.AttrName, threatintelsetName1), resource.TestCheckResourceAttr(resourceName, "activate", acctest.CtTrue), resource.TestMatchResourceAttr(resourceName, names.AttrLocation, regexache.MustCompile(fmt.Sprintf("%s/%s$", bucketName, keyName1))), From d66f0571c60b09f511697a8dc7308a895ba8d8bf Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:49 -0500 Subject: [PATCH 085/304] Make 'AWSClient.AccountID' a getter - iam. --- internal/service/iam/group_data_source_test.go | 4 ++-- internal/service/iam/group_test.go | 10 +++++----- internal/service/iam/instance_profile_test.go | 12 ++++++------ internal/service/iam/openid_connect_provider_test.go | 2 +- internal/service/iam/policy_test.go | 2 +- internal/service/iam/saml_provider_test.go | 2 +- .../iam/security_token_service_preferences.go | 2 +- internal/service/iam/server_certificate_test.go | 2 +- internal/service/iam/service_linked_role_test.go | 6 +++--- .../service/iam/session_context_data_source_test.go | 2 +- internal/service/iam/virtual_mfa_device_test.go | 4 ++-- 11 files changed, 24 insertions(+), 24 deletions(-) diff --git a/internal/service/iam/group_data_source_test.go b/internal/service/iam/group_data_source_test.go index fc90ed812a6..70b4f482caa 100644 --- a/internal/service/iam/group_data_source_test.go +++ b/internal/service/iam/group_data_source_test.go @@ -29,7 +29,7 @@ func TestAccIAMGroupDataSource_basic(t *testing.T) { resource.TestCheckResourceAttrSet("data.aws_iam_group.test", "group_id"), resource.TestCheckResourceAttr("data.aws_iam_group.test", names.AttrPath, "/"), resource.TestCheckResourceAttr("data.aws_iam_group.test", names.AttrGroupName, groupName), - acctest.CheckResourceAttrGlobalARN("data.aws_iam_group.test", names.AttrARN, "iam", fmt.Sprintf("group/%s", groupName)), + acctest.CheckResourceAttrGlobalARN(ctx, "data.aws_iam_group.test", names.AttrARN, "iam", fmt.Sprintf("group/%s", groupName)), ), }, }, @@ -54,7 +54,7 @@ func TestAccIAMGroupDataSource_users(t *testing.T) { resource.TestCheckResourceAttrSet("data.aws_iam_group.test", "group_id"), resource.TestCheckResourceAttr("data.aws_iam_group.test", names.AttrPath, "/"), resource.TestCheckResourceAttr("data.aws_iam_group.test", names.AttrGroupName, groupName), - acctest.CheckResourceAttrGlobalARN("data.aws_iam_group.test", names.AttrARN, "iam", fmt.Sprintf("group/%s", groupName)), + acctest.CheckResourceAttrGlobalARN(ctx, "data.aws_iam_group.test", names.AttrARN, "iam", fmt.Sprintf("group/%s", groupName)), resource.TestCheckResourceAttr("data.aws_iam_group.test", "users.#", strconv.Itoa(userCount)), resource.TestCheckResourceAttrSet("data.aws_iam_group.test", "users.0.arn"), resource.TestCheckResourceAttrSet("data.aws_iam_group.test", "users.0.user_id"), diff --git a/internal/service/iam/group_test.go b/internal/service/iam/group_test.go index 807ea56732c..7a7f4dcc559 100644 --- a/internal/service/iam/group_test.go +++ b/internal/service/iam/group_test.go @@ -36,7 +36,7 @@ func TestAccIAMGroup_basic(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGroupExists(ctx, resourceName, &conf), // arn:${Partition}:iam::${Account}:group/${GroupNameWithPath} - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrARN, "iam", fmt.Sprintf("group/%s", rName)), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "iam", fmt.Sprintf("group/%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrPath, "/"), resource.TestCheckResourceAttrSet(resourceName, "unique_id"), @@ -92,7 +92,7 @@ func TestAccIAMGroup_nameChange(t *testing.T) { Config: testAccGroupConfig_basic(rName1), Check: resource.ComposeTestCheckFunc( testAccCheckGroupExists(ctx, resourceName, &conf), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrARN, "iam", fmt.Sprintf("group/%s", rName1)), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "iam", fmt.Sprintf("group/%s", rName1)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName1), ), }, @@ -100,7 +100,7 @@ func TestAccIAMGroup_nameChange(t *testing.T) { Config: testAccGroupConfig_basic(rName2), Check: resource.ComposeTestCheckFunc( testAccCheckGroupExists(ctx, resourceName, &conf), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrARN, "iam", fmt.Sprintf("group/%s", rName2)), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "iam", fmt.Sprintf("group/%s", rName2)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName2), ), }, @@ -124,7 +124,7 @@ func TestAccIAMGroup_path(t *testing.T) { Config: testAccGroupConfig_path(rName, "/path1/"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGroupExists(ctx, resourceName, &conf), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrARN, "iam", fmt.Sprintf("group/path1/%s", rName)), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "iam", fmt.Sprintf("group/path1/%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrPath, "/path1/"), ), @@ -138,7 +138,7 @@ func TestAccIAMGroup_path(t *testing.T) { Config: testAccGroupConfig_path(rName, "/path2/"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGroupExists(ctx, resourceName, &conf), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrARN, "iam", fmt.Sprintf("group/path2/%s", rName)), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "iam", fmt.Sprintf("group/path2/%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrPath, "/path2/"), ), diff --git a/internal/service/iam/instance_profile_test.go b/internal/service/iam/instance_profile_test.go index 1e65b63f2d6..27e0c9ddc57 100644 --- a/internal/service/iam/instance_profile_test.go +++ b/internal/service/iam/instance_profile_test.go @@ -36,7 +36,7 @@ func TestAccIAMInstanceProfile_basic(t *testing.T) { Config: testAccInstanceProfileConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckInstanceProfileExists(ctx, resourceName, &conf), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrARN, "iam", fmt.Sprintf("instance-profile/%s", rName)), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "iam", fmt.Sprintf("instance-profile/%s", rName)), resource.TestCheckResourceAttrPair(resourceName, names.AttrRole, "aws_iam_role.test", names.AttrName), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), @@ -201,7 +201,7 @@ func TestAccIAMInstanceProfile_launchConfiguration(t *testing.T) { Config: testAccInstanceProfileConfig_launchConfiguration(rName), Check: resource.ComposeTestCheckFunc( testAccCheckInstanceProfileExists(ctx, resourceName, &conf), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrARN, "iam", fmt.Sprintf("instance-profile/%s", rName)), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "iam", fmt.Sprintf("instance-profile/%s", rName)), resource.TestCheckResourceAttrPair(resourceName, names.AttrRole, "aws_iam_role.test", names.AttrName), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), ), @@ -215,7 +215,7 @@ func TestAccIAMInstanceProfile_launchConfiguration(t *testing.T) { Config: testAccInstanceProfileConfig_launchConfiguration(rName), Check: resource.ComposeTestCheckFunc( testAccCheckInstanceProfileExists(ctx, resourceName, &conf), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrARN, "iam", fmt.Sprintf("instance-profile/%s", rName)), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "iam", fmt.Sprintf("instance-profile/%s", rName)), resource.TestCheckResourceAttrPair(resourceName, names.AttrRole, "aws_iam_role.test", names.AttrName), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), ), @@ -224,7 +224,7 @@ func TestAccIAMInstanceProfile_launchConfiguration(t *testing.T) { Config: testAccInstanceProfileConfig_launchConfiguration(rName), Check: resource.ComposeTestCheckFunc( testAccCheckInstanceProfileExists(ctx, resourceName, &conf), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrARN, "iam", fmt.Sprintf("instance-profile/%s", rName)), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "iam", fmt.Sprintf("instance-profile/%s", rName)), resource.TestCheckResourceAttrPair(resourceName, names.AttrRole, "aws_iam_role.test", names.AttrName), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), ), @@ -233,7 +233,7 @@ func TestAccIAMInstanceProfile_launchConfiguration(t *testing.T) { Config: testAccInstanceProfileConfig_launchConfiguration(rName), Check: resource.ComposeTestCheckFunc( testAccCheckInstanceProfileExists(ctx, resourceName, &conf), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrARN, "iam", fmt.Sprintf("instance-profile/%s", rName)), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "iam", fmt.Sprintf("instance-profile/%s", rName)), resource.TestCheckResourceAttrPair(resourceName, names.AttrRole, "aws_iam_role.test", names.AttrName), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), ), @@ -247,7 +247,7 @@ func TestAccIAMInstanceProfile_launchConfiguration(t *testing.T) { Config: testAccInstanceProfileConfig_launchConfiguration(rName), Check: resource.ComposeTestCheckFunc( testAccCheckInstanceProfileExists(ctx, resourceName, &conf), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrARN, "iam", fmt.Sprintf("instance-profile/%s", rName)), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "iam", fmt.Sprintf("instance-profile/%s", rName)), resource.TestCheckResourceAttrPair(resourceName, names.AttrRole, "aws_iam_role.test", names.AttrName), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), ), diff --git a/internal/service/iam/openid_connect_provider_test.go b/internal/service/iam/openid_connect_provider_test.go index 226d323cd74..f46acb41964 100644 --- a/internal/service/iam/openid_connect_provider_test.go +++ b/internal/service/iam/openid_connect_provider_test.go @@ -34,7 +34,7 @@ func TestAccIAMOpenIDConnectProvider_basic(t *testing.T) { Config: testAccOpenIDConnectProviderConfig_basic(rString), Check: resource.ComposeTestCheckFunc( testAccCheckOpenIDConnectProviderExists(ctx, resourceName), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrARN, "iam", fmt.Sprintf("oidc-provider/%s", url)), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "iam", fmt.Sprintf("oidc-provider/%s", url)), resource.TestCheckResourceAttr(resourceName, names.AttrURL, url), resource.TestCheckResourceAttr(resourceName, "client_id_list.#", "1"), resource.TestCheckResourceAttr(resourceName, "client_id_list.0", diff --git a/internal/service/iam/policy_test.go b/internal/service/iam/policy_test.go index d583676449d..5367e661eb0 100644 --- a/internal/service/iam/policy_test.go +++ b/internal/service/iam/policy_test.go @@ -37,7 +37,7 @@ func TestAccIAMPolicy_basic(t *testing.T) { Config: testAccPolicyConfig_name(rName), Check: resource.ComposeTestCheckFunc( testAccCheckPolicyExists(ctx, resourceName, &out), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrARN, "iam", fmt.Sprintf("policy/%s", rName)), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "iam", fmt.Sprintf("policy/%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttr(resourceName, "attachment_count", "0"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), diff --git a/internal/service/iam/saml_provider_test.go b/internal/service/iam/saml_provider_test.go index 10b85389f4e..a4c1e51af2a 100644 --- a/internal/service/iam/saml_provider_test.go +++ b/internal/service/iam/saml_provider_test.go @@ -35,7 +35,7 @@ func TestAccIAMSAMLProvider_basic(t *testing.T) { Config: testAccSAMLProviderConfig_basic(rName, idpEntityId), Check: resource.ComposeTestCheckFunc( testAccCheckSAMLProviderExists(ctx, resourceName), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrARN, "iam", fmt.Sprintf("saml-provider/%s", rName)), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "iam", fmt.Sprintf("saml-provider/%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttrSet(resourceName, "saml_metadata_document"), resource.TestCheckResourceAttrSet(resourceName, "valid_until"), diff --git a/internal/service/iam/security_token_service_preferences.go b/internal/service/iam/security_token_service_preferences.go index 77a56ac62c2..8b30d166e56 100644 --- a/internal/service/iam/security_token_service_preferences.go +++ b/internal/service/iam/security_token_service_preferences.go @@ -49,7 +49,7 @@ func resourceSecurityTokenServicePreferencesUpsert(ctx context.Context, d *schem } if d.IsNewResource() { - d.SetId(meta.(*conns.AWSClient).AccountID) + d.SetId(meta.(*conns.AWSClient).AccountID(ctx)) } return append(diags, resourceSecurityTokenServicePreferencesRead(ctx, d, meta)...) diff --git a/internal/service/iam/server_certificate_test.go b/internal/service/iam/server_certificate_test.go index df2ac177119..ce93fe7b61b 100644 --- a/internal/service/iam/server_certificate_test.go +++ b/internal/service/iam/server_certificate_test.go @@ -39,7 +39,7 @@ func TestAccIAMServerCertificate_basic(t *testing.T) { Config: testAccServerCertificateConfig_basic(rName, key, certificate), Check: resource.ComposeTestCheckFunc( testAccCheckServerCertificateExists(ctx, resourceName, &cert), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrARN, "iam", fmt.Sprintf("server-certificate/%s", rName)), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "iam", fmt.Sprintf("server-certificate/%s", rName)), acctest.CheckResourceAttrRFC3339(resourceName, "expiration"), acctest.CheckResourceAttrRFC3339(resourceName, "upload_date"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), diff --git a/internal/service/iam/service_linked_role_test.go b/internal/service/iam/service_linked_role_test.go index 17564eb5a44..fc491c7436d 100644 --- a/internal/service/iam/service_linked_role_test.go +++ b/internal/service/iam/service_linked_role_test.go @@ -109,7 +109,7 @@ func TestAccIAMServiceLinkedRole_basic(t *testing.T) { Config: testAccServiceLinkedRoleConfig_basic(awsServiceName), Check: resource.ComposeTestCheckFunc( testAccCheckServiceLinkedRoleExists(ctx, resourceName), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrARN, "iam", arnResource), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "iam", arnResource), resource.TestCheckResourceAttr(resourceName, "aws_service_name", awsServiceName), acctest.CheckResourceAttrRFC3339(resourceName, "create_date"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -146,7 +146,7 @@ func TestAccIAMServiceLinkedRole_customSuffix(t *testing.T) { Config: testAccServiceLinkedRoleConfig_customSuffix(awsServiceName, customSuffix), Check: resource.ComposeTestCheckFunc( testAccCheckServiceLinkedRoleExists(ctx, resourceName), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrARN, "iam", fmt.Sprintf("role%s%s", path, name)), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "iam", fmt.Sprintf("role%s%s", path, name)), resource.TestCheckResourceAttr(resourceName, names.AttrName, name), ), }, @@ -176,7 +176,7 @@ func TestAccIAMServiceLinkedRole_CustomSuffix_diffSuppressFunc(t *testing.T) { Config: testAccServiceLinkedRoleConfig_basic(awsServiceName), Check: resource.ComposeTestCheckFunc( testAccCheckServiceLinkedRoleExists(ctx, resourceName), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrARN, "iam", fmt.Sprintf("role/aws-service-role/%s/%s", awsServiceName, name)), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "iam", fmt.Sprintf("role/aws-service-role/%s/%s", awsServiceName, name)), resource.TestCheckResourceAttr(resourceName, "custom_suffix", "CustomResource"), resource.TestCheckResourceAttr(resourceName, names.AttrName, name), ), diff --git a/internal/service/iam/session_context_data_source_test.go b/internal/service/iam/session_context_data_source_test.go index fbfe0d91107..d47d5ae7801 100644 --- a/internal/service/iam/session_context_data_source_test.go +++ b/internal/service/iam/session_context_data_source_test.go @@ -205,7 +205,7 @@ func TestAccIAMSessionContextDataSource_notAssumedRoleUser(t *testing.T) { { Config: testAccSessionContextDataSourceConfig_user(rName), Check: resource.ComposeAggregateTestCheckFunc( - acctest.CheckResourceAttrGlobalARN(dataSourceName, names.AttrARN, "iam", fmt.Sprintf("user/division/extra-division/not-assumed-role/%[1]s", rName)), + acctest.CheckResourceAttrGlobalARN(ctx, dataSourceName, names.AttrARN, "iam", fmt.Sprintf("user/division/extra-division/not-assumed-role/%[1]s", rName)), resource.TestCheckResourceAttr(dataSourceName, "issuer_name", ""), resource.TestCheckResourceAttr(dataSourceName, "session_name", ""), ), diff --git a/internal/service/iam/virtual_mfa_device_test.go b/internal/service/iam/virtual_mfa_device_test.go index 98ac5107362..ee0e3111b57 100644 --- a/internal/service/iam/virtual_mfa_device_test.go +++ b/internal/service/iam/virtual_mfa_device_test.go @@ -37,7 +37,7 @@ func TestAccIAMVirtualMFADevice_basic(t *testing.T) { Config: testAccVirtualMFADeviceConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckVirtualMFADeviceExists(ctx, resourceName, &conf), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrARN, "iam", fmt.Sprintf("mfa/%s", rName)), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "iam", fmt.Sprintf("mfa/%s", rName)), resource.TestCheckResourceAttrSet(resourceName, "base_32_string_seed"), resource.TestCheckNoResourceAttr(resourceName, "enable_date"), resource.TestCheckResourceAttr(resourceName, names.AttrPath, "/"), @@ -77,7 +77,7 @@ func TestAccIAMVirtualMFADevice_path(t *testing.T) { Config: testAccVirtualMFADeviceConfig_path(rName, path), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckVirtualMFADeviceExists(ctx, resourceName, &conf), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrARN, "iam", fmt.Sprintf("mfa%s%s", path, rName)), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "iam", fmt.Sprintf("mfa%s%s", path, rName)), resource.TestCheckResourceAttr(resourceName, names.AttrPath, path), ), }, From 865131beff4415124ce663c1a8d9126a69644589 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:49 -0500 Subject: [PATCH 086/304] Make 'AWSClient.AccountID' a getter - imagebuilder. --- internal/service/imagebuilder/component_test.go | 4 ++-- internal/service/imagebuilder/container_recipe_test.go | 4 ++-- .../service/imagebuilder/distribution_configuration_test.go | 2 +- internal/service/imagebuilder/image_pipeline_test.go | 2 +- internal/service/imagebuilder/image_recipe_test.go | 4 ++-- internal/service/imagebuilder/image_test.go | 2 +- .../service/imagebuilder/infrastructure_configuration_test.go | 2 +- internal/service/imagebuilder/lifecycle_policy_test.go | 2 +- internal/service/imagebuilder/workflow_test.go | 4 ++-- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/imagebuilder/component_test.go b/internal/service/imagebuilder/component_test.go index c2fb8826e4f..391913f0699 100644 --- a/internal/service/imagebuilder/component_test.go +++ b/internal/service/imagebuilder/component_test.go @@ -35,7 +35,7 @@ func TestAccImageBuilderComponent_basic(t *testing.T) { Config: testAccComponentConfig_name(rName), Check: resource.ComposeTestCheckFunc( testAccCheckComponentExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "imagebuilder", regexache.MustCompile(fmt.Sprintf("component/%s/1.0.0/[1-9][0-9]*", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "imagebuilder", regexache.MustCompile(fmt.Sprintf("component/%s/1.0.0/[1-9][0-9]*", rName))), resource.TestCheckResourceAttr(resourceName, "change_description", ""), resource.TestMatchResourceAttr(resourceName, "data", regexache.MustCompile(`schemaVersion`)), acctest.CheckResourceAttrRFC3339(resourceName, "date_created"), @@ -43,7 +43,7 @@ func TestAccImageBuilderComponent_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrEncrypted, acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, names.AttrKMSKeyID, ""), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwner), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwner), resource.TestCheckResourceAttr(resourceName, "platform", string(awstypes.PlatformLinux)), resource.TestCheckResourceAttr(resourceName, "supported_os_versions.#", "0"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), diff --git a/internal/service/imagebuilder/container_recipe_test.go b/internal/service/imagebuilder/container_recipe_test.go index df0b795cf34..691dca7734d 100644 --- a/internal/service/imagebuilder/container_recipe_test.go +++ b/internal/service/imagebuilder/container_recipe_test.go @@ -35,7 +35,7 @@ func TestAccImageBuilderContainerRecipe_basic(t *testing.T) { Config: testAccContainerRecipeConfig_name(rName), Check: resource.ComposeTestCheckFunc( testAccCheckContainerRecipeExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "imagebuilder", regexache.MustCompile(fmt.Sprintf("container-recipe/%s/1.0.0", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "imagebuilder", regexache.MustCompile(fmt.Sprintf("container-recipe/%s/1.0.0", rName))), resource.TestCheckResourceAttr(resourceName, "component.#", "1"), acctest.CheckResourceAttrRegionalARNAccountID(resourceName, "component.0.component_arn", "imagebuilder", "aws", "component/update-linux/x.x.x"), resource.TestCheckResourceAttr(resourceName, "component.0.parameter.#", "0"), @@ -47,7 +47,7 @@ func TestAccImageBuilderContainerRecipe_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "instance_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, names.AttrKMSKeyID, ""), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwner), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwner), acctest.CheckResourceAttrRegionalARNAccountID(resourceName, "parent_image", "imagebuilder", "aws", "image/amazon-linux-x86-2/x.x.x"), resource.TestCheckResourceAttr(resourceName, "platform", string(awstypes.PlatformLinux)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), diff --git a/internal/service/imagebuilder/distribution_configuration_test.go b/internal/service/imagebuilder/distribution_configuration_test.go index df00e55e8a2..f52124d708e 100644 --- a/internal/service/imagebuilder/distribution_configuration_test.go +++ b/internal/service/imagebuilder/distribution_configuration_test.go @@ -45,7 +45,7 @@ func TestAccImageBuilderDistributionConfiguration_basic(t *testing.T) { Config: testAccDistributionConfigurationConfig_name(rName), Check: resource.ComposeTestCheckFunc( testAccCheckDistributionConfigurationExists(ctx, resourceName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "imagebuilder", fmt.Sprintf("distribution-configuration/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "imagebuilder", fmt.Sprintf("distribution-configuration/%s", rName)), acctest.CheckResourceAttrRFC3339(resourceName, "date_created"), resource.TestCheckResourceAttr(resourceName, "date_updated", ""), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), diff --git a/internal/service/imagebuilder/image_pipeline_test.go b/internal/service/imagebuilder/image_pipeline_test.go index 9e0470617ec..62df8b40419 100644 --- a/internal/service/imagebuilder/image_pipeline_test.go +++ b/internal/service/imagebuilder/image_pipeline_test.go @@ -37,7 +37,7 @@ func TestAccImageBuilderImagePipeline_basic(t *testing.T) { Config: testAccImagePipelineConfig_name(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckImagePipelineExists(ctx, resourceName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "imagebuilder", fmt.Sprintf("image-pipeline/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "imagebuilder", fmt.Sprintf("image-pipeline/%s", rName)), acctest.CheckResourceAttrRFC3339(resourceName, "date_created"), resource.TestCheckResourceAttr(resourceName, "date_last_run", ""), resource.TestCheckResourceAttr(resourceName, "date_next_run", ""), diff --git a/internal/service/imagebuilder/image_recipe_test.go b/internal/service/imagebuilder/image_recipe_test.go index f2bdce8a013..795b12ec77d 100644 --- a/internal/service/imagebuilder/image_recipe_test.go +++ b/internal/service/imagebuilder/image_recipe_test.go @@ -36,13 +36,13 @@ func TestAccImageBuilderImageRecipe_basic(t *testing.T) { Config: testAccImageRecipeConfig_name(rName), Check: resource.ComposeTestCheckFunc( testAccCheckImageRecipeExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "imagebuilder", regexache.MustCompile(fmt.Sprintf("image-recipe/%s/1.0.0", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "imagebuilder", regexache.MustCompile(fmt.Sprintf("image-recipe/%s/1.0.0", rName))), resource.TestCheckResourceAttr(resourceName, "block_device_mapping.#", "0"), resource.TestCheckResourceAttr(resourceName, "component.#", "1"), acctest.CheckResourceAttrRFC3339(resourceName, "date_created"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwner), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwner), acctest.CheckResourceAttrRegionalARNAccountID(resourceName, "parent_image", "imagebuilder", "aws", "image/amazon-linux-2-x86/x.x.x"), resource.TestCheckResourceAttr(resourceName, "platform", string(awstypes.PlatformLinux)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), diff --git a/internal/service/imagebuilder/image_test.go b/internal/service/imagebuilder/image_test.go index 8f2d289ffee..00a8eeb2592 100644 --- a/internal/service/imagebuilder/image_test.go +++ b/internal/service/imagebuilder/image_test.go @@ -37,7 +37,7 @@ func TestAccImageBuilderImage_basic(t *testing.T) { Config: testAccImageConfig_required(rName), Check: resource.ComposeTestCheckFunc( testAccCheckImageExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "imagebuilder", regexache.MustCompile(fmt.Sprintf("image/%s/1.0.0/[1-9][0-9]*", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "imagebuilder", regexache.MustCompile(fmt.Sprintf("image/%s/1.0.0/[1-9][0-9]*", rName))), resource.TestCheckNoResourceAttr(resourceName, "container_recipe_arn"), acctest.CheckResourceAttrRFC3339(resourceName, "date_created"), resource.TestCheckNoResourceAttr(resourceName, "distribution_configuration_arn"), diff --git a/internal/service/imagebuilder/infrastructure_configuration_test.go b/internal/service/imagebuilder/infrastructure_configuration_test.go index 3f17a0a010e..acae0aac6dd 100644 --- a/internal/service/imagebuilder/infrastructure_configuration_test.go +++ b/internal/service/imagebuilder/infrastructure_configuration_test.go @@ -34,7 +34,7 @@ func TestAccImageBuilderInfrastructureConfiguration_basic(t *testing.T) { Config: testAccInfrastructureConfigurationConfig_name(rName), Check: resource.ComposeTestCheckFunc( testAccCheckInfrastructureConfigurationExists(ctx, resourceName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "imagebuilder", fmt.Sprintf("infrastructure-configuration/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "imagebuilder", fmt.Sprintf("infrastructure-configuration/%s", rName)), acctest.CheckResourceAttrRFC3339(resourceName, "date_created"), resource.TestCheckResourceAttr(resourceName, "date_updated", ""), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), diff --git a/internal/service/imagebuilder/lifecycle_policy_test.go b/internal/service/imagebuilder/lifecycle_policy_test.go index e7c82ccb0bb..ad2d239c372 100644 --- a/internal/service/imagebuilder/lifecycle_policy_test.go +++ b/internal/service/imagebuilder/lifecycle_policy_test.go @@ -34,7 +34,7 @@ func TestAccImageBuilderLifecyclePolicy_basic(t *testing.T) { Config: testAccLifecyclePolicyConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckLifecyclePolicyExists(ctx, resourceName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "imagebuilder", fmt.Sprintf("lifecycle-policy/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "imagebuilder", fmt.Sprintf("lifecycle-policy/%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Used for setting lifecycle policies"), resource.TestCheckResourceAttrSet(resourceName, "execution_role"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), diff --git a/internal/service/imagebuilder/workflow_test.go b/internal/service/imagebuilder/workflow_test.go index 9ee0307b35a..de3245e2dd0 100644 --- a/internal/service/imagebuilder/workflow_test.go +++ b/internal/service/imagebuilder/workflow_test.go @@ -35,14 +35,14 @@ func TestAccImageBuilderWorkflow_basic(t *testing.T) { Config: testAccWorkflowConfig_name(rName), Check: resource.ComposeTestCheckFunc( testAccCheckWorkflowExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "imagebuilder", regexache.MustCompile(fmt.Sprintf("workflow/test/%s/1.0.0/[1-9][0-9]*", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "imagebuilder", regexache.MustCompile(fmt.Sprintf("workflow/test/%s/1.0.0/[1-9][0-9]*", rName))), resource.TestCheckResourceAttr(resourceName, "change_description", ""), resource.TestMatchResourceAttr(resourceName, "data", regexache.MustCompile(`schemaVersion`)), acctest.CheckResourceAttrRFC3339(resourceName, "date_created"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttr(resourceName, names.AttrKMSKeyID, ""), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwner), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwner), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttr(resourceName, names.AttrType, string(types.WorkflowTypeTest)), resource.TestCheckResourceAttr(resourceName, names.AttrVersion, "1.0.0"), From e82fbfd45f1acb18b2a0fad63bfb8951a06c61ee Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:49 -0500 Subject: [PATCH 087/304] Make 'AWSClient.AccountID' a getter - inspector. --- internal/service/inspector/assessment_target_test.go | 2 +- internal/service/inspector/assessment_template_test.go | 2 +- internal/service/inspector/resource_group_test.go | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/inspector/assessment_target_test.go b/internal/service/inspector/assessment_target_test.go index cdc44b84755..f052327efb4 100644 --- a/internal/service/inspector/assessment_target_test.go +++ b/internal/service/inspector/assessment_target_test.go @@ -40,7 +40,7 @@ func TestAccInspectorAssessmentTarget_basic(t *testing.T) { Config: testAccAssessmentTargetConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckTargetExists(ctx, resourceName, &assessmentTarget1), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "inspector", regexache.MustCompile(`target/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "inspector", regexache.MustCompile(`target/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "resource_group_arn", ""), ), diff --git a/internal/service/inspector/assessment_template_test.go b/internal/service/inspector/assessment_template_test.go index e021471a646..88fcf5923e8 100644 --- a/internal/service/inspector/assessment_template_test.go +++ b/internal/service/inspector/assessment_template_test.go @@ -40,7 +40,7 @@ func TestAccInspectorAssessmentTemplate_basic(t *testing.T) { Config: testAccAssessmentTemplateConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckTemplateExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "inspector", regexache.MustCompile(`target/.+/template/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "inspector", regexache.MustCompile(`target/.+/template/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrDuration, "3600"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttrPair(resourceName, "rules_package_arns.#", "data.aws_inspector_rules_packages.available", "arns.#"), diff --git a/internal/service/inspector/resource_group_test.go b/internal/service/inspector/resource_group_test.go index 3fa0d5ecf6a..249a85e7cf1 100644 --- a/internal/service/inspector/resource_group_test.go +++ b/internal/service/inspector/resource_group_test.go @@ -33,7 +33,7 @@ func TestAccInspectorResourceGroup_basic(t *testing.T) { Config: testAccResourceGroupConfig_basic, Check: resource.ComposeTestCheckFunc( testAccCheckResourceGroupExists(ctx, resourceName, &v1), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "inspector", regexache.MustCompile(`resourcegroup/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "inspector", regexache.MustCompile(`resourcegroup/.+`)), resource.TestCheckResourceAttr(resourceName, "tags.Name", "foo"), ), }, @@ -41,7 +41,7 @@ func TestAccInspectorResourceGroup_basic(t *testing.T) { Config: testAccResourceGroupConfig_modified, Check: resource.ComposeTestCheckFunc( testAccCheckResourceGroupExists(ctx, resourceName, &v2), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "inspector", regexache.MustCompile(`resourcegroup/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "inspector", regexache.MustCompile(`resourcegroup/.+`)), resource.TestCheckResourceAttr(resourceName, "tags.Name", "bar"), testAccCheckResourceGroupRecreated(&v1, &v2), ), From d607a2c893bc2fae9f5ac847ce110571023f57cf Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:49 -0500 Subject: [PATCH 088/304] Make 'AWSClient.AccountID' a getter - inspector2. --- internal/service/inspector2/enabler.go | 8 ++-- internal/service/inspector2/enabler_test.go | 42 +++++++++---------- .../inspector2/organization_configuration.go | 2 +- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/internal/service/inspector2/enabler.go b/internal/service/inspector2/enabler.go index 3a964a870ee..814e26dcc25 100644 --- a/internal/service/inspector2/enabler.go +++ b/internal/service/inspector2/enabler.go @@ -75,7 +75,7 @@ func ResourceEnabler() *schema.Resource { if l := len(accountIDs); l > 1 { client := meta.(*conns.AWSClient) - if slices.Contains(accountIDs, client.AccountID) { + if slices.Contains(accountIDs, client.AccountID(ctx)) { return fmt.Errorf(`"account_ids" can contain either the administrator account or one or more member accounts. Contains %v`, accountIDs) } } @@ -322,9 +322,9 @@ func resourceEnablerDelete(ctx context.Context, d *schema.ResourceData, meta int conn := client.Inspector2Client(ctx) accountIDs := getAccountIDs(d) - admin := slices.Contains(accountIDs, client.AccountID) + admin := slices.Contains(accountIDs, client.AccountID(ctx)) members := tfslices.Filter(accountIDs, func(s string) bool { - return s != client.AccountID + return s != client.AccountID(ctx) }) if len(members) > 0 { // Catch legacy case mixing admin account and member accounts @@ -340,7 +340,7 @@ func resourceEnablerDelete(ctx context.Context, d *schema.ResourceData, meta int return diags } } else if admin { - diags = append(diags, disableAccounts(ctx, conn, d, []string{client.AccountID})...) + diags = append(diags, disableAccounts(ctx, conn, d, []string{client.AccountID(ctx)})...) } return diags diff --git a/internal/service/inspector2/enabler_test.go b/internal/service/inspector2/enabler_test.go index f1103472e17..9af7d12e67e 100644 --- a/internal/service/inspector2/enabler_test.go +++ b/internal/service/inspector2/enabler_test.go @@ -45,7 +45,7 @@ func testAccEnabler_basic(t *testing.T) { Config: testAccEnablerConfig_basic(resourceTypes), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckEnablerExists(ctx, resourceName, resourceTypes), - testAccCheckEnablerID(resourceName, resourceTypes), + testAccCheckEnablerID(ctx, resourceName, resourceTypes), resource.TestCheckResourceAttr(resourceName, "account_ids.#", "1"), resource.TestCheckTypeSetElemAttrPair(resourceName, "account_ids.*", "data.aws_caller_identity.current", names.AttrAccountID), resource.TestCheckResourceAttr(resourceName, "resource_types.#", "1"), @@ -77,7 +77,7 @@ func testAccEnabler_accountID(t *testing.T) { Config: testAccEnablerConfig_basic(resourceTypes), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckEnablerExists(ctx, resourceName, resourceTypes), - testAccCheckEnablerID(resourceName, resourceTypes), + testAccCheckEnablerID(ctx, resourceName, resourceTypes), resource.TestCheckResourceAttr(resourceName, "account_ids.#", "1"), resource.TestCheckTypeSetElemAttrPair(resourceName, "account_ids.0", "data.aws_caller_identity.current", names.AttrAccountID), resource.TestCheckResourceAttr(resourceName, "resource_types.#", "2"), @@ -141,7 +141,7 @@ func testAccEnabler_updateResourceTypes(t *testing.T) { Config: testAccEnablerConfig_basic(originalResourceTypes), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckEnablerExists(ctx, resourceName, originalResourceTypes), - testAccCheckEnablerID(resourceName, originalResourceTypes), + testAccCheckEnablerID(ctx, resourceName, originalResourceTypes), resource.TestCheckResourceAttr(resourceName, "account_ids.#", "1"), resource.TestCheckTypeSetElemAttrPair(resourceName, "account_ids.0", "data.aws_caller_identity.current", names.AttrAccountID), resource.TestCheckResourceAttr(resourceName, "resource_types.#", "1"), @@ -152,7 +152,7 @@ func testAccEnabler_updateResourceTypes(t *testing.T) { Config: testAccEnablerConfig_basic(update1ResourceTypes), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckEnablerExists(ctx, resourceName, update1ResourceTypes), - testAccCheckEnablerID(resourceName, update1ResourceTypes), + testAccCheckEnablerID(ctx, resourceName, update1ResourceTypes), resource.TestCheckResourceAttr(resourceName, "account_ids.#", "1"), resource.TestCheckTypeSetElemAttrPair(resourceName, "account_ids.0", "data.aws_caller_identity.current", names.AttrAccountID), resource.TestCheckResourceAttr(resourceName, "resource_types.#", "2"), @@ -164,7 +164,7 @@ func testAccEnabler_updateResourceTypes(t *testing.T) { Config: testAccEnablerConfig_basic(update2ResourceTypes), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckEnablerExists(ctx, resourceName, update2ResourceTypes), - testAccCheckEnablerID(resourceName, update2ResourceTypes), + testAccCheckEnablerID(ctx, resourceName, update2ResourceTypes), resource.TestCheckResourceAttr(resourceName, "account_ids.#", "1"), resource.TestCheckTypeSetElemAttrPair(resourceName, "account_ids.0", "data.aws_caller_identity.current", names.AttrAccountID), resource.TestCheckResourceAttr(resourceName, "resource_types.#", "1"), @@ -197,7 +197,7 @@ func testAccEnabler_updateResourceTypes_disjoint(t *testing.T) { Config: testAccEnablerConfig_basic(originalResourceTypes), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckEnablerExists(ctx, resourceName, originalResourceTypes), - testAccCheckEnablerID(resourceName, originalResourceTypes), + testAccCheckEnablerID(ctx, resourceName, originalResourceTypes), resource.TestCheckResourceAttr(resourceName, "account_ids.#", "1"), resource.TestCheckTypeSetElemAttrPair(resourceName, "account_ids.0", "data.aws_caller_identity.current", names.AttrAccountID), resource.TestCheckResourceAttr(resourceName, "resource_types.#", "1"), @@ -208,7 +208,7 @@ func testAccEnabler_updateResourceTypes_disjoint(t *testing.T) { Config: testAccEnablerConfig_basic(updatedResourceTypes), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckEnablerExists(ctx, resourceName, updatedResourceTypes), - testAccCheckEnablerID(resourceName, updatedResourceTypes), + testAccCheckEnablerID(ctx, resourceName, updatedResourceTypes), resource.TestCheckResourceAttr(resourceName, "account_ids.#", "1"), resource.TestCheckTypeSetElemAttrPair(resourceName, "account_ids.0", "data.aws_caller_identity.current", names.AttrAccountID), resource.TestCheckResourceAttr(resourceName, "resource_types.#", "1"), @@ -240,7 +240,7 @@ func testAccEnabler_lambda(t *testing.T) { Config: testAccEnablerConfig_basic(resourceTypes), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckEnablerExists(ctx, resourceName, resourceTypes), - testAccCheckEnablerID(resourceName, resourceTypes), + testAccCheckEnablerID(ctx, resourceName, resourceTypes), resource.TestCheckResourceAttr(resourceName, "account_ids.#", "1"), resource.TestCheckTypeSetElemAttrPair(resourceName, "account_ids.*", "data.aws_caller_identity.current", names.AttrAccountID), resource.TestCheckResourceAttr(resourceName, "resource_types.#", "1"), @@ -274,7 +274,7 @@ func testAccEnabler_lambdaCode(t *testing.T) { Config: testAccEnablerConfig_basic(resourceTypes), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckEnablerExists(ctx, resourceName, resourceTypes), - testAccCheckEnablerID(resourceName, resourceTypes), + testAccCheckEnablerID(ctx, resourceName, resourceTypes), resource.TestCheckResourceAttr(resourceName, "account_ids.#", "1"), resource.TestCheckTypeSetElemAttrPair(resourceName, "account_ids.*", "data.aws_caller_identity.current", names.AttrAccountID), resource.TestCheckResourceAttr(resourceName, "resource_types.#", "2"), @@ -310,7 +310,7 @@ func testAccEnabler_memberAccount_basic(t *testing.T) { Config: testAccEnablerConfig_MemberAccount(resourceTypes), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckEnablerExists(ctx, resourceName, resourceTypes), - testAccCheckEnablerIDProvider(resourceName, resourceTypes, acctest.NamedProviderFunc(acctest.ProviderNameAlternate, providers)), + testAccCheckEnablerIDProvider(ctx, resourceName, resourceTypes, acctest.NamedProviderFunc(acctest.ProviderNameAlternate, providers)), resource.TestCheckResourceAttr(resourceName, "account_ids.#", "1"), resource.TestCheckTypeSetElemAttrPair(resourceName, "account_ids.*", "data.aws_caller_identity.member", names.AttrAccountID), resource.TestCheckResourceAttr(resourceName, "resource_types.#", "1"), @@ -378,7 +378,7 @@ func testAccEnabler_memberAccount_multiple(t *testing.T) { Config: testAccEnablerConfig_MemberAccount_Multiple(t, resourceTypes), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckEnablerExists(ctx, resourceName, resourceTypes), - testAccCheckEnablerIDProvider(resourceName, resourceTypes, + testAccCheckEnablerIDProvider(ctx, resourceName, resourceTypes, acctest.NamedProviderFunc(acctest.ProviderNameAlternate, providers), acctest.NamedProviderFunc(acctest.ProviderNameThird, providers), ), @@ -418,7 +418,7 @@ func testAccEnabler_memberAccount_updateMemberAccounts(t *testing.T) { Config: testAccEnablerConfig_MemberAccount_UpdateMemberAccountsAlternate(t, resourceTypes), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckEnablerExists(ctx, resourceName, resourceTypes), - testAccCheckEnablerIDProvider(resourceName, resourceTypes, + testAccCheckEnablerIDProvider(ctx, resourceName, resourceTypes, acctest.NamedProviderFunc(acctest.ProviderNameAlternate, providers), ), resource.TestCheckResourceAttr(resourceName, "account_ids.#", "1"), @@ -431,7 +431,7 @@ func testAccEnabler_memberAccount_updateMemberAccounts(t *testing.T) { Config: testAccEnablerConfig_MemberAccount_UpdateMemberAccountsMultiple(t, resourceTypes), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckEnablerExists(ctx, resourceName, resourceTypes), - testAccCheckEnablerIDProvider(resourceName, resourceTypes, + testAccCheckEnablerIDProvider(ctx, resourceName, resourceTypes, acctest.NamedProviderFunc(acctest.ProviderNameAlternate, providers), acctest.NamedProviderFunc(acctest.ProviderNameThird, providers), ), @@ -446,7 +446,7 @@ func testAccEnabler_memberAccount_updateMemberAccounts(t *testing.T) { Config: testAccEnablerConfig_MemberAccount_UpdateMemberAccountsThird(t, resourceTypes), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckEnablerExists(ctx, resourceName, resourceTypes), - testAccCheckEnablerIDProvider(resourceName, resourceTypes, + testAccCheckEnablerIDProvider(ctx, resourceName, resourceTypes, acctest.NamedProviderFunc(acctest.ProviderNameThird, providers), ), resource.TestCheckResourceAttr(resourceName, "account_ids.#", "1"), @@ -486,7 +486,7 @@ func testAccEnabler_memberAccount_updateMemberAccountsAndScanTypes(t *testing.T) Config: testAccEnablerConfig_MemberAccount_UpdateMemberAccountsAlternate(t, originalResourceTypes), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckEnablerExists(ctx, resourceName, originalResourceTypes), - testAccCheckEnablerIDProvider(resourceName, originalResourceTypes, + testAccCheckEnablerIDProvider(ctx, resourceName, originalResourceTypes, acctest.NamedProviderFunc(acctest.ProviderNameAlternate, providers), ), resource.TestCheckResourceAttr(resourceName, "account_ids.#", "1"), @@ -499,7 +499,7 @@ func testAccEnabler_memberAccount_updateMemberAccountsAndScanTypes(t *testing.T) Config: testAccEnablerConfig_MemberAccount_UpdateMemberAccountsMultiple(t, update1ResourceTypes), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckEnablerExists(ctx, resourceName, update1ResourceTypes), - testAccCheckEnablerIDProvider(resourceName, update1ResourceTypes, + testAccCheckEnablerIDProvider(ctx, resourceName, update1ResourceTypes, acctest.NamedProviderFunc(acctest.ProviderNameAlternate, providers), acctest.NamedProviderFunc(acctest.ProviderNameThird, providers), ), @@ -515,7 +515,7 @@ func testAccEnabler_memberAccount_updateMemberAccountsAndScanTypes(t *testing.T) Config: testAccEnablerConfig_MemberAccount_UpdateMemberAccountsThird(t, update2ResourceTypes), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckEnablerExists(ctx, resourceName, update2ResourceTypes), - testAccCheckEnablerIDProvider(resourceName, update2ResourceTypes, + testAccCheckEnablerIDProvider(ctx, resourceName, update2ResourceTypes, acctest.NamedProviderFunc(acctest.ProviderNameThird, providers), ), resource.TestCheckResourceAttr(resourceName, "account_ids.#", "1"), @@ -609,15 +609,15 @@ func testAccCheckEnablerExists(ctx context.Context, name string, t []types.Resou } } -func testAccCheckEnablerID(resourceName string, types []types.ResourceScanType) resource.TestCheckFunc { - return testAccCheckEnablerIDProvider(resourceName, types, func() *schema.Provider { return acctest.Provider }) +func testAccCheckEnablerID(ctx context.Context, resourceName string, types []types.ResourceScanType) resource.TestCheckFunc { + return testAccCheckEnablerIDProvider(ctx, resourceName, types, func() *schema.Provider { return acctest.Provider }) } -func testAccCheckEnablerIDProvider(resourceName string, types []types.ResourceScanType, providerF ...func() *schema.Provider) resource.TestCheckFunc { +func testAccCheckEnablerIDProvider(ctx context.Context, resourceName string, types []types.ResourceScanType, providerF ...func() *schema.Provider) resource.TestCheckFunc { return func(s *terraform.State) error { // accountID := acctest.ProviderAccountID(providerF()) accountIDs := tfslices.ApplyToAll(providerF, func(f func() *schema.Provider) string { - return acctest.ProviderAccountID(f()) + return acctest.ProviderAccountID(ctx, f()) }) id := tfinspector2.EnablerID(accountIDs, types) return resource.TestCheckResourceAttr(resourceName, names.AttrID, id)(s) diff --git a/internal/service/inspector2/organization_configuration.go b/internal/service/inspector2/organization_configuration.go index 1e2125c7ed4..fe90c3e2ef6 100644 --- a/internal/service/inspector2/organization_configuration.go +++ b/internal/service/inspector2/organization_configuration.go @@ -78,7 +78,7 @@ const ( func resourceOrganizationConfigurationCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - d.SetId(meta.(*conns.AWSClient).AccountID) + d.SetId(meta.(*conns.AWSClient).AccountID(ctx)) return append(diags, resourceOrganizationConfigurationUpdate(ctx, d, meta)...) } From 0cd992852512eeb778a459d4b21888c6b17bef32 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:50 -0500 Subject: [PATCH 089/304] Make 'AWSClient.AccountID' a getter - internetmonitor. --- internal/service/internetmonitor/monitor_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/internetmonitor/monitor_test.go b/internal/service/internetmonitor/monitor_test.go index e04857a1fa6..e3c798a4ebe 100644 --- a/internal/service/internetmonitor/monitor_test.go +++ b/internal/service/internetmonitor/monitor_test.go @@ -34,7 +34,7 @@ func TestAccInternetMonitorMonitor_basic(t *testing.T) { Config: testAccMonitorConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckMonitorExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "internetmonitor", regexache.MustCompile(`monitor/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "internetmonitor", regexache.MustCompile(`monitor/.+$`)), resource.TestCheckResourceAttr(resourceName, "health_events_config.#", "0"), resource.TestCheckResourceAttr(resourceName, "internet_measurements_log_delivery.#", "1"), resource.TestCheckResourceAttr(resourceName, "max_city_networks_to_monitor", "0"), From e8d0e5754c1524eeb3ddbac4985e758d02f7d50f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:50 -0500 Subject: [PATCH 090/304] Make 'AWSClient.AccountID' a getter - iot. --- internal/service/iot/authorizer_test.go | 8 ++++---- internal/service/iot/billing_group_test.go | 4 ++-- internal/service/iot/policy_test.go | 2 +- internal/service/iot/role_alias_test.go | 6 +++--- internal/service/iot/thing_group_test.go | 2 +- internal/service/iot/topic_rule_destination_test.go | 2 +- internal/service/iot/topic_rule_test.go | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/iot/authorizer_test.go b/internal/service/iot/authorizer_test.go index d25c5a153c0..bbc28076a03 100644 --- a/internal/service/iot/authorizer_test.go +++ b/internal/service/iot/authorizer_test.go @@ -35,7 +35,7 @@ func TestAccIoTAuthorizer_basic(t *testing.T) { Config: testAccAuthorizerConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAuthorizerExists(ctx, resourceName, &conf), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "iot", fmt.Sprintf("authorizer/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "iot", fmt.Sprintf("authorizer/%s", rName)), resource.TestCheckResourceAttr(resourceName, "enable_caching_for_http", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "signing_disabled", acctest.CtFalse), @@ -94,7 +94,7 @@ func TestAccIoTAuthorizer_signingDisabled(t *testing.T) { Config: testAccAuthorizerConfig_signingDisabled(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAuthorizerExists(ctx, resourceName, &conf), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "iot", fmt.Sprintf("authorizer/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "iot", fmt.Sprintf("authorizer/%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "signing_disabled", acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, names.AttrStatus, "INACTIVE"), @@ -127,7 +127,7 @@ func TestAccIoTAuthorizer_update(t *testing.T) { Config: testAccAuthorizerConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAuthorizerExists(ctx, resourceName, &conf), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "iot", fmt.Sprintf("authorizer/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "iot", fmt.Sprintf("authorizer/%s", rName)), resource.TestCheckResourceAttr(resourceName, "enable_caching_for_http", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "signing_disabled", acctest.CtFalse), @@ -141,7 +141,7 @@ func TestAccIoTAuthorizer_update(t *testing.T) { Config: testAccAuthorizerConfig_updated(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAuthorizerExists(ctx, resourceName, &conf), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "iot", fmt.Sprintf("authorizer/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "iot", fmt.Sprintf("authorizer/%s", rName)), resource.TestCheckResourceAttr(resourceName, "enable_caching_for_http", acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "signing_disabled", acctest.CtFalse), diff --git a/internal/service/iot/billing_group_test.go b/internal/service/iot/billing_group_test.go index 46b6a1f9e5f..6feadcd2df5 100644 --- a/internal/service/iot/billing_group_test.go +++ b/internal/service/iot/billing_group_test.go @@ -34,7 +34,7 @@ func TestAccIoTBillingGroup_basic(t *testing.T) { Config: testAccBillingGroupConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckBillingGroupExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "iot", regexache.MustCompile(fmt.Sprintf("billinggroup/%s$", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "iot", regexache.MustCompile(fmt.Sprintf("billinggroup/%s$", rName))), resource.TestCheckResourceAttr(resourceName, "metadata.#", "1"), resource.TestCheckResourceAttrSet(resourceName, "metadata.0.creation_date"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), @@ -178,7 +178,7 @@ func TestAccIoTBillingGroup_migrateFromPluginSDK(t *testing.T) { Config: testAccBillingGroupConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckBillingGroupExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "iot", regexache.MustCompile(fmt.Sprintf("billinggroup/%s$", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "iot", regexache.MustCompile(fmt.Sprintf("billinggroup/%s$", rName))), resource.TestCheckResourceAttr(resourceName, "metadata.#", "1"), resource.TestCheckResourceAttrSet(resourceName, "metadata.0.creation_date"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), diff --git a/internal/service/iot/policy_test.go b/internal/service/iot/policy_test.go index b3907e70849..b8a0651cf8b 100644 --- a/internal/service/iot/policy_test.go +++ b/internal/service/iot/policy_test.go @@ -40,7 +40,7 @@ func TestAccIoTPolicy_basic(t *testing.T) { Config: testAccPolicyConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPolicyExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "iot", fmt.Sprintf("policy/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "iot", fmt.Sprintf("policy/%s", rName)), resource.TestCheckResourceAttr(resourceName, "default_version_id", "1"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttrSet(resourceName, names.AttrPolicy), diff --git a/internal/service/iot/role_alias_test.go b/internal/service/iot/role_alias_test.go index bec17473972..f31b10c1261 100644 --- a/internal/service/iot/role_alias_test.go +++ b/internal/service/iot/role_alias_test.go @@ -36,7 +36,7 @@ func TestAccIoTRoleAlias_basic(t *testing.T) { Config: testAccRoleAliasConfig_basic(alias), Check: resource.ComposeTestCheckFunc( testAccCheckRoleAliasExists(ctx, resourceName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "iot", fmt.Sprintf("rolealias/%s", alias)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "iot", fmt.Sprintf("rolealias/%s", alias)), resource.TestCheckResourceAttr(resourceName, "credential_duration", "3600"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsAllPercent, "0"), @@ -47,7 +47,7 @@ func TestAccIoTRoleAlias_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckRoleAliasExists(ctx, resourceName), testAccCheckRoleAliasExists(ctx, resourceName2), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "iot", fmt.Sprintf("rolealias/%s", alias)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "iot", fmt.Sprintf("rolealias/%s", alias)), resource.TestCheckResourceAttr(resourceName, "credential_duration", "43200"), ), }, @@ -72,7 +72,7 @@ func TestAccIoTRoleAlias_basic(t *testing.T) { Config: testAccRoleAliasConfig_update5(alias, alias2), Check: resource.ComposeTestCheckFunc( testAccCheckRoleAliasExists(ctx, resourceName2), - acctest.MatchResourceAttrGlobalARN(resourceName2, names.AttrRoleARN, "iam", regexache.MustCompile("role/"+alias+"/bogus")), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName2, names.AttrRoleARN, "iam", regexache.MustCompile("role/"+alias+"/bogus")), ), }, { diff --git a/internal/service/iot/thing_group_test.go b/internal/service/iot/thing_group_test.go index cafbad9e2f1..262b3204662 100644 --- a/internal/service/iot/thing_group_test.go +++ b/internal/service/iot/thing_group_test.go @@ -34,7 +34,7 @@ func TestAccIoTThingGroup_basic(t *testing.T) { Config: testAccThingGroupConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckThingGroupExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "iot", regexache.MustCompile(fmt.Sprintf("thinggroup/%s$", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "iot", regexache.MustCompile(fmt.Sprintf("thinggroup/%s$", rName))), resource.TestCheckResourceAttr(resourceName, "metadata.#", "1"), resource.TestCheckResourceAttrSet(resourceName, "metadata.0.creation_date"), resource.TestCheckResourceAttr(resourceName, "metadata.0.parent_group_name", ""), diff --git a/internal/service/iot/topic_rule_destination_test.go b/internal/service/iot/topic_rule_destination_test.go index 2bb0abcdc8c..3fc80d13c9f 100644 --- a/internal/service/iot/topic_rule_destination_test.go +++ b/internal/service/iot/topic_rule_destination_test.go @@ -34,7 +34,7 @@ func TestAccIoTTopicRuleDestination_basic(t *testing.T) { Config: testAccTopicRuleDestinationConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckTopicRuleDestinationExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "iot", regexache.MustCompile(`ruledestination/vpc/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "iot", regexache.MustCompile(`ruledestination/vpc/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrEnabled, acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, "vpc_configuration.#", "1"), resource.TestCheckResourceAttrSet(resourceName, "vpc_configuration.0.role_arn"), diff --git a/internal/service/iot/topic_rule_test.go b/internal/service/iot/topic_rule_test.go index f64dacbd656..8a546bc3eb1 100644 --- a/internal/service/iot/topic_rule_test.go +++ b/internal/service/iot/topic_rule_test.go @@ -43,7 +43,7 @@ func TestAccIoTTopicRule_basic(t *testing.T) { Config: testAccTopicRuleConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckTopicRuleExists(ctx, resourceName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "iot", fmt.Sprintf("rule/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "iot", fmt.Sprintf("rule/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_alarm.#", "0"), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logs.#", "0"), resource.TestCheckResourceAttr(resourceName, "cloudwatch_metric.#", "0"), From a112c752a236cd70bf938b3b802a3d56d327da99 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:50 -0500 Subject: [PATCH 091/304] Make 'AWSClient.AccountID' a getter - ivs. --- internal/service/ivs/channel_test.go | 2 +- internal/service/ivs/playback_key_pair_test.go | 2 +- internal/service/ivs/recording_configuration_test.go | 2 +- internal/service/ivs/stream_key_data_source_test.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/ivs/channel_test.go b/internal/service/ivs/channel_test.go index 2b1b0007678..66ac2c5754f 100644 --- a/internal/service/ivs/channel_test.go +++ b/internal/service/ivs/channel_test.go @@ -48,7 +48,7 @@ func TestAccIVSChannel_basic(t *testing.T) { resource.TestCheckResourceAttrSet(resourceName, "playback_url"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsAllPercent, "0"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ivs", regexache.MustCompile(`channel/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ivs", regexache.MustCompile(`channel/.+`)), ), }, { diff --git a/internal/service/ivs/playback_key_pair_test.go b/internal/service/ivs/playback_key_pair_test.go index ceec0e77d52..26e15c188d6 100644 --- a/internal/service/ivs/playback_key_pair_test.go +++ b/internal/service/ivs/playback_key_pair_test.go @@ -54,7 +54,7 @@ func testAccPlaybackKeyPair_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "fingerprint", fingerprint), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsAllPercent, "0"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ivs", regexache.MustCompile(`playback-key/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ivs", regexache.MustCompile(`playback-key/.+`)), ), }, { diff --git a/internal/service/ivs/recording_configuration_test.go b/internal/service/ivs/recording_configuration_test.go index 7d2e09b2d94..fbfdede9e01 100644 --- a/internal/service/ivs/recording_configuration_test.go +++ b/internal/service/ivs/recording_configuration_test.go @@ -49,7 +49,7 @@ func TestAccIVSRecordingConfiguration_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "destination_configuration.0.s3.0.bucket_name", bucketName), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsAllPercent, "0"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ivs", regexache.MustCompile(`recording-configuration/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ivs", regexache.MustCompile(`recording-configuration/.+`)), ), }, { diff --git a/internal/service/ivs/stream_key_data_source_test.go b/internal/service/ivs/stream_key_data_source_test.go index c3093c0b6a3..e0d927a76f6 100644 --- a/internal/service/ivs/stream_key_data_source_test.go +++ b/internal/service/ivs/stream_key_data_source_test.go @@ -30,7 +30,7 @@ func TestAccIVSStreamKeyDataSource_basic(t *testing.T) { testAccCheckStreamKeyDataSource(dataSourceName), resource.TestCheckResourceAttrPair(dataSourceName, "channel_arn", channelResourceName, names.AttrID), resource.TestCheckResourceAttrSet(dataSourceName, names.AttrValue), - acctest.MatchResourceAttrRegionalARN(dataSourceName, names.AttrARN, "ivs", regexache.MustCompile(`stream-key/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, dataSourceName, names.AttrARN, "ivs", regexache.MustCompile(`stream-key/.+`)), ), }, }, From a59a323d9a857956c23d0de4e6c69b0c88f9d9ba Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:50 -0500 Subject: [PATCH 092/304] Make 'AWSClient.AccountID' a getter - ivschat. --- internal/service/ivschat/logging_configuration_test.go | 6 +++--- internal/service/ivschat/room_test.go | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/service/ivschat/logging_configuration_test.go b/internal/service/ivschat/logging_configuration_test.go index 389da3de281..72fefd30aba 100644 --- a/internal/service/ivschat/logging_configuration_test.go +++ b/internal/service/ivschat/logging_configuration_test.go @@ -45,7 +45,7 @@ func TestAccIVSChatLoggingConfiguration_basic_cloudwatch(t *testing.T) { resource.TestCheckResourceAttrPair(resourceName, "destination_configuration.0.cloudwatch_logs.0.log_group_name", "aws_cloudwatch_log_group.test", names.AttrName), resource.TestCheckResourceAttr(resourceName, names.AttrState, "ACTIVE"), resource.TestCheckResourceAttrSet(resourceName, names.AttrID), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ivschat", regexache.MustCompile(`logging-configuration/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ivschat", regexache.MustCompile(`logging-configuration/.+`)), ), }, { @@ -84,7 +84,7 @@ func TestAccIVSChatLoggingConfiguration_basic_firehose(t *testing.T) { resource.TestCheckResourceAttrPair(resourceName, "destination_configuration.0.firehose.0.delivery_stream_name", "aws_kinesis_firehose_delivery_stream.test", names.AttrName), resource.TestCheckResourceAttr(resourceName, names.AttrState, "ACTIVE"), resource.TestCheckResourceAttrSet(resourceName, names.AttrID), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ivschat", regexache.MustCompile(`logging-configuration/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ivschat", regexache.MustCompile(`logging-configuration/.+`)), ), }, { @@ -119,7 +119,7 @@ func TestAccIVSChatLoggingConfiguration_basic_s3(t *testing.T) { resource.TestCheckResourceAttrPair(resourceName, "destination_configuration.0.s3.0.bucket_name", "aws_s3_bucket.test", names.AttrID), resource.TestCheckResourceAttr(resourceName, names.AttrState, "ACTIVE"), resource.TestCheckResourceAttrSet(resourceName, names.AttrID), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ivschat", regexache.MustCompile(`logging-configuration/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ivschat", regexache.MustCompile(`logging-configuration/.+`)), ), }, { diff --git a/internal/service/ivschat/room_test.go b/internal/service/ivschat/room_test.go index a5c8d3ef0a7..b0f22009e33 100644 --- a/internal/service/ivschat/room_test.go +++ b/internal/service/ivschat/room_test.go @@ -45,7 +45,7 @@ func TestAccIVSChatRoom_basic(t *testing.T) { resource.TestCheckResourceAttrSet(resourceName, names.AttrID), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsAllPercent, "0"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ivschat", regexache.MustCompile(`room/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ivschat", regexache.MustCompile(`room/.+`)), ), }, { @@ -171,7 +171,7 @@ func TestAccIVSChatRoom_update(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "maximum_message_length", maximumMessageLength), resource.TestCheckResourceAttr(resourceName, "maximum_message_rate_per_second", maximumMessageRatePerSecond), resource.TestCheckResourceAttr(resourceName, "message_review_handler.0.fallback_result", fallbackResult), - acctest.CheckResourceAttrRegionalARN(resourceName, "message_review_handler.0.uri", "lambda", fmt.Sprintf("function:%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, "message_review_handler.0.uri", "lambda", fmt.Sprintf("function:%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), ), }, From 845aa20664517924a6ce1fbe5b0fe56879c455c9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:50 -0500 Subject: [PATCH 093/304] Make 'AWSClient.AccountID' a getter - kafka. --- internal/service/kafka/cluster_test.go | 6 +++--- internal/service/kafka/configuration_test.go | 2 +- internal/service/kafka/serverless_cluster_test.go | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/service/kafka/cluster_test.go b/internal/service/kafka/cluster_test.go index 6570a6625d6..2fe4bd7fd81 100644 --- a/internal/service/kafka/cluster_test.go +++ b/internal/service/kafka/cluster_test.go @@ -66,7 +66,7 @@ func TestAccKafkaCluster_basic(t *testing.T) { Config: testAccClusterConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckClusterExists(ctx, resourceName, &cluster), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "kafka", regexache.MustCompile(`cluster/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kafka", regexache.MustCompile(`cluster/.+$`)), resource.TestCheckResourceAttr(resourceName, "bootstrap_brokers", ""), resource.TestCheckResourceAttr(resourceName, "bootstrap_brokers_public_sasl_iam", ""), resource.TestCheckResourceAttr(resourceName, "bootstrap_brokers_public_sasl_scram", ""), @@ -105,7 +105,7 @@ func TestAccKafkaCluster_basic(t *testing.T) { resource.TestCheckResourceAttrSet(resourceName, "cluster_uuid"), resource.TestCheckResourceAttr(resourceName, "configuration_info.#", "1"), resource.TestCheckResourceAttr(resourceName, "encryption_info.#", "1"), - acctest.MatchResourceAttrRegionalARN(resourceName, "encryption_info.0.encryption_at_rest_kms_key_arn", "kms", regexache.MustCompile(`key/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "encryption_info.0.encryption_at_rest_kms_key_arn", "kms", regexache.MustCompile(`key/.+`)), resource.TestCheckResourceAttr(resourceName, "encryption_info.0.encryption_in_transit.#", "1"), resource.TestCheckResourceAttr(resourceName, "encryption_info.0.encryption_in_transit.0.client_broker", "TLS"), resource.TestCheckResourceAttr(resourceName, "encryption_info.0.encryption_in_transit.0.in_cluster", acctest.CtTrue), @@ -994,7 +994,7 @@ func TestAccKafkaCluster_storageMode(t *testing.T) { Config: testAccClusterConfig_storageMode(rName, "TIERED", "2.8.2.tiered"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckClusterExists(ctx, resourceName, &cluster), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "kafka", regexache.MustCompile(`cluster/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kafka", regexache.MustCompile(`cluster/.+$`)), resource.TestCheckResourceAttr(resourceName, "storage_mode", "TIERED"), ), }, diff --git a/internal/service/kafka/configuration_test.go b/internal/service/kafka/configuration_test.go index 3b61ad2db9d..3f3d5acc4b0 100644 --- a/internal/service/kafka/configuration_test.go +++ b/internal/service/kafka/configuration_test.go @@ -36,7 +36,7 @@ func TestAccKafkaConfiguration_basic(t *testing.T) { Config: testAccConfigurationConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckConfigurationExists(ctx, resourceName, &configuration1), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "kafka", regexache.MustCompile(`configuration/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kafka", regexache.MustCompile(`configuration/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttr(resourceName, "kafka_versions.#", "0"), resource.TestCheckResourceAttr(resourceName, "latest_revision", "1"), diff --git a/internal/service/kafka/serverless_cluster_test.go b/internal/service/kafka/serverless_cluster_test.go index bd28717a30c..32a74e5f4c9 100644 --- a/internal/service/kafka/serverless_cluster_test.go +++ b/internal/service/kafka/serverless_cluster_test.go @@ -36,7 +36,7 @@ func TestAccKafkaServerlessCluster_basic(t *testing.T) { Config: testAccServerlessClusterConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckServerlessClusterExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "kafka", regexache.MustCompile(`cluster/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kafka", regexache.MustCompile(`cluster/.+$`)), resource.TestCheckResourceAttr(resourceName, "client_authentication.#", "1"), resource.TestCheckResourceAttr(resourceName, "client_authentication.0.sasl.#", "1"), resource.TestCheckResourceAttr(resourceName, "client_authentication.0.sasl.0.iam.#", "1"), From 1c103114d42814f2b385ec4496dea0024dcc22e4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:50 -0500 Subject: [PATCH 094/304] Make 'AWSClient.AccountID' a getter - kendra. --- internal/service/kendra/data_source.go | 2 +- internal/service/kendra/data_source_test.go | 6 +++--- internal/service/kendra/experience.go | 2 +- internal/service/kendra/experience_data_source.go | 2 +- internal/service/kendra/experience_test.go | 2 +- internal/service/kendra/faq.go | 2 +- internal/service/kendra/faq_data_source.go | 2 +- internal/service/kendra/faq_test.go | 2 +- internal/service/kendra/index.go | 2 +- internal/service/kendra/index_data_source.go | 2 +- internal/service/kendra/query_suggestions_block_list.go | 2 +- .../kendra/query_suggestions_block_list_data_source.go | 2 +- .../service/kendra/query_suggestions_block_list_test.go | 2 +- internal/service/kendra/thesaurus.go | 2 +- internal/service/kendra/thesaurus_data_source.go | 2 +- internal/service/kendra/thesaurus_test.go | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/internal/service/kendra/data_source.go b/internal/service/kendra/data_source.go index a7070d90bf2..d23b166645d 100644 --- a/internal/service/kendra/data_source.go +++ b/internal/service/kendra/data_source.go @@ -692,7 +692,7 @@ func resourceDataSourceRead(ctx context.Context, d *schema.ResourceData, meta in Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "kendra", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("index/%s/data-source/%s", indexId, id), }.String() diff --git a/internal/service/kendra/data_source_test.go b/internal/service/kendra/data_source_test.go index 006b5eee7f4..a74dbf9b5bd 100644 --- a/internal/service/kendra/data_source_test.go +++ b/internal/service/kendra/data_source_test.go @@ -43,7 +43,7 @@ func TestAccKendraDataSource_basic(t *testing.T) { Config: testAccDataSourceConfig_basic(rName, rName2, rName3, rName4), Check: resource.ComposeTestCheckFunc( testAccCheckDataSourceExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "kendra", regexache.MustCompile(`index/.+/data-source/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kendra", regexache.MustCompile(`index/.+/data-source/.+$`)), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedAt), resource.TestCheckResourceAttrPair(resourceName, "index_id", "aws_kendra_index.test", names.AttrID), resource.TestCheckResourceAttr(resourceName, names.AttrLanguageCode, "en"), @@ -158,7 +158,7 @@ func TestAccKendraDataSource_description(t *testing.T) { Config: testAccDataSourceConfig_description(rName, rName2, rName3, rName4, originalDescription), Check: resource.ComposeTestCheckFunc( testAccCheckDataSourceExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "kendra", regexache.MustCompile(`index/.+/data-source/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kendra", regexache.MustCompile(`index/.+/data-source/.+$`)), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedAt), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, originalDescription), resource.TestCheckResourceAttrPair(resourceName, "index_id", "aws_kendra_index.test", names.AttrID), @@ -178,7 +178,7 @@ func TestAccKendraDataSource_description(t *testing.T) { Config: testAccDataSourceConfig_description(rName, rName2, rName3, rName4, updatedDescription), Check: resource.ComposeTestCheckFunc( testAccCheckDataSourceExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "kendra", regexache.MustCompile(`index/.+/data-source/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kendra", regexache.MustCompile(`index/.+/data-source/.+$`)), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedAt), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, updatedDescription), resource.TestCheckResourceAttrPair(resourceName, "index_id", "aws_kendra_index.test", names.AttrID), diff --git a/internal/service/kendra/experience.go b/internal/service/kendra/experience.go index cb696745b8e..99701ca0bad 100644 --- a/internal/service/kendra/experience.go +++ b/internal/service/kendra/experience.go @@ -245,7 +245,7 @@ func resourceExperienceRead(ctx context.Context, d *schema.ResourceData, meta in Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, Service: "kendra", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("index/%s/experience/%s", indexId, id), }.String() diff --git a/internal/service/kendra/experience_data_source.go b/internal/service/kendra/experience_data_source.go index f0c464a8906..df511d6fdcb 100644 --- a/internal/service/kendra/experience_data_source.go +++ b/internal/service/kendra/experience_data_source.go @@ -159,7 +159,7 @@ func dataSourceExperienceRead(ctx context.Context, d *schema.ResourceData, meta Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "kendra", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("index/%s/experience/%s", indexID, experienceID), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/kendra/experience_test.go b/internal/service/kendra/experience_test.go index 3aecabfdebe..2e12d66a29d 100644 --- a/internal/service/kendra/experience_test.go +++ b/internal/service/kendra/experience_test.go @@ -43,7 +43,7 @@ func TestAccKendraExperience_basic(t *testing.T) { Config: testAccExperienceConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckExperienceExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "kendra", regexache.MustCompile(`index/.+/experience/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kendra", regexache.MustCompile(`index/.+/experience/.+$`)), resource.TestCheckResourceAttr(resourceName, "configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "endpoints.#", "1"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), diff --git a/internal/service/kendra/faq.go b/internal/service/kendra/faq.go index 0a82d227fc5..5e36c762546 100644 --- a/internal/service/kendra/faq.go +++ b/internal/service/kendra/faq.go @@ -239,7 +239,7 @@ func resourceFaqRead(ctx context.Context, d *schema.ResourceData, meta interface Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "kendra", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("index/%s/faq/%s", indexId, id), }.String() diff --git a/internal/service/kendra/faq_data_source.go b/internal/service/kendra/faq_data_source.go index bc3bdf2fb40..8d9e8ca1889 100644 --- a/internal/service/kendra/faq_data_source.go +++ b/internal/service/kendra/faq_data_source.go @@ -128,7 +128,7 @@ func dataSourceFaqRead(ctx context.Context, d *schema.ResourceData, meta interfa Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "kendra", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("index/%s/faq/%s", indexId, id), }.String() diff --git a/internal/service/kendra/faq_test.go b/internal/service/kendra/faq_test.go index a3c2a5ea18e..a08db8078d8 100644 --- a/internal/service/kendra/faq_test.go +++ b/internal/service/kendra/faq_test.go @@ -43,7 +43,7 @@ func TestAccKendraFaq_basic(t *testing.T) { Config: testAccFaqConfig_basic(rName, rName2, rName3, rName4, rName5), Check: resource.ComposeTestCheckFunc( testAccCheckFaqExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "kendra", regexache.MustCompile(`index/.+/faq/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kendra", regexache.MustCompile(`index/.+/faq/.+$`)), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedAt), resource.TestCheckResourceAttrSet(resourceName, "faq_id"), resource.TestCheckResourceAttrPair(resourceName, "index_id", "aws_kendra_index.test", names.AttrID), diff --git a/internal/service/kendra/index.go b/internal/service/kendra/index.go index fe36e9440d4..970135018a9 100644 --- a/internal/service/kendra/index.go +++ b/internal/service/kendra/index.go @@ -488,7 +488,7 @@ func resourceIndexRead(ctx context.Context, d *schema.ResourceData, meta interfa Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "kendra", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("index/%s", d.Id()), }.String() diff --git a/internal/service/kendra/index_data_source.go b/internal/service/kendra/index_data_source.go index 8f97063b830..be0fdec2000 100644 --- a/internal/service/kendra/index_data_source.go +++ b/internal/service/kendra/index_data_source.go @@ -305,7 +305,7 @@ func dataSourceIndexRead(ctx context.Context, d *schema.ResourceData, meta inter Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "kendra", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("index/%s", id), }.String() diff --git a/internal/service/kendra/query_suggestions_block_list.go b/internal/service/kendra/query_suggestions_block_list.go index 6d8014c3463..6256f874f81 100644 --- a/internal/service/kendra/query_suggestions_block_list.go +++ b/internal/service/kendra/query_suggestions_block_list.go @@ -183,7 +183,7 @@ func resourceQuerySuggestionsBlockListRead(ctx context.Context, d *schema.Resour Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, Service: "kendra", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("index/%s/query-suggestions-block-list/%s", indexId, id), }.String() diff --git a/internal/service/kendra/query_suggestions_block_list_data_source.go b/internal/service/kendra/query_suggestions_block_list_data_source.go index 43d4dab8c04..eb52b0efc57 100644 --- a/internal/service/kendra/query_suggestions_block_list_data_source.go +++ b/internal/service/kendra/query_suggestions_block_list_data_source.go @@ -121,7 +121,7 @@ func dataSourceQuerySuggestionsBlockListRead(ctx context.Context, d *schema.Reso Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "kendra", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("index/%s/query-suggestions-block-list/%s", indexID, querySuggestionsBlockListID), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/kendra/query_suggestions_block_list_test.go b/internal/service/kendra/query_suggestions_block_list_test.go index eb321ec61cd..12481ea23e2 100644 --- a/internal/service/kendra/query_suggestions_block_list_test.go +++ b/internal/service/kendra/query_suggestions_block_list_test.go @@ -49,7 +49,7 @@ func TestAccKendraQuerySuggestionsBlockList_basic(t *testing.T) { resource.TestCheckResourceAttrPair(resourceName, "source_s3_path.0.bucket", "aws_s3_bucket.test", names.AttrID), resource.TestCheckResourceAttrPair(resourceName, "source_s3_path.0.key", "aws_s3_object.test", names.AttrKey), resource.TestCheckResourceAttrSet(resourceName, names.AttrStatus), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "kendra", regexache.MustCompile(`index/.+/query-suggestions-block-list/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kendra", regexache.MustCompile(`index/.+/query-suggestions-block-list/.+$`)), ), }, { diff --git a/internal/service/kendra/thesaurus.go b/internal/service/kendra/thesaurus.go index ba72b2a37d6..386424f7365 100644 --- a/internal/service/kendra/thesaurus.go +++ b/internal/service/kendra/thesaurus.go @@ -184,7 +184,7 @@ func resourceThesaurusRead(ctx context.Context, d *schema.ResourceData, meta int Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, Service: "kendra", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("index/%s/thesaurus/%s", indexId, id), }.String() diff --git a/internal/service/kendra/thesaurus_data_source.go b/internal/service/kendra/thesaurus_data_source.go index 766fe16f79e..d6a2ab46a8d 100644 --- a/internal/service/kendra/thesaurus_data_source.go +++ b/internal/service/kendra/thesaurus_data_source.go @@ -128,7 +128,7 @@ func dataSourceThesaurusRead(ctx context.Context, d *schema.ResourceData, meta i Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "kendra", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("index/%s/thesaurus/%s", indexID, thesaurusID), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/kendra/thesaurus_test.go b/internal/service/kendra/thesaurus_test.go index 8f1a74e9505..9ef7c1559f8 100644 --- a/internal/service/kendra/thesaurus_test.go +++ b/internal/service/kendra/thesaurus_test.go @@ -50,7 +50,7 @@ func TestAccKendraThesaurus_basic(t *testing.T) { resource.TestCheckResourceAttrPair(resourceName, "source_s3_path.0.key", "aws_s3_object.test", names.AttrKey), resource.TestCheckResourceAttrSet(resourceName, names.AttrStatus), resource.TestCheckResourceAttrSet(resourceName, "thesaurus_id"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "kendra", regexache.MustCompile(`index/.+/thesaurus/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kendra", regexache.MustCompile(`index/.+/thesaurus/.+$`)), ), }, { From 7fec454edb142416e1dab290cbdf8bd586ecf58c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:50 -0500 Subject: [PATCH 095/304] Make 'AWSClient.AccountID' a getter - keyspaces. --- internal/service/keyspaces/keyspace_test.go | 6 +++--- internal/service/keyspaces/table_test.go | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/keyspaces/keyspace_test.go b/internal/service/keyspaces/keyspace_test.go index 33c439f2a48..2248334f203 100644 --- a/internal/service/keyspaces/keyspace_test.go +++ b/internal/service/keyspaces/keyspace_test.go @@ -39,7 +39,7 @@ func TestAccKeyspacesKeyspace_basic(t *testing.T) { Config: testAccKeyspaceConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckKeyspaceExists(ctx, resourceName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "cassandra", "/keyspace/"+rName+"/"), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "cassandra", "/keyspace/"+rName+"/"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), @@ -70,7 +70,7 @@ func TestAccKeyspacesKeyspace_replicationSpecificationMulti(t *testing.T) { Config: testAccKeyspaceConfig_replicationSpecification(rName, string(types.RsSingleRegion)), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckKeyspaceExists(ctx, resourceName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "cassandra", "/keyspace/"+rName+"/"), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "cassandra", "/keyspace/"+rName+"/"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttr(resourceName, "replication_specification.0.replication_strategy", string(types.RsSingleRegion)), @@ -80,7 +80,7 @@ func TestAccKeyspacesKeyspace_replicationSpecificationMulti(t *testing.T) { Config: testAccKeyspaceConfig_multiReplicationSpecification(rName, string(types.RsMultiRegion), region1, region2), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckKeyspaceExists(ctx, resourceName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "cassandra", "/keyspace/"+rName+"/"), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "cassandra", "/keyspace/"+rName+"/"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttr(resourceName, "replication_specification.0.replication_strategy", string(types.RsMultiRegion)), diff --git a/internal/service/keyspaces/table_test.go b/internal/service/keyspaces/table_test.go index eca94754703..191750fccc7 100644 --- a/internal/service/keyspaces/table_test.go +++ b/internal/service/keyspaces/table_test.go @@ -38,7 +38,7 @@ func TestAccKeyspacesTable_basic(t *testing.T) { Config: testAccTableConfig_basic(rName1, rName2), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTableExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "cassandra", fmt.Sprintf("/keyspace/%s/table/%s", rName1, rName2)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "cassandra", fmt.Sprintf("/keyspace/%s/table/%s", rName1, rName2)), resource.TestCheckResourceAttr(resourceName, "capacity_specification.#", "1"), resource.TestCheckResourceAttr(resourceName, "capacity_specification.0.throughput_mode", "PAY_PER_REQUEST"), resource.TestCheckResourceAttr(resourceName, "client_side_timestamps.#", "0"), @@ -290,7 +290,7 @@ func TestAccKeyspacesTable_update(t *testing.T) { Config: testAccTableConfig_allAttributes(rName1, rName2), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTableExists(ctx, resourceName, &v1), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "cassandra", fmt.Sprintf("/keyspace/%s/table/%s", rName1, rName2)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "cassandra", fmt.Sprintf("/keyspace/%s/table/%s", rName1, rName2)), resource.TestCheckResourceAttr(resourceName, "capacity_specification.#", "1"), resource.TestCheckResourceAttr(resourceName, "capacity_specification.0.read_capacity_units", "200"), resource.TestCheckResourceAttr(resourceName, "capacity_specification.0.throughput_mode", "PROVISIONED"), @@ -321,7 +321,7 @@ func TestAccKeyspacesTable_update(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTableExists(ctx, resourceName, &v2), testAccCheckTableNotRecreated(&v1, &v2), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "cassandra", fmt.Sprintf("/keyspace/%s/table/%s", rName1, rName2)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "cassandra", fmt.Sprintf("/keyspace/%s/table/%s", rName1, rName2)), resource.TestCheckResourceAttr(resourceName, "capacity_specification.#", "1"), resource.TestCheckResourceAttr(resourceName, "capacity_specification.0.read_capacity_units", "0"), resource.TestCheckResourceAttr(resourceName, "capacity_specification.0.throughput_mode", "PAY_PER_REQUEST"), From 11d5481a97ef7c7d541522a7dbb8e2ff42787cc7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:51 -0500 Subject: [PATCH 096/304] Make 'AWSClient.AccountID' a getter - kinesis. --- internal/service/kinesis/stream_consumer_test.go | 2 +- internal/service/kinesis/stream_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/kinesis/stream_consumer_test.go b/internal/service/kinesis/stream_consumer_test.go index ac62236aa46..13e8ca8cb59 100644 --- a/internal/service/kinesis/stream_consumer_test.go +++ b/internal/service/kinesis/stream_consumer_test.go @@ -35,7 +35,7 @@ func TestAccKinesisStreamConsumer_basic(t *testing.T) { Config: testAccStreamConsumerConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccStreamConsumerExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesis", regexache.MustCompile(fmt.Sprintf("stream/%[1]s/consumer/%[1]s", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesis", regexache.MustCompile(fmt.Sprintf("stream/%[1]s/consumer/%[1]s", rName))), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttrPair(resourceName, names.AttrStreamARN, streamName, names.AttrARN), resource.TestCheckResourceAttrSet(resourceName, "creation_timestamp"), diff --git a/internal/service/kinesis/stream_test.go b/internal/service/kinesis/stream_test.go index 7629baecc79..6ecb64b576f 100644 --- a/internal/service/kinesis/stream_test.go +++ b/internal/service/kinesis/stream_test.go @@ -38,7 +38,7 @@ func TestAccKinesisStream_basic(t *testing.T) { Config: testAccStreamConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckStreamExists(ctx, resourceName, &stream), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesis", fmt.Sprintf("stream/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesis", fmt.Sprintf("stream/%s", rName)), resource.TestCheckResourceAttr(resourceName, "encryption_type", "NONE"), resource.TestCheckResourceAttr(resourceName, "enforce_consumer_deletion", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, names.AttrKMSKeyID, ""), From 9c34d0c7a15b75b43ad82a125a5eedece05dc0d3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:51 -0500 Subject: [PATCH 097/304] Make 'AWSClient.AccountID' a getter - kinesisanalytics. --- .../kinesisanalytics/application_test.go | 72 +++++++++---------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/internal/service/kinesisanalytics/application_test.go b/internal/service/kinesisanalytics/application_test.go index 00558291056..80d91a5cb85 100644 --- a/internal/service/kinesisanalytics/application_test.go +++ b/internal/service/kinesisanalytics/application_test.go @@ -37,7 +37,7 @@ func TestAccKinesisAnalyticsApplication_basic(t *testing.T) { Config: testAccApplicationConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttr(resourceName, "code", ""), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), @@ -151,7 +151,7 @@ func TestAccKinesisAnalyticsApplication_Code_update(t *testing.T) { Config: testAccApplicationConfig_code(rName, "SELECT 1;\n"), Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttr(resourceName, "code", "SELECT 1;\n"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), @@ -171,7 +171,7 @@ func TestAccKinesisAnalyticsApplication_Code_update(t *testing.T) { Config: testAccApplicationConfig_code(rName, "SELECT 2;\n"), Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttr(resourceName, "code", "SELECT 2;\n"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), @@ -214,7 +214,7 @@ func TestAccKinesisAnalyticsApplication_CloudWatchLoggingOptions_add(t *testing. Config: testAccApplicationConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttr(resourceName, "code", ""), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), @@ -234,7 +234,7 @@ func TestAccKinesisAnalyticsApplication_CloudWatchLoggingOptions_add(t *testing. Config: testAccApplicationConfig_cloudWatchLoggingOptions(rName, 0), Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "cloudwatch_logging_options.0.log_stream_arn", cloudWatchLogStreamResourceName, names.AttrARN), resource.TestCheckResourceAttrPair(resourceName, "cloudwatch_logging_options.0.role_arn", iamRoleResourceName, names.AttrARN), @@ -279,7 +279,7 @@ func TestAccKinesisAnalyticsApplication_CloudWatchLoggingOptions_delete(t *testi Config: testAccApplicationConfig_cloudWatchLoggingOptions(rName, 0), Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "cloudwatch_logging_options.0.log_stream_arn", cloudWatchLogStreamResourceName, names.AttrARN), resource.TestCheckResourceAttrPair(resourceName, "cloudwatch_logging_options.0.role_arn", iamRoleResourceName, names.AttrARN), @@ -301,7 +301,7 @@ func TestAccKinesisAnalyticsApplication_CloudWatchLoggingOptions_delete(t *testi Config: testAccApplicationConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttr(resourceName, "code", ""), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), @@ -346,7 +346,7 @@ func TestAccKinesisAnalyticsApplication_CloudWatchLoggingOptions_update(t *testi Config: testAccApplicationConfig_cloudWatchLoggingOptions(rName, 0), Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "cloudwatch_logging_options.0.log_stream_arn", cloudWatchLogStream1ResourceName, names.AttrARN), resource.TestCheckResourceAttrPair(resourceName, "cloudwatch_logging_options.0.role_arn", iamRole1ResourceName, names.AttrARN), @@ -368,7 +368,7 @@ func TestAccKinesisAnalyticsApplication_CloudWatchLoggingOptions_update(t *testi Config: testAccApplicationConfig_cloudWatchLoggingOptions(rName, 1), Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "cloudwatch_logging_options.0.log_stream_arn", cloudWatchLogStream2ResourceName, names.AttrARN), resource.TestCheckResourceAttrPair(resourceName, "cloudwatch_logging_options.0.role_arn", iamRole2ResourceName, names.AttrARN), @@ -413,7 +413,7 @@ func TestAccKinesisAnalyticsApplication_Input_add(t *testing.T) { Config: testAccApplicationConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttr(resourceName, "code", ""), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), @@ -433,7 +433,7 @@ func TestAccKinesisAnalyticsApplication_Input_add(t *testing.T) { Config: testAccApplicationConfig_input(rName), Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttr(resourceName, "code", ""), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), @@ -502,7 +502,7 @@ func TestAccKinesisAnalyticsApplication_Input_update(t *testing.T) { Config: testAccApplicationConfig_input(rName), Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttr(resourceName, "code", ""), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), @@ -546,7 +546,7 @@ func TestAccKinesisAnalyticsApplication_Input_update(t *testing.T) { Config: testAccApplicationConfig_inputUpdated(rName), Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttr(resourceName, "code", ""), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), @@ -617,7 +617,7 @@ func TestAccKinesisAnalyticsApplication_InputProcessing_add(t *testing.T) { Config: testAccApplicationConfig_input(rName), Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttr(resourceName, "code", ""), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), @@ -661,7 +661,7 @@ func TestAccKinesisAnalyticsApplication_InputProcessing_add(t *testing.T) { Config: testAccApplicationConfig_inputProcessing(rName, 0), Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttr(resourceName, "code", ""), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), @@ -732,7 +732,7 @@ func TestAccKinesisAnalyticsApplication_InputProcessing_delete(t *testing.T) { Config: testAccApplicationConfig_inputProcessing(rName, 0), Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttr(resourceName, "code", ""), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), @@ -779,7 +779,7 @@ func TestAccKinesisAnalyticsApplication_InputProcessing_delete(t *testing.T) { Config: testAccApplicationConfig_input(rName), Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttr(resourceName, "code", ""), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), @@ -849,7 +849,7 @@ func TestAccKinesisAnalyticsApplication_InputProcessing_update(t *testing.T) { Config: testAccApplicationConfig_inputProcessing(rName, 0), Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttr(resourceName, "code", ""), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), @@ -896,7 +896,7 @@ func TestAccKinesisAnalyticsApplication_InputProcessing_update(t *testing.T) { Config: testAccApplicationConfig_inputProcessing(rName, 1), Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttr(resourceName, "code", ""), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), @@ -971,7 +971,7 @@ func TestAccKinesisAnalyticsApplication_Multiple_update(t *testing.T) { Config: testAccApplicationConfig_multiple(rName, "", ""), Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "cloudwatch_logging_options.0.log_stream_arn", cloudWatchLogStreamResourceName, names.AttrARN), resource.TestCheckResourceAttrPair(resourceName, "cloudwatch_logging_options.0.role_arn", iamRole2ResourceName, names.AttrARN), @@ -1030,7 +1030,7 @@ func TestAccKinesisAnalyticsApplication_Multiple_update(t *testing.T) { Config: testAccApplicationConfig_multipleUpdated(rName, "", ""), Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttr(resourceName, "code", ""), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), @@ -1142,7 +1142,7 @@ func TestAccKinesisAnalyticsApplication_Output_update(t *testing.T) { Config: testAccApplicationConfig_output(rName), Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttr(resourceName, "code", ""), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), @@ -1172,7 +1172,7 @@ func TestAccKinesisAnalyticsApplication_Output_update(t *testing.T) { Config: testAccApplicationConfig_outputUpdated(rName), Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttr(resourceName, "code", ""), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), @@ -1217,7 +1217,7 @@ func TestAccKinesisAnalyticsApplication_Output_update(t *testing.T) { Config: testAccApplicationConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttr(resourceName, "code", ""), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), @@ -1255,7 +1255,7 @@ func TestAccKinesisAnalyticsApplication_ReferenceDataSource_add(t *testing.T) { Config: testAccApplicationConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttr(resourceName, "code", ""), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), @@ -1275,7 +1275,7 @@ func TestAccKinesisAnalyticsApplication_ReferenceDataSource_add(t *testing.T) { Config: testAccApplicationConfig_referenceDataSource(rName), Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttr(resourceName, "code", ""), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), @@ -1336,7 +1336,7 @@ func TestAccKinesisAnalyticsApplication_ReferenceDataSource_delete(t *testing.T) Config: testAccApplicationConfig_referenceDataSource(rName), Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttr(resourceName, "code", ""), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), @@ -1374,7 +1374,7 @@ func TestAccKinesisAnalyticsApplication_ReferenceDataSource_delete(t *testing.T) Config: testAccApplicationConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttr(resourceName, "code", ""), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), @@ -1418,7 +1418,7 @@ func TestAccKinesisAnalyticsApplication_ReferenceDataSource_update(t *testing.T) Config: testAccApplicationConfig_referenceDataSource(rName), Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttr(resourceName, "code", ""), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), @@ -1456,7 +1456,7 @@ func TestAccKinesisAnalyticsApplication_ReferenceDataSource_update(t *testing.T) Config: testAccApplicationConfig_referenceDataSourceUpdated(rName), Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttr(resourceName, "code", ""), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), @@ -1520,7 +1520,7 @@ func TestAccKinesisAnalyticsApplication_StartApplication_onCreate(t *testing.T) Config: testAccApplicationConfig_start(rName, true), Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttr(resourceName, "code", ""), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), @@ -1588,7 +1588,7 @@ func TestAccKinesisAnalyticsApplication_StartApplication_onUpdate(t *testing.T) Config: testAccApplicationConfig_start(rName, false), Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttr(resourceName, "code", ""), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), @@ -1638,7 +1638,7 @@ func TestAccKinesisAnalyticsApplication_StartApplication_onUpdate(t *testing.T) Config: testAccApplicationConfig_start(rName, true), Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttr(resourceName, "code", ""), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), @@ -1682,7 +1682,7 @@ func TestAccKinesisAnalyticsApplication_StartApplication_onUpdate(t *testing.T) Config: testAccApplicationConfig_start(rName, false), Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttr(resourceName, "code", ""), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), @@ -1749,7 +1749,7 @@ func TestAccKinesisAnalyticsApplication_StartApplication_update(t *testing.T) { Config: testAccApplicationConfig_multiple(rName, acctest.CtTrue, "LAST_STOPPED_POINT"), Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "cloudwatch_logging_options.0.log_stream_arn", cloudWatchLogStreamResourceName, names.AttrARN), resource.TestCheckResourceAttrPair(resourceName, "cloudwatch_logging_options.0.role_arn", iamRole2ResourceName, names.AttrARN), @@ -1809,7 +1809,7 @@ func TestAccKinesisAnalyticsApplication_StartApplication_update(t *testing.T) { Config: testAccApplicationConfig_multipleUpdated(rName, acctest.CtTrue, "LAST_STOPPED_POINT"), Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttr(resourceName, "code", ""), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), From 2b7d78c5aa4c03cb87f202810909649603d1cee7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:51 -0500 Subject: [PATCH 098/304] Make 'AWSClient.AccountID' a getter - kinesisanalyticsv2. --- .../kinesisanalyticsv2/application_test.go | 138 +++++++++--------- 1 file changed, 69 insertions(+), 69 deletions(-) diff --git a/internal/service/kinesisanalyticsv2/application_test.go b/internal/service/kinesisanalyticsv2/application_test.go index 84c76be7b6c..4ccd53ff08b 100644 --- a/internal/service/kinesisanalyticsv2/application_test.go +++ b/internal/service/kinesisanalyticsv2/application_test.go @@ -61,7 +61,7 @@ func TestAccKinesisAnalyticsV2Application_basicFlinkApplication(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "application_configuration.0.run_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -103,7 +103,7 @@ func TestAccKinesisAnalyticsV2Application_basicFlinkApplication(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "application_configuration.0.run_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -145,7 +145,7 @@ func TestAccKinesisAnalyticsV2Application_basicFlinkApplication(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "application_configuration.0.run_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -187,7 +187,7 @@ func TestAccKinesisAnalyticsV2Application_basicFlinkApplication(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "application_configuration.0.run_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -229,7 +229,7 @@ func TestAccKinesisAnalyticsV2Application_basicFlinkApplication(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "application_configuration.0.run_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -271,7 +271,7 @@ func TestAccKinesisAnalyticsV2Application_basicFlinkApplication(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "application_configuration.0.run_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -313,7 +313,7 @@ func TestAccKinesisAnalyticsV2Application_basicSQLApplication(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "application_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -467,7 +467,7 @@ func TestAccKinesisAnalyticsV2Application_ApplicationCode_update(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "application_configuration.0.run_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -498,7 +498,7 @@ func TestAccKinesisAnalyticsV2Application_ApplicationCode_update(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "application_configuration.0.run_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -541,7 +541,7 @@ func TestAccKinesisAnalyticsV2Application_CloudWatchLoggingOptions_add(t *testin Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "application_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -561,7 +561,7 @@ func TestAccKinesisAnalyticsV2Application_CloudWatchLoggingOptions_add(t *testin Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "application_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "cloudwatch_logging_options.0.log_stream_arn", cloudWatchLogStreamResourceName, names.AttrARN), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), @@ -605,7 +605,7 @@ func TestAccKinesisAnalyticsV2Application_CloudWatchLoggingOptions_delete(t *tes Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "application_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "cloudwatch_logging_options.0.log_stream_arn", cloudWatchLogStreamResourceName, names.AttrARN), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), @@ -626,7 +626,7 @@ func TestAccKinesisAnalyticsV2Application_CloudWatchLoggingOptions_delete(t *tes Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "application_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -670,7 +670,7 @@ func TestAccKinesisAnalyticsV2Application_CloudWatchLoggingOptions_update(t *tes Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "application_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "cloudwatch_logging_options.0.log_stream_arn", cloudWatchLogStream1ResourceName, names.AttrARN), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), @@ -691,7 +691,7 @@ func TestAccKinesisAnalyticsV2Application_CloudWatchLoggingOptions_update(t *tes Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "application_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "cloudwatch_logging_options.0.log_stream_arn", cloudWatchLogStream2ResourceName, names.AttrARN), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), @@ -777,7 +777,7 @@ func TestAccKinesisAnalyticsV2Application_EnvironmentProperties_update(t *testin resource.TestCheckResourceAttr(resourceName, "application_configuration.0.run_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -841,7 +841,7 @@ func TestAccKinesisAnalyticsV2Application_EnvironmentProperties_update(t *testin resource.TestCheckResourceAttr(resourceName, "application_configuration.0.run_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -894,7 +894,7 @@ func TestAccKinesisAnalyticsV2Application_EnvironmentProperties_update(t *testin resource.TestCheckResourceAttr(resourceName, "application_configuration.0.run_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -962,7 +962,7 @@ func TestAccKinesisAnalyticsV2Application_FlinkApplication_update(t *testing.T) resource.TestCheckResourceAttr(resourceName, "application_configuration.0.run_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -1010,7 +1010,7 @@ func TestAccKinesisAnalyticsV2Application_FlinkApplication_update(t *testing.T) resource.TestCheckResourceAttr(resourceName, "application_configuration.0.run_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -1097,7 +1097,7 @@ func TestAccKinesisAnalyticsV2Application_FlinkApplicationEnvironmentProperties_ resource.TestCheckResourceAttr(resourceName, "application_configuration.0.run_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -1162,7 +1162,7 @@ func TestAccKinesisAnalyticsV2Application_FlinkApplicationEnvironmentProperties_ resource.TestCheckResourceAttr(resourceName, "application_configuration.0.run_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -1253,7 +1253,7 @@ func TestAccKinesisAnalyticsV2Application_FlinkApplication_restoreFromSnapshot(t resource.TestCheckResourceAttr(resourceName, "application_configuration.0.run_configuration.0.flink_run_configuration.0.allow_non_restored_state", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -1312,7 +1312,7 @@ func TestAccKinesisAnalyticsV2Application_FlinkApplication_restoreFromSnapshot(t resource.TestCheckResourceAttr(resourceName, "application_configuration.0.run_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -1382,7 +1382,7 @@ func TestAccKinesisAnalyticsV2Application_FlinkApplication_restoreFromSnapshot(t resource.TestCheckResourceAttr(resourceName, "application_configuration.0.run_configuration.0.flink_run_configuration.0.allow_non_restored_state", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -1441,7 +1441,7 @@ func TestAccKinesisAnalyticsV2Application_FlinkApplication_restoreFromSnapshot(t resource.TestCheckResourceAttr(resourceName, "application_configuration.0.run_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -1512,7 +1512,7 @@ func TestAccKinesisAnalyticsV2Application_FlinkApplicationStartApplication_onCre resource.TestCheckResourceAttr(resourceName, "application_configuration.0.run_configuration.0.flink_run_configuration.0.allow_non_restored_state", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -1585,7 +1585,7 @@ func TestAccKinesisAnalyticsV2Application_FlinkApplicationStartApplication_onUpd resource.TestCheckResourceAttr(resourceName, "application_configuration.0.run_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -1643,7 +1643,7 @@ func TestAccKinesisAnalyticsV2Application_FlinkApplicationStartApplication_onUpd resource.TestCheckResourceAttr(resourceName, "application_configuration.0.run_configuration.0.flink_run_configuration.0.allow_non_restored_state", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -1691,7 +1691,7 @@ func TestAccKinesisAnalyticsV2Application_FlinkApplicationStartApplication_onUpd resource.TestCheckResourceAttr(resourceName, "application_configuration.0.run_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -1763,7 +1763,7 @@ func TestAccKinesisAnalyticsV2Application_FlinkApplication_updateRunning(t *test resource.TestCheckResourceAttr(resourceName, "application_configuration.0.run_configuration.0.flink_run_configuration.0.allow_non_restored_state", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -1821,7 +1821,7 @@ func TestAccKinesisAnalyticsV2Application_FlinkApplication_updateRunning(t *test resource.TestCheckResourceAttr(resourceName, "application_configuration.0.run_configuration.0.flink_run_configuration.0.allow_non_restored_state", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -1859,7 +1859,7 @@ func TestAccKinesisAnalyticsV2Application_ServiceExecutionRole_update(t *testing Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "application_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Testing"), @@ -1879,7 +1879,7 @@ func TestAccKinesisAnalyticsV2Application_ServiceExecutionRole_update(t *testing Check: resource.ComposeTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "application_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Testing"), @@ -1933,7 +1933,7 @@ func TestAccKinesisAnalyticsV2Application_SQLApplicationInput_add(t *testing.T) resource.TestCheckResourceAttr(resourceName, "application_configuration.0.run_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -1990,7 +1990,7 @@ func TestAccKinesisAnalyticsV2Application_SQLApplicationInput_add(t *testing.T) resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.0.output.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.0.reference_data_source.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -2071,7 +2071,7 @@ func TestAccKinesisAnalyticsV2Application_SQLApplicationInput_update(t *testing. resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.0.output.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.0.reference_data_source.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -2131,7 +2131,7 @@ func TestAccKinesisAnalyticsV2Application_SQLApplicationInput_update(t *testing. resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.0.output.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.0.reference_data_source.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -2212,7 +2212,7 @@ func TestAccKinesisAnalyticsV2Application_SQLApplicationInputProcessing_add(t *t resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.0.output.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.0.reference_data_source.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -2271,7 +2271,7 @@ func TestAccKinesisAnalyticsV2Application_SQLApplicationInputProcessing_add(t *t resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.0.output.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.0.reference_data_source.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -2354,7 +2354,7 @@ func TestAccKinesisAnalyticsV2Application_SQLApplicationInputProcessing_delete(t resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.0.output.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.0.reference_data_source.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -2411,7 +2411,7 @@ func TestAccKinesisAnalyticsV2Application_SQLApplicationInputProcessing_delete(t resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.0.output.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.0.reference_data_source.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -2495,7 +2495,7 @@ func TestAccKinesisAnalyticsV2Application_SQLApplicationInputProcessing_update(t resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.0.output.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.0.reference_data_source.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -2554,7 +2554,7 @@ func TestAccKinesisAnalyticsV2Application_SQLApplicationInputProcessing_update(t resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.0.output.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.0.reference_data_source.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -2650,7 +2650,7 @@ func TestAccKinesisAnalyticsV2Application_SQLApplicationMultiple_update(t *testi resource.TestCheckTypeSetElemAttrPair(resourceName, "application_configuration.0.sql_application_configuration.0.output.*.kinesis_firehose_output.0.resource_arn", firehoseResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.0.reference_data_source.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "cloudwatch_logging_options.0.log_stream_arn", cloudWatchLogStreamResourceName, names.AttrARN), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), @@ -2747,7 +2747,7 @@ func TestAccKinesisAnalyticsV2Application_SQLApplicationMultiple_update(t *testi resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.0.reference_data_source.0.table_name", "TABLE-1"), resource.TestCheckResourceAttrSet(resourceName, "application_configuration.0.sql_application_configuration.0.reference_data_source.0.reference_id"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -2817,7 +2817,7 @@ func TestAccKinesisAnalyticsV2Application_SQLApplicationOutput_update(t *testing resource.TestCheckTypeSetElemAttrPair(resourceName, "application_configuration.0.sql_application_configuration.0.output.*.kinesis_firehose_output.0.resource_arn", firehoseResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.0.reference_data_source.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -2869,7 +2869,7 @@ func TestAccKinesisAnalyticsV2Application_SQLApplicationOutput_update(t *testing resource.TestCheckTypeSetElemAttrPair(resourceName, "application_configuration.0.sql_application_configuration.0.output.*.lambda_output.0.resource_arn", lambdaResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.0.reference_data_source.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -2905,7 +2905,7 @@ func TestAccKinesisAnalyticsV2Application_SQLApplicationOutput_update(t *testing resource.TestCheckResourceAttr(resourceName, "application_configuration.0.run_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -2954,7 +2954,7 @@ func TestAccKinesisAnalyticsV2Application_SQLApplicationReferenceDataSource_add( resource.TestCheckResourceAttr(resourceName, "application_configuration.0.run_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -3005,7 +3005,7 @@ func TestAccKinesisAnalyticsV2Application_SQLApplicationReferenceDataSource_add( resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.0.reference_data_source.0.table_name", "TABLE-1"), resource.TestCheckResourceAttrSet(resourceName, "application_configuration.0.sql_application_configuration.0.reference_data_source.0.reference_id"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -3079,7 +3079,7 @@ func TestAccKinesisAnalyticsV2Application_SQLApplicationReferenceDataSource_dele resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.0.reference_data_source.0.table_name", "TABLE-1"), resource.TestCheckResourceAttrSet(resourceName, "application_configuration.0.sql_application_configuration.0.reference_data_source.0.reference_id"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -3110,7 +3110,7 @@ func TestAccKinesisAnalyticsV2Application_SQLApplicationReferenceDataSource_dele resource.TestCheckResourceAttr(resourceName, "application_configuration.0.run_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -3184,7 +3184,7 @@ func TestAccKinesisAnalyticsV2Application_SQLApplicationReferenceDataSource_upda resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.0.reference_data_source.0.table_name", "TABLE-1"), resource.TestCheckResourceAttrSet(resourceName, "application_configuration.0.sql_application_configuration.0.reference_data_source.0.reference_id"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -3238,7 +3238,7 @@ func TestAccKinesisAnalyticsV2Application_SQLApplicationReferenceDataSource_upda resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.0.reference_data_source.0.table_name", "TABLE-2"), resource.TestCheckResourceAttrSet(resourceName, "application_configuration.0.sql_application_configuration.0.reference_data_source.0.reference_id"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -3318,7 +3318,7 @@ func TestAccKinesisAnalyticsV2Application_SQLApplicationStartApplication_onCreat resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.0.output.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.0.reference_data_source.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -3399,7 +3399,7 @@ func TestAccKinesisAnalyticsV2Application_SQLApplicationStartApplication_onUpdat resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.0.output.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.0.reference_data_source.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -3462,7 +3462,7 @@ func TestAccKinesisAnalyticsV2Application_SQLApplicationStartApplication_onUpdat resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.0.output.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.0.reference_data_source.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -3519,7 +3519,7 @@ func TestAccKinesisAnalyticsV2Application_SQLApplicationStartApplication_onUpdat resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.0.output.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.0.reference_data_source.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -3610,7 +3610,7 @@ func TestAccKinesisAnalyticsV2Application_SQLApplication_updateRunning(t *testin resource.TestCheckTypeSetElemAttrPair(resourceName, "application_configuration.0.sql_application_configuration.0.output.*.kinesis_firehose_output.0.resource_arn", firehoseResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.0.reference_data_source.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "cloudwatch_logging_options.0.log_stream_arn", cloudWatchLogStreamResourceName, names.AttrARN), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), @@ -3707,7 +3707,7 @@ func TestAccKinesisAnalyticsV2Application_SQLApplication_updateRunning(t *testin resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.0.reference_data_source.0.table_name", "TABLE-1"), resource.TestCheckResourceAttrSet(resourceName, "application_configuration.0.sql_application_configuration.0.reference_data_source.0.reference_id"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -3783,7 +3783,7 @@ func TestAccKinesisAnalyticsV2Application_SQLApplicationVPC_add(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "application_configuration.0.run_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -3835,7 +3835,7 @@ func TestAccKinesisAnalyticsV2Application_SQLApplicationVPC_add(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.0.subnet_ids.#", "2"), resource.TestCheckResourceAttrSet(resourceName, "application_configuration.0.vpc_configuration.0.vpc_configuration_id"), resource.TestCheckResourceAttrPair(resourceName, "application_configuration.0.vpc_configuration.0.vpc_id", vpcResourceName, names.AttrID), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -3912,7 +3912,7 @@ func TestAccKinesisAnalyticsV2Application_SQLApplicationVPC_delete(t *testing.T) resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.0.subnet_ids.#", "2"), resource.TestCheckResourceAttrSet(resourceName, "application_configuration.0.vpc_configuration.0.vpc_configuration_id"), resource.TestCheckResourceAttrPair(resourceName, "application_configuration.0.vpc_configuration.0.vpc_id", vpcResourceName, names.AttrID), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -3960,7 +3960,7 @@ func TestAccKinesisAnalyticsV2Application_SQLApplicationVPC_delete(t *testing.T) resource.TestCheckResourceAttr(resourceName, "application_configuration.0.run_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -4037,7 +4037,7 @@ func TestAccKinesisAnalyticsV2Application_SQLApplicationVPC_update(t *testing.T) resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.0.subnet_ids.#", "2"), resource.TestCheckResourceAttrSet(resourceName, "application_configuration.0.vpc_configuration.0.vpc_configuration_id"), resource.TestCheckResourceAttrPair(resourceName, "application_configuration.0.vpc_configuration.0.vpc_id", vpcResourceName, names.AttrID), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -4089,7 +4089,7 @@ func TestAccKinesisAnalyticsV2Application_SQLApplicationVPC_update(t *testing.T) resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.0.subnet_ids.#", "1"), resource.TestCheckResourceAttrSet(resourceName, "application_configuration.0.vpc_configuration.0.vpc_configuration_id"), resource.TestCheckResourceAttrPair(resourceName, "application_configuration.0.vpc_configuration.0.vpc_id", vpcResourceName, names.AttrID), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -4177,7 +4177,7 @@ func TestAccKinesisAnalyticsV2Application_RunConfiguration_Update(t *testing.T) resource.TestCheckResourceAttr(resourceName, "application_configuration.0.run_configuration.0.flink_run_configuration.0.allow_non_restored_state", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -4241,7 +4241,7 @@ func TestAccKinesisAnalyticsV2Application_RunConfiguration_Update(t *testing.T) resource.TestCheckResourceAttr(resourceName, "application_configuration.0.run_configuration.0.flink_run_configuration.0.allow_non_restored_state", acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.sql_application_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, "application_configuration.0.vpc_configuration.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kinesisanalytics", fmt.Sprintf("application/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cloudwatch_logging_options.#", "0"), resource.TestCheckResourceAttrSet(resourceName, "create_timestamp"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), From 568d1fc1e021f6202cc7d1b74800ab0d8770b785 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:51 -0500 Subject: [PATCH 099/304] Make 'AWSClient.AccountID' a getter - kms. --- internal/service/kms/alias_data_source_test.go | 4 ++-- internal/service/kms/alias_test.go | 2 +- internal/service/kms/external_key_test.go | 2 +- internal/service/kms/key_data_source_test.go | 14 +++++++------- internal/service/kms/replica_external_key_test.go | 2 +- internal/service/kms/replica_key_test.go | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/kms/alias_data_source_test.go b/internal/service/kms/alias_data_source_test.go index cb9edfd164a..a27011cd254 100644 --- a/internal/service/kms/alias_data_source_test.go +++ b/internal/service/kms/alias_data_source_test.go @@ -27,9 +27,9 @@ func TestAccKMSAliasDataSource_service(t *testing.T) { { Config: testAccAliasDataSourceConfig_basic(rName), Check: resource.ComposeTestCheckFunc( - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "kms", rName), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kms", rName), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), - acctest.MatchResourceAttrRegionalARN(resourceName, "target_key_arn", "kms", regexache.MustCompile(`key/[0-9a-z]{8}-([0-9a-z]{4}-){3}[0-9a-z]{12}`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "target_key_arn", "kms", regexache.MustCompile(`key/[0-9a-z]{8}-([0-9a-z]{4}-){3}[0-9a-z]{12}`)), resource.TestMatchResourceAttr(resourceName, "target_key_id", regexache.MustCompile("^[0-9a-z]{8}-([0-9a-z]{4}-){3}[0-9a-z]{12}$")), ), }, diff --git a/internal/service/kms/alias_test.go b/internal/service/kms/alias_test.go index 28cc59c6beb..50bf070fa14 100644 --- a/internal/service/kms/alias_test.go +++ b/internal/service/kms/alias_test.go @@ -38,7 +38,7 @@ func TestAccKMSAlias_basic(t *testing.T) { Config: testAccAliasConfig_name(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAliasExists(ctx, resourceName, &alias), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "kms", regexache.MustCompile(`alias/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kms", regexache.MustCompile(`alias/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, tfkms.AliasNamePrefix+rName), resource.TestCheckResourceAttrPair(resourceName, "target_key_arn", keyResourceName, names.AttrARN), resource.TestCheckResourceAttrPair(resourceName, "target_key_id", keyResourceName, names.AttrID), diff --git a/internal/service/kms/external_key_test.go b/internal/service/kms/external_key_test.go index ad146121203..99ad3f88ec7 100644 --- a/internal/service/kms/external_key_test.go +++ b/internal/service/kms/external_key_test.go @@ -41,7 +41,7 @@ func TestAccKMSExternalKey_basic(t *testing.T) { Config: testAccExternalKeyConfig_basic(), Check: resource.ComposeTestCheckFunc( testAccCheckExternalKeyExists(ctx, resourceName, &key), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "kms", regexache.MustCompile(`key/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kms", regexache.MustCompile(`key/.+`)), resource.TestCheckResourceAttr(resourceName, "bypass_policy_lockout_safety_check", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "deletion_window_in_days", "30"), resource.TestCheckResourceAttr(resourceName, names.AttrEnabled, acctest.CtFalse), diff --git a/internal/service/kms/key_data_source_test.go b/internal/service/kms/key_data_source_test.go index d02dd254412..fb012ed138e 100644 --- a/internal/service/kms/key_data_source_test.go +++ b/internal/service/kms/key_data_source_test.go @@ -28,7 +28,7 @@ func TestAccKMSKeyDataSource_byKeyARN(t *testing.T) { Config: testAccKeyDataSourceConfig_byKeyARN(rName), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrPair(dataSourceName, names.AttrARN, resourceName, names.AttrARN), - acctest.CheckResourceAttrAccountID(dataSourceName, names.AttrAWSAccountID), + acctest.CheckResourceAttrAccountID(ctx, dataSourceName, names.AttrAWSAccountID), resource.TestCheckResourceAttrSet(dataSourceName, names.AttrCreationDate), resource.TestCheckResourceAttrPair(dataSourceName, "customer_master_key_spec", resourceName, "customer_master_key_spec"), resource.TestCheckNoResourceAttr(dataSourceName, "deletion_date"), @@ -63,7 +63,7 @@ func TestAccKMSKeyDataSource_byKeyID(t *testing.T) { Config: testAccKeyDataSourceConfig_byKeyID(rName), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrPair(dataSourceName, names.AttrARN, resourceName, names.AttrARN), - acctest.CheckResourceAttrAccountID(dataSourceName, names.AttrAWSAccountID), + acctest.CheckResourceAttrAccountID(ctx, dataSourceName, names.AttrAWSAccountID), resource.TestCheckResourceAttrSet(dataSourceName, names.AttrCreationDate), resource.TestCheckResourceAttrPair(dataSourceName, "customer_master_key_spec", resourceName, "customer_master_key_spec"), resource.TestCheckNoResourceAttr(dataSourceName, "deletion_date"), @@ -98,7 +98,7 @@ func TestAccKMSKeyDataSource_byAliasARN(t *testing.T) { Config: testAccKeyDataSourceConfig_byAliasARN(rName), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrPair(dataSourceName, names.AttrARN, resourceName, names.AttrARN), - acctest.CheckResourceAttrAccountID(dataSourceName, names.AttrAWSAccountID), + acctest.CheckResourceAttrAccountID(ctx, dataSourceName, names.AttrAWSAccountID), resource.TestCheckResourceAttrSet(dataSourceName, names.AttrCreationDate), resource.TestCheckResourceAttrPair(dataSourceName, "customer_master_key_spec", resourceName, "customer_master_key_spec"), resource.TestCheckNoResourceAttr(dataSourceName, "deletion_date"), @@ -133,7 +133,7 @@ func TestAccKMSKeyDataSource_byAliasID(t *testing.T) { Config: testAccKeyDataSourceConfig_byAliasID(rName), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrPair(dataSourceName, names.AttrARN, resourceName, names.AttrARN), - acctest.CheckResourceAttrAccountID(dataSourceName, names.AttrAWSAccountID), + acctest.CheckResourceAttrAccountID(ctx, dataSourceName, names.AttrAWSAccountID), resource.TestCheckResourceAttr(dataSourceName, "cloud_hsm_cluster_id", ""), resource.TestCheckResourceAttrSet(dataSourceName, names.AttrCreationDate), resource.TestCheckResourceAttrPair(dataSourceName, "customer_master_key_spec", resourceName, "customer_master_key_spec"), @@ -173,7 +173,7 @@ func TestAccKMSKeyDataSource_grantToken(t *testing.T) { Config: testAccKeyDataSourceConfig_grantToken(rName), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrPair(dataSourceName, names.AttrARN, resourceName, names.AttrARN), - acctest.CheckResourceAttrAccountID(dataSourceName, names.AttrAWSAccountID), + acctest.CheckResourceAttrAccountID(ctx, dataSourceName, names.AttrAWSAccountID), resource.TestCheckResourceAttrSet(dataSourceName, names.AttrCreationDate), resource.TestCheckResourceAttrPair(dataSourceName, "customer_master_key_spec", resourceName, "customer_master_key_spec"), resource.TestCheckNoResourceAttr(dataSourceName, "deletion_date"), @@ -208,7 +208,7 @@ func TestAccKMSKeyDataSource_multiRegionConfigurationByARN(t *testing.T) { Config: testAccKeyDataSourceConfig_multiRegionByARN(rName), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrPair(dataSourceName, names.AttrARN, resourceName, names.AttrARN), - acctest.CheckResourceAttrAccountID(dataSourceName, names.AttrAWSAccountID), + acctest.CheckResourceAttrAccountID(ctx, dataSourceName, names.AttrAWSAccountID), resource.TestCheckResourceAttrSet(dataSourceName, names.AttrCreationDate), resource.TestCheckResourceAttrPair(dataSourceName, "customer_master_key_spec", resourceName, "customer_master_key_spec"), resource.TestCheckNoResourceAttr(dataSourceName, "deletion_date"), @@ -248,7 +248,7 @@ func TestAccKMSKeyDataSource_multiRegionConfigurationByID(t *testing.T) { Config: testAccKeyDataSourceConfig_multiRegionByID(rName), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrPair(dataSourceName, names.AttrARN, resourceName, names.AttrARN), - acctest.CheckResourceAttrAccountID(dataSourceName, names.AttrAWSAccountID), + acctest.CheckResourceAttrAccountID(ctx, dataSourceName, names.AttrAWSAccountID), resource.TestCheckResourceAttrSet(dataSourceName, names.AttrCreationDate), resource.TestCheckResourceAttrPair(dataSourceName, "customer_master_key_spec", resourceName, "customer_master_key_spec"), resource.TestCheckNoResourceAttr(dataSourceName, "deletion_date"), diff --git a/internal/service/kms/replica_external_key_test.go b/internal/service/kms/replica_external_key_test.go index 9be75c05ccc..33a66c98b53 100644 --- a/internal/service/kms/replica_external_key_test.go +++ b/internal/service/kms/replica_external_key_test.go @@ -39,7 +39,7 @@ func TestAccKMSReplicaExternalKey_basic(t *testing.T) { Config: testAccReplicaExternalKeyConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckKeyExists(ctx, resourceName, &key), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "kms", regexache.MustCompile(`key/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kms", regexache.MustCompile(`key/.+`)), resource.TestCheckResourceAttr(resourceName, "bypass_policy_lockout_safety_check", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "deletion_window_in_days", "30"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), diff --git a/internal/service/kms/replica_key_test.go b/internal/service/kms/replica_key_test.go index 1be9ea53072..22ecf2d77e7 100644 --- a/internal/service/kms/replica_key_test.go +++ b/internal/service/kms/replica_key_test.go @@ -40,7 +40,7 @@ func TestAccKMSReplicaKey_basic(t *testing.T) { Config: testAccReplicaKeyConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckKeyExists(ctx, resourceName, &key), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "kms", regexache.MustCompile(`key/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "kms", regexache.MustCompile(`key/.+`)), resource.TestCheckResourceAttr(resourceName, "bypass_policy_lockout_safety_check", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "deletion_window_in_days", "30"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), From ef34dad67de002b88bc69160ed17bd7e487604b4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:51 -0500 Subject: [PATCH 100/304] Make 'AWSClient.AccountID' a getter - lakeformation. --- internal/service/lakeformation/lf_tag.go | 2 +- internal/service/lakeformation/lf_tag_test.go | 14 +++++++------- .../service/lakeformation/resource_lf_tag_test.go | 2 +- .../service/lakeformation/resource_lf_tags_test.go | 2 +- internal/service/lakeformation/resource_test.go | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/internal/service/lakeformation/lf_tag.go b/internal/service/lakeformation/lf_tag.go index 507d271e1bd..1a1e4b09d61 100644 --- a/internal/service/lakeformation/lf_tag.go +++ b/internal/service/lakeformation/lf_tag.go @@ -78,7 +78,7 @@ func resourceLFTagCreate(ctx context.Context, d *schema.ResourceData, meta inter if v, ok := d.GetOk(names.AttrCatalogID); ok { catalogID = v.(string) } else { - catalogID = meta.(*conns.AWSClient).AccountID + catalogID = meta.(*conns.AWSClient).AccountID(ctx) } id := lfTagCreateResourceID(catalogID, tagKey) diff --git a/internal/service/lakeformation/lf_tag_test.go b/internal/service/lakeformation/lf_tag_test.go index 176fef331d5..d59ef1492a5 100644 --- a/internal/service/lakeformation/lf_tag_test.go +++ b/internal/service/lakeformation/lf_tag_test.go @@ -93,7 +93,7 @@ func testAccLFTag_basic(t *testing.T) { testAccCheckLFTagExists(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, names.AttrKey, rName), resource.TestCheckResourceAttr(resourceName, "values.0", names.AttrValue), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrCatalogID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrCatalogID), ), }, { @@ -122,7 +122,7 @@ func testAccLFTag_TagKey_complex(t *testing.T) { testAccCheckLFTagExists(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, names.AttrKey, rName), resource.TestCheckResourceAttr(resourceName, "values.0", names.AttrValue), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrCatalogID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrCatalogID), ), }, }, @@ -170,7 +170,7 @@ func testAccLFTag_Values(t *testing.T) { testAccCheckLFTagExists(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, names.AttrKey, rName), resource.TestCheckResourceAttr(resourceName, "values.0", acctest.CtValue1), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrCatalogID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrCatalogID), ), }, { @@ -187,7 +187,7 @@ func testAccLFTag_Values(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "values.0", acctest.CtValue1), resource.TestCheckTypeSetElemAttr(resourceName, "values.*", "value3"), testAccCheckLFTagValuesLen(ctx, resourceName, 2), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrCatalogID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrCatalogID), ), }, }, @@ -216,7 +216,7 @@ func testAccLFTag_Values_overFifty(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrKey, rName), resource.TestCheckResourceAttr(resourceName, "values.0", acctest.CtValue1), testAccCheckLFTagValuesLen(ctx, resourceName, len(generatedValues)), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrCatalogID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrCatalogID), ), }, { @@ -227,7 +227,7 @@ func testAccLFTag_Values_overFifty(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "values.0", acctest.CtValue1), testAccCheckLFTagValuesLen(ctx, resourceName, len(generatedValues2)), resource.TestCheckTypeSetElemAttr(resourceName, "values.*", "value59"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrCatalogID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrCatalogID), ), }, { @@ -237,7 +237,7 @@ func testAccLFTag_Values_overFifty(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrKey, rName), resource.TestCheckResourceAttr(resourceName, "values.0", acctest.CtValue1), testAccCheckLFTagValuesLen(ctx, resourceName, len(generatedValues)-1), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrCatalogID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrCatalogID), ), }, }, diff --git a/internal/service/lakeformation/resource_lf_tag_test.go b/internal/service/lakeformation/resource_lf_tag_test.go index afcbed67997..05652098095 100644 --- a/internal/service/lakeformation/resource_lf_tag_test.go +++ b/internal/service/lakeformation/resource_lf_tag_test.go @@ -54,7 +54,7 @@ func testAccResourceLFTag_basic(t *testing.T) { Config: testAccResourceLFTagConfig_basic(rName, []string{names.AttrValue}, names.AttrValue), Check: resource.ComposeTestCheckFunc( testAccCheckResourceLFTagExists(ctx, resourceName, &resourcelftag), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrCatalogID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrCatalogID), resource.TestCheckResourceAttr(resourceName, "lf_tag.0.key", rName), resource.TestCheckResourceAttr(resourceName, "lf_tag.0.value", names.AttrValue), ), diff --git a/internal/service/lakeformation/resource_lf_tags_test.go b/internal/service/lakeformation/resource_lf_tags_test.go index c13eaf66807..072b3dd704c 100644 --- a/internal/service/lakeformation/resource_lf_tags_test.go +++ b/internal/service/lakeformation/resource_lf_tags_test.go @@ -43,7 +43,7 @@ func testAccResourceLFTags_basic(t *testing.T) { names.AttrKey: rName, names.AttrValue: "copse", }), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrCatalogID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrCatalogID), ), }, }, diff --git a/internal/service/lakeformation/resource_test.go b/internal/service/lakeformation/resource_test.go index eb1a1f80ddf..0a902551eea 100644 --- a/internal/service/lakeformation/resource_test.go +++ b/internal/service/lakeformation/resource_test.go @@ -90,7 +90,7 @@ func TestAccLakeFormationResource_serviceLinkedRole(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckResourceExists(ctx, resourceName), resource.TestCheckResourceAttrPair(resourceName, names.AttrARN, bucketResourceName, names.AttrARN), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrRoleARN, "iam", "role/aws-service-role/lakeformation.amazonaws.com/AWSServiceRoleForLakeFormationDataAccess"), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrRoleARN, "iam", "role/aws-service-role/lakeformation.amazonaws.com/AWSServiceRoleForLakeFormationDataAccess"), ), }, }, @@ -155,7 +155,7 @@ func TestAccLakeFormationResource_updateSLRToRole(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckResourceExists(ctx, resourceName), resource.TestCheckResourceAttrPair(resourceName, names.AttrARN, bucketResourceName, names.AttrARN), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrRoleARN, "iam", "role/aws-service-role/lakeformation.amazonaws.com/AWSServiceRoleForLakeFormationDataAccess"), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrRoleARN, "iam", "role/aws-service-role/lakeformation.amazonaws.com/AWSServiceRoleForLakeFormationDataAccess"), ), }, { From 5a6e630c2c65656241fa53452cc68c3ebad0b678 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:51 -0500 Subject: [PATCH 101/304] Make 'AWSClient.AccountID' a getter - lambda. --- internal/service/lambda/alias_test.go | 14 +++++----- internal/service/lambda/function_test.go | 26 +++++++++---------- internal/service/lambda/layer_version_test.go | 18 ++++++------- .../lambda/runtime_management_config_test.go | 4 +-- 4 files changed, 31 insertions(+), 31 deletions(-) diff --git a/internal/service/lambda/alias_test.go b/internal/service/lambda/alias_test.go index 67b837dd7aa..eab85adb36d 100644 --- a/internal/service/lambda/alias_test.go +++ b/internal/service/lambda/alias_test.go @@ -44,7 +44,7 @@ func TestAccLambdaAlias_basic(t *testing.T) { testAccCheckAliasExists(ctx, resourceName, &conf), testAccCheckAliasAttributes(&conf), testAccCheckAliasRoutingDoesNotExistConfig(&conf), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "lambda", functionArnResourcePart), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "lambda", functionArnResourcePart), testAccCheckAliasInvokeARN(resourceName, &conf), ), }, @@ -109,7 +109,7 @@ func TestAccLambdaAlias_FunctionName_name(t *testing.T) { testAccCheckAliasExists(ctx, resourceName, &conf), testAccCheckAliasAttributes(&conf), testAccCheckAliasRoutingDoesNotExistConfig(&conf), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "lambda", fmt.Sprintf("function:%s:%s", rName, rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "lambda", fmt.Sprintf("function:%s:%s", rName, rName)), testAccCheckAliasInvokeARN(resourceName, &conf), ), }, @@ -148,7 +148,7 @@ func TestAccLambdaAlias_nameUpdate(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAliasExists(ctx, resourceName, &conf), testAccCheckAliasAttributes(&conf), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "lambda", functionArnResourcePart), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "lambda", functionArnResourcePart), ), }, { @@ -162,7 +162,7 @@ func TestAccLambdaAlias_nameUpdate(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAliasExists(ctx, resourceName, &conf), testAccCheckAliasAttributes(&conf), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "lambda", functionArnResourcePartUpdate), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "lambda", functionArnResourcePartUpdate), ), }, }, @@ -192,7 +192,7 @@ func TestAccLambdaAlias_routing(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAliasExists(ctx, resourceName, &conf), testAccCheckAliasAttributes(&conf), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "lambda", functionArnResourcePart), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "lambda", functionArnResourcePart), ), }, { @@ -207,7 +207,7 @@ func TestAccLambdaAlias_routing(t *testing.T) { testAccCheckAliasExists(ctx, resourceName, &conf), testAccCheckAliasAttributes(&conf), testAccCheckAliasRoutingExistsConfig(&conf), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "lambda", functionArnResourcePart), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "lambda", functionArnResourcePart), ), }, { @@ -216,7 +216,7 @@ func TestAccLambdaAlias_routing(t *testing.T) { testAccCheckAliasExists(ctx, resourceName, &conf), testAccCheckAliasAttributes(&conf), testAccCheckAliasRoutingDoesNotExistConfig(&conf), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "lambda", functionArnResourcePart), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "lambda", functionArnResourcePart), ), }, }, diff --git a/internal/service/lambda/function_test.go b/internal/service/lambda/function_test.go index 5a17323051e..2150420af95 100644 --- a/internal/service/lambda/function_test.go +++ b/internal/service/lambda/function_test.go @@ -66,7 +66,7 @@ func TestAccLambdaFunction_basic(t *testing.T) { testAccCheckFunctionName(&conf, funcName), resource.TestCheckResourceAttr(resourceName, "architectures.#", "1"), resource.TestCheckResourceAttr(resourceName, "architectures.0", string(awstypes.ArchitectureX8664)), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "lambda", fmt.Sprintf("function:%s", funcName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "lambda", fmt.Sprintf("function:%s", funcName)), resource.TestCheckResourceAttrSet(resourceName, "code_sha256"), resource.TestCheckResourceAttr(resourceName, "ephemeral_storage.#", "1"), resource.TestCheckResourceAttr(resourceName, "ephemeral_storage.0.size", "512"), @@ -76,7 +76,7 @@ func TestAccLambdaFunction_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "logging_config.0.log_group", fmt.Sprintf("/aws/lambda/%s", funcName)), resource.TestCheckResourceAttr(resourceName, "logging_config.0.system_log_level", ""), resource.TestCheckResourceAttr(resourceName, "package_type", string(awstypes.PackageTypeZip)), - acctest.CheckResourceAttrRegionalARN(resourceName, "qualified_arn", "lambda", fmt.Sprintf("function:%s:%s", funcName, tflambda.FunctionVersionLatest)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, "qualified_arn", "lambda", fmt.Sprintf("function:%s:%s", funcName, tflambda.FunctionVersionLatest)), resource.TestCheckResourceAttr(resourceName, "reserved_concurrent_executions", "-1"), resource.TestCheckResourceAttr(resourceName, names.AttrSkipDestroy, acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, names.AttrVersion, tflambda.FunctionVersionLatest), @@ -146,7 +146,7 @@ func TestAccLambdaFunction_unpublishedCodeUpdate(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckFunctionExists(ctx, resourceName, &conf1), resource.TestCheckResourceAttr(resourceName, names.AttrVersion, tflambda.FunctionVersionLatest), - acctest.CheckResourceAttrRegionalARN(resourceName, "qualified_arn", "lambda", fmt.Sprintf("function:%s:%s", rName, tflambda.FunctionVersionLatest)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, "qualified_arn", "lambda", fmt.Sprintf("function:%s:%s", rName, tflambda.FunctionVersionLatest)), ), }, { @@ -160,7 +160,7 @@ func TestAccLambdaFunction_unpublishedCodeUpdate(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckFunctionExists(ctx, resourceName, &conf2), resource.TestCheckResourceAttr(resourceName, names.AttrVersion, tflambda.FunctionVersionLatest), - acctest.CheckResourceAttrRegionalARN(resourceName, "qualified_arn", "lambda", fmt.Sprintf("function:%s:%s", rName, tflambda.FunctionVersionLatest)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, "qualified_arn", "lambda", fmt.Sprintf("function:%s:%s", rName, tflambda.FunctionVersionLatest)), func(s *terraform.State) error { return testAccCheckAttributeIsDateAfter(s, resourceName, "last_modified", timeBeforeUpdate) }, @@ -565,7 +565,7 @@ func TestAccLambdaFunction_versioned(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckFunctionExists(ctx, resourceName, &conf), resource.TestCheckResourceAttr(resourceName, names.AttrVersion, "1"), - acctest.CheckResourceAttrRegionalARN(resourceName, "qualified_arn", "lambda", fmt.Sprintf("function:%s:%s", rName, "1")), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, "qualified_arn", "lambda", fmt.Sprintf("function:%s:%s", rName, "1")), ), }, { @@ -609,7 +609,7 @@ func TestAccLambdaFunction_versionedUpdate(t *testing.T) { Config: testAccFunctionConfig_publishable("test-fixtures/lambdatest.zip", rName, true), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr(resourceName, names.AttrVersion, "1"), - acctest.CheckResourceAttrRegionalARN(resourceName, "qualified_arn", "lambda", fmt.Sprintf("function:%s:%s", rName, "1")), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, "qualified_arn", "lambda", fmt.Sprintf("function:%s:%s", rName, "1")), ), }, { @@ -624,7 +624,7 @@ func TestAccLambdaFunction_versionedUpdate(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckFunctionExists(ctx, resourceName, &conf), resource.TestCheckResourceAttr(resourceName, names.AttrVersion, version), - acctest.CheckResourceAttrRegionalARN(resourceName, "qualified_arn", "lambda", fmt.Sprintf("function:%s:%s", rName, version)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, "qualified_arn", "lambda", fmt.Sprintf("function:%s:%s", rName, version)), func(s *terraform.State) error { return testAccCheckAttributeIsDateAfter(s, resourceName, "last_modified", timeBeforeUpdate) }, @@ -639,7 +639,7 @@ func TestAccLambdaFunction_versionedUpdate(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckFunctionExists(ctx, resourceName, &conf), resource.TestCheckResourceAttr(resourceName, names.AttrVersion, versionUpdated), - acctest.CheckResourceAttrRegionalARN(resourceName, "qualified_arn", "lambda", fmt.Sprintf("function:%s:%s", rName, versionUpdated)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, "qualified_arn", "lambda", fmt.Sprintf("function:%s:%s", rName, versionUpdated)), resource.TestCheckResourceAttr(resourceName, "runtime", string(awstypes.RuntimeNodejs20x)), func(s *terraform.State) error { return testAccCheckAttributeIsDateAfter(s, resourceName, "last_modified", timeBeforeUpdate) @@ -681,7 +681,7 @@ func TestAccLambdaFunction_enablePublish(t *testing.T) { testAccCheckFunctionExists(ctx, resourceName, &conf1), resource.TestCheckResourceAttr(resourceName, "publish", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, names.AttrVersion, unpublishedVersion), - acctest.CheckResourceAttrRegionalARN(resourceName, "qualified_arn", "lambda", fmt.Sprintf("function:%s:%s", rName, unpublishedVersion)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, "qualified_arn", "lambda", fmt.Sprintf("function:%s:%s", rName, unpublishedVersion)), ), }, { @@ -691,7 +691,7 @@ func TestAccLambdaFunction_enablePublish(t *testing.T) { testAccCheckFunctionExists(ctx, resourceName, &conf2), resource.TestCheckResourceAttr(resourceName, "publish", acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, names.AttrVersion, "1"), - acctest.CheckResourceAttrRegionalARN(resourceName, "qualified_arn", "lambda", fmt.Sprintf("function:%s:%s", rName, "1")), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, "qualified_arn", "lambda", fmt.Sprintf("function:%s:%s", rName, "1")), ), }, { @@ -706,7 +706,7 @@ func TestAccLambdaFunction_enablePublish(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckFunctionExists(ctx, resourceName, &conf3), resource.TestCheckResourceAttr(resourceName, names.AttrVersion, "1"), - acctest.CheckResourceAttrRegionalARN(resourceName, "qualified_arn", "lambda", fmt.Sprintf("function:%s:%s", rName, "1")), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, "qualified_arn", "lambda", fmt.Sprintf("function:%s:%s", rName, "1")), ), }, }, @@ -736,7 +736,7 @@ func TestAccLambdaFunction_disablePublish(t *testing.T) { testAccCheckFunctionExists(ctx, resourceName, &conf1), resource.TestCheckResourceAttr(resourceName, "publish", acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, names.AttrVersion, "1"), - acctest.CheckResourceAttrRegionalARN(resourceName, "qualified_arn", "lambda", fmt.Sprintf("function:%s:%s", rName, "1")), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, "qualified_arn", "lambda", fmt.Sprintf("function:%s:%s", rName, "1")), ), }, { @@ -746,7 +746,7 @@ func TestAccLambdaFunction_disablePublish(t *testing.T) { testAccCheckFunctionExists(ctx, resourceName, &conf2), resource.TestCheckResourceAttr(resourceName, "publish", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, names.AttrVersion, "1"), - acctest.CheckResourceAttrRegionalARN(resourceName, "qualified_arn", "lambda", fmt.Sprintf("function:%s:%s", rName, "1")), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, "qualified_arn", "lambda", fmt.Sprintf("function:%s:%s", rName, "1")), ), }, { diff --git a/internal/service/lambda/layer_version_test.go b/internal/service/lambda/layer_version_test.go index f779796d72a..0046d911b19 100644 --- a/internal/service/lambda/layer_version_test.go +++ b/internal/service/lambda/layer_version_test.go @@ -34,12 +34,12 @@ func TestAccLambdaLayerVersion_basic(t *testing.T) { Config: testAccLayerVersionConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckLayerVersionExists(ctx, resourceName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "lambda", fmt.Sprintf("layer:%s:1", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "lambda", fmt.Sprintf("layer:%s:1", rName)), resource.TestCheckResourceAttr(resourceName, "compatible_runtimes.#", "0"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttr(resourceName, "layer_name", rName), resource.TestCheckResourceAttr(resourceName, "license_info", ""), - acctest.CheckResourceAttrRegionalARN(resourceName, "layer_arn", "lambda", fmt.Sprintf("layer:%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, "layer_arn", "lambda", fmt.Sprintf("layer:%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrVersion, "1"), resource.TestCheckResourceAttr(resourceName, "signing_profile_version_arn", ""), resource.TestCheckResourceAttr(resourceName, "signing_job_arn", ""), @@ -94,7 +94,7 @@ func TestAccLambdaLayerVersion_update(t *testing.T) { Config: testAccLayerVersionConfig_createBeforeDestroy(rName, "test-fixtures/lambdatest.zip"), Check: resource.ComposeTestCheckFunc( testAccCheckLayerVersionExists(ctx, resourceName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "lambda", fmt.Sprintf("layer:%s:1", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "lambda", fmt.Sprintf("layer:%s:1", rName)), ), }, { @@ -107,7 +107,7 @@ func TestAccLambdaLayerVersion_update(t *testing.T) { Config: testAccLayerVersionConfig_createBeforeDestroy(rName, "test-fixtures/lambdatest_modified.zip"), Check: resource.ComposeTestCheckFunc( testAccCheckLayerVersionExists(ctx, resourceName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "lambda", fmt.Sprintf("layer:%s:2", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "lambda", fmt.Sprintf("layer:%s:2", rName)), ), }, }, @@ -129,21 +129,21 @@ func TestAccLambdaLayerVersion_sourceCodeHash(t *testing.T) { Config: testAccLayerVersionConfig_sourceCodeHash(rName, "test-fixtures/lambdatest.zip"), Check: resource.ComposeTestCheckFunc( testAccCheckLayerVersionExists(ctx, resourceName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "lambda", fmt.Sprintf("layer:%s:1", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "lambda", fmt.Sprintf("layer:%s:1", rName)), ), }, { Config: testAccLayerVersionConfig_sourceCodeHash(rName, "test-fixtures/lambdatest.zip"), Check: resource.ComposeTestCheckFunc( testAccCheckLayerVersionExists(ctx, resourceName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "lambda", fmt.Sprintf("layer:%s:1", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "lambda", fmt.Sprintf("layer:%s:1", rName)), ), }, { Config: testAccLayerVersionConfig_sourceCodeHash(rName, "test-fixtures/lambdatest_modified.zip"), Check: resource.ComposeTestCheckFunc( testAccCheckLayerVersionExists(ctx, resourceName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "lambda", fmt.Sprintf("layer:%s:2", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "lambda", fmt.Sprintf("layer:%s:2", rName)), ), }, }, @@ -331,7 +331,7 @@ func TestAccLambdaLayerVersion_skipDestroy(t *testing.T) { Config: testAccLayerVersionConfig_skipDestroy(rName, "nodejs18.x"), Check: resource.ComposeTestCheckFunc( testAccCheckLayerVersionExists(ctx, resourceName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "lambda", fmt.Sprintf("layer:%s:1", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "lambda", fmt.Sprintf("layer:%s:1", rName)), resource.TestCheckResourceAttr(resourceName, "compatible_runtimes.#", "1"), resource.TestCheckResourceAttr(resourceName, names.AttrSkipDestroy, acctest.CtTrue), ), @@ -340,7 +340,7 @@ func TestAccLambdaLayerVersion_skipDestroy(t *testing.T) { Config: testAccLayerVersionConfig_skipDestroy(rName, "nodejs20.x"), Check: resource.ComposeTestCheckFunc( testAccCheckLayerVersionExists(ctx, resourceName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "lambda", fmt.Sprintf("layer:%s:2", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "lambda", fmt.Sprintf("layer:%s:2", rName)), resource.TestCheckResourceAttr(resourceName, "compatible_runtimes.#", "1"), resource.TestCheckResourceAttr(resourceName, names.AttrSkipDestroy, acctest.CtTrue), ), diff --git a/internal/service/lambda/runtime_management_config_test.go b/internal/service/lambda/runtime_management_config_test.go index 816ce8b1ade..bce061e3afd 100644 --- a/internal/service/lambda/runtime_management_config_test.go +++ b/internal/service/lambda/runtime_management_config_test.go @@ -47,7 +47,7 @@ func TestAccLambdaRuntimeManagementConfig_basic(t *testing.T) { testAccCheckRuntimeManagementConfigExists(ctx, resourceName, &cfg), resource.TestCheckResourceAttrPair(resourceName, "function_name", functionResourceName, "function_name"), resource.TestCheckResourceAttr(resourceName, "update_runtime_on", string(types.UpdateRuntimeOnFunctionUpdate)), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrFunctionARN, "lambda", regexache.MustCompile(`function:+.`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrFunctionARN, "lambda", regexache.MustCompile(`function:+.`)), ), }, { @@ -125,7 +125,7 @@ func TestAccLambdaRuntimeManagementConfig_runtimeVersionARN(t *testing.T) { resource.TestCheckResourceAttrPair(resourceName, "function_name", functionResourceName, "function_name"), resource.TestCheckResourceAttr(resourceName, "update_runtime_on", string(types.UpdateRuntimeOnManual)), resource.TestMatchResourceAttr(resourceName, "runtime_version_arn", regexache.MustCompile(runtimeVersion)), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrFunctionARN, "lambda", regexache.MustCompile(`function:+.`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrFunctionARN, "lambda", regexache.MustCompile(`function:+.`)), ), }, }, From 16e3601d68bd3a774d4fbbf7af2af5e34bce9d72 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:51 -0500 Subject: [PATCH 102/304] Make 'AWSClient.AccountID' a getter - lexmodels. --- internal/service/lexmodels/bot.go | 2 +- internal/service/lexmodels/bot_alias.go | 2 +- internal/service/lexmodels/bot_alias_data_source.go | 2 +- internal/service/lexmodels/bot_data_source.go | 2 +- internal/service/lexmodels/intent.go | 2 +- internal/service/lexmodels/intent_data_source.go | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/lexmodels/bot.go b/internal/service/lexmodels/bot.go index 7a5dd446e85..6bc48b1ec1e 100644 --- a/internal/service/lexmodels/bot.go +++ b/internal/service/lexmodels/bot.go @@ -302,7 +302,7 @@ func resourceBotRead(ctx context.Context, d *schema.ResourceData, meta interface Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, Service: "lex", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("bot:%s", d.Id()), } d.Set(names.AttrARN, arn.String()) diff --git a/internal/service/lexmodels/bot_alias.go b/internal/service/lexmodels/bot_alias.go index bc27cfad6e7..16319ead9d0 100644 --- a/internal/service/lexmodels/bot_alias.go +++ b/internal/service/lexmodels/bot_alias.go @@ -202,7 +202,7 @@ func resourceBotAliasRead(ctx context.Context, d *schema.ResourceData, meta inte Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, Service: "lex", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("bot:%s", d.Id()), } d.Set(names.AttrARN, arn.String()) diff --git a/internal/service/lexmodels/bot_alias_data_source.go b/internal/service/lexmodels/bot_alias_data_source.go index 10539537afa..51be370cfd4 100644 --- a/internal/service/lexmodels/bot_alias_data_source.go +++ b/internal/service/lexmodels/bot_alias_data_source.go @@ -82,7 +82,7 @@ func dataSourceBotAliasRead(ctx context.Context, d *schema.ResourceData, meta in Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, Service: "lex", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("bot:%s", d.Id()), } d.Set(names.AttrARN, arn.String()) diff --git a/internal/service/lexmodels/bot_data_source.go b/internal/service/lexmodels/bot_data_source.go index b6d18609fed..aea3ebf9e84 100644 --- a/internal/service/lexmodels/bot_data_source.go +++ b/internal/service/lexmodels/bot_data_source.go @@ -109,7 +109,7 @@ func dataSourceBotRead(ctx context.Context, d *schema.ResourceData, meta interfa Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, Service: "lex", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("bot:%s", name), } d.Set(names.AttrARN, arn.String()) diff --git a/internal/service/lexmodels/intent.go b/internal/service/lexmodels/intent.go index 1f6bddf09be..94699e3c271 100644 --- a/internal/service/lexmodels/intent.go +++ b/internal/service/lexmodels/intent.go @@ -372,7 +372,7 @@ func resourceIntentRead(ctx context.Context, d *schema.ResourceData, meta interf Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, Service: "lex", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("intent:%s", d.Id()), } d.Set(names.AttrARN, arn.String()) diff --git a/internal/service/lexmodels/intent_data_source.go b/internal/service/lexmodels/intent_data_source.go index eba04356ce4..cd7cb687e82 100644 --- a/internal/service/lexmodels/intent_data_source.go +++ b/internal/service/lexmodels/intent_data_source.go @@ -88,7 +88,7 @@ func dataSourceIntentRead(ctx context.Context, d *schema.ResourceData, meta inte Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, Service: "lex", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("intent:%s", d.Get(names.AttrName).(string)), } d.Set(names.AttrARN, arn.String()) From 12df2499d8d4b1418ae4f424400d0d24e6568a42 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:51 -0500 Subject: [PATCH 103/304] Make 'AWSClient.AccountID' a getter - licensemanager. --- internal/service/licensemanager/grant_test.go | 2 +- .../licensemanager/license_configuration_test.go | 12 ++++++------ .../received_license_data_source_test.go | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/service/licensemanager/grant_test.go b/internal/service/licensemanager/grant_test.go index fdf957a89b8..e2284410c8a 100644 --- a/internal/service/licensemanager/grant_test.go +++ b/internal/service/licensemanager/grant_test.go @@ -72,7 +72,7 @@ func testAccGrant_basic(t *testing.T) { Config: testAccGrantConfig_basic(licenseARN, rName, principal, homeRegion), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGrantExists(ctx, resourceName), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "license-manager", regexache.MustCompile(`grant:g-.+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "license-manager", regexache.MustCompile(`grant:g-.+`)), resource.TestCheckTypeSetElemAttr(resourceName, "allowed_operations.*", "ListPurchasedLicenses"), resource.TestCheckTypeSetElemAttr(resourceName, "allowed_operations.*", "CheckoutLicense"), resource.TestCheckTypeSetElemAttr(resourceName, "allowed_operations.*", "CheckInLicense"), diff --git a/internal/service/licensemanager/license_configuration_test.go b/internal/service/licensemanager/license_configuration_test.go index 827802dea07..d14cc7f4f42 100644 --- a/internal/service/licensemanager/license_configuration_test.go +++ b/internal/service/licensemanager/license_configuration_test.go @@ -46,14 +46,14 @@ func TestAccLicenseManagerLicenseConfiguration_basic(t *testing.T) { Config: testAccLicenseConfigurationConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckLicenseConfigurationExists(ctx, resourceName, &licenseConfiguration), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "license-manager", regexache.MustCompile(`license-configuration:lic-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "license-manager", regexache.MustCompile(`license-configuration:lic-.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttr(resourceName, "license_count", "0"), resource.TestCheckResourceAttr(resourceName, "license_count_hard_limit", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "license_counting_type", "Instance"), resource.TestCheckResourceAttr(resourceName, "license_rules.#", "0"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerAccountID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerAccountID), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -153,7 +153,7 @@ func TestAccLicenseManagerLicenseConfiguration_update(t *testing.T) { Config: testAccLicenseConfigurationConfig_allAttributes(rName1), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckLicenseConfigurationExists(ctx, resourceName, &licenseConfiguration), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "license-manager", regexache.MustCompile(`license-configuration:lic-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "license-manager", regexache.MustCompile(`license-configuration:lic-.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "test1"), resource.TestCheckResourceAttr(resourceName, "license_count", "10"), resource.TestCheckResourceAttr(resourceName, "license_count_hard_limit", acctest.CtTrue), @@ -161,7 +161,7 @@ func TestAccLicenseManagerLicenseConfiguration_update(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "license_rules.#", "1"), resource.TestCheckResourceAttr(resourceName, "license_rules.0", "#minimumSockets=3"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName1), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerAccountID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerAccountID), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -174,7 +174,7 @@ func TestAccLicenseManagerLicenseConfiguration_update(t *testing.T) { Config: testAccLicenseConfigurationConfig_allAttributesUpdated(rName2), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckLicenseConfigurationExists(ctx, resourceName, &licenseConfiguration), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "license-manager", regexache.MustCompile(`license-configuration:lic-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "license-manager", regexache.MustCompile(`license-configuration:lic-.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "test2"), resource.TestCheckResourceAttr(resourceName, "license_count", "99"), resource.TestCheckResourceAttr(resourceName, "license_count_hard_limit", acctest.CtFalse), @@ -182,7 +182,7 @@ func TestAccLicenseManagerLicenseConfiguration_update(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "license_rules.#", "1"), resource.TestCheckResourceAttr(resourceName, "license_rules.0", "#minimumSockets=3"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName2), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerAccountID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerAccountID), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, diff --git a/internal/service/licensemanager/received_license_data_source_test.go b/internal/service/licensemanager/received_license_data_source_test.go index b65db693d76..9584790d920 100644 --- a/internal/service/licensemanager/received_license_data_source_test.go +++ b/internal/service/licensemanager/received_license_data_source_test.go @@ -27,7 +27,7 @@ func TestAccLicenseManagerReceivedLicenseDataSource_basic(t *testing.T) { { Config: testAccReceivedLicenseDataSourceConfig_arn(licenseARN), Check: resource.ComposeAggregateTestCheckFunc( - acctest.CheckResourceAttrGlobalARN(datasourceName, "beneficiary", "iam", "root"), + acctest.CheckResourceAttrGlobalARN(ctx, datasourceName, "beneficiary", "iam", "root"), resource.TestCheckResourceAttr(datasourceName, "consumption_configuration.#", "1"), acctest.CheckResourceAttrRFC3339(datasourceName, names.AttrCreateTime), resource.TestCheckResourceAttr(datasourceName, "entitlements.#", "1"), From 85a898bb8e7a81e12dc3e59e8e9c57ea97455ce8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:51 -0500 Subject: [PATCH 104/304] Make 'AWSClient.AccountID' a getter - lightsail. --- internal/service/lightsail/bucket_test.go | 2 +- internal/service/lightsail/certificate_test.go | 2 +- internal/service/lightsail/disk_test.go | 2 +- internal/service/lightsail/distribution_test.go | 2 +- internal/service/lightsail/lb_certificate_test.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/service/lightsail/bucket_test.go b/internal/service/lightsail/bucket_test.go index 3d6dc87c399..cca6f0f76c3 100644 --- a/internal/service/lightsail/bucket_test.go +++ b/internal/service/lightsail/bucket_test.go @@ -42,7 +42,7 @@ func TestAccLightsailBucket_basic(t *testing.T) { Config: testAccBucketConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckBucketExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "lightsail", regexache.MustCompile(`Bucket/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "lightsail", regexache.MustCompile(`Bucket/.+`)), resource.TestCheckResourceAttrSet(resourceName, names.AttrAvailabilityZone), resource.TestCheckResourceAttr(resourceName, "bundle_id", "small_1_0"), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedAt), diff --git a/internal/service/lightsail/certificate_test.go b/internal/service/lightsail/certificate_test.go index 1f5e575871d..dda3e564ef6 100644 --- a/internal/service/lightsail/certificate_test.go +++ b/internal/service/lightsail/certificate_test.go @@ -45,7 +45,7 @@ func TestAccLightsailCertificate_basic(t *testing.T) { Config: testAccCertificateConfig_basic(rName, domainName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCertificateExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "lightsail", regexache.MustCompile(`Certificate/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "lightsail", regexache.MustCompile(`Certificate/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrDomainName, domainName), resource.TestCheckResourceAttr(resourceName, "subject_alternative_names.#", "1"), diff --git a/internal/service/lightsail/disk_test.go b/internal/service/lightsail/disk_test.go index 59293e12d14..759c4e68f39 100644 --- a/internal/service/lightsail/disk_test.go +++ b/internal/service/lightsail/disk_test.go @@ -42,7 +42,7 @@ func TestAccLightsailDisk_basic(t *testing.T) { Config: testAccDiskConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckDiskExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "lightsail", regexache.MustCompile(`Disk/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "lightsail", regexache.MustCompile(`Disk/.+`)), resource.TestCheckResourceAttrSet(resourceName, names.AttrAvailabilityZone), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedAt), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), diff --git a/internal/service/lightsail/distribution_test.go b/internal/service/lightsail/distribution_test.go index d46243ece6d..229b3c851e7 100644 --- a/internal/service/lightsail/distribution_test.go +++ b/internal/service/lightsail/distribution_test.go @@ -72,7 +72,7 @@ func testAccDistribution_basic(t *testing.T) { testAccCheckDistributionExists(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "alternative_domain_names.#", "0"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "lightsail", regexache.MustCompile(`Distribution/*`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "lightsail", regexache.MustCompile(`Distribution/*`)), resource.TestCheckResourceAttr(resourceName, "bundle_id", "small_1_0"), resource.TestCheckResourceAttr(resourceName, "cache_behavior_settings.#", "1"), resource.TestCheckResourceAttr(resourceName, "cache_behavior_settings.0.allowed_http_methods", "GET,HEAD,OPTIONS,PUT,PATCH,POST,DELETE"), diff --git a/internal/service/lightsail/lb_certificate_test.go b/internal/service/lightsail/lb_certificate_test.go index 81b80e7ebd2..eeaf88e5698 100644 --- a/internal/service/lightsail/lb_certificate_test.go +++ b/internal/service/lightsail/lb_certificate_test.go @@ -44,7 +44,7 @@ func testAccLoadBalancerCertificate_basic(t *testing.T) { Config: testAccLoadBalancerCertificateConfig_basic(rName, lbName, domainName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckLoadBalancerCertificateExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "lightsail", regexache.MustCompile(`LoadBalancerTlsCertificate/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "lightsail", regexache.MustCompile(`LoadBalancerTlsCertificate/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrDomainName, domainName), resource.TestCheckResourceAttr(resourceName, "subject_alternative_names.#", "1"), From 61f2ef42580bcc877abf4de5a8c4e0e72a6aeb31 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:52 -0500 Subject: [PATCH 105/304] Make 'AWSClient.AccountID' a getter - location. --- internal/service/location/geofence_collection_test.go | 2 +- internal/service/location/map_test.go | 2 +- internal/service/location/place_index_test.go | 2 +- internal/service/location/route_calculator_test.go | 2 +- internal/service/location/tracker_test.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/service/location/geofence_collection_test.go b/internal/service/location/geofence_collection_test.go index b252ee575ed..72d1017ba9f 100644 --- a/internal/service/location/geofence_collection_test.go +++ b/internal/service/location/geofence_collection_test.go @@ -38,7 +38,7 @@ func TestAccLocationGeofenceCollection_basic(t *testing.T) { Config: testAccGeofenceCollectionConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckGeofenceCollectionExists(ctx, resourceName), - acctest.CheckResourceAttrRegionalARN(resourceName, "collection_arn", "geo", fmt.Sprintf("geofence-collection/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, "collection_arn", "geo", fmt.Sprintf("geofence-collection/%s", rName)), resource.TestCheckResourceAttr(resourceName, "collection_name", rName), acctest.CheckResourceAttrRFC3339(resourceName, names.AttrCreateTime), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), diff --git a/internal/service/location/map_test.go b/internal/service/location/map_test.go index 17bab495ed2..5059de9f6fb 100644 --- a/internal/service/location/map_test.go +++ b/internal/service/location/map_test.go @@ -40,7 +40,7 @@ func TestAccLocationMap_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "configuration.0.style", "VectorHereBerlin"), acctest.CheckResourceAttrRFC3339(resourceName, names.AttrCreateTime), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), - acctest.CheckResourceAttrRegionalARN(resourceName, "map_arn", "geo", fmt.Sprintf("map/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, "map_arn", "geo", fmt.Sprintf("map/%s", rName)), resource.TestCheckResourceAttr(resourceName, "map_name", rName), acctest.CheckResourceAttrRFC3339(resourceName, "update_time"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), diff --git a/internal/service/location/place_index_test.go b/internal/service/location/place_index_test.go index e942b72fd97..4a4a7e7d17b 100644 --- a/internal/service/location/place_index_test.go +++ b/internal/service/location/place_index_test.go @@ -41,7 +41,7 @@ func TestAccLocationPlaceIndex_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "data_source_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "data_source_configuration.0.intended_use", "SingleUse"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), - acctest.CheckResourceAttrRegionalARN(resourceName, "index_arn", "geo", fmt.Sprintf("place-index/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, "index_arn", "geo", fmt.Sprintf("place-index/%s", rName)), resource.TestCheckResourceAttr(resourceName, "index_name", rName), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), acctest.CheckResourceAttrRFC3339(resourceName, "update_time"), diff --git a/internal/service/location/route_calculator_test.go b/internal/service/location/route_calculator_test.go index 297120d2910..131907d2e0a 100644 --- a/internal/service/location/route_calculator_test.go +++ b/internal/service/location/route_calculator_test.go @@ -36,7 +36,7 @@ func TestAccLocationRouteCalculator_basic(t *testing.T) { Config: testAccRouteCalculatorConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckRouteCalculatorExists(ctx, resourceName), - acctest.CheckResourceAttrRegionalARN(resourceName, "calculator_arn", "geo", fmt.Sprintf("route-calculator/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, "calculator_arn", "geo", fmt.Sprintf("route-calculator/%s", rName)), resource.TestCheckResourceAttr(resourceName, "calculator_name", rName), acctest.CheckResourceAttrRFC3339(resourceName, names.AttrCreateTime), resource.TestCheckResourceAttr(resourceName, "data_source", "Here"), diff --git a/internal/service/location/tracker_test.go b/internal/service/location/tracker_test.go index 9648239fd53..992a790f449 100644 --- a/internal/service/location/tracker_test.go +++ b/internal/service/location/tracker_test.go @@ -41,7 +41,7 @@ func TestAccLocationTracker_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrKMSKeyID, ""), resource.TestCheckResourceAttr(resourceName, "position_filtering", "TimeBased"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, "tracker_arn", "geo", fmt.Sprintf("tracker/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, "tracker_arn", "geo", fmt.Sprintf("tracker/%s", rName)), resource.TestCheckResourceAttr(resourceName, "tracker_name", rName), acctest.CheckResourceAttrRFC3339(resourceName, "update_time"), ), From 6790d15cd75f6f1d2c8fdb2ab53b2e609537ca7e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:52 -0500 Subject: [PATCH 106/304] Make 'AWSClient.AccountID' a getter - logs. --- internal/service/logs/account_policy_test.go | 6 +++--- internal/service/logs/destination_test.go | 2 +- internal/service/logs/group_test.go | 2 +- internal/service/logs/query_definition_test.go | 10 +++++----- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/internal/service/logs/account_policy_test.go b/internal/service/logs/account_policy_test.go index e207ba6cae7..db41081bb1e 100644 --- a/internal/service/logs/account_policy_test.go +++ b/internal/service/logs/account_policy_test.go @@ -36,7 +36,7 @@ func TestAccLogsAccountPolicy_basicSubscriptionFilter(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAccountPolicyExists(ctx, resourceName, &accountPolicy), resource.TestCheckResourceAttr(resourceName, "policy_name", rName), - testAccCheckAccountHasSubscriptionFilterPolicy(resourceName, rName), + testAccCheckAccountHasSubscriptionFilterPolicy(ctx, resourceName, rName), ), }, { @@ -226,14 +226,14 @@ func testAccCheckAccountPolicyDestroy(ctx context.Context) resource.TestCheckFun } } -func testAccCheckAccountHasSubscriptionFilterPolicy(resourceName string, rName string) resource.TestCheckFunc { +func testAccCheckAccountHasSubscriptionFilterPolicy(ctx context.Context, resourceName string, rName string) resource.TestCheckFunc { return func(s *terraform.State) error { expectedJSONTemplate := `{ "DestinationArn": "arn:%s:lambda:%s:%s:function:%s", "FilterPattern" : " ", "Distribution" : "Random" }` - expectedJSON := fmt.Sprintf(expectedJSONTemplate, acctest.Partition(), acctest.Region(), acctest.AccountID(), rName) + expectedJSON := fmt.Sprintf(expectedJSONTemplate, acctest.Partition(), acctest.Region(), acctest.AccountID(ctx), rName) return acctest.CheckResourceAttrEquivalentJSON(resourceName, "policy_document", expectedJSON)(s) } } diff --git a/internal/service/logs/destination_test.go b/internal/service/logs/destination_test.go index b1c70d34126..c0f57e94f01 100644 --- a/internal/service/logs/destination_test.go +++ b/internal/service/logs/destination_test.go @@ -38,7 +38,7 @@ func TestAccLogsDestination_basic(t *testing.T) { Config: testAccDestinationConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckDestinationExists(ctx, resourceName, &destination), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "logs", regexache.MustCompile(`destination:.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "logs", regexache.MustCompile(`destination:.+`)), resource.TestCheckResourceAttrPair(resourceName, names.AttrRoleARN, roleResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrPair(resourceName, names.AttrTargetARN, streamResourceName, names.AttrARN), diff --git a/internal/service/logs/group_test.go b/internal/service/logs/group_test.go index 01ea571cf66..807f4590c84 100644 --- a/internal/service/logs/group_test.go +++ b/internal/service/logs/group_test.go @@ -40,7 +40,7 @@ func TestAccLogsGroup_basic(t *testing.T) { Config: testAccGroupConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckLogGroupExists(ctx, t, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "logs", fmt.Sprintf("log-group:%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "logs", fmt.Sprintf("log-group:%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrKMSKeyID, ""), resource.TestCheckResourceAttr(resourceName, "log_group_class", expectedLogGroupClass), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), diff --git a/internal/service/logs/query_definition_test.go b/internal/service/logs/query_definition_test.go index 1fd8dba02c7..99583fdc633 100644 --- a/internal/service/logs/query_definition_test.go +++ b/internal/service/logs/query_definition_test.go @@ -54,16 +54,16 @@ func TestAccLogsQueryDefinition_basic(t *testing.T) { ResourceName: resourceName, ImportState: true, ImportStateVerify: true, - ImportStateIdFunc: testAccQueryDefinitionImportStateID(&v), + ImportStateIdFunc: testAccQueryDefinitionImportStateID(ctx, &v), }, }, }) } -func testAccQueryDefinitionImportStateID(v *types.QueryDefinition) resource.ImportStateIdFunc { +func testAccQueryDefinitionImportStateID(ctx context.Context, v *types.QueryDefinition) resource.ImportStateIdFunc { return func(*terraform.State) (string, error) { id := arn.ARN{ - AccountID: acctest.AccountID(), + AccountID: acctest.AccountID(ctx), Partition: acctest.Partition(), Region: acctest.Region(), Service: "logs", @@ -129,7 +129,7 @@ func TestAccLogsQueryDefinition_rename(t *testing.T) { ResourceName: resourceName, ImportState: true, ImportStateVerify: true, - ImportStateIdFunc: testAccQueryDefinitionImportStateID(&v2), + ImportStateIdFunc: testAccQueryDefinitionImportStateID(ctx, &v2), }, }, }) @@ -170,7 +170,7 @@ func TestAccLogsQueryDefinition_logGroups(t *testing.T) { ResourceName: resourceName, ImportState: true, ImportStateVerify: true, - ImportStateIdFunc: testAccQueryDefinitionImportStateID(&v2), + ImportStateIdFunc: testAccQueryDefinitionImportStateID(ctx, &v2), }, }, }) From f5bfc81060a6fb1d055ad1569bcc7316f57ef763 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:52 -0500 Subject: [PATCH 107/304] Make 'AWSClient.AccountID' a getter - m2. --- internal/service/m2/application_test.go | 6 +++--- internal/service/m2/environment_test.go | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/service/m2/application_test.go b/internal/service/m2/application_test.go index 76d385ff255..4bd0e1fc010 100644 --- a/internal/service/m2/application_test.go +++ b/internal/service/m2/application_test.go @@ -48,7 +48,7 @@ func TestAccM2Application_basic_Content(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &application), resource.TestCheckResourceAttrSet(resourceName, names.AttrApplicationID), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "m2", regexache.MustCompile(`app/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "m2", regexache.MustCompile(`app/.+`)), resource.TestCheckResourceAttr(resourceName, "current_version", "1"), resource.TestCheckResourceAttr(resourceName, "definition.#", "1"), resource.TestCheckResourceAttrSet(resourceName, "definition.0.content"), @@ -95,7 +95,7 @@ func TestAccM2Application_basic_S3Location(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &application), resource.TestCheckResourceAttrSet(resourceName, names.AttrApplicationID), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "m2", regexache.MustCompile(`app/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "m2", regexache.MustCompile(`app/.+`)), resource.TestCheckResourceAttr(resourceName, "current_version", "1"), resource.TestCheckResourceAttr(resourceName, "definition.#", "1"), resource.TestCheckNoResourceAttr(resourceName, "definition.0.content"), @@ -187,7 +187,7 @@ func TestAccM2Application_full(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckApplicationExists(ctx, resourceName, &application), resource.TestCheckResourceAttrSet(resourceName, names.AttrApplicationID), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "m2", regexache.MustCompile(`app/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "m2", regexache.MustCompile(`app/.+`)), resource.TestCheckResourceAttr(resourceName, "current_version", "1"), resource.TestCheckResourceAttr(resourceName, "definition.#", "1"), resource.TestCheckResourceAttrSet(resourceName, "definition.0.content"), diff --git a/internal/service/m2/environment_test.go b/internal/service/m2/environment_test.go index 4e02d969790..4ddc6db5dae 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(ctx, 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(ctx, 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 e031f63fd09be2a58f25650dfc8d0eacd7cc91a2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:52 -0500 Subject: [PATCH 108/304] Make 'AWSClient.AccountID' a getter - macie2. --- internal/service/macie2/account.go | 2 +- internal/service/macie2/account_test.go | 14 ++++---- .../classification_export_configuration.go | 2 +- .../macie2/custom_data_identifier_test.go | 10 +++--- .../service/macie2/findings_filter_test.go | 18 +++++------ internal/service/macie2/member_test.go | 32 +++++++++---------- .../macie2/organization_admin_account_test.go | 2 +- 7 files changed, 40 insertions(+), 40 deletions(-) diff --git a/internal/service/macie2/account.go b/internal/service/macie2/account.go index fa249d955d2..d99961f2ee4 100644 --- a/internal/service/macie2/account.go +++ b/internal/service/macie2/account.go @@ -102,7 +102,7 @@ func resourceAccountCreate(ctx context.Context, d *schema.ResourceData, meta int return sdkdiag.AppendErrorf(diags, "enabling Macie Account: %s", err) } - d.SetId(meta.(*conns.AWSClient).AccountID) + d.SetId(meta.(*conns.AWSClient).AccountID(ctx)) return append(diags, resourceAccountRead(ctx, d, meta)...) } diff --git a/internal/service/macie2/account_test.go b/internal/service/macie2/account_test.go index 556e0edaf06..ef86f276601 100644 --- a/internal/service/macie2/account_test.go +++ b/internal/service/macie2/account_test.go @@ -36,7 +36,7 @@ func testAccAccount_basic(t *testing.T) { testAccCheckAccountExists(ctx, resourceName, &macie2Output), resource.TestCheckResourceAttr(resourceName, "finding_publishing_frequency", string(awstypes.FindingPublishingFrequencyFifteenMinutes)), resource.TestCheckResourceAttr(resourceName, names.AttrStatus, string(awstypes.MacieStatusEnabled)), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrServiceRole, "iam", "role/aws-service-role/macie.amazonaws.com/AWSServiceRoleForAmazonMacie"), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrServiceRole, "iam", "role/aws-service-role/macie.amazonaws.com/AWSServiceRoleForAmazonMacie"), acctest.CheckResourceAttrRFC3339(resourceName, names.AttrCreatedAt), acctest.CheckResourceAttrRFC3339(resourceName, "updated_at"), ), @@ -67,7 +67,7 @@ func testAccAccount_FindingPublishingFrequency(t *testing.T) { testAccCheckAccountExists(ctx, resourceName, &macie2Output), resource.TestCheckResourceAttr(resourceName, "finding_publishing_frequency", string(awstypes.FindingPublishingFrequencyFifteenMinutes)), resource.TestCheckResourceAttr(resourceName, names.AttrStatus, string(awstypes.MacieStatusEnabled)), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrServiceRole, "iam", "role/aws-service-role/macie.amazonaws.com/AWSServiceRoleForAmazonMacie"), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrServiceRole, "iam", "role/aws-service-role/macie.amazonaws.com/AWSServiceRoleForAmazonMacie"), acctest.CheckResourceAttrRFC3339(resourceName, names.AttrCreatedAt), acctest.CheckResourceAttrRFC3339(resourceName, "updated_at"), ), @@ -78,7 +78,7 @@ func testAccAccount_FindingPublishingFrequency(t *testing.T) { testAccCheckAccountExists(ctx, resourceName, &macie2Output), resource.TestCheckResourceAttr(resourceName, "finding_publishing_frequency", string(awstypes.FindingPublishingFrequencyOneHour)), resource.TestCheckResourceAttr(resourceName, names.AttrStatus, string(awstypes.MacieStatusEnabled)), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrServiceRole, "iam", "role/aws-service-role/macie.amazonaws.com/AWSServiceRoleForAmazonMacie"), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrServiceRole, "iam", "role/aws-service-role/macie.amazonaws.com/AWSServiceRoleForAmazonMacie"), acctest.CheckResourceAttrRFC3339(resourceName, names.AttrCreatedAt), acctest.CheckResourceAttrRFC3339(resourceName, "updated_at"), ), @@ -109,7 +109,7 @@ func testAccAccount_WithStatus(t *testing.T) { testAccCheckAccountExists(ctx, resourceName, &macie2Output), resource.TestCheckResourceAttr(resourceName, "finding_publishing_frequency", string(awstypes.FindingPublishingFrequencyFifteenMinutes)), resource.TestCheckResourceAttr(resourceName, names.AttrStatus, string(awstypes.MacieStatusEnabled)), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrServiceRole, "iam", "role/aws-service-role/macie.amazonaws.com/AWSServiceRoleForAmazonMacie"), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrServiceRole, "iam", "role/aws-service-role/macie.amazonaws.com/AWSServiceRoleForAmazonMacie"), acctest.CheckResourceAttrRFC3339(resourceName, names.AttrCreatedAt), acctest.CheckResourceAttrRFC3339(resourceName, "updated_at"), ), @@ -120,7 +120,7 @@ func testAccAccount_WithStatus(t *testing.T) { testAccCheckAccountExists(ctx, resourceName, &macie2Output), resource.TestCheckResourceAttr(resourceName, "finding_publishing_frequency", string(awstypes.FindingPublishingFrequencyFifteenMinutes)), resource.TestCheckResourceAttr(resourceName, names.AttrStatus, string(awstypes.MacieStatusPaused)), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrServiceRole, "iam", "role/aws-service-role/macie.amazonaws.com/AWSServiceRoleForAmazonMacie"), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrServiceRole, "iam", "role/aws-service-role/macie.amazonaws.com/AWSServiceRoleForAmazonMacie"), acctest.CheckResourceAttrRFC3339(resourceName, names.AttrCreatedAt), acctest.CheckResourceAttrRFC3339(resourceName, "updated_at"), ), @@ -151,7 +151,7 @@ func testAccAccount_WithFindingAndStatus(t *testing.T) { testAccCheckAccountExists(ctx, resourceName, &macie2Output), resource.TestCheckResourceAttr(resourceName, "finding_publishing_frequency", string(awstypes.FindingPublishingFrequencyFifteenMinutes)), resource.TestCheckResourceAttr(resourceName, names.AttrStatus, string(awstypes.MacieStatusEnabled)), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrServiceRole, "iam", "role/aws-service-role/macie.amazonaws.com/AWSServiceRoleForAmazonMacie"), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrServiceRole, "iam", "role/aws-service-role/macie.amazonaws.com/AWSServiceRoleForAmazonMacie"), acctest.CheckResourceAttrRFC3339(resourceName, names.AttrCreatedAt), acctest.CheckResourceAttrRFC3339(resourceName, "updated_at"), ), @@ -162,7 +162,7 @@ func testAccAccount_WithFindingAndStatus(t *testing.T) { testAccCheckAccountExists(ctx, resourceName, &macie2Output), resource.TestCheckResourceAttr(resourceName, "finding_publishing_frequency", string(awstypes.FindingPublishingFrequencyOneHour)), resource.TestCheckResourceAttr(resourceName, names.AttrStatus, string(awstypes.MacieStatusPaused)), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrServiceRole, "iam", "role/aws-service-role/macie.amazonaws.com/AWSServiceRoleForAmazonMacie"), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrServiceRole, "iam", "role/aws-service-role/macie.amazonaws.com/AWSServiceRoleForAmazonMacie"), acctest.CheckResourceAttrRFC3339(resourceName, names.AttrCreatedAt), acctest.CheckResourceAttrRFC3339(resourceName, "updated_at"), ), diff --git a/internal/service/macie2/classification_export_configuration.go b/internal/service/macie2/classification_export_configuration.go index e39857c1e4f..c846d63a654 100644 --- a/internal/service/macie2/classification_export_configuration.go +++ b/internal/service/macie2/classification_export_configuration.go @@ -139,7 +139,7 @@ func resourceClassificationExportConfigurationRead(ctx context.Context, d *schem return sdkdiag.AppendErrorf(diags, "setting Macie classification export configuration s3_destination: %s", err) } } - d.SetId(fmt.Sprintf("%s:%s:%s", "macie:classification_export_configuration", meta.(*conns.AWSClient).AccountID, meta.(*conns.AWSClient).Region)) + d.SetId(fmt.Sprintf("%s:%s:%s", "macie:classification_export_configuration", meta.(*conns.AWSClient).AccountID(ctx), meta.(*conns.AWSClient).Region)) } return diags diff --git a/internal/service/macie2/custom_data_identifier_test.go b/internal/service/macie2/custom_data_identifier_test.go index b70e79eaed4..beb626a2edb 100644 --- a/internal/service/macie2/custom_data_identifier_test.go +++ b/internal/service/macie2/custom_data_identifier_test.go @@ -42,7 +42,7 @@ func testAccCustomDataIdentifier_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrNamePrefix, "terraform-"), acctest.CheckResourceAttrRFC3339(resourceName, names.AttrCreatedAt), resource.TestCheckResourceAttr(resourceName, "regex", regex), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "macie2", regexache.MustCompile(`custom-data-identifier/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "macie2", regexache.MustCompile(`custom-data-identifier/.+`)), ), }, { @@ -127,7 +127,7 @@ func testAccCustomDataIdentifier_NamePrefix(t *testing.T) { testAccCheckCustomDataIdentifierExists(ctx, resourceName, &macie2Output), acctest.CheckResourceAttrNameFromPrefix(resourceName, names.AttrName, namePrefix), resource.TestCheckResourceAttr(resourceName, names.AttrNamePrefix, namePrefix), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "macie2", regexache.MustCompile(`custom-data-identifier/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "macie2", regexache.MustCompile(`custom-data-identifier/.+`)), ), }, { @@ -161,7 +161,7 @@ func testAccCustomDataIdentifier_WithClassificationJob(t *testing.T) { acctest.CheckResourceAttrNameGenerated(resourceName, names.AttrName), resource.TestCheckResourceAttr(resourceName, names.AttrNamePrefix, "terraform-"), acctest.CheckResourceAttrRFC3339(resourceName, names.AttrCreatedAt), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "macie2", regexache.MustCompile(`custom-data-identifier/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "macie2", regexache.MustCompile(`custom-data-identifier/.+`)), ), }, { @@ -171,7 +171,7 @@ func testAccCustomDataIdentifier_WithClassificationJob(t *testing.T) { acctest.CheckResourceAttrNameGenerated(resourceName, names.AttrName), resource.TestCheckResourceAttr(resourceName, names.AttrNamePrefix, "terraform-"), acctest.CheckResourceAttrRFC3339(resourceName, names.AttrCreatedAt), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "macie2", regexache.MustCompile(`custom-data-identifier/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "macie2", regexache.MustCompile(`custom-data-identifier/.+`)), ), }, { @@ -211,7 +211,7 @@ func testAccCustomDataIdentifier_WithTags(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "tags_all.Key2", acctest.CtValue2), resource.TestCheckResourceAttr(resourceName, "tags_all.Key3", "value3"), acctest.CheckResourceAttrRFC3339(resourceName, names.AttrCreatedAt), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "macie2", regexache.MustCompile(`custom-data-identifier/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "macie2", regexache.MustCompile(`custom-data-identifier/.+`)), ), }, { diff --git a/internal/service/macie2/findings_filter_test.go b/internal/service/macie2/findings_filter_test.go index c8b1d06d506..a8926762e19 100644 --- a/internal/service/macie2/findings_filter_test.go +++ b/internal/service/macie2/findings_filter_test.go @@ -40,7 +40,7 @@ func testAccFindingsFilter_basic(t *testing.T) { acctest.CheckResourceAttrNameGenerated(resourceName, names.AttrName), resource.TestCheckResourceAttr(resourceName, names.AttrNamePrefix, "terraform-"), resource.TestCheckResourceAttr(resourceName, names.AttrAction, string(awstypes.FindingsFilterActionArchive)), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "macie2", regexache.MustCompile(`findings-filter/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "macie2", regexache.MustCompile(`findings-filter/.+`)), ), }, { @@ -162,7 +162,7 @@ func testAccFindingsFilter_complete(t *testing.T) { "eq.#": "1", "eq.0": acctest.Region(), }), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "macie2", regexache.MustCompile(`findings-filter/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "macie2", regexache.MustCompile(`findings-filter/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, description), resource.TestCheckResourceAttr(resourceName, "position", "1"), ), @@ -174,7 +174,7 @@ func testAccFindingsFilter_complete(t *testing.T) { acctest.CheckResourceAttrNameGenerated(resourceName, names.AttrName), resource.TestCheckResourceAttr(resourceName, names.AttrNamePrefix, "terraform-"), resource.TestCheckResourceAttr(resourceName, names.AttrAction, string(awstypes.FindingsFilterActionNoop)), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "macie2", regexache.MustCompile(`findings-filter/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "macie2", regexache.MustCompile(`findings-filter/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, descriptionUpdated), resource.TestCheckResourceAttr(resourceName, "position", "1"), resource.TestCheckResourceAttr(resourceName, "finding_criteria.0.criterion.0.field", names.AttrRegion), @@ -193,7 +193,7 @@ func testAccFindingsFilter_complete(t *testing.T) { acctest.CheckResourceAttrNameGenerated(resourceName, names.AttrName), resource.TestCheckResourceAttr(resourceName, names.AttrNamePrefix, "terraform-"), resource.TestCheckResourceAttr(resourceName, names.AttrAction, string(awstypes.FindingsFilterActionNoop)), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "macie2", regexache.MustCompile(`findings-filter/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "macie2", regexache.MustCompile(`findings-filter/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, descriptionUpdated), resource.TestCheckResourceAttr(resourceName, "position", "1"), resource.TestCheckResourceAttr(resourceName, "finding_criteria.0.criterion.0.field", names.AttrRegion), @@ -243,7 +243,7 @@ func testAccFindingsFilter_WithDate(t *testing.T) { "eq.#": "1", "eq.0": acctest.Region(), }), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "macie2", regexache.MustCompile(`findings-filter/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "macie2", regexache.MustCompile(`findings-filter/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, description), resource.TestCheckResourceAttr(resourceName, "position", "1"), ), @@ -255,7 +255,7 @@ func testAccFindingsFilter_WithDate(t *testing.T) { acctest.CheckResourceAttrNameGenerated(resourceName, names.AttrName), resource.TestCheckResourceAttr(resourceName, names.AttrNamePrefix, "terraform-"), resource.TestCheckResourceAttr(resourceName, names.AttrAction, string(awstypes.FindingsFilterActionNoop)), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "macie2", regexache.MustCompile(`findings-filter/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "macie2", regexache.MustCompile(`findings-filter/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, descriptionUpdated), resource.TestCheckResourceAttr(resourceName, "position", "1"), resource.TestCheckTypeSetElemAttrPair(resourceName, "finding_criteria.0.criterion.*.eq.*", dataSourceRegion, names.AttrName), @@ -316,7 +316,7 @@ func testAccFindingsFilter_WithNumber(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrNamePrefix, "terraform-"), resource.TestCheckResourceAttr(resourceName, names.AttrAction, string(awstypes.FindingsFilterActionArchive)), resource.TestCheckTypeSetElemAttrPair(resourceName, "finding_criteria.0.criterion.*.eq.*", dataSourceRegion, names.AttrName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "macie2", regexache.MustCompile(`findings-filter/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "macie2", regexache.MustCompile(`findings-filter/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, description), resource.TestCheckResourceAttr(resourceName, "position", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "finding_criteria.0.criterion.*", map[string]string{ @@ -333,7 +333,7 @@ func testAccFindingsFilter_WithNumber(t *testing.T) { acctest.CheckResourceAttrNameGenerated(resourceName, names.AttrName), resource.TestCheckResourceAttr(resourceName, names.AttrNamePrefix, "terraform-"), resource.TestCheckResourceAttr(resourceName, names.AttrAction, string(awstypes.FindingsFilterActionNoop)), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "macie2", regexache.MustCompile(`findings-filter/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "macie2", regexache.MustCompile(`findings-filter/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, descriptionUpdated), resource.TestCheckResourceAttr(resourceName, "position", "1"), resource.TestCheckResourceAttr(resourceName, "finding_criteria.#", "1"), @@ -388,7 +388,7 @@ func testAccFindingsFilter_withTags(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "tags.Key", names.AttrValue), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsAllPercent, "1"), resource.TestCheckResourceAttr(resourceName, "tags_all.Key", names.AttrValue), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "macie2", regexache.MustCompile(`findings-filter/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "macie2", regexache.MustCompile(`findings-filter/.+`)), resource.TestCheckResourceAttr(resourceName, "position", "1"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, description), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "finding_criteria.0.criterion.*", map[string]string{ diff --git a/internal/service/macie2/member_test.go b/internal/service/macie2/member_test.go index 32ec736b3e8..bfe96a4feeb 100644 --- a/internal/service/macie2/member_test.go +++ b/internal/service/macie2/member_test.go @@ -49,8 +49,8 @@ func testAccMember_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckMemberExists(ctx, resourceName, &macie2Output), resource.TestCheckResourceAttr(resourceName, "relationship_status", string(awstypes.RelationshipStatusCreated)), - acctest.CheckResourceAttrAccountID(resourceName, "administrator_account_id"), - acctest.CheckResourceAttrAccountID(resourceName, "master_account_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "administrator_account_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "master_account_id"), resource.TestCheckResourceAttrPair(resourceName, names.AttrAccountID, dataSourceAlternate, names.AttrAccountID), acctest.CheckResourceAttrRFC3339(resourceName, "invited_at"), acctest.CheckResourceAttrRFC3339(resourceName, "updated_at"), @@ -156,8 +156,8 @@ func testAccMember_invite(t *testing.T) { testAccCheckMemberExists(ctx, resourceName, &macie2Output), resource.TestCheckResourceAttr(resourceName, "relationship_status", string(awstypes.RelationshipStatusCreated)), resource.TestCheckResourceAttr(resourceName, "invite", acctest.CtFalse), - acctest.CheckResourceAttrAccountID(resourceName, "administrator_account_id"), - acctest.CheckResourceAttrAccountID(resourceName, "master_account_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "administrator_account_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "master_account_id"), resource.TestCheckResourceAttrPair(resourceName, names.AttrAccountID, dataSourceAlternate, names.AttrAccountID), acctest.CheckResourceAttrRFC3339(resourceName, "invited_at"), acctest.CheckResourceAttrRFC3339(resourceName, "updated_at"), @@ -170,8 +170,8 @@ func testAccMember_invite(t *testing.T) { testAccCheckMemberExists(ctx, resourceName, &macie2Output), resource.TestCheckResourceAttr(resourceName, "relationship_status", string(awstypes.RelationshipStatusInvited)), resource.TestCheckResourceAttr(resourceName, "invite", acctest.CtTrue), - acctest.CheckResourceAttrAccountID(resourceName, "administrator_account_id"), - acctest.CheckResourceAttrAccountID(resourceName, "master_account_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "administrator_account_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "master_account_id"), resource.TestCheckResourceAttrPair(resourceName, names.AttrAccountID, dataSourceAlternate, names.AttrAccountID), acctest.CheckResourceAttrRFC3339(resourceName, "invited_at"), acctest.CheckResourceAttrRFC3339(resourceName, "updated_at"), @@ -211,8 +211,8 @@ func testAccMember_inviteRemoved(t *testing.T) { testAccCheckMemberExists(ctx, resourceName, &macie2Output), resource.TestCheckResourceAttr(resourceName, "relationship_status", string(awstypes.RelationshipStatusInvited)), resource.TestCheckResourceAttr(resourceName, "invite", acctest.CtTrue), - acctest.CheckResourceAttrAccountID(resourceName, "administrator_account_id"), - acctest.CheckResourceAttrAccountID(resourceName, "master_account_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "administrator_account_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "master_account_id"), resource.TestCheckResourceAttrPair(resourceName, names.AttrAccountID, dataSourceAlternate, names.AttrAccountID), acctest.CheckResourceAttrRFC3339(resourceName, "invited_at"), acctest.CheckResourceAttrRFC3339(resourceName, "updated_at"), @@ -225,8 +225,8 @@ func testAccMember_inviteRemoved(t *testing.T) { testAccCheckMemberExists(ctx, resourceName, &macie2Output), resource.TestCheckResourceAttr(resourceName, "relationship_status", string(awstypes.RelationshipStatusRemoved)), resource.TestCheckResourceAttr(resourceName, "invite", acctest.CtFalse), - acctest.CheckResourceAttrAccountID(resourceName, "administrator_account_id"), - acctest.CheckResourceAttrAccountID(resourceName, "master_account_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "administrator_account_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "master_account_id"), resource.TestCheckResourceAttrPair(resourceName, names.AttrAccountID, dataSourceAlternate, names.AttrAccountID), acctest.CheckResourceAttrRFC3339(resourceName, "invited_at"), acctest.CheckResourceAttrRFC3339(resourceName, "updated_at"), @@ -266,8 +266,8 @@ func testAccMember_status(t *testing.T) { testAccCheckMemberExists(ctx, resourceName, &macie2Output), resource.TestCheckResourceAttr(resourceName, "relationship_status", string(awstypes.RelationshipStatusInvited)), resource.TestCheckResourceAttr(resourceName, "invite", acctest.CtTrue), - acctest.CheckResourceAttrAccountID(resourceName, "administrator_account_id"), - acctest.CheckResourceAttrAccountID(resourceName, "master_account_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "administrator_account_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "master_account_id"), resource.TestCheckResourceAttrPair(resourceName, names.AttrAccountID, dataSourceAlternate, names.AttrAccountID), acctest.CheckResourceAttrRFC3339(resourceName, "invited_at"), acctest.CheckResourceAttrRFC3339(resourceName, "updated_at"), @@ -280,8 +280,8 @@ func testAccMember_status(t *testing.T) { testAccCheckMemberExists(ctx, resourceName, &macie2Output), resource.TestCheckResourceAttr(resourceName, "relationship_status", string(awstypes.RelationshipStatusPaused)), resource.TestCheckResourceAttr(resourceName, "invite", acctest.CtTrue), - acctest.CheckResourceAttrAccountID(resourceName, "administrator_account_id"), - acctest.CheckResourceAttrAccountID(resourceName, "master_account_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "administrator_account_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "master_account_id"), resource.TestCheckResourceAttrPair(resourceName, names.AttrAccountID, dataSourceAlternate, names.AttrAccountID), acctest.CheckResourceAttrRFC3339(resourceName, "invited_at"), acctest.CheckResourceAttrRFC3339(resourceName, "updated_at"), @@ -324,8 +324,8 @@ func testAccMember_withTags(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "tags.Key", names.AttrValue), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsAllPercent, "1"), resource.TestCheckResourceAttr(resourceName, "tags_all.Key", names.AttrValue), - acctest.CheckResourceAttrAccountID(resourceName, "administrator_account_id"), - acctest.CheckResourceAttrAccountID(resourceName, "master_account_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "administrator_account_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "master_account_id"), resource.TestCheckResourceAttrPair(resourceName, names.AttrAccountID, dataSourceAlternate, names.AttrAccountID), ), }, diff --git a/internal/service/macie2/organization_admin_account_test.go b/internal/service/macie2/organization_admin_account_test.go index 6d0ed406a4d..4029474ce4e 100644 --- a/internal/service/macie2/organization_admin_account_test.go +++ b/internal/service/macie2/organization_admin_account_test.go @@ -34,7 +34,7 @@ func testAccOrganizationAdminAccount_basic(t *testing.T) { Config: testAccOrganizationAdminAccountConfig_basic(), Check: resource.ComposeTestCheckFunc( testAccCheckOrganizationAdminAccountExists(ctx, resourceName), - acctest.CheckResourceAttrAccountID(resourceName, "admin_account_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "admin_account_id"), ), }, { From 617c341d4238f31b28c60546ac8fe8b4659aa1a4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:52 -0500 Subject: [PATCH 109/304] Make 'AWSClient.AccountID' a getter - mediaconvert. --- internal/service/mediaconvert/queue_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/mediaconvert/queue_test.go b/internal/service/mediaconvert/queue_test.go index 4fbdcd801bc..2c102c33620 100644 --- a/internal/service/mediaconvert/queue_test.go +++ b/internal/service/mediaconvert/queue_test.go @@ -36,7 +36,7 @@ func TestAccMediaConvertQueue_basic(t *testing.T) { Config: testAccQueueConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckQueueExists(ctx, resourceName, &queue), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "mediaconvert", regexache.MustCompile(`queues/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "mediaconvert", regexache.MustCompile(`queues/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "pricing_plan", string(types.PricingPlanOnDemand)), resource.TestCheckResourceAttr(resourceName, "reservation_plan_settings.#", "0"), From 58f8dab2a0a1292d9b2bf8ee716737d91be15655 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:52 -0500 Subject: [PATCH 110/304] Make 'AWSClient.AccountID' a getter - mediapackage. --- internal/service/mediapackage/channel_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/mediapackage/channel_test.go b/internal/service/mediapackage/channel_test.go index 15a720bfb4a..3064d90eb51 100644 --- a/internal/service/mediapackage/channel_test.go +++ b/internal/service/mediapackage/channel_test.go @@ -41,7 +41,7 @@ func TestAccMediaPackageChannel_basic(t *testing.T) { Config: testAccChannelConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckChannelExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "mediapackage", regexache.MustCompile(`channels/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "mediapackage", regexache.MustCompile(`channels/.+`)), resource.TestMatchResourceAttr(resourceName, "hls_ingest.0.ingest_endpoints.0.password", regexache.MustCompile("^[0-9a-f]*$")), resource.TestMatchResourceAttr(resourceName, "hls_ingest.0.ingest_endpoints.0.url", regexache.MustCompile("^https://")), resource.TestMatchResourceAttr(resourceName, "hls_ingest.0.ingest_endpoints.0.username", regexache.MustCompile("^[0-9a-f]*$")), From 9a3525055dc285754dc7211a615cdc4ca4a0cd9f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:53 -0500 Subject: [PATCH 111/304] Make 'AWSClient.AccountID' a getter - memorydb. --- internal/service/memorydb/acl_test.go | 2 +- internal/service/memorydb/cluster_test.go | 6 +++--- internal/service/memorydb/parameter_group_test.go | 2 +- internal/service/memorydb/snapshot_test.go | 2 +- internal/service/memorydb/subnet_group_test.go | 2 +- internal/service/memorydb/user_test.go | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/internal/service/memorydb/acl_test.go b/internal/service/memorydb/acl_test.go index f58b7b50d17..5afe655f55e 100644 --- a/internal/service/memorydb/acl_test.go +++ b/internal/service/memorydb/acl_test.go @@ -34,7 +34,7 @@ func TestAccMemoryDBACL_basic(t *testing.T) { Config: testAccACLConfig_basic(rName, []string{user1}, []string{user1}), Check: resource.ComposeTestCheckFunc( testAccCheckACLExists(ctx, resourceName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "memorydb", "acl/"+rName), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "memorydb", "acl/"+rName), resource.TestCheckResourceAttrSet(resourceName, "minimum_engine_version"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), diff --git a/internal/service/memorydb/cluster_test.go b/internal/service/memorydb/cluster_test.go index 1d4a8f03211..577c9c644d6 100644 --- a/internal/service/memorydb/cluster_test.go +++ b/internal/service/memorydb/cluster_test.go @@ -35,7 +35,7 @@ func TestAccMemoryDBCluster_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckClusterExists(ctx, resourceName), resource.TestCheckTypeSetElemAttrPair(resourceName, "acl_name", "aws_memorydb_acl.test", names.AttrID), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "memorydb", "cluster/"+rName), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "memorydb", "cluster/"+rName), resource.TestCheckResourceAttr(resourceName, names.AttrAutoMinorVersionUpgrade, acctest.CtFalse), resource.TestMatchResourceAttr(resourceName, "cluster_endpoint.0.address", regexache.MustCompile(`^clustercfg\..*?\.amazonaws\.com$`)), resource.TestCheckResourceAttr(resourceName, "cluster_endpoint.0.port", "6379"), @@ -98,7 +98,7 @@ func TestAccMemoryDBCluster_defaults(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckClusterExists(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, "acl_name", "open-access"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "memorydb", "cluster/"+rName), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "memorydb", "cluster/"+rName), resource.TestCheckResourceAttr(resourceName, names.AttrAutoMinorVersionUpgrade, acctest.CtTrue), resource.TestCheckResourceAttrSet(resourceName, "cluster_endpoint.0.address"), resource.TestCheckResourceAttr(resourceName, "cluster_endpoint.0.port", "6379"), @@ -1044,7 +1044,7 @@ func TestAccMemoryDBCluster_valkeyEngine(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckClusterExists(ctx, resourceName), resource.TestCheckTypeSetElemAttrPair(resourceName, "acl_name", "aws_memorydb_acl.test", names.AttrID), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "memorydb", "cluster/"+rName), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "memorydb", "cluster/"+rName), resource.TestCheckResourceAttr(resourceName, names.AttrAutoMinorVersionUpgrade, acctest.CtFalse), resource.TestMatchResourceAttr(resourceName, "cluster_endpoint.0.address", regexache.MustCompile(`^clustercfg\..*?\.amazonaws\.com$`)), resource.TestCheckResourceAttr(resourceName, "cluster_endpoint.0.port", "6379"), diff --git a/internal/service/memorydb/parameter_group_test.go b/internal/service/memorydb/parameter_group_test.go index 4e6d754d0f9..0b9c4cb879f 100644 --- a/internal/service/memorydb/parameter_group_test.go +++ b/internal/service/memorydb/parameter_group_test.go @@ -158,7 +158,7 @@ func TestAccMemoryDBParameterGroup_basic(t *testing.T) { Config: testAccParameterGroupConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckParameterGroupExists(ctx, resourceName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "memorydb", "parametergroup/"+rName), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "memorydb", "parametergroup/"+rName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Managed by Terraform"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrFamily, "memorydb_redis6"), diff --git a/internal/service/memorydb/snapshot_test.go b/internal/service/memorydb/snapshot_test.go index 4a438e25c3c..2f0f58aff91 100644 --- a/internal/service/memorydb/snapshot_test.go +++ b/internal/service/memorydb/snapshot_test.go @@ -33,7 +33,7 @@ func TestAccMemoryDBSnapshot_basic(t *testing.T) { Config: testAccSnapshotConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckSnapshotExists(ctx, resourceName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "memorydb", "snapshot/"+rName), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "memorydb", "snapshot/"+rName), resource.TestCheckTypeSetElemAttrPair(resourceName, "cluster_configuration.0.description", "aws_memorydb_cluster.test", names.AttrDescription), resource.TestCheckTypeSetElemAttrPair(resourceName, "cluster_configuration.0.engine", "aws_memorydb_cluster.test", names.AttrEngine), resource.TestCheckTypeSetElemAttrPair(resourceName, "cluster_configuration.0.engine_version", "aws_memorydb_cluster.test", names.AttrEngineVersion), diff --git a/internal/service/memorydb/subnet_group_test.go b/internal/service/memorydb/subnet_group_test.go index 3d9c31a19c2..d0f9bb64b17 100644 --- a/internal/service/memorydb/subnet_group_test.go +++ b/internal/service/memorydb/subnet_group_test.go @@ -38,7 +38,7 @@ func TestAccMemoryDBSubnetGroup_basic(t *testing.T) { Config: testAccSubnetGroupConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckSubnetGroupExists(ctx, resourceName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "memorydb", "subnetgroup/"+rName), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "memorydb", "subnetgroup/"+rName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Managed by Terraform"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "subnet_ids.#", "2"), diff --git a/internal/service/memorydb/user_test.go b/internal/service/memorydb/user_test.go index b7525f763b3..2b9da17a435 100644 --- a/internal/service/memorydb/user_test.go +++ b/internal/service/memorydb/user_test.go @@ -34,7 +34,7 @@ func TestAccMemoryDBUser_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckUserExists(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, "access_string", "on ~* &* +@all"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "memorydb", "user/"+rName), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "memorydb", "user/"+rName), resource.TestCheckResourceAttr(resourceName, "authentication_mode.0.password_count", "1"), resource.TestCheckResourceAttr(resourceName, "authentication_mode.0.passwords.#", "1"), resource.TestCheckTypeSetElemAttr(resourceName, "authentication_mode.0.passwords.*", "aaaaaaaaaaaaaaaa"), @@ -71,7 +71,7 @@ func TestAccMemoryDBUser_authenticationModeIAM(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckUserExists(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, "access_string", "on ~* &* +@all"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "memorydb", "user/"+rName), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "memorydb", "user/"+rName), resource.TestCheckResourceAttr(resourceName, "authentication_mode.0.type", "iam"), resource.TestCheckResourceAttr(resourceName, "authentication_mode.0.password_count", "0"), resource.TestCheckResourceAttrSet(resourceName, "minimum_engine_version"), From c4573583fb9cda56819e3da186b9b924d09cd229 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:53 -0500 Subject: [PATCH 112/304] Make 'AWSClient.AccountID' a getter - mq. --- internal/service/mq/broker_test.go | 10 +++++----- internal/service/mq/configuration_test.go | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/internal/service/mq/broker_test.go b/internal/service/mq/broker_test.go index 45c955d4995..e83f3ca2458 100644 --- a/internal/service/mq/broker_test.go +++ b/internal/service/mq/broker_test.go @@ -350,7 +350,7 @@ func TestAccMQBroker_basic(t *testing.T) { Config: testAccBrokerConfig_basic(rName, testAccBrokerVersionNewer), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckBrokerExists(ctx, resourceName, &broker), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "mq", regexache.MustCompile(`broker:+.`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "mq", regexache.MustCompile(`broker:+.`)), resource.TestCheckResourceAttr(resourceName, names.AttrAutoMinorVersionUpgrade, acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "authentication_strategy", "simple"), resource.TestCheckResourceAttr(resourceName, "broker_name", rName), @@ -587,7 +587,7 @@ func TestAccMQBroker_throughputOptimized(t *testing.T) { names.AttrUsername: "Test", names.AttrPassword: "TestTest1234", }), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "mq", regexache.MustCompile(`broker:+.`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "mq", regexache.MustCompile(`broker:+.`)), resource.TestCheckResourceAttr(resourceName, "instances.#", "1"), resource.TestMatchResourceAttr(resourceName, "instances.0.console_url", regexache.MustCompile(`^https://[0-9a-f-]+\.mq.[0-9a-z-]+.amazonaws.com:8162$`)), @@ -678,7 +678,7 @@ func TestAccMQBroker_AllFields_defaultVPC(t *testing.T) { names.AttrUsername: "Test", names.AttrPassword: "TestTest1234", }), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "mq", regexache.MustCompile(`broker:+.`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "mq", regexache.MustCompile(`broker:+.`)), resource.TestCheckResourceAttr(resourceName, "instances.#", "2"), resource.TestMatchResourceAttr(resourceName, "instances.0.console_url", regexache.MustCompile(`^https://[0-9a-f-]+\.mq.[0-9a-z-]+.amazonaws.com:8162$`)), @@ -807,7 +807,7 @@ func TestAccMQBroker_AllFields_customVPC(t *testing.T) { names.AttrUsername: "Test", names.AttrPassword: "TestTest1234", }), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "mq", regexache.MustCompile(`broker:+.`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "mq", regexache.MustCompile(`broker:+.`)), resource.TestCheckResourceAttr(resourceName, "instances.#", "2"), resource.TestMatchResourceAttr(resourceName, "instances.0.console_url", regexache.MustCompile(`^https://[0-9a-f-]+\.mq.[0-9a-z-]+.amazonaws.com:8162$`)), @@ -1519,7 +1519,7 @@ func TestAccMQBroker_RabbitMQ_cluster(t *testing.T) { names.AttrUsername: "Test", names.AttrPassword: "TestTest1234", }), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "mq", regexache.MustCompile(`broker:+.`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "mq", regexache.MustCompile(`broker:+.`)), resource.TestCheckResourceAttr(resourceName, "instances.#", "1"), resource.TestMatchResourceAttr(resourceName, "instances.0.console_url", regexache.MustCompile(`^https://[0-9a-f-]+\.mq.[0-9a-z-]+.amazonaws.com$`)), diff --git a/internal/service/mq/configuration_test.go b/internal/service/mq/configuration_test.go index 92512c854aa..2461ef3d7d0 100644 --- a/internal/service/mq/configuration_test.go +++ b/internal/service/mq/configuration_test.go @@ -37,7 +37,7 @@ func TestAccMQConfiguration_basic(t *testing.T) { Config: testAccConfigurationConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckConfigurationExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "mq", regexache.MustCompile(`configuration:+.`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "mq", regexache.MustCompile(`configuration:+.`)), resource.TestCheckResourceAttr(resourceName, "authentication_strategy", "simple"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "TfAccTest MQ Configuration"), resource.TestCheckResourceAttr(resourceName, "engine_type", "ActiveMQ"), @@ -55,7 +55,7 @@ func TestAccMQConfiguration_basic(t *testing.T) { Config: testAccConfigurationConfig_descriptionUpdated(rName), Check: resource.ComposeTestCheckFunc( testAccCheckConfigurationExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "mq", regexache.MustCompile(`configuration:+.`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "mq", regexache.MustCompile(`configuration:+.`)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "TfAccTest MQ Configuration Updated"), resource.TestCheckResourceAttr(resourceName, "engine_type", "ActiveMQ"), resource.TestCheckResourceAttr(resourceName, names.AttrEngineVersion, "5.17.6"), @@ -86,7 +86,7 @@ func TestAccMQConfiguration_withActiveMQData(t *testing.T) { Config: testAccConfigurationConfig_activeData(rName), Check: resource.ComposeTestCheckFunc( testAccCheckConfigurationExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "mq", regexache.MustCompile(`configuration:+.`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "mq", regexache.MustCompile(`configuration:+.`)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "TfAccTest MQ Configuration"), resource.TestCheckResourceAttr(resourceName, "engine_type", "ActiveMQ"), resource.TestCheckResourceAttr(resourceName, names.AttrEngineVersion, "5.17.6"), @@ -122,7 +122,7 @@ func TestAccMQConfiguration_withActiveMQLdapData(t *testing.T) { Config: testAccConfigurationConfig_activeLdapData(rName), Check: resource.ComposeTestCheckFunc( testAccCheckConfigurationExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "mq", regexache.MustCompile(`configuration:+.`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "mq", regexache.MustCompile(`configuration:+.`)), resource.TestCheckResourceAttr(resourceName, "authentication_strategy", "ldap"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "TfAccTest MQ Configuration"), resource.TestCheckResourceAttr(resourceName, "engine_type", "ActiveMQ"), @@ -159,7 +159,7 @@ func TestAccMQConfiguration_withRabbitMQData(t *testing.T) { Config: testAccConfigurationConfig_rabbitData(rName), Check: resource.ComposeTestCheckFunc( testAccCheckConfigurationExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "mq", regexache.MustCompile(`configuration:+.`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "mq", regexache.MustCompile(`configuration:+.`)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "TfAccTest MQ Configuration"), resource.TestCheckResourceAttr(resourceName, "engine_type", "RabbitMQ"), resource.TestCheckResourceAttr(resourceName, names.AttrEngineVersion, "3.11.16"), From 0e7479bba8939440b00fd2300e63940e4548ccc5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:53 -0500 Subject: [PATCH 113/304] Make 'AWSClient.AccountID' a getter - mwaa. --- internal/service/mwaa/environment_test.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/mwaa/environment_test.go b/internal/service/mwaa/environment_test.go index 9b36666374e..e729598c9bf 100644 --- a/internal/service/mwaa/environment_test.go +++ b/internal/service/mwaa/environment_test.go @@ -38,13 +38,13 @@ func TestAccMWAAEnvironment_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckEnvironmentExists(ctx, resourceName, &environment), resource.TestCheckResourceAttrSet(resourceName, "airflow_version"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "airflow", "environment/"+rName), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "airflow", "environment/"+rName), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedAt), resource.TestCheckResourceAttrSet(resourceName, "database_vpc_endpoint_service"), resource.TestCheckResourceAttrSet(resourceName, "webserver_vpc_endpoint_service"), resource.TestCheckResourceAttr(resourceName, "dag_s3_path", "dags/"), resource.TestCheckResourceAttr(resourceName, "environment_class", "mw1.small"), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrExecutionRoleARN, "iam", "role/service-role/"+rName), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrExecutionRoleARN, "iam", "role/service-role/"+rName), resource.TestCheckResourceAttr(resourceName, "logging_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "logging_configuration.0.dag_processing_logs.#", "1"), resource.TestCheckResourceAttr(resourceName, "logging_configuration.0.dag_processing_logs.0.enabled", acctest.CtFalse), @@ -264,11 +264,11 @@ func TestAccMWAAEnvironment_full(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "airflow_configuration_options.core.default_task_retries", "1"), resource.TestCheckResourceAttr(resourceName, "airflow_configuration_options.core.parallelism", "16"), resource.TestCheckResourceAttr(resourceName, "airflow_version", "2.4.3"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "airflow", "environment/"+rName), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "airflow", "environment/"+rName), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedAt), resource.TestCheckResourceAttr(resourceName, "dag_s3_path", "dags/"), resource.TestCheckResourceAttr(resourceName, "environment_class", "mw1.medium"), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrExecutionRoleARN, "iam", "role/service-role/"+rName), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrExecutionRoleARN, "iam", "role/service-role/"+rName), resource.TestCheckResourceAttrSet(resourceName, names.AttrKMSKey), resource.TestCheckResourceAttr(resourceName, "logging_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "logging_configuration.0.dag_processing_logs.#", "1"), @@ -381,13 +381,13 @@ func TestAccMWAAEnvironment_customerVPCE(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckEnvironmentExists(ctx, resourceName, &environment), resource.TestCheckResourceAttrSet(resourceName, "airflow_version"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "airflow", "environment/"+rName), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "airflow", "environment/"+rName), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedAt), resource.TestCheckResourceAttrSet(resourceName, "database_vpc_endpoint_service"), resource.TestCheckResourceAttrSet(resourceName, "webserver_vpc_endpoint_service"), resource.TestCheckResourceAttr(resourceName, "dag_s3_path", "dags/"), resource.TestCheckResourceAttr(resourceName, "environment_class", "mw1.small"), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrExecutionRoleARN, "iam", "role/service-role/"+rName), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrExecutionRoleARN, "iam", "role/service-role/"+rName), resource.TestCheckResourceAttr(resourceName, "logging_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "logging_configuration.0.dag_processing_logs.#", "1"), resource.TestCheckResourceAttr(resourceName, "logging_configuration.0.dag_processing_logs.0.enabled", acctest.CtFalse), From 573409edec3d9deffa584031c6df0985edd0aa5d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:53 -0500 Subject: [PATCH 114/304] Make 'AWSClient.AccountID' a getter - neptune. --- internal/service/neptune/cluster_endpoint_test.go | 2 +- internal/service/neptune/cluster_instance_test.go | 2 +- internal/service/neptune/cluster_parameter_group_test.go | 2 +- internal/service/neptune/cluster_snapshot_test.go | 2 +- internal/service/neptune/cluster_test.go | 2 +- internal/service/neptune/event_subscription_test.go | 2 +- internal/service/neptune/global_cluster_test.go | 4 ++-- internal/service/neptune/parameter_group_test.go | 2 +- internal/service/neptune/subnet_group_test.go | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/internal/service/neptune/cluster_endpoint_test.go b/internal/service/neptune/cluster_endpoint_test.go index 2d539cbb04c..f2be6ed108b 100644 --- a/internal/service/neptune/cluster_endpoint_test.go +++ b/internal/service/neptune/cluster_endpoint_test.go @@ -37,7 +37,7 @@ func TestAccNeptuneClusterEndpoint_basic(t *testing.T) { Config: testAccClusterEndpointConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckClusterEndpointExists(ctx, resourceName, &dbCluster), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "rds", regexache.MustCompile(`cluster-endpoint:.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "rds", regexache.MustCompile(`cluster-endpoint:.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrEndpointType, "READER"), resource.TestCheckResourceAttr(resourceName, "cluster_endpoint_identifier", rName), resource.TestCheckResourceAttrPair(resourceName, names.AttrClusterIdentifier, "aws_neptune_cluster.test", names.AttrClusterIdentifier), diff --git a/internal/service/neptune/cluster_instance_test.go b/internal/service/neptune/cluster_instance_test.go index e71632a7876..0a54b9f91c5 100644 --- a/internal/service/neptune/cluster_instance_test.go +++ b/internal/service/neptune/cluster_instance_test.go @@ -40,7 +40,7 @@ func TestAccNeptuneClusterInstance_basic(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckClusterInstanceExists(ctx, resourceName, &v), resource.TestCheckResourceAttrSet(resourceName, names.AttrAddress), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "rds", fmt.Sprintf("db:%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "rds", fmt.Sprintf("db:%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrAutoMinorVersionUpgrade, acctest.CtTrue), resource.TestMatchResourceAttr(resourceName, names.AttrAvailabilityZone, regexache.MustCompile(fmt.Sprintf("^%s[a-z]{1}$", acctest.Region()))), resource.TestCheckResourceAttrPair(resourceName, names.AttrClusterIdentifier, clusterResourceName, names.AttrID), diff --git a/internal/service/neptune/cluster_parameter_group_test.go b/internal/service/neptune/cluster_parameter_group_test.go index e045071a928..f304506fc90 100644 --- a/internal/service/neptune/cluster_parameter_group_test.go +++ b/internal/service/neptune/cluster_parameter_group_test.go @@ -36,7 +36,7 @@ func TestAccNeptuneClusterParameterGroup_basic(t *testing.T) { Config: testAccClusterParameterGroupConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckClusterParameterGroupExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "rds", fmt.Sprintf("cluster-pg:%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "rds", fmt.Sprintf("cluster-pg:%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Managed by Terraform"), resource.TestCheckResourceAttr(resourceName, names.AttrFamily, "neptune1"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), diff --git a/internal/service/neptune/cluster_snapshot_test.go b/internal/service/neptune/cluster_snapshot_test.go index 8ae42ddf04a..e313040c6e5 100644 --- a/internal/service/neptune/cluster_snapshot_test.go +++ b/internal/service/neptune/cluster_snapshot_test.go @@ -38,7 +38,7 @@ func TestAccNeptuneClusterSnapshot_basic(t *testing.T) { testAccCheckClusterSnapshotExists(ctx, resourceName, &dbClusterSnapshot), resource.TestCheckResourceAttrSet(resourceName, names.AttrAllocatedStorage), resource.TestCheckResourceAttrSet(resourceName, "availability_zones.#"), - acctest.CheckResourceAttrRegionalARN(resourceName, "db_cluster_snapshot_arn", "rds", fmt.Sprintf("cluster-snapshot:%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, "db_cluster_snapshot_arn", "rds", fmt.Sprintf("cluster-snapshot:%s", rName)), resource.TestCheckResourceAttrSet(resourceName, names.AttrEngine), resource.TestCheckResourceAttrSet(resourceName, names.AttrEngineVersion), resource.TestCheckResourceAttr(resourceName, names.AttrKMSKeyID, ""), diff --git a/internal/service/neptune/cluster_test.go b/internal/service/neptune/cluster_test.go index a841df67b66..d0e719edf26 100644 --- a/internal/service/neptune/cluster_test.go +++ b/internal/service/neptune/cluster_test.go @@ -59,7 +59,7 @@ func TestAccNeptuneCluster_basic(t *testing.T) { testAccCheckClusterExists(ctx, resourceName, &dbCluster), resource.TestCheckNoResourceAttr(resourceName, names.AttrAllowMajorVersionUpgrade), resource.TestCheckNoResourceAttr(resourceName, names.AttrApplyImmediately), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "rds", regexache.MustCompile(`cluster:.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "rds", regexache.MustCompile(`cluster:.+`)), acctest.CheckResourceAttrGreaterThanValue(resourceName, "availability_zones.#", 0), resource.TestCheckResourceAttr(resourceName, "backup_retention_period", "1"), resource.TestCheckResourceAttr(resourceName, names.AttrClusterIdentifier, rName), diff --git a/internal/service/neptune/event_subscription_test.go b/internal/service/neptune/event_subscription_test.go index 34eaa427355..24116946f67 100644 --- a/internal/service/neptune/event_subscription_test.go +++ b/internal/service/neptune/event_subscription_test.go @@ -35,7 +35,7 @@ func TestAccNeptuneEventSubscription_basic(t *testing.T) { Config: testAccEventSubscriptionConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckEventSubscriptionExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "rds", fmt.Sprintf("es:%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "rds", fmt.Sprintf("es:%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrEnabled, acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, names.AttrSourceType, "db-instance"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), diff --git a/internal/service/neptune/global_cluster_test.go b/internal/service/neptune/global_cluster_test.go index d2973dc5057..1ccbcc4732c 100644 --- a/internal/service/neptune/global_cluster_test.go +++ b/internal/service/neptune/global_cluster_test.go @@ -40,7 +40,7 @@ func TestAccNeptuneGlobalCluster_basic(t *testing.T) { Config: testAccGlobalClusterConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckGlobalClusterExists(ctx, resourceName, &v), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrARN, "rds", fmt.Sprintf("global-cluster:%s", rName)), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "rds", fmt.Sprintf("global-cluster:%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrDeletionProtection, acctest.CtFalse), resource.TestCheckResourceAttrSet(resourceName, names.AttrEngine), resource.TestCheckResourceAttrSet(resourceName, names.AttrEngineVersion), @@ -74,7 +74,7 @@ func TestAccNeptuneGlobalCluster_completeBasic(t *testing.T) { Config: testAccGlobalClusterConfig_completeBasic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckGlobalClusterExists(ctx, resourceName, &v), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrARN, "rds", fmt.Sprintf("global-cluster:%s", rName)), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "rds", fmt.Sprintf("global-cluster:%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrDeletionProtection, acctest.CtFalse), resource.TestCheckResourceAttrSet(resourceName, names.AttrEngine), resource.TestCheckResourceAttrSet(resourceName, names.AttrEngineVersion), diff --git a/internal/service/neptune/parameter_group_test.go b/internal/service/neptune/parameter_group_test.go index 783322ad040..2e1e5640912 100644 --- a/internal/service/neptune/parameter_group_test.go +++ b/internal/service/neptune/parameter_group_test.go @@ -38,7 +38,7 @@ func TestAccNeptuneParameterGroup_basic(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckParameterGroupExists(ctx, resourceName, &v), testAccCheckParameterGroupAttributes(&v, rName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "rds", fmt.Sprintf("pg:%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "rds", fmt.Sprintf("pg:%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Managed by Terraform"), resource.TestCheckResourceAttr(resourceName, names.AttrFamily, "neptune1"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), diff --git a/internal/service/neptune/subnet_group_test.go b/internal/service/neptune/subnet_group_test.go index 0630481a85a..638feb81549 100644 --- a/internal/service/neptune/subnet_group_test.go +++ b/internal/service/neptune/subnet_group_test.go @@ -37,7 +37,7 @@ func TestAccNeptuneSubnetGroup_basic(t *testing.T) { Config: testAccSubnetGroupConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSubnetGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "rds", regexache.MustCompile(fmt.Sprintf("subgrp:%s$", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "rds", regexache.MustCompile(fmt.Sprintf("subgrp:%s$", rName))), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Managed by Terraform"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrNamePrefix, ""), From 0892106876bda6080a6f9c937029ecbf381795b8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:53 -0500 Subject: [PATCH 115/304] Make 'AWSClient.AccountID' a getter - networkfirewall. --- .../firewall_data_source_test.go | 6 +++--- .../networkfirewall/firewall_policy_test.go | 2 +- .../service/networkfirewall/firewall_test.go | 4 ++-- .../service/networkfirewall/rule_group_test.go | 18 +++++++++--------- .../tls_inspection_configuration_test.go | 8 ++++---- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/internal/service/networkfirewall/firewall_data_source_test.go b/internal/service/networkfirewall/firewall_data_source_test.go index 4be0c929cb4..86182b78295 100644 --- a/internal/service/networkfirewall/firewall_data_source_test.go +++ b/internal/service/networkfirewall/firewall_data_source_test.go @@ -33,7 +33,7 @@ func TestAccNetworkFirewallFirewallDataSource_arn(t *testing.T) { Config: testAccFirewallDataSourceConfig_arn(rName), Check: resource.ComposeTestCheckFunc( testAccCheckFirewallExists(ctx, resourceName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "network-firewall", fmt.Sprintf("firewall/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "network-firewall", fmt.Sprintf("firewall/%s", rName)), resource.TestCheckResourceAttr(dataSourceName, "delete_protection", acctest.CtFalse), resource.TestCheckResourceAttr(dataSourceName, names.AttrDescription, ""), resource.TestCheckResourceAttr(dataSourceName, "encryption_configuration.#", "1"), @@ -81,7 +81,7 @@ func TestAccNetworkFirewallFirewallDataSource_name(t *testing.T) { Config: testAccFirewallDataSourceConfig_name(rName), Check: resource.ComposeTestCheckFunc( testAccCheckFirewallExists(ctx, resourceName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "network-firewall", fmt.Sprintf("firewall/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "network-firewall", fmt.Sprintf("firewall/%s", rName)), resource.TestCheckResourceAttr(dataSourceName, "delete_protection", acctest.CtFalse), resource.TestCheckResourceAttr(dataSourceName, names.AttrDescription, ""), resource.TestCheckResourceAttr(dataSourceName, "encryption_configuration.#", "1"), @@ -129,7 +129,7 @@ func TestAccNetworkFirewallFirewallDataSource_arnandname(t *testing.T) { Config: testAccFirewallDataSourceConfig_arnandname(rName), Check: resource.ComposeTestCheckFunc( testAccCheckFirewallExists(ctx, resourceName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "network-firewall", fmt.Sprintf("firewall/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "network-firewall", fmt.Sprintf("firewall/%s", rName)), resource.TestCheckResourceAttr(dataSourceName, "delete_protection", acctest.CtFalse), resource.TestCheckResourceAttr(dataSourceName, names.AttrDescription, ""), resource.TestCheckResourceAttr(dataSourceName, "encryption_configuration.#", "1"), diff --git a/internal/service/networkfirewall/firewall_policy_test.go b/internal/service/networkfirewall/firewall_policy_test.go index 3613f117261..f65e1a75d0c 100644 --- a/internal/service/networkfirewall/firewall_policy_test.go +++ b/internal/service/networkfirewall/firewall_policy_test.go @@ -37,7 +37,7 @@ func TestAccNetworkFirewallFirewallPolicy_basic(t *testing.T) { Config: testAccFirewallPolicyConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckFirewallPolicyExists(ctx, resourceName, &firewallPolicy), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "network-firewall", fmt.Sprintf("firewall-policy/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "network-firewall", fmt.Sprintf("firewall-policy/%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttr(resourceName, "firewall_policy.#", "1"), resource.TestCheckResourceAttr(resourceName, "firewall_policy.0.policy_variables.#", "0"), diff --git a/internal/service/networkfirewall/firewall_test.go b/internal/service/networkfirewall/firewall_test.go index 01ddda0d0dc..827a94c924b 100644 --- a/internal/service/networkfirewall/firewall_test.go +++ b/internal/service/networkfirewall/firewall_test.go @@ -40,7 +40,7 @@ func TestAccNetworkFirewallFirewall_basic(t *testing.T) { Config: testAccFirewallConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckFirewallExists(ctx, resourceName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "network-firewall", fmt.Sprintf("firewall/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "network-firewall", fmt.Sprintf("firewall/%s", rName)), resource.TestCheckResourceAttr(resourceName, "delete_protection", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttrPair(resourceName, "firewall_policy_arn", policyResourceName, names.AttrARN), @@ -89,7 +89,7 @@ func TestAccNetworkFirewallFirewall_dualstackSubnet(t *testing.T) { Config: testAccFirewallConfig_dualstackSubnet(rName), Check: resource.ComposeTestCheckFunc( testAccCheckFirewallExists(ctx, resourceName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "network-firewall", fmt.Sprintf("firewall/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "network-firewall", fmt.Sprintf("firewall/%s", rName)), resource.TestCheckResourceAttr(resourceName, "delete_protection", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttrPair(resourceName, "firewall_policy_arn", policyResourceName, names.AttrARN), diff --git a/internal/service/networkfirewall/rule_group_test.go b/internal/service/networkfirewall/rule_group_test.go index a3dca9e3476..84cd0c69f66 100644 --- a/internal/service/networkfirewall/rule_group_test.go +++ b/internal/service/networkfirewall/rule_group_test.go @@ -37,7 +37,7 @@ func TestAccNetworkFirewallRuleGroup_Basic_rulesSourceList(t *testing.T) { Config: testAccRuleGroupConfig_basicSourceList(rName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &ruleGroup), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "network-firewall", fmt.Sprintf("stateful-rulegroup/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "network-firewall", fmt.Sprintf("stateful-rulegroup/%s", rName)), resource.TestCheckResourceAttr(resourceName, "capacity", "100"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrType, string(awstypes.RuleGroupTypeStateful)), @@ -80,7 +80,7 @@ func TestAccNetworkFirewallRuleGroup_Basic_referenceSets(t *testing.T) { Config: testAccRuleGroupConfig_referenceSets(rName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &ruleGroup), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "network-firewall", fmt.Sprintf("stateful-rulegroup/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "network-firewall", fmt.Sprintf("stateful-rulegroup/%s", rName)), resource.TestCheckResourceAttr(resourceName, "capacity", "100"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrType, string(awstypes.RuleGroupTypeStateful)), @@ -117,7 +117,7 @@ func TestAccNetworkFirewallRuleGroup_Basic_updateReferenceSets(t *testing.T) { Config: testAccRuleGroupConfig_referenceSets(rName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &ruleGroup), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "network-firewall", fmt.Sprintf("stateful-rulegroup/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "network-firewall", fmt.Sprintf("stateful-rulegroup/%s", rName)), resource.TestCheckResourceAttr(resourceName, "capacity", "100"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrType, string(awstypes.RuleGroupTypeStateful)), @@ -138,7 +138,7 @@ func TestAccNetworkFirewallRuleGroup_Basic_updateReferenceSets(t *testing.T) { Config: testAccRuleGroupConfig_referenceSets1(rName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &ruleGroup), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "network-firewall", fmt.Sprintf("stateful-rulegroup/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "network-firewall", fmt.Sprintf("stateful-rulegroup/%s", rName)), resource.TestCheckResourceAttr(resourceName, "capacity", "100"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrType, string(awstypes.RuleGroupTypeStateful)), @@ -170,7 +170,7 @@ func TestAccNetworkFirewallRuleGroup_Basic_statefulRule(t *testing.T) { Config: testAccRuleGroupConfig_basicStateful(rName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &ruleGroup), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "network-firewall", fmt.Sprintf("stateful-rulegroup/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "network-firewall", fmt.Sprintf("stateful-rulegroup/%s", rName)), resource.TestCheckResourceAttr(resourceName, "capacity", "100"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrType, string(awstypes.RuleGroupTypeStateful)), @@ -220,7 +220,7 @@ func TestAccNetworkFirewallRuleGroup_Basic_statelessRule(t *testing.T) { Config: testAccRuleGroupConfig_basicStateless(rName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &ruleGroup), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "network-firewall", fmt.Sprintf("stateless-rulegroup/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "network-firewall", fmt.Sprintf("stateless-rulegroup/%s", rName)), resource.TestCheckResourceAttr(resourceName, "capacity", "100"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrType, string(awstypes.RuleGroupTypeStateless)), @@ -266,7 +266,7 @@ alert http any any -> any any (http_response_line; content:"403 Forbidden"; sid: Config: testAccRuleGroupConfig_basic(rName, rules), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &ruleGroup), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "network-firewall", fmt.Sprintf("stateful-rulegroup/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "network-firewall", fmt.Sprintf("stateful-rulegroup/%s", rName)), resource.TestCheckResourceAttr(resourceName, "capacity", "100"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrType, string(awstypes.RuleGroupTypeStateful)), @@ -381,7 +381,7 @@ func TestAccNetworkFirewallRuleGroup_statelessRuleWithCustomAction(t *testing.T) Config: testAccRuleGroupConfig_statelessCustomAction(rName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &ruleGroup), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "network-firewall", fmt.Sprintf("stateless-rulegroup/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "network-firewall", fmt.Sprintf("stateless-rulegroup/%s", rName)), resource.TestCheckResourceAttr(resourceName, "capacity", "100"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrType, string(awstypes.RuleGroupTypeStateless)), @@ -480,7 +480,7 @@ func TestAccNetworkFirewallRuleGroup_updateRulesSourceList(t *testing.T) { Config: testAccRuleGroupConfig_updateSourceList(rName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &ruleGroup), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "network-firewall", fmt.Sprintf("stateful-rulegroup/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "network-firewall", fmt.Sprintf("stateful-rulegroup/%s", rName)), resource.TestCheckResourceAttr(resourceName, "capacity", "100"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrType, string(awstypes.RuleGroupTypeStateful)), diff --git a/internal/service/networkfirewall/tls_inspection_configuration_test.go b/internal/service/networkfirewall/tls_inspection_configuration_test.go index 2deab66b64c..cff00c8c496 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(ctx, resourceName, names.AttrARN, "network-firewall", regexache.MustCompile(`tls-configuration/.+$`)), resource.TestCheckNoResourceAttr(resourceName, "certificate_authority"), resource.TestCheckResourceAttr(resourceName, "certificates.#", "1"), 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(ctx, resourceName, names.AttrARN, "network-firewall", regexache.MustCompile(`tls-configuration/.+$`)), resource.TestCheckNoResourceAttr(resourceName, "certificate_authority"), resource.TestCheckResourceAttr(resourceName, "certificates.#", "1"), 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(ctx, resourceName, names.AttrARN, "network-firewall", regexache.MustCompile(`tls-configuration/.+$`)), resource.TestCheckNoResourceAttr(resourceName, "certificates"), resource.TestCheckResourceAttr(resourceName, "certificate_authority.#", "1"), 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(ctx, resourceName, names.AttrARN, "network-firewall", regexache.MustCompile(`tls-configuration/.+$`)), resource.TestCheckNoResourceAttr(resourceName, "certificates"), resource.TestCheckResourceAttr(resourceName, "certificate_authority.#", "1"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "test"), From 93e5b2e002669f3f11674b84e007c1676a852d29 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:53 -0500 Subject: [PATCH 116/304] Make 'AWSClient.AccountID' a getter - networkmanager. --- .../service/networkmanager/connect_attachment.go | 2 +- .../networkmanager/connect_attachment_test.go | 12 ++++++------ internal/service/networkmanager/connect_peer.go | 2 +- internal/service/networkmanager/connect_peer_test.go | 6 +++--- internal/service/networkmanager/core_network_test.go | 2 +- .../service/networkmanager/global_network_test.go | 2 +- .../networkmanager/site_to_site_vpn_attachment.go | 2 +- .../site_to_site_vpn_attachment_test.go | 4 ++-- .../networkmanager/transit_gateway_peering.go | 2 +- .../networkmanager/transit_gateway_peering_test.go | 4 ++-- .../transit_gateway_route_table_attachment.go | 2 +- .../transit_gateway_route_table_attachment_test.go | 4 ++-- internal/service/networkmanager/vpc_attachment.go | 2 +- .../service/networkmanager/vpc_attachment_test.go | 8 ++++---- 14 files changed, 27 insertions(+), 27 deletions(-) diff --git a/internal/service/networkmanager/connect_attachment.go b/internal/service/networkmanager/connect_attachment.go index 6897ae3d255..0eb64813a3c 100644 --- a/internal/service/networkmanager/connect_attachment.go +++ b/internal/service/networkmanager/connect_attachment.go @@ -216,7 +216,7 @@ func resourceConnectAttachmentRead(ctx context.Context, d *schema.ResourceData, arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "networkmanager", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("attachment/%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/networkmanager/connect_attachment_test.go b/internal/service/networkmanager/connect_attachment_test.go index 37f7a460069..1142d56211b 100644 --- a/internal/service/networkmanager/connect_attachment_test.go +++ b/internal/service/networkmanager/connect_attachment_test.go @@ -36,12 +36,12 @@ func TestAccNetworkManagerConnectAttachment_basic(t *testing.T) { Config: testAccConnectAttachmentConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckConnectAttachmentExists(ctx, resourceName, &v), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "networkmanager", regexache.MustCompile(`attachment/.+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "networkmanager", regexache.MustCompile(`attachment/.+`)), resource.TestCheckResourceAttr(resourceName, "attachment_type", "CONNECT"), resource.TestCheckResourceAttrSet(resourceName, "core_network_id"), resource.TestCheckResourceAttr(resourceName, "edge_location", acctest.Region()), resource.TestCheckResourceAttr(resourceName, "options.0.protocol", "GRE"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerAccountID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerAccountID), resource.TestCheckResourceAttr(resourceName, "segment_name", "shared"), resource.TestCheckResourceAttrSet(resourceName, names.AttrState), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), @@ -73,12 +73,12 @@ func TestAccNetworkManagerConnectAttachment_basic_NoDependsOn(t *testing.T) { Config: testAccConnectAttachmentConfig_basic_NoDependsOn(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckConnectAttachmentExists(ctx, resourceName, &v), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "networkmanager", regexache.MustCompile(`attachment/.+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "networkmanager", regexache.MustCompile(`attachment/.+`)), resource.TestCheckResourceAttr(resourceName, "attachment_type", "CONNECT"), resource.TestCheckResourceAttrSet(resourceName, "core_network_id"), resource.TestCheckResourceAttr(resourceName, "edge_location", acctest.Region()), resource.TestCheckResourceAttr(resourceName, "options.0.protocol", "GRE"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerAccountID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerAccountID), resource.TestCheckResourceAttr(resourceName, "segment_name", "shared"), resource.TestCheckResourceAttrSet(resourceName, names.AttrState), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), @@ -134,12 +134,12 @@ func TestAccNetworkManagerConnectAttachment_protocolNoEncap(t *testing.T) { Config: testAccConnectAttachmentConfig_protocolNoEncap(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckConnectAttachmentExists(ctx, resourceName, &v), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "networkmanager", regexache.MustCompile(`attachment/.+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "networkmanager", regexache.MustCompile(`attachment/.+`)), resource.TestCheckResourceAttr(resourceName, "attachment_type", "CONNECT"), resource.TestCheckResourceAttrSet(resourceName, "core_network_id"), resource.TestCheckResourceAttr(resourceName, "edge_location", acctest.Region()), resource.TestCheckResourceAttr(resourceName, "options.0.protocol", "NO_ENCAP"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerAccountID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerAccountID), resource.TestCheckResourceAttr(resourceName, "segment_name", "shared"), resource.TestCheckResourceAttrSet(resourceName, names.AttrState), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), diff --git a/internal/service/networkmanager/connect_peer.go b/internal/service/networkmanager/connect_peer.go index b8bba578f6a..834b064b67b 100644 --- a/internal/service/networkmanager/connect_peer.go +++ b/internal/service/networkmanager/connect_peer.go @@ -280,7 +280,7 @@ func resourceConnectPeerRead(ctx context.Context, d *schema.ResourceData, meta i arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "networkmanager", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("connect-peer/%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/networkmanager/connect_peer_test.go b/internal/service/networkmanager/connect_peer_test.go index 5c3ac12de39..921a9fab033 100644 --- a/internal/service/networkmanager/connect_peer_test.go +++ b/internal/service/networkmanager/connect_peer_test.go @@ -40,7 +40,7 @@ func TestAccNetworkManagerConnectPeer_basic(t *testing.T) { Config: testAccConnectPeerConfig_basic(rName, insideCidrBlocksv4, peerAddress, asn, protocol), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckConnectPeerExists(ctx, resourceName, &v), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "networkmanager", regexache.MustCompile(`connect-peer/.+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "networkmanager", regexache.MustCompile(`connect-peer/.+`)), resource.TestCheckResourceAttr(resourceName, "configuration.#", "1"), resource.TestCheckResourceAttrSet(resourceName, "configuration.0.core_network_address"), resource.TestCheckResourceAttr(resourceName, "configuration.0.inside_cidr_blocks.0", insideCidrBlocksv4), @@ -85,7 +85,7 @@ func TestAccNetworkManagerConnectPeer_noDependsOn(t *testing.T) { Config: testAccConnectPeerConfig_noDependsOn(rName, insideCidrBlocksv4, peerAddress, asn, protocol), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckConnectPeerExists(ctx, resourceName, &v), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "networkmanager", regexache.MustCompile(`connect-peer/.+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "networkmanager", regexache.MustCompile(`connect-peer/.+`)), resource.TestCheckResourceAttr(resourceName, "configuration.#", "1"), resource.TestCheckResourceAttrSet(resourceName, "configuration.0.core_network_address"), resource.TestCheckResourceAttr(resourceName, "configuration.0.inside_cidr_blocks.0", insideCidrBlocksv4), @@ -130,7 +130,7 @@ func TestAccNetworkManagerConnectPeer_subnetARN(t *testing.T) { Config: testAccConnectPeerConfig_subnetARN(rName, peerAddress, asn, protocol), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckConnectPeerExists(ctx, resourceName, &v), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "networkmanager", regexache.MustCompile(`connect-peer/.+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "networkmanager", regexache.MustCompile(`connect-peer/.+`)), resource.TestCheckResourceAttr(resourceName, "configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "configuration.0.peer_address", peerAddress), resource.TestCheckResourceAttr(resourceName, "configuration.0.protocol", "NO_ENCAP"), diff --git a/internal/service/networkmanager/core_network_test.go b/internal/service/networkmanager/core_network_test.go index bad69ac416f..aef381466a0 100644 --- a/internal/service/networkmanager/core_network_test.go +++ b/internal/service/networkmanager/core_network_test.go @@ -33,7 +33,7 @@ func TestAccNetworkManagerCoreNetwork_basic(t *testing.T) { Config: testAccCoreNetworkConfig_basic(), Check: resource.ComposeTestCheckFunc( testAccCheckCoreNetworkExists(ctx, resourceName), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "networkmanager", regexache.MustCompile(`core-network/core-network-.+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "networkmanager", regexache.MustCompile(`core-network/core-network-.+`)), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedAt), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestMatchResourceAttr(resourceName, names.AttrID, regexache.MustCompile(`core-network-.+`)), diff --git a/internal/service/networkmanager/global_network_test.go b/internal/service/networkmanager/global_network_test.go index 95434cf75ef..6959f0c41d3 100644 --- a/internal/service/networkmanager/global_network_test.go +++ b/internal/service/networkmanager/global_network_test.go @@ -32,7 +32,7 @@ func TestAccNetworkManagerGlobalNetwork_basic(t *testing.T) { Config: testAccGlobalNetworkConfig_basic(), Check: resource.ComposeTestCheckFunc( testAccCheckGlobalNetworkExists(ctx, resourceName), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "networkmanager", regexache.MustCompile(`global-network/global-network-.+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "networkmanager", regexache.MustCompile(`global-network/global-network-.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), diff --git a/internal/service/networkmanager/site_to_site_vpn_attachment.go b/internal/service/networkmanager/site_to_site_vpn_attachment.go index ebe2225a8b8..53efa4145e3 100644 --- a/internal/service/networkmanager/site_to_site_vpn_attachment.go +++ b/internal/service/networkmanager/site_to_site_vpn_attachment.go @@ -152,7 +152,7 @@ func resourceSiteToSiteVPNAttachmentRead(ctx context.Context, d *schema.Resource arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "networkmanager", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("attachment/%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/networkmanager/site_to_site_vpn_attachment_test.go b/internal/service/networkmanager/site_to_site_vpn_attachment_test.go index 09b15088446..898ca6cb0c8 100644 --- a/internal/service/networkmanager/site_to_site_vpn_attachment_test.go +++ b/internal/service/networkmanager/site_to_site_vpn_attachment_test.go @@ -43,13 +43,13 @@ func TestAccNetworkManagerSiteToSiteVPNAttachment_basic(t *testing.T) { Config: testAccSiteToSiteVPNAttachmentConfig_basic(rName, bgpASN, vpnIP), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSiteToSiteVPNAttachmentExists(ctx, resourceName, &v), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "networkmanager", regexache.MustCompile(`attachment/.+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "networkmanager", regexache.MustCompile(`attachment/.+`)), resource.TestCheckResourceAttr(resourceName, "attachment_policy_rule_number", "1"), resource.TestCheckResourceAttr(resourceName, "attachment_type", "SITE_TO_SITE_VPN"), resource.TestCheckResourceAttrPair(resourceName, "core_network_arn", coreNetworkResourceName, names.AttrARN), resource.TestCheckResourceAttrSet(resourceName, "core_network_id"), resource.TestCheckResourceAttr(resourceName, "edge_location", acctest.Region()), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerAccountID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerAccountID), resource.TestCheckResourceAttrPair(resourceName, names.AttrResourceARN, vpnResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "segment_name", "shared"), resource.TestCheckResourceAttrSet(resourceName, names.AttrState), diff --git a/internal/service/networkmanager/transit_gateway_peering.go b/internal/service/networkmanager/transit_gateway_peering.go index ee11704df21..c37199826bc 100644 --- a/internal/service/networkmanager/transit_gateway_peering.go +++ b/internal/service/networkmanager/transit_gateway_peering.go @@ -142,7 +142,7 @@ func resourceTransitGatewayPeeringRead(ctx context.Context, d *schema.ResourceDa arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "networkmanager", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("peering/%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/networkmanager/transit_gateway_peering_test.go b/internal/service/networkmanager/transit_gateway_peering_test.go index ad712b23a15..055f48cd1fe 100644 --- a/internal/service/networkmanager/transit_gateway_peering_test.go +++ b/internal/service/networkmanager/transit_gateway_peering_test.go @@ -47,11 +47,11 @@ func TestAccNetworkManagerTransitGatewayPeering_basic(t *testing.T) { Config: testAccTransitGatewayPeeringConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTransitGatewayPeeringExists(ctx, resourceName, &v), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "networkmanager", regexache.MustCompile(`peering/.+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "networkmanager", regexache.MustCompile(`peering/.+`)), resource.TestCheckResourceAttrSet(resourceName, "core_network_arn"), resource.TestCheckResourceAttrSet(resourceName, "core_network_id"), resource.TestCheckResourceAttr(resourceName, "edge_location", acctest.Region()), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerAccountID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerAccountID), resource.TestCheckResourceAttrPair(resourceName, names.AttrResourceARN, tgwResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrPair(resourceName, "transit_gateway_arn", tgwResourceName, names.AttrARN), diff --git a/internal/service/networkmanager/transit_gateway_route_table_attachment.go b/internal/service/networkmanager/transit_gateway_route_table_attachment.go index a21ca03525a..fbc79a273f4 100644 --- a/internal/service/networkmanager/transit_gateway_route_table_attachment.go +++ b/internal/service/networkmanager/transit_gateway_route_table_attachment.go @@ -154,7 +154,7 @@ func resourceTransitGatewayRouteTableAttachmentRead(ctx context.Context, d *sche arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "networkmanager", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("attachment/%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/networkmanager/transit_gateway_route_table_attachment_test.go b/internal/service/networkmanager/transit_gateway_route_table_attachment_test.go index cfe6744316d..1de058ecf46 100644 --- a/internal/service/networkmanager/transit_gateway_route_table_attachment_test.go +++ b/internal/service/networkmanager/transit_gateway_route_table_attachment_test.go @@ -36,11 +36,11 @@ func TestAccNetworkManagerTransitGatewayRouteTableAttachment_basic(t *testing.T) Config: testAccTransitGatewayRouteTableAttachmentConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTransitGatewayRouteTableAttachmentExists(ctx, resourceName, &v), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "networkmanager", regexache.MustCompile(`attachment/.+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "networkmanager", regexache.MustCompile(`attachment/.+`)), resource.TestCheckResourceAttr(resourceName, "attachment_policy_rule_number", "0"), resource.TestCheckResourceAttr(resourceName, "attachment_type", "TRANSIT_GATEWAY_ROUTE_TABLE"), resource.TestCheckResourceAttr(resourceName, "edge_location", acctest.Region()), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerAccountID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerAccountID), resource.TestCheckResourceAttrSet(resourceName, names.AttrResourceARN), resource.TestCheckResourceAttr(resourceName, "segment_name", ""), resource.TestCheckResourceAttrSet(resourceName, names.AttrState), diff --git a/internal/service/networkmanager/vpc_attachment.go b/internal/service/networkmanager/vpc_attachment.go index 69851b84eb6..6b72d463ac7 100644 --- a/internal/service/networkmanager/vpc_attachment.go +++ b/internal/service/networkmanager/vpc_attachment.go @@ -214,7 +214,7 @@ func resourceVPCAttachmentRead(ctx context.Context, d *schema.ResourceData, meta arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "networkmanager", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("attachment/%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/networkmanager/vpc_attachment_test.go b/internal/service/networkmanager/vpc_attachment_test.go index 53ada83d54e..31919c964ce 100644 --- a/internal/service/networkmanager/vpc_attachment_test.go +++ b/internal/service/networkmanager/vpc_attachment_test.go @@ -62,7 +62,7 @@ func TestAccNetworkManagerVPCAttachment_basic(t *testing.T) { Config: testAccVPCAttachmentConfig_basic(rName, testcase.acceptanceRequired), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckVPCAttachmentExists(ctx, resourceName, &v), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "networkmanager", regexache.MustCompile(`attachment/.+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "networkmanager", regexache.MustCompile(`attachment/.+`)), resource.TestCheckResourceAttr(resourceName, "attachment_policy_rule_number", "1"), resource.TestCheckResourceAttr(resourceName, "attachment_type", "VPC"), resource.TestCheckResourceAttrPair(resourceName, "core_network_arn", coreNetworkResourceName, names.AttrARN), @@ -71,7 +71,7 @@ func TestAccNetworkManagerVPCAttachment_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "options.#", "1"), resource.TestCheckResourceAttr(resourceName, "options.0.appliance_mode_support", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "options.0.ipv6_support", acctest.CtFalse), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerAccountID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerAccountID), resource.TestCheckResourceAttrPair(resourceName, names.AttrResourceARN, vpcResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "segment_name", "shared"), resource.TestCheckResourceAttr(resourceName, names.AttrState, string(testcase.expectedState)), @@ -128,7 +128,7 @@ func TestAccNetworkManagerVPCAttachment_Attached_basic(t *testing.T) { Config: testAccVPCAttachmentConfig_Attached_basic(rName, testcase.acceptanceRequired), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckVPCAttachmentExists(ctx, resourceName, &v), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "networkmanager", regexache.MustCompile(`attachment/.+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "networkmanager", regexache.MustCompile(`attachment/.+`)), resource.TestCheckResourceAttr(resourceName, "attachment_policy_rule_number", "1"), resource.TestCheckResourceAttr(resourceName, "attachment_type", "VPC"), resource.TestCheckResourceAttrPair(resourceName, "core_network_arn", coreNetworkResourceName, names.AttrARN), @@ -137,7 +137,7 @@ func TestAccNetworkManagerVPCAttachment_Attached_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "options.#", "1"), resource.TestCheckResourceAttr(resourceName, "options.0.appliance_mode_support", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "options.0.ipv6_support", acctest.CtFalse), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerAccountID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerAccountID), resource.TestCheckResourceAttrPair(resourceName, names.AttrResourceARN, vpcResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "segment_name", "shared"), resource.TestCheckResourceAttrSet(resourceName, names.AttrState), From a759b2cd5282cb64cee1746ffabc2755f89914cc Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:53 -0500 Subject: [PATCH 117/304] Make 'AWSClient.AccountID' a getter - networkmonitor. --- internal/service/networkmonitor/monitor_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/networkmonitor/monitor_test.go b/internal/service/networkmonitor/monitor_test.go index 5629fea8a9c..cd6cb2e58b3 100644 --- a/internal/service/networkmonitor/monitor_test.go +++ b/internal/service/networkmonitor/monitor_test.go @@ -37,7 +37,7 @@ func TestAccNetworkMonitorMonitor_basic(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckMonitorExists(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, "aggregation_period", "60"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "networkmonitor", fmt.Sprintf("monitor/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "networkmonitor", fmt.Sprintf("monitor/%s", rName)), resource.TestCheckResourceAttrPair(resourceName, names.AttrID, resourceName, "monitor_name"), resource.TestCheckResourceAttr(resourceName, "monitor_name", rName), ), From 843b04333061fb7a794a35bd0aa310cb491a49a2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:53 -0500 Subject: [PATCH 118/304] Make 'AWSClient.AccountID' a getter - oam. --- internal/service/oam/link_data_source_test.go | 6 +++--- internal/service/oam/link_test.go | 6 +++--- internal/service/oam/links_data_source_test.go | 2 +- internal/service/oam/sink_data_source_test.go | 2 +- internal/service/oam/sink_policy_test.go | 10 +++++----- internal/service/oam/sink_test.go | 2 +- internal/service/oam/sinks_data_source_test.go | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/internal/service/oam/link_data_source_test.go b/internal/service/oam/link_data_source_test.go index 1a84cd201ac..4346de38d91 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(ctx, 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(ctx, dataSourceName, names.AttrARN, "oam", regexache.MustCompile(`link/.+$`)), resource.TestCheckResourceAttrSet(dataSourceName, "label"), resource.TestCheckResourceAttr(dataSourceName, "label_template", "$AccountName"), resource.TestCheckResourceAttr(dataSourceName, "link_configuration.#", "1"), @@ -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(ctx, dataSourceName, names.AttrARN, "oam", regexache.MustCompile(`link/.+$`)), resource.TestCheckResourceAttrSet(dataSourceName, "label"), resource.TestCheckResourceAttr(dataSourceName, "label_template", "$AccountName"), resource.TestCheckResourceAttr(dataSourceName, "link_configuration.#", "1"), diff --git a/internal/service/oam/link_test.go b/internal/service/oam/link_test.go index e342bacaa29..22dbd304e97 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(ctx, 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(ctx, 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(ctx, 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 6ecc9a70dda..8743c65b441 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.#", "1"), - acctest.MatchResourceAttrRegionalARN(dataSourceName, "arns.0", "oam", regexache.MustCompile(`link/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, 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 b70ca8fce4d..6d0e96a24c4 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, "1"), resource.TestCheckResourceAttr(dataSourceName, acctest.CtTagsKey1, acctest.CtValue1), - acctest.MatchResourceAttrRegionalARN(dataSourceName, names.AttrARN, "oam", regexache.MustCompile(`sink/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, 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 791359f1452..912f6ec26cd 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(ctx, resourceName, names.AttrARN, "oam", regexache.MustCompile(`sink/.+$`)), resource.TestCheckResourceAttrWith(resourceName, names.AttrPolicy, func(value string) error { _, err := awspolicy.PoliciesAreEquivalent(value, fmt.Sprintf(` { @@ -67,7 +67,7 @@ func testAccObservabilityAccessManagerSinkPolicy_basic(t *testing.T) { } }] } - `, acctest.Partition(), acctest.AccountID())) + `, acctest.Partition(), acctest.AccountID(ctx))) return err }), resource.TestCheckResourceAttrSet(resourceName, "sink_id"), @@ -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(ctx, resourceName, names.AttrARN, "oam", regexache.MustCompile(`sink/.+$`)), resource.TestCheckResourceAttrWith(resourceName, names.AttrPolicy, func(value string) error { _, err := awspolicy.PoliciesAreEquivalent(value, fmt.Sprintf(` { @@ -126,7 +126,7 @@ func testAccObservabilityAccessManagerSinkPolicy_update(t *testing.T) { } }] } - `, acctest.Partition(), acctest.AccountID())) + `, acctest.Partition(), acctest.AccountID(ctx))) return err }), resource.TestCheckResourceAttrSet(resourceName, "sink_id"), @@ -154,7 +154,7 @@ func testAccObservabilityAccessManagerSinkPolicy_update(t *testing.T) { } }] } - `, acctest.Partition(), acctest.AccountID())) + `, acctest.Partition(), acctest.AccountID(ctx))) return err }), ), diff --git a/internal/service/oam/sink_test.go b/internal/service/oam/sink_test.go index 0dac1aa8271..bda5ee25e68 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(ctx, resourceName, names.AttrARN, "oam", regexache.MustCompile(`sink/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttrSet(resourceName, "sink_id"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), diff --git a/internal/service/oam/sinks_data_source_test.go b/internal/service/oam/sinks_data_source_test.go index 2cd4e3e6d23..a12ad3d9fb1 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.#", "1"), - acctest.MatchResourceAttrRegionalARN(dataSourceName, "arns.0", "oam", regexache.MustCompile(`sink/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, dataSourceName, "arns.0", "oam", regexache.MustCompile(`sink/.+$`)), ), }, }, From 913b8f80d6e8dbadb83acb0f29ec32a981c8769e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:54 -0500 Subject: [PATCH 119/304] Make 'AWSClient.AccountID' a getter - opensearch. --- internal/service/opensearch/domain_policy_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/opensearch/domain_policy_test.go b/internal/service/opensearch/domain_policy_test.go index 010822b7102..4251e5df507 100644 --- a/internal/service/opensearch/domain_policy_test.go +++ b/internal/service/opensearch/domain_policy_test.go @@ -63,7 +63,7 @@ func TestAccOpenSearchDomainPolicy_basic(t *testing.T) { testAccCheckDomainExists(ctx, "aws_opensearch_domain.test", &domain), func(s *terraform.State) error { awsClient := acctest.Provider.Meta().(*conns.AWSClient) - expectedArn, err := buildDomainARN(name, awsClient.Partition(ctx), awsClient.AccountID, awsClient.Region) + expectedArn, err := buildDomainARN(name, awsClient.Partition(ctx), awsClient.AccountID(ctx), awsClient.Region) if err != nil { return err } From 4bbf5134da0cf9f1f4353628985a194091bd2350 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:54 -0500 Subject: [PATCH 120/304] Make 'AWSClient.AccountID' a getter - opsworks. --- internal/service/opsworks/custom_layer_test.go | 4 ++-- internal/service/opsworks/rails_app_layer_test.go | 2 +- internal/service/opsworks/stack.go | 2 +- internal/service/opsworks/stack_test.go | 10 +++++----- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/internal/service/opsworks/custom_layer_test.go b/internal/service/opsworks/custom_layer_test.go index b06fc18da7d..9208ad9158c 100644 --- a/internal/service/opsworks/custom_layer_test.go +++ b/internal/service/opsworks/custom_layer_test.go @@ -35,7 +35,7 @@ func TestAccOpsWorksCustomLayer_basic(t *testing.T) { Config: testAccCustomLayerConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckLayerExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "opsworks", regexache.MustCompile(`layer/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "opsworks", regexache.MustCompile(`layer/.+`)), resource.TestCheckResourceAttr(resourceName, "auto_assign_elastic_ips", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "auto_assign_public_ips", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "auto_healing", acctest.CtTrue), @@ -108,7 +108,7 @@ func TestAccOpsWorksCustomLayer_update(t *testing.T) { { Config: testAccCustomLayerConfig_update(rName), Check: resource.ComposeAggregateTestCheckFunc( - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "opsworks", regexache.MustCompile(`layer/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "opsworks", regexache.MustCompile(`layer/.+`)), resource.TestCheckResourceAttr(resourceName, "auto_assign_elastic_ips", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "auto_assign_public_ips", acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, "auto_healing", acctest.CtTrue), diff --git a/internal/service/opsworks/rails_app_layer_test.go b/internal/service/opsworks/rails_app_layer_test.go index e0cca45243b..2e8bd19b393 100644 --- a/internal/service/opsworks/rails_app_layer_test.go +++ b/internal/service/opsworks/rails_app_layer_test.go @@ -37,7 +37,7 @@ func TestAccOpsWorksRailsAppLayer_basic(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckLayerExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "app_server", "apache_passenger"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "opsworks", regexache.MustCompile(`layer/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "opsworks", regexache.MustCompile(`layer/.+`)), resource.TestCheckResourceAttr(resourceName, "auto_assign_elastic_ips", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "auto_assign_public_ips", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "auto_healing", acctest.CtTrue), diff --git a/internal/service/opsworks/stack.go b/internal/service/opsworks/stack.go index 3e118f417dd..7e417ac7a18 100644 --- a/internal/service/opsworks/stack.go +++ b/internal/service/opsworks/stack.go @@ -298,7 +298,7 @@ func resourceStackCreate(ctx context.Context, d *schema.ResourceData, meta inter Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.OpsWorks, Region: region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("stack/%s/", d.Id()), }.String() diff --git a/internal/service/opsworks/stack_test.go b/internal/service/opsworks/stack_test.go index 35be0d09e26..247528f358a 100644 --- a/internal/service/opsworks/stack_test.go +++ b/internal/service/opsworks/stack_test.go @@ -45,7 +45,7 @@ func TestAccOpsWorksStack_basic(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckStackExists(ctx, resourceName, &v), resource.TestCheckResourceAttrSet(resourceName, "agent_version"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "opsworks", regexache.MustCompile(`stack/.+/`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "opsworks", regexache.MustCompile(`stack/.+/`)), resource.TestCheckResourceAttr(resourceName, "berkshelf_version", "3.2.0"), resource.TestCheckResourceAttr(resourceName, "color", ""), resource.TestCheckResourceAttr(resourceName, "configuration_manager_name", "Chef"), @@ -273,7 +273,7 @@ func TestAccOpsWorksStack_tagsAlternateRegion(t *testing.T) { Partition: acctest.Partition(), Service: names.OpsWorks, Region: acctest.AlternateRegion(), - AccountID: acctest.AccountID(), + AccountID: acctest.AccountID(ctx), Resource: `stack/.+/`, }.String()).MatchString(value) { return fmt.Errorf("%s doesn't match ARN pattern", value) @@ -337,7 +337,7 @@ func TestAccOpsWorksStack_allAttributes(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckStackExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "agent_version", "4039-20200430042739"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "opsworks", regexache.MustCompile(`stack/.+/`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "opsworks", regexache.MustCompile(`stack/.+/`)), resource.TestCheckResourceAttr(resourceName, "berkshelf_version", "3.2.0"), resource.TestCheckResourceAttr(resourceName, "color", "rgb(186, 65, 50)"), resource.TestCheckResourceAttr(resourceName, "configuration_manager_name", "Chef"), @@ -381,7 +381,7 @@ func TestAccOpsWorksStack_allAttributes(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckStackExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "agent_version", "4038-20200305044341"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "opsworks", regexache.MustCompile(`stack/.+/`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "opsworks", regexache.MustCompile(`stack/.+/`)), resource.TestCheckResourceAttr(resourceName, "berkshelf_version", "3.2.0"), resource.TestCheckResourceAttr(resourceName, "color", "rgb(186, 65, 50)"), resource.TestCheckResourceAttr(resourceName, "configuration_manager_name", "Chef"), @@ -417,7 +417,7 @@ func TestAccOpsWorksStack_allAttributes(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckStackExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "agent_version", "4038-20200305044341"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "opsworks", regexache.MustCompile(`stack/.+/`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "opsworks", regexache.MustCompile(`stack/.+/`)), resource.TestCheckResourceAttr(resourceName, "berkshelf_version", "3.2.0"), resource.TestCheckResourceAttr(resourceName, "color", "rgb(209, 105, 41)"), resource.TestCheckResourceAttr(resourceName, "configuration_manager_name", "Chef"), From 8d711847d401723b7e656fa9dd6bf8f2dbe222f4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:54 -0500 Subject: [PATCH 121/304] Make 'AWSClient.AccountID' a getter - organizations. --- .../organizations/delegated_administrators_data_source.go | 2 +- .../service/organizations/delegated_services_data_source.go | 2 +- internal/service/organizations/organization_data_source.go | 2 +- internal/service/organizations/organization_test.go | 6 +++--- internal/service/organizations/policy_test.go | 4 ++-- internal/service/organizations/resource_policy_test.go | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/internal/service/organizations/delegated_administrators_data_source.go b/internal/service/organizations/delegated_administrators_data_source.go index 918a63b1490..70d60337685 100644 --- a/internal/service/organizations/delegated_administrators_data_source.go +++ b/internal/service/organizations/delegated_administrators_data_source.go @@ -90,7 +90,7 @@ func dataSourceDelegatedAdministratorsRead(ctx context.Context, d *schema.Resour return sdkdiag.AppendErrorf(diags, "reading Organizations Delegated Administrators: %s", err) } - d.SetId(meta.(*conns.AWSClient).AccountID) + d.SetId(meta.(*conns.AWSClient).AccountID(ctx)) if err = d.Set("delegated_administrators", flattenDelegatedAdministrators(output)); err != nil { return sdkdiag.AppendErrorf(diags, "setting delegated_administrators: %s", err) } diff --git a/internal/service/organizations/delegated_services_data_source.go b/internal/service/organizations/delegated_services_data_source.go index 5541184cb6d..0d985b9201c 100644 --- a/internal/service/organizations/delegated_services_data_source.go +++ b/internal/service/organizations/delegated_services_data_source.go @@ -59,7 +59,7 @@ func dataSourceDelegatedServicesRead(ctx context.Context, d *schema.ResourceData return sdkdiag.AppendErrorf(diags, "reading Organizations Delegated Services (%s): %s", accountID, err) } - d.SetId(meta.(*conns.AWSClient).AccountID) + d.SetId(meta.(*conns.AWSClient).AccountID(ctx)) if err = d.Set("delegated_services", flattenDelegatedServices(output)); err != nil { return sdkdiag.AppendErrorf(diags, "setting delegated_services: %s", err) } diff --git a/internal/service/organizations/organization_data_source.go b/internal/service/organizations/organization_data_source.go index 9f3ab3579d4..52faee900f4 100644 --- a/internal/service/organizations/organization_data_source.go +++ b/internal/service/organizations/organization_data_source.go @@ -174,7 +174,7 @@ func dataSourceOrganizationRead(ctx context.Context, d *schema.ResourceData, met managementAccountID := aws.ToString(org.MasterAccountId) d.Set("master_account_id", managementAccountID) - isManagementAccount := managementAccountID == meta.(*conns.AWSClient).AccountID + isManagementAccount := managementAccountID == meta.(*conns.AWSClient).AccountID(ctx) isDelegatedAdministrator := true accounts, err := findAccounts(ctx, conn, &organizations.ListAccountsInput{}) diff --git a/internal/service/organizations/organization_test.go b/internal/service/organizations/organization_test.go index 0710ea6f8d6..c2e825bee97 100644 --- a/internal/service/organizations/organization_test.go +++ b/internal/service/organizations/organization_test.go @@ -40,12 +40,12 @@ func testAccOrganization_basic(t *testing.T) { resource.TestCheckResourceAttrPair(resourceName, "accounts.0.arn", resourceName, "master_account_arn"), resource.TestCheckResourceAttrPair(resourceName, "accounts.0.email", resourceName, "master_account_email"), resource.TestCheckResourceAttrPair(resourceName, "accounts.0.id", resourceName, "master_account_id"), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "organizations", regexache.MustCompile(`organization/o-.+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "organizations", regexache.MustCompile(`organization/o-.+`)), resource.TestCheckResourceAttr(resourceName, "aws_service_access_principals.#", "0"), resource.TestCheckResourceAttr(resourceName, "feature_set", string(awstypes.OrganizationFeatureSetAll)), - acctest.MatchResourceAttrGlobalARN(resourceName, "master_account_arn", "organizations", regexache.MustCompile(`account/o-.+/.+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, "master_account_arn", "organizations", regexache.MustCompile(`account/o-.+/.+`)), resource.TestMatchResourceAttr(resourceName, "master_account_email", regexache.MustCompile(`.+@.+`)), - acctest.CheckResourceAttrAccountID(resourceName, "master_account_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "master_account_id"), resource.TestCheckResourceAttr(resourceName, "non_master_accounts.#", "0"), resource.TestCheckResourceAttr(resourceName, "roots.#", "1"), resource.TestMatchResourceAttr(resourceName, "roots.0.id", regexache.MustCompile(`r-[0-9a-z]{4,32}`)), diff --git a/internal/service/organizations/policy_test.go b/internal/service/organizations/policy_test.go index 212c852c7e2..ef89532efbf 100644 --- a/internal/service/organizations/policy_test.go +++ b/internal/service/organizations/policy_test.go @@ -41,7 +41,7 @@ func testAccPolicy_basic(t *testing.T) { Config: testAccPolicyConfig_required(rName, content1), Check: resource.ComposeTestCheckFunc( testAccCheckPolicyExists(ctx, resourceName, &policy), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "organizations", regexache.MustCompile("policy/o-.+/service_control_policy/p-.+$")), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "organizations", regexache.MustCompile("policy/o-.+/service_control_policy/p-.+$")), resource.TestCheckResourceAttr(resourceName, names.AttrContent, content1), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), @@ -196,7 +196,7 @@ func testAccPolicy_skipDestroy(t *testing.T) { Config: testAccPolicyConfig_skipDestroy(rName, content), Check: resource.ComposeTestCheckFunc( testAccCheckPolicyExists(ctx, resourceName, &policy), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "organizations", regexache.MustCompile("policy/o-.+/service_control_policy/p-.+$")), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "organizations", regexache.MustCompile("policy/o-.+/service_control_policy/p-.+$")), resource.TestCheckResourceAttr(resourceName, names.AttrContent, content), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), diff --git a/internal/service/organizations/resource_policy_test.go b/internal/service/organizations/resource_policy_test.go index 4bb230c0c26..7cb22a722bb 100644 --- a/internal/service/organizations/resource_policy_test.go +++ b/internal/service/organizations/resource_policy_test.go @@ -38,7 +38,7 @@ func testAccResourcePolicy_basic(t *testing.T) { Config: testAccResourcePolicyConfig_basic(), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckResourcePolicyExists(ctx, resourceName, &policy), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "organizations", regexache.MustCompile("resourcepolicy/o-.+/rp-.+$")), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "organizations", regexache.MustCompile("resourcepolicy/o-.+/rp-.+$")), resource.TestCheckResourceAttrSet(resourceName, names.AttrContent), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), From 2259989b38c2d26f88c760faf4a89f1075f3957d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:54 -0500 Subject: [PATCH 122/304] Make 'AWSClient.AccountID' a getter - osis. --- internal/service/osis/pipeline_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/osis/pipeline_test.go b/internal/service/osis/pipeline_test.go index 6ac45bb4728..24e8d006123 100644 --- a/internal/service/osis/pipeline_test.go +++ b/internal/service/osis/pipeline_test.go @@ -47,7 +47,7 @@ func TestAccOpenSearchIngestionPipeline_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "log_publishing_options.#", "0"), resource.TestCheckResourceAttr(resourceName, "max_units", "1"), resource.TestCheckResourceAttr(resourceName, "min_units", "1"), - acctest.MatchResourceAttrRegionalARN(resourceName, "pipeline_arn", "osis", regexache.MustCompile(`pipeline/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "pipeline_arn", "osis", regexache.MustCompile(`pipeline/.+$`)), resource.TestCheckResourceAttrSet(resourceName, "pipeline_configuration_body"), resource.TestCheckResourceAttr(resourceName, "pipeline_name", rName), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), From 9ddb22ff2bf5240c2b8ec0fe853ff585b03bc31c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:54 -0500 Subject: [PATCH 123/304] Make 'AWSClient.AccountID' a getter - outposts. --- internal/service/outposts/outpost_asset_data_source_test.go | 2 +- internal/service/outposts/outpost_assets_data_source_test.go | 2 +- internal/service/outposts/site_data_source_test.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/service/outposts/outpost_asset_data_source_test.go b/internal/service/outposts/outpost_asset_data_source_test.go index 68ebd45181c..d1f50453e1c 100644 --- a/internal/service/outposts/outpost_asset_data_source_test.go +++ b/internal/service/outposts/outpost_asset_data_source_test.go @@ -24,7 +24,7 @@ func TestAccOutpostsAssetDataSource_basic(t *testing.T) { { Config: testAccOutpostAssetDataSourceConfig_basic(), Check: resource.ComposeTestCheckFunc( - acctest.MatchResourceAttrRegionalARN(dataSourceName, names.AttrARN, "outposts", regexache.MustCompile(`outpost/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, dataSourceName, names.AttrARN, "outposts", regexache.MustCompile(`outpost/.+`)), resource.TestMatchResourceAttr(dataSourceName, "asset_id", regexache.MustCompile(`^(\w+)$`)), resource.TestCheckResourceAttrSet(dataSourceName, "asset_type"), resource.TestMatchResourceAttr(dataSourceName, "rack_elevation", regexache.MustCompile(`^[\S \n]+$`)), diff --git a/internal/service/outposts/outpost_assets_data_source_test.go b/internal/service/outposts/outpost_assets_data_source_test.go index 210616ec8cd..199049d4aa1 100644 --- a/internal/service/outposts/outpost_assets_data_source_test.go +++ b/internal/service/outposts/outpost_assets_data_source_test.go @@ -31,7 +31,7 @@ func TestAccOutpostsAssetsDataSource_id(t *testing.T) { { Config: testAccOutpostAssetsDataSourceConfig_id(), Check: resource.ComposeTestCheckFunc( - acctest.MatchResourceAttrRegionalARN(dataSourceName, names.AttrARN, "outposts", regexache.MustCompile(`outpost/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, dataSourceName, names.AttrARN, "outposts", regexache.MustCompile(`outpost/.+`)), ), }, }, diff --git a/internal/service/outposts/site_data_source_test.go b/internal/service/outposts/site_data_source_test.go index fbfcbc66ee4..14d011a0c81 100644 --- a/internal/service/outposts/site_data_source_test.go +++ b/internal/service/outposts/site_data_source_test.go @@ -25,7 +25,7 @@ func TestAccOutpostsSiteDataSource_id(t *testing.T) { { Config: testAccSiteDataSourceConfig_id(), Check: resource.ComposeTestCheckFunc( - acctest.CheckResourceAttrAccountID(dataSourceName, names.AttrAccountID), + acctest.CheckResourceAttrAccountID(ctx, dataSourceName, names.AttrAccountID), resource.TestCheckResourceAttrSet(dataSourceName, names.AttrDescription), resource.TestMatchResourceAttr(dataSourceName, names.AttrID, regexache.MustCompile(`^os-.+$`)), resource.TestMatchResourceAttr(dataSourceName, names.AttrName, regexache.MustCompile(`^.+$`)), From 46e8304043f52f603071a8932cfdd938b3bfb706 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:54 -0500 Subject: [PATCH 124/304] Make 'AWSClient.AccountID' a getter - paymentcryptography. --- internal/service/paymentcryptography/key_test.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/paymentcryptography/key_test.go b/internal/service/paymentcryptography/key_test.go index 87eb2e3cef9..af0ec531766 100644 --- a/internal/service/paymentcryptography/key_test.go +++ b/internal/service/paymentcryptography/key_test.go @@ -48,7 +48,7 @@ func TestAccPaymentCryptographyKey_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckKeyExists(ctx, resourceName, &key), resource.TestCheckResourceAttr(resourceName, names.AttrEnabled, acctest.CtTrue), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "payment-cryptography", regexache.MustCompile(`key/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "payment-cryptography", regexache.MustCompile(`key/.+`)), ), }, { @@ -88,7 +88,7 @@ func TestAccPaymentCryptographyKey_tags(t *testing.T) { resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "2"), resource.TestCheckResourceAttr(resourceName, "tags.Name", rName), resource.TestCheckResourceAttr(resourceName, "tags.Other", "Value"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "payment-cryptography", regexache.MustCompile(`key/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "payment-cryptography", regexache.MustCompile(`key/.+`)), ), }, { @@ -106,7 +106,7 @@ func TestAccPaymentCryptographyKey_tags(t *testing.T) { resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "2"), resource.TestCheckResourceAttr(resourceName, "tags.Name2", rName), resource.TestCheckResourceAttr(resourceName, "tags.Other", "Value2"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "payment-cryptography", regexache.MustCompile(`key/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "payment-cryptography", regexache.MustCompile(`key/.+`)), ), }, }, @@ -137,7 +137,7 @@ func TestAccPaymentCryptographyKey_update(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckKeyExists(ctx, resourceName, &key1), resource.TestCheckResourceAttr(resourceName, names.AttrEnabled, acctest.CtTrue), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "payment-cryptography", regexache.MustCompile(`key/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "payment-cryptography", regexache.MustCompile(`key/.+`)), ), }, { @@ -152,7 +152,7 @@ func TestAccPaymentCryptographyKey_update(t *testing.T) { testAccCheckKeyExists(ctx, resourceName, &key2), testAccCheckKeyNotRecreated(&key1, &key2), resource.TestCheckResourceAttr(resourceName, names.AttrEnabled, acctest.CtFalse), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "payment-cryptography", regexache.MustCompile(`key/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "payment-cryptography", regexache.MustCompile(`key/.+`)), ), }, { @@ -161,7 +161,7 @@ func TestAccPaymentCryptographyKey_update(t *testing.T) { testAccCheckKeyExists(ctx, resourceName, &key3), testAccCheckKeyNotRecreated(&key2, &key3), resource.TestCheckResourceAttr(resourceName, names.AttrEnabled, acctest.CtTrue), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "payment-cryptography", regexache.MustCompile(`key/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "payment-cryptography", regexache.MustCompile(`key/.+`)), ), }, }, From 525bc2dd298f9bcf8d37c0e640c41f7b0ffcb0fb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:55 -0500 Subject: [PATCH 125/304] Make 'AWSClient.AccountID' a getter - pipes. --- internal/service/pipes/pipe_test.go | 36 ++++++++++++++--------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/internal/service/pipes/pipe_test.go b/internal/service/pipes/pipe_test.go index c2209d7ae4c..ed7240b270e 100644 --- a/internal/service/pipes/pipe_test.go +++ b/internal/service/pipes/pipe_test.go @@ -44,7 +44,7 @@ func TestAccPipesPipe_basicSQS(t *testing.T) { Config: testAccPipeConfig_basicSQS(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPipeExists(ctx, resourceName, &pipe), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "pipes", regexache.MustCompile(regexp.QuoteMeta(`pipe/`+rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "pipes", regexache.MustCompile(regexp.QuoteMeta(`pipe/`+rName))), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Managed by Terraform"), resource.TestCheckResourceAttr(resourceName, "desired_state", "RUNNING"), resource.TestCheckResourceAttr(resourceName, "enrichment", ""), @@ -332,7 +332,7 @@ func TestAccPipesPipe_logConfiguration_cloudwatchLogsLogDestination(t *testing.T Config: testAccPipeConfig_logConfiguration_cloudwatchLogsLogDestination(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPipeExists(ctx, resourceName, &pipe), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "pipes", regexache.MustCompile(regexp.QuoteMeta(`pipe/`+rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "pipes", regexache.MustCompile(regexp.QuoteMeta(`pipe/`+rName))), resource.TestCheckResourceAttr(resourceName, "log_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "log_configuration.0.level", "INFO"), resource.TestCheckResourceAttr(resourceName, "log_configuration.0.cloudwatch_logs_log_destination.#", "1"), @@ -368,7 +368,7 @@ func TestAccPipesPipe_update_logConfiguration_cloudwatchLogsLogDestination(t *te Config: testAccPipeConfig_logConfiguration_cloudwatchLogsLogDestination(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPipeExists(ctx, resourceName, &pipe), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "pipes", regexache.MustCompile(regexp.QuoteMeta(`pipe/`+rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "pipes", regexache.MustCompile(regexp.QuoteMeta(`pipe/`+rName))), resource.TestCheckResourceAttr(resourceName, "log_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "log_configuration.0.level", "INFO"), resource.TestCheckResourceAttr(resourceName, "log_configuration.0.cloudwatch_logs_log_destination.#", "1"), @@ -384,7 +384,7 @@ func TestAccPipesPipe_update_logConfiguration_cloudwatchLogsLogDestination(t *te Config: testAccPipeConfig_logConfiguration_update_cloudwatchLogsLogDestination(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPipeExists(ctx, resourceName, &pipe), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "pipes", regexache.MustCompile(regexp.QuoteMeta(`pipe/`+rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "pipes", regexache.MustCompile(regexp.QuoteMeta(`pipe/`+rName))), resource.TestCheckResourceAttr(resourceName, "log_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "log_configuration.0.level", "ERROR"), resource.TestCheckResourceAttr(resourceName, "log_configuration.0.cloudwatch_logs_log_destination.#", "1"), @@ -415,7 +415,7 @@ func TestAccPipesPipe_logConfiguration_includeExecutionData(t *testing.T) { Config: testAccPipeConfig_logConfiguration_includeExecutionData(rName, "null"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPipeExists(ctx, resourceName, &pipe), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "pipes", regexache.MustCompile(regexp.QuoteMeta(`pipe/`+rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "pipes", regexache.MustCompile(regexp.QuoteMeta(`pipe/`+rName))), resource.TestCheckResourceAttr(resourceName, "log_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "log_configuration.0.include_execution_data.#", "0"), ), @@ -429,7 +429,7 @@ func TestAccPipesPipe_logConfiguration_includeExecutionData(t *testing.T) { Config: testAccPipeConfig_logConfiguration_includeExecutionData(rName, "[\"ALL\"]"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPipeExists(ctx, resourceName, &pipe), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "pipes", regexache.MustCompile(regexp.QuoteMeta(`pipe/`+rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "pipes", regexache.MustCompile(regexp.QuoteMeta(`pipe/`+rName))), resource.TestCheckResourceAttr(resourceName, "log_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "log_configuration.0.include_execution_data.#", "1"), resource.TestCheckResourceAttr(resourceName, "log_configuration.0.include_execution_data.0", "ALL"), @@ -444,7 +444,7 @@ func TestAccPipesPipe_logConfiguration_includeExecutionData(t *testing.T) { Config: testAccPipeConfig_logConfiguration_includeExecutionData(rName, "[]"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPipeExists(ctx, resourceName, &pipe), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "pipes", regexache.MustCompile(regexp.QuoteMeta(`pipe/`+rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "pipes", regexache.MustCompile(regexp.QuoteMeta(`pipe/`+rName))), resource.TestCheckResourceAttr(resourceName, "log_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "log_configuration.0.include_execution_data.#", "0"), ), @@ -865,7 +865,7 @@ func TestAccPipesPipe_kinesisSourceAndTarget(t *testing.T) { Config: testAccPipeConfig_basicKinesis(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPipeExists(ctx, resourceName, &pipe), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "pipes", regexache.MustCompile(regexp.QuoteMeta(`pipe/`+rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "pipes", regexache.MustCompile(regexp.QuoteMeta(`pipe/`+rName))), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Managed by Terraform"), resource.TestCheckResourceAttr(resourceName, "desired_state", "RUNNING"), resource.TestCheckResourceAttr(resourceName, "enrichment", ""), @@ -918,7 +918,7 @@ func TestAccPipesPipe_kinesisSourceAndTarget(t *testing.T) { Config: testAccPipeConfig_updateKinesis(rName, 10), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPipeExists(ctx, resourceName, &pipe), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "pipes", regexache.MustCompile(regexp.QuoteMeta(`pipe/`+rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "pipes", regexache.MustCompile(regexp.QuoteMeta(`pipe/`+rName))), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Managed by Terraform"), resource.TestCheckResourceAttr(resourceName, "desired_state", "RUNNING"), resource.TestCheckResourceAttr(resourceName, "enrichment", ""), @@ -986,7 +986,7 @@ func TestAccPipesPipe_dynamoDBSourceCloudWatchLogsTarget(t *testing.T) { Config: testAccPipeConfig_basicDynamoDBSourceCloudWatchLogsTarget(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPipeExists(ctx, resourceName, &pipe), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "pipes", regexache.MustCompile(regexp.QuoteMeta(`pipe/`+rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "pipes", regexache.MustCompile(regexp.QuoteMeta(`pipe/`+rName))), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Managed by Terraform"), resource.TestCheckResourceAttr(resourceName, "desired_state", "RUNNING"), resource.TestCheckResourceAttr(resourceName, "enrichment", ""), @@ -1058,7 +1058,7 @@ func TestAccPipesPipe_activeMQSourceStepFunctionTarget(t *testing.T) { Config: testAccPipeConfig_basicActiveMQSourceStepFunctionTarget(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPipeExists(ctx, resourceName, &pipe), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "pipes", regexache.MustCompile(regexp.QuoteMeta(`pipe/`+rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "pipes", regexache.MustCompile(regexp.QuoteMeta(`pipe/`+rName))), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Managed by Terraform"), resource.TestCheckResourceAttr(resourceName, "desired_state", "RUNNING"), resource.TestCheckResourceAttr(resourceName, "enrichment", ""), @@ -1126,7 +1126,7 @@ func TestAccPipesPipe_rabbitMQSourceEventBusTarget(t *testing.T) { Config: testAccPipeConfig_basicRabbitMQSourceEventBusTarget(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPipeExists(ctx, resourceName, &pipe), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "pipes", regexache.MustCompile(regexp.QuoteMeta(`pipe/`+rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "pipes", regexache.MustCompile(regexp.QuoteMeta(`pipe/`+rName))), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Managed by Terraform"), resource.TestCheckResourceAttr(resourceName, "desired_state", "RUNNING"), resource.TestCheckResourceAttr(resourceName, "enrichment", ""), @@ -1184,7 +1184,7 @@ func TestAccPipesPipe_mskSourceHTTPTarget(t *testing.T) { Config: testAccPipeConfig_basicMSKSourceHTTPTarget(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPipeExists(ctx, resourceName, &pipe), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "pipes", regexache.MustCompile(regexp.QuoteMeta(`pipe/`+rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "pipes", regexache.MustCompile(regexp.QuoteMeta(`pipe/`+rName))), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Managed by Terraform"), resource.TestCheckResourceAttr(resourceName, "desired_state", "RUNNING"), resource.TestCheckResourceAttr(resourceName, "enrichment", ""), @@ -1260,7 +1260,7 @@ func TestAccPipesPipe_selfManagedKafkaSourceLambdaFunctionTarget(t *testing.T) { Config: testAccPipeConfig_basicSelfManagedKafkaSourceLambdaFunctionTarget(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPipeExists(ctx, resourceName, &pipe), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "pipes", regexache.MustCompile(regexp.QuoteMeta(`pipe/`+rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "pipes", regexache.MustCompile(regexp.QuoteMeta(`pipe/`+rName))), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Managed by Terraform"), resource.TestCheckResourceAttr(resourceName, "desired_state", "RUNNING"), resource.TestCheckResourceAttr(resourceName, "enrichment", ""), @@ -1335,7 +1335,7 @@ func TestAccPipesPipe_sqsSourceRedshiftTarget(t *testing.T) { Config: testAccPipeConfig_basicSQSSourceRedshiftTarget(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPipeExists(ctx, resourceName, &pipe), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "pipes", regexache.MustCompile(regexp.QuoteMeta(`pipe/`+rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "pipes", regexache.MustCompile(regexp.QuoteMeta(`pipe/`+rName))), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Managed by Terraform"), resource.TestCheckResourceAttr(resourceName, "desired_state", "RUNNING"), resource.TestCheckResourceAttr(resourceName, "enrichment", ""), @@ -1407,7 +1407,7 @@ func TestAccPipesPipe_SourceSageMakerTarget(t *testing.T) { Config: testAccPipeConfig_basicSQSSourceSageMakerTarget(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPipeExists(ctx, resourceName, &pipe), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "pipes", regexache.MustCompile(regexp.QuoteMeta(`pipe/`+rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "pipes", regexache.MustCompile(regexp.QuoteMeta(`pipe/`+rName))), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Managed by Terraform"), resource.TestCheckResourceAttr(resourceName, "desired_state", "RUNNING"), resource.TestCheckResourceAttr(resourceName, "enrichment", ""), @@ -1474,7 +1474,7 @@ func TestAccPipesPipe_sqsSourceBatchJobTarget(t *testing.T) { Config: testAccPipeConfig_basicSQSSourceBatchJobTarget(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPipeExists(ctx, resourceName, &pipe), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "pipes", regexache.MustCompile(regexp.QuoteMeta(`pipe/`+rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "pipes", regexache.MustCompile(regexp.QuoteMeta(`pipe/`+rName))), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Managed by Terraform"), resource.TestCheckResourceAttr(resourceName, "desired_state", "RUNNING"), resource.TestCheckResourceAttr(resourceName, "enrichment", ""), @@ -1558,7 +1558,7 @@ func TestAccPipesPipe_sqsSourceECSTaskTarget(t *testing.T) { Config: testAccPipeConfig_basicSQSSourceECSTaskTarget(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckPipeExists(ctx, resourceName, &pipe), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "pipes", regexache.MustCompile(regexp.QuoteMeta(`pipe/`+rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "pipes", regexache.MustCompile(regexp.QuoteMeta(`pipe/`+rName))), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Managed by Terraform"), resource.TestCheckResourceAttr(resourceName, "desired_state", "RUNNING"), resource.TestCheckResourceAttr(resourceName, "enrichment", ""), From 4fbf22fddd3415d70451625a882712ea9e4b0cbe Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:55 -0500 Subject: [PATCH 126/304] Make 'AWSClient.AccountID' a getter - polly. --- internal/service/polly/voices_data_source.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/polly/voices_data_source.go b/internal/service/polly/voices_data_source.go index c7634746c84..ca99c29ed7b 100644 --- a/internal/service/polly/voices_data_source.go +++ b/internal/service/polly/voices_data_source.go @@ -95,7 +95,7 @@ func (d *dataSourceVoices) Read(ctx context.Context, req datasource.ReadRequest, if resp.Diagnostics.HasError() { return } - data.ID = types.StringValue(d.Meta().AccountID) + data.ID = types.StringValue(d.Meta().AccountID(ctx)) input := &polly.DescribeVoicesInput{} resp.Diagnostics.Append(flex.Expand(ctx, data, input)...) From ad9ea37d80170cbf16713813f3263f5fd96e9b08 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:55 -0500 Subject: [PATCH 127/304] Make 'AWSClient.AccountID' a getter - qldb. --- internal/service/qldb/ledger_test.go | 2 +- internal/service/qldb/stream_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/qldb/ledger_test.go b/internal/service/qldb/ledger_test.go index a215b4c78df..d3550745636 100644 --- a/internal/service/qldb/ledger_test.go +++ b/internal/service/qldb/ledger_test.go @@ -36,7 +36,7 @@ func TestAccQLDBLedger_basic(t *testing.T) { Config: testAccLedgerConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckLedgerExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "qldb", regexache.MustCompile(`ledger/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "qldb", regexache.MustCompile(`ledger/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrDeletionProtection, acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, names.AttrKMSKey, ""), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), diff --git a/internal/service/qldb/stream_test.go b/internal/service/qldb/stream_test.go index 6975082b332..06afaecdd87 100644 --- a/internal/service/qldb/stream_test.go +++ b/internal/service/qldb/stream_test.go @@ -36,7 +36,7 @@ func TestAccQLDBStream_basic(t *testing.T) { Config: testAccStreamConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckStreamExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "qldb", regexache.MustCompile(`stream/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "qldb", regexache.MustCompile(`stream/.+`)), resource.TestCheckResourceAttr(resourceName, "exclusive_end_time", ""), resource.TestCheckResourceAttrSet(resourceName, "inclusive_start_time"), resource.TestCheckResourceAttr(resourceName, "kinesis_configuration.#", "1"), From 08d3c195d5fdf74c5580b3553b8890615727408c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:55 -0500 Subject: [PATCH 128/304] Make 'AWSClient.AccountID' a getter - quicksight. --- .../service/quicksight/account_subscription.go | 2 +- internal/service/quicksight/analysis.go | 2 +- .../service/quicksight/analysis_data_source.go | 2 +- internal/service/quicksight/analysis_test.go | 2 +- internal/service/quicksight/dashboard.go | 2 +- internal/service/quicksight/dashboard_test.go | 2 +- internal/service/quicksight/data_set.go | 2 +- .../service/quicksight/data_set_data_source.go | 2 +- internal/service/quicksight/data_set_test.go | 4 ++-- internal/service/quicksight/data_source.go | 2 +- internal/service/quicksight/data_source_test.go | 2 +- internal/service/quicksight/folder.go | 2 +- internal/service/quicksight/folder_membership.go | 2 +- internal/service/quicksight/folder_test.go | 10 +++++----- internal/service/quicksight/group.go | 2 +- internal/service/quicksight/group_data_source.go | 2 +- internal/service/quicksight/group_membership.go | 2 +- internal/service/quicksight/group_test.go | 4 ++-- .../service/quicksight/iam_policy_assignment.go | 2 +- internal/service/quicksight/ingestion.go | 2 +- internal/service/quicksight/ingestion_test.go | 2 +- internal/service/quicksight/namespace.go | 2 +- internal/service/quicksight/namespace_test.go | 2 +- internal/service/quicksight/refresh_schedule.go | 2 +- .../service/quicksight/refresh_schedule_test.go | 10 +++++----- internal/service/quicksight/sweep.go | 16 ++++++++-------- internal/service/quicksight/template.go | 2 +- internal/service/quicksight/template_alias.go | 2 +- .../service/quicksight/template_alias_test.go | 2 +- internal/service/quicksight/template_test.go | 6 +++--- internal/service/quicksight/theme.go | 2 +- internal/service/quicksight/theme_data_source.go | 2 +- internal/service/quicksight/user.go | 2 +- internal/service/quicksight/user_data_source.go | 2 +- internal/service/quicksight/user_test.go | 4 ++-- internal/service/quicksight/vpc_connection.go | 2 +- .../service/quicksight/vpc_connection_test.go | 2 +- 37 files changed, 57 insertions(+), 57 deletions(-) diff --git a/internal/service/quicksight/account_subscription.go b/internal/service/quicksight/account_subscription.go index d2760ed45f2..6f0407f5fc5 100644 --- a/internal/service/quicksight/account_subscription.go +++ b/internal/service/quicksight/account_subscription.go @@ -142,7 +142,7 @@ func resourceAccountSubscriptionCreate(ctx context.Context, d *schema.ResourceDa var diags diag.Diagnostics conn := meta.(*conns.AWSClient).QuickSightClient(ctx) - awsAccountID := meta.(*conns.AWSClient).AccountID + awsAccountID := meta.(*conns.AWSClient).AccountID(ctx) if v, ok := d.GetOk(names.AttrAWSAccountID); ok { awsAccountID = v.(string) } diff --git a/internal/service/quicksight/analysis.go b/internal/service/quicksight/analysis.go index 95bce91748a..31c5b128ffa 100644 --- a/internal/service/quicksight/analysis.go +++ b/internal/service/quicksight/analysis.go @@ -123,7 +123,7 @@ func resourceAnalysisCreate(ctx context.Context, d *schema.ResourceData, meta in var diags diag.Diagnostics conn := meta.(*conns.AWSClient).QuickSightClient(ctx) - awsAccountID := meta.(*conns.AWSClient).AccountID + awsAccountID := meta.(*conns.AWSClient).AccountID(ctx) if v, ok := d.GetOk(names.AttrAWSAccountID); ok { awsAccountID = v.(string) } diff --git a/internal/service/quicksight/analysis_data_source.go b/internal/service/quicksight/analysis_data_source.go index 2e98efc291d..bc3c572b2d4 100644 --- a/internal/service/quicksight/analysis_data_source.go +++ b/internal/service/quicksight/analysis_data_source.go @@ -75,7 +75,7 @@ func dataSourceAnalysisRead(ctx context.Context, d *schema.ResourceData, meta in var diags diag.Diagnostics conn := meta.(*conns.AWSClient).QuickSightClient(ctx) - awsAccountID := meta.(*conns.AWSClient).AccountID + awsAccountID := meta.(*conns.AWSClient).AccountID(ctx) if v, ok := d.GetOk(names.AttrAWSAccountID); ok { awsAccountID = v.(string) } diff --git a/internal/service/quicksight/analysis_test.go b/internal/service/quicksight/analysis_test.go index 54dd607a55e..47112b0783b 100644 --- a/internal/service/quicksight/analysis_test.go +++ b/internal/service/quicksight/analysis_test.go @@ -103,7 +103,7 @@ func TestAccQuickSightAnalysis_sourceEntity(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "analysis_id", rId), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrStatus, string(awstypes.ResourceStatusCreationSuccessful)), - acctest.CheckResourceAttrRegionalARN(resourceName, "source_entity.0.source_template.0.arn", "quicksight", fmt.Sprintf("template/%s", sourceId)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, "source_entity.0.source_template.0.arn", "quicksight", fmt.Sprintf("template/%s", sourceId)), ), }, { diff --git a/internal/service/quicksight/dashboard.go b/internal/service/quicksight/dashboard.go index 5929ac559ce..8512aa8c908 100644 --- a/internal/service/quicksight/dashboard.go +++ b/internal/service/quicksight/dashboard.go @@ -130,7 +130,7 @@ func resourceDashboardCreate(ctx context.Context, d *schema.ResourceData, meta i var diags diag.Diagnostics conn := meta.(*conns.AWSClient).QuickSightClient(ctx) - awsAccountID := meta.(*conns.AWSClient).AccountID + awsAccountID := meta.(*conns.AWSClient).AccountID(ctx) if v, ok := d.GetOk(names.AttrAWSAccountID); ok { awsAccountID = v.(string) } diff --git a/internal/service/quicksight/dashboard_test.go b/internal/service/quicksight/dashboard_test.go index 78eb7008c63..e1ca2a60a61 100644 --- a/internal/service/quicksight/dashboard_test.go +++ b/internal/service/quicksight/dashboard_test.go @@ -103,7 +103,7 @@ func TestAccQuickSightDashboard_sourceEntity(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "dashboard_id", rId), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrStatus, string(awstypes.ResourceStatusCreationSuccessful)), - acctest.CheckResourceAttrRegionalARN(resourceName, "source_entity.0.source_template.0.arn", "quicksight", fmt.Sprintf("template/%s", sourceId)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, "source_entity.0.source_template.0.arn", "quicksight", fmt.Sprintf("template/%s", sourceId)), ), }, { diff --git a/internal/service/quicksight/data_set.go b/internal/service/quicksight/data_set.go index dc22f0fccd6..3ff6b23668f 100644 --- a/internal/service/quicksight/data_set.go +++ b/internal/service/quicksight/data_set.go @@ -104,7 +104,7 @@ func resourceDataSetCreate(ctx context.Context, d *schema.ResourceData, meta int var diags diag.Diagnostics conn := meta.(*conns.AWSClient).QuickSightClient(ctx) - awsAccountID := meta.(*conns.AWSClient).AccountID + awsAccountID := meta.(*conns.AWSClient).AccountID(ctx) if v, ok := d.GetOk(names.AttrAWSAccountID); ok { awsAccountID = v.(string) } diff --git a/internal/service/quicksight/data_set_data_source.go b/internal/service/quicksight/data_set_data_source.go index e9716d49ffa..603c5ea50ce 100644 --- a/internal/service/quicksight/data_set_data_source.go +++ b/internal/service/quicksight/data_set_data_source.go @@ -73,7 +73,7 @@ func dataSourceDataSetRead(ctx context.Context, d *schema.ResourceData, meta int var diags diag.Diagnostics conn := meta.(*conns.AWSClient).QuickSightClient(ctx) - awsAccountID := meta.(*conns.AWSClient).AccountID + awsAccountID := meta.(*conns.AWSClient).AccountID(ctx) if v, ok := d.GetOk(names.AttrAWSAccountID); ok { awsAccountID = v.(string) } diff --git a/internal/service/quicksight/data_set_test.go b/internal/service/quicksight/data_set_test.go index 011048de8e2..cff1166ef25 100644 --- a/internal/service/quicksight/data_set_test.go +++ b/internal/service/quicksight/data_set_test.go @@ -40,7 +40,7 @@ func TestAccQuickSightDataSet_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckDataSetExists(ctx, resourceName, &dataSet), resource.TestCheckResourceAttr(resourceName, "data_set_id", rId), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "quicksight", fmt.Sprintf("dataset/%s", rId)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "quicksight", fmt.Sprintf("dataset/%s", rId)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "import_mode", "SPICE"), resource.TestCheckResourceAttr(resourceName, "physical_table_map.#", "1"), @@ -465,7 +465,7 @@ func TestAccQuickSightDataSet_noPhysicalTableMap(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckDataSetExists(ctx, resourceName, &dataSet), resource.TestCheckResourceAttr(resourceName, "data_set_id", rId), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "quicksight", fmt.Sprintf("dataset/%s", rId)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "quicksight", fmt.Sprintf("dataset/%s", rId)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "import_mode", "SPICE"), resource.TestCheckResourceAttr(resourceName, "physical_table_map.#", "0"), diff --git a/internal/service/quicksight/data_source.go b/internal/service/quicksight/data_source.go index 30718f93f14..86d63b426a6 100644 --- a/internal/service/quicksight/data_source.go +++ b/internal/service/quicksight/data_source.go @@ -93,7 +93,7 @@ func resourceDataSourceCreate(ctx context.Context, d *schema.ResourceData, meta var diags diag.Diagnostics conn := meta.(*conns.AWSClient).QuickSightClient(ctx) - awsAccountID := meta.(*conns.AWSClient).AccountID + awsAccountID := meta.(*conns.AWSClient).AccountID(ctx) if v, ok := d.GetOk(names.AttrAWSAccountID); ok { awsAccountID = v.(string) } diff --git a/internal/service/quicksight/data_source_test.go b/internal/service/quicksight/data_source_test.go index 47b7570de96..ee7062b3bc7 100644 --- a/internal/service/quicksight/data_source_test.go +++ b/internal/service/quicksight/data_source_test.go @@ -39,7 +39,7 @@ func TestAccQuickSightDataSource_basic(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckDataSourceExists(ctx, resourceName, &dataSource), resource.TestCheckResourceAttr(resourceName, "data_source_id", rId), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "quicksight", fmt.Sprintf("datasource/%s", rId)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "quicksight", fmt.Sprintf("datasource/%s", rId)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "parameters.#", "1"), resource.TestCheckResourceAttr(resourceName, "parameters.0.amazon_elasticsearch.#", "0"), diff --git a/internal/service/quicksight/folder.go b/internal/service/quicksight/folder.go index fe224cbdc90..ee9cd67f489 100644 --- a/internal/service/quicksight/folder.go +++ b/internal/service/quicksight/folder.go @@ -119,7 +119,7 @@ func resourceFolderCreate(ctx context.Context, d *schema.ResourceData, meta inte var diags diag.Diagnostics conn := meta.(*conns.AWSClient).QuickSightClient(ctx) - awsAccountID := meta.(*conns.AWSClient).AccountID + awsAccountID := meta.(*conns.AWSClient).AccountID(ctx) if v, ok := d.GetOk(names.AttrAWSAccountID); ok { awsAccountID = v.(string) } diff --git a/internal/service/quicksight/folder_membership.go b/internal/service/quicksight/folder_membership.go index 4a2de832d39..a2e3a8fe794 100644 --- a/internal/service/quicksight/folder_membership.go +++ b/internal/service/quicksight/folder_membership.go @@ -95,7 +95,7 @@ func (r *folderMembershipResource) Create(ctx context.Context, req resource.Crea } if plan.AWSAccountID.IsUnknown() || plan.AWSAccountID.IsNull() { - plan.AWSAccountID = types.StringValue(r.Meta().AccountID) + plan.AWSAccountID = types.StringValue(r.Meta().AccountID(ctx)) } awsAccountID, folderID, memberType, memberID := flex.StringValueFromFramework(ctx, plan.AWSAccountID), flex.StringValueFromFramework(ctx, plan.FolderID), flex.StringValueFromFramework(ctx, plan.MemberType), flex.StringValueFromFramework(ctx, plan.MemberID) in := &quicksight.CreateFolderMembershipInput{ diff --git a/internal/service/quicksight/folder_test.go b/internal/service/quicksight/folder_test.go index d6ddafe0ab2..f1c25f82343 100644 --- a/internal/service/quicksight/folder_test.go +++ b/internal/service/quicksight/folder_test.go @@ -44,7 +44,7 @@ func TestAccQuickSightFolder_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "folder_id", rId), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "folder_type", string(awstypes.FolderTypeShared)), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "quicksight", fmt.Sprintf("folder/%s", rId)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "quicksight", fmt.Sprintf("folder/%s", rId)), ), }, { @@ -171,7 +171,7 @@ func TestAccQuickSightFolder_parentFolder(t *testing.T) { Config: testAccFolderConfig_parentFolder(rId, rName, parentId1, parentName1), Check: resource.ComposeTestCheckFunc( testAccCheckFolderExists(ctx, resourceName, &folder), - acctest.CheckResourceAttrRegionalARN(resourceName, "parent_folder_arn", "quicksight", fmt.Sprintf("folder/%s", parentId1)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, "parent_folder_arn", "quicksight", fmt.Sprintf("folder/%s", parentId1)), ), }, { @@ -183,7 +183,7 @@ func TestAccQuickSightFolder_parentFolder(t *testing.T) { Config: testAccFolderConfig_parentFolder(rId, rName, parentId2, parentName2), Check: resource.ComposeTestCheckFunc( testAccCheckFolderExists(ctx, resourceName, &folder), - acctest.CheckResourceAttrRegionalARN(resourceName, "parent_folder_arn", "quicksight", fmt.Sprintf("folder/%s", parentId2)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, "parent_folder_arn", "quicksight", fmt.Sprintf("folder/%s", parentId2)), ), }, }, @@ -214,7 +214,7 @@ func TestAccQuickSightFolder_parentFolderNested(t *testing.T) { Config: testAccFolderConfig_parentFolder(rId, rName, parentId1, parentName1), Check: resource.ComposeTestCheckFunc( testAccCheckFolderExists(ctx, resourceName, &folder), - acctest.CheckResourceAttrRegionalARN(resourceName, "parent_folder_arn", "quicksight", fmt.Sprintf("folder/%s", parentId1)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, "parent_folder_arn", "quicksight", fmt.Sprintf("folder/%s", parentId1)), ), }, { @@ -226,7 +226,7 @@ func TestAccQuickSightFolder_parentFolderNested(t *testing.T) { Config: testAccFolderConfig_parentFolder2(rId, rName, parentId1, parentName1, parentId2, parentName2), Check: resource.ComposeTestCheckFunc( testAccCheckFolderExists(ctx, resourceName, &folder), - acctest.CheckResourceAttrRegionalARN(resourceName, "parent_folder_arn", "quicksight", fmt.Sprintf("folder/%s", parentId2)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, "parent_folder_arn", "quicksight", fmt.Sprintf("folder/%s", parentId2)), ), }, }, diff --git a/internal/service/quicksight/group.go b/internal/service/quicksight/group.go index 5e6bc9ef664..48cc0d7c3c9 100644 --- a/internal/service/quicksight/group.go +++ b/internal/service/quicksight/group.go @@ -80,7 +80,7 @@ func resourceGroupCreate(ctx context.Context, d *schema.ResourceData, meta inter var diags diag.Diagnostics conn := meta.(*conns.AWSClient).QuickSightClient(ctx) - awsAccountID := meta.(*conns.AWSClient).AccountID + awsAccountID := meta.(*conns.AWSClient).AccountID(ctx) if v, ok := d.GetOk(names.AttrAWSAccountID); ok { awsAccountID = v.(string) } diff --git a/internal/service/quicksight/group_data_source.go b/internal/service/quicksight/group_data_source.go index 718963ebd14..6beab475470 100644 --- a/internal/service/quicksight/group_data_source.go +++ b/internal/service/quicksight/group_data_source.go @@ -61,7 +61,7 @@ func dataSourceGroupRead(ctx context.Context, d *schema.ResourceData, meta inter var diags diag.Diagnostics conn := meta.(*conns.AWSClient).QuickSightClient(ctx) - awsAccountID := meta.(*conns.AWSClient).AccountID + awsAccountID := meta.(*conns.AWSClient).AccountID(ctx) if v, ok := d.GetOk(names.AttrAWSAccountID); ok { awsAccountID = v.(string) } diff --git a/internal/service/quicksight/group_membership.go b/internal/service/quicksight/group_membership.go index 36de55d3c40..8f0932a11a3 100644 --- a/internal/service/quicksight/group_membership.go +++ b/internal/service/quicksight/group_membership.go @@ -77,7 +77,7 @@ func resourceGroupMembershipCreate(ctx context.Context, d *schema.ResourceData, var diags diag.Diagnostics conn := meta.(*conns.AWSClient).QuickSightClient(ctx) - awsAccountID := meta.(*conns.AWSClient).AccountID + awsAccountID := meta.(*conns.AWSClient).AccountID(ctx) if v, ok := d.GetOk(names.AttrAWSAccountID); ok { awsAccountID = v.(string) } diff --git a/internal/service/quicksight/group_test.go b/internal/service/quicksight/group_test.go index 961aac61ef0..b8ad3d5c00f 100644 --- a/internal/service/quicksight/group_test.go +++ b/internal/service/quicksight/group_test.go @@ -37,7 +37,7 @@ func TestAccQuickSightGroup_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckGroupExists(ctx, resourceName, &group), resource.TestCheckResourceAttr(resourceName, names.AttrGroupName, rName1), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "quicksight", fmt.Sprintf("group/default/%s", rName1)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "quicksight", fmt.Sprintf("group/default/%s", rName1)), ), }, { @@ -45,7 +45,7 @@ func TestAccQuickSightGroup_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckGroupExists(ctx, resourceName, &group), resource.TestCheckResourceAttr(resourceName, names.AttrGroupName, rName2), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "quicksight", fmt.Sprintf("group/default/%s", rName2)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "quicksight", fmt.Sprintf("group/default/%s", rName2)), ), }, { diff --git a/internal/service/quicksight/iam_policy_assignment.go b/internal/service/quicksight/iam_policy_assignment.go index db9bc7d3aed..1150f16f4d5 100644 --- a/internal/service/quicksight/iam_policy_assignment.go +++ b/internal/service/quicksight/iam_policy_assignment.go @@ -125,7 +125,7 @@ func (r *iamPolicyAssignmentResource) Create(ctx context.Context, req resource.C } if plan.AWSAccountID.IsUnknown() || plan.AWSAccountID.IsNull() { - plan.AWSAccountID = types.StringValue(r.Meta().AccountID) + plan.AWSAccountID = types.StringValue(r.Meta().AccountID(ctx)) } awsAccountID, namespace, assignmentName := flex.StringValueFromFramework(ctx, plan.AWSAccountID), flex.StringValueFromFramework(ctx, plan.Namespace), flex.StringValueFromFramework(ctx, plan.AssignmentName) in := quicksight.CreateIAMPolicyAssignmentInput{ diff --git a/internal/service/quicksight/ingestion.go b/internal/service/quicksight/ingestion.go index 9e224fff2d7..9433e451c28 100644 --- a/internal/service/quicksight/ingestion.go +++ b/internal/service/quicksight/ingestion.go @@ -100,7 +100,7 @@ func (r *ingestionResource) Create(ctx context.Context, req resource.CreateReque } if plan.AWSAccountID.IsUnknown() || plan.AWSAccountID.IsNull() { - plan.AWSAccountID = types.StringValue(r.Meta().AccountID) + plan.AWSAccountID = types.StringValue(r.Meta().AccountID(ctx)) } awsAccountID, dataSetID, ingestionID := flex.StringValueFromFramework(ctx, plan.AWSAccountID), flex.StringValueFromFramework(ctx, plan.DataSetID), flex.StringValueFromFramework(ctx, plan.IngestionID) in := quicksight.CreateIngestionInput{ diff --git a/internal/service/quicksight/ingestion_test.go b/internal/service/quicksight/ingestion_test.go index 09fb5a16d8f..666e4cb35be 100644 --- a/internal/service/quicksight/ingestion_test.go +++ b/internal/service/quicksight/ingestion_test.go @@ -41,7 +41,7 @@ func TestAccQuickSightIngestion_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "ingestion_id", rId), resource.TestCheckResourceAttr(resourceName, "ingestion_type", string(awstypes.IngestionTypeFullRefresh)), resource.TestCheckResourceAttrPair(resourceName, "data_set_id", dataSetName, "data_set_id"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "quicksight", fmt.Sprintf("dataset/%[1]s/ingestion/%[1]s", rId)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "quicksight", fmt.Sprintf("dataset/%[1]s/ingestion/%[1]s", rId)), ), }, { diff --git a/internal/service/quicksight/namespace.go b/internal/service/quicksight/namespace.go index 4600c7d8bb9..404f657e010 100644 --- a/internal/service/quicksight/namespace.go +++ b/internal/service/quicksight/namespace.go @@ -119,7 +119,7 @@ func (r *namespaceResource) Create(ctx context.Context, req resource.CreateReque } if plan.AWSAccountID.IsUnknown() || plan.AWSAccountID.IsNull() { - plan.AWSAccountID = types.StringValue(r.Meta().AccountID) + plan.AWSAccountID = types.StringValue(r.Meta().AccountID(ctx)) } awsAccountID, namespace := flex.StringValueFromFramework(ctx, plan.AWSAccountID), flex.StringValueFromFramework(ctx, plan.Namespace) in := quicksight.CreateNamespaceInput{ diff --git a/internal/service/quicksight/namespace_test.go b/internal/service/quicksight/namespace_test.go index dce3f440808..270a5a8d7fb 100644 --- a/internal/service/quicksight/namespace_test.go +++ b/internal/service/quicksight/namespace_test.go @@ -37,7 +37,7 @@ func TestAccQuickSightNamespace_basic(t *testing.T) { testAccCheckNamespaceExists(ctx, resourceName, &namespace), resource.TestCheckResourceAttr(resourceName, names.AttrNamespace, rName), resource.TestCheckResourceAttr(resourceName, "identity_store", string(awstypes.IdentityStoreQuicksight)), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "quicksight", fmt.Sprintf("namespace/%[1]s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "quicksight", fmt.Sprintf("namespace/%[1]s", rName)), ), }, { diff --git a/internal/service/quicksight/refresh_schedule.go b/internal/service/quicksight/refresh_schedule.go index 026568b16f8..d66a7ade014 100644 --- a/internal/service/quicksight/refresh_schedule.go +++ b/internal/service/quicksight/refresh_schedule.go @@ -216,7 +216,7 @@ func (r *refreshScheduleResource) Create(ctx context.Context, req resource.Creat } if plan.AWSAccountID.IsUnknown() || plan.AWSAccountID.IsNull() { - plan.AWSAccountID = types.StringValue(r.Meta().AccountID) + plan.AWSAccountID = types.StringValue(r.Meta().AccountID(ctx)) } awsAccountID, dataSetID, scheduleID := flex.StringValueFromFramework(ctx, plan.AWSAccountID), flex.StringValueFromFramework(ctx, plan.DataSetID), flex.StringValueFromFramework(ctx, plan.ScheduleID) diff --git a/internal/service/quicksight/refresh_schedule_test.go b/internal/service/quicksight/refresh_schedule_test.go index d727fbe2e05..24eb810ab4e 100644 --- a/internal/service/quicksight/refresh_schedule_test.go +++ b/internal/service/quicksight/refresh_schedule_test.go @@ -43,7 +43,7 @@ func TestAccQuickSightRefreshSchedule_basic(t *testing.T) { Config: testAccRefreshScheduleConfig_basic(rId, rName, sId), Check: resource.ComposeTestCheckFunc( testAccCheckRefreshScheduleExists(ctx, resourceName, &schedule), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "quicksight", + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "quicksight", fmt.Sprintf("dataset/%s/refresh-schedule/%s", rId, sId)), resource.TestCheckResourceAttr(resourceName, "data_set_id", rId), resource.TestCheckResourceAttr(resourceName, "schedule.#", "1"), @@ -111,7 +111,7 @@ func TestAccQuickSightRefreshSchedule_weeklyRefresh(t *testing.T) { Config: testAccRefreshScheduleConfig_WeeklyRefresh(rId, rName, sId, awstypes.DayOfWeekMonday), Check: resource.ComposeTestCheckFunc( testAccCheckRefreshScheduleExists(ctx, resourceName, &schedule), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "quicksight", + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "quicksight", fmt.Sprintf("dataset/%s/refresh-schedule/%s", rId, sId)), resource.TestCheckResourceAttr(resourceName, "data_set_id", rId), resource.TestCheckResourceAttr(resourceName, "schedule.0.refresh_type", "FULL_REFRESH"), @@ -134,7 +134,7 @@ func TestAccQuickSightRefreshSchedule_weeklyRefresh(t *testing.T) { Config: testAccRefreshScheduleConfig_WeeklyRefresh(rId, rName, sId, awstypes.DayOfWeekWednesday), Check: resource.ComposeTestCheckFunc( testAccCheckRefreshScheduleExists(ctx, resourceName, &schedule), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "quicksight", + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "quicksight", fmt.Sprintf("dataset/%s/refresh-schedule/%s", rId, sId)), resource.TestCheckResourceAttr(resourceName, "data_set_id", rId), resource.TestCheckResourceAttr(resourceName, "schedule.0.refresh_type", "FULL_REFRESH"), @@ -209,7 +209,7 @@ func TestAccQuickSightRefreshSchedule_monthlyRefresh(t *testing.T) { Config: testAccRefreshScheduleConfig_MonthlyRefresh(rId, rName, sId, "15"), Check: resource.ComposeTestCheckFunc( testAccCheckRefreshScheduleExists(ctx, resourceName, &schedule), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "quicksight", + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "quicksight", fmt.Sprintf("dataset/%s/refresh-schedule/%s", rId, sId)), resource.TestCheckResourceAttr(resourceName, "data_set_id", rId), resource.TestCheckResourceAttr(resourceName, "schedule.0.refresh_type", "FULL_REFRESH"), @@ -232,7 +232,7 @@ func TestAccQuickSightRefreshSchedule_monthlyRefresh(t *testing.T) { Config: testAccRefreshScheduleConfig_MonthlyRefresh(rId, rName, sId, "21"), Check: resource.ComposeTestCheckFunc( testAccCheckRefreshScheduleExists(ctx, resourceName, &schedule), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "quicksight", + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "quicksight", fmt.Sprintf("dataset/%s/refresh-schedule/%s", rId, sId)), resource.TestCheckResourceAttr(resourceName, "data_set_id", rId), resource.TestCheckResourceAttr(resourceName, "schedule.0.refresh_type", "FULL_REFRESH"), diff --git a/internal/service/quicksight/sweep.go b/internal/service/quicksight/sweep.go index 347b2c14417..975f7a1c226 100644 --- a/internal/service/quicksight/sweep.go +++ b/internal/service/quicksight/sweep.go @@ -70,7 +70,7 @@ func sweepDashboards(region string) error { } conn := client.QuickSightClient(ctx) sweepResources := make([]sweep.Sweepable, 0) - awsAccountID := client.AccountID + awsAccountID := client.AccountID(ctx) input := &quicksight.ListDashboardsInput{ AwsAccountId: aws.String(awsAccountID), } @@ -114,7 +114,7 @@ func sweepDataSets(region string) error { } conn := client.QuickSightClient(ctx) sweepResources := make([]sweep.Sweepable, 0) - awsAccountID := client.AccountID + awsAccountID := client.AccountID(ctx) input := &quicksight.ListDataSetsInput{ AwsAccountId: aws.String(awsAccountID), } @@ -158,7 +158,7 @@ func sweepDataSources(region string) error { } conn := client.QuickSightClient(ctx) sweepResources := make([]sweep.Sweepable, 0) - awsAccountID := client.AccountID + awsAccountID := client.AccountID(ctx) input := &quicksight.ListDataSourcesInput{ AwsAccountId: aws.String(awsAccountID), } @@ -202,7 +202,7 @@ func sweepFolders(region string) error { } conn := client.QuickSightClient(ctx) sweepResources := make([]sweep.Sweepable, 0) - accountID := client.AccountID + accountID := client.AccountID(ctx) input := &quicksight.ListFoldersInput{ AwsAccountId: aws.String(accountID), } @@ -246,7 +246,7 @@ func sweepGroups(region string) error { } conn := client.QuickSightClient(ctx) sweepResources := make([]sweep.Sweepable, 0) - awsAccountID := client.AccountID + awsAccountID := client.AccountID(ctx) input := &quicksight.ListGroupsInput{ AwsAccountId: aws.String(awsAccountID), Namespace: aws.String(defaultUserNamespace), @@ -298,7 +298,7 @@ func sweepTemplates(region string) error { } conn := client.QuickSightClient(ctx) sweepResources := make([]sweep.Sweepable, 0) - awsAccountID := client.AccountID + awsAccountID := client.AccountID(ctx) input := &quicksight.ListTemplatesInput{ AwsAccountId: aws.String(awsAccountID), } @@ -342,7 +342,7 @@ func sweepUsers(region string) error { } conn := client.QuickSightClient(ctx) sweepResources := make([]sweep.Sweepable, 0) - awsAccountID := client.AccountID + awsAccountID := client.AccountID(ctx) input := &quicksight.ListUsersInput{ AwsAccountId: aws.String(awsAccountID), Namespace: aws.String(defaultUserNamespace), @@ -394,7 +394,7 @@ func sweepVPCConnections(region string) error { } conn := client.QuickSightClient(ctx) sweepResources := make([]sweep.Sweepable, 0) - awsAccountID := client.AccountID + awsAccountID := client.AccountID(ctx) input := &quicksight.ListVPCConnectionsInput{ AwsAccountId: aws.String(awsAccountID), } diff --git a/internal/service/quicksight/template.go b/internal/service/quicksight/template.go index 0fa2fa0f854..c0b5919b4ed 100644 --- a/internal/service/quicksight/template.go +++ b/internal/service/quicksight/template.go @@ -115,7 +115,7 @@ func resourceTemplateCreate(ctx context.Context, d *schema.ResourceData, meta in var diags diag.Diagnostics conn := meta.(*conns.AWSClient).QuickSightClient(ctx) - awsAccountID := meta.(*conns.AWSClient).AccountID + awsAccountID := meta.(*conns.AWSClient).AccountID(ctx) if v, ok := d.GetOk(names.AttrAWSAccountID); ok { awsAccountID = v.(string) } diff --git a/internal/service/quicksight/template_alias.go b/internal/service/quicksight/template_alias.go index 60a6a4f9d69..6496cc27572 100644 --- a/internal/service/quicksight/template_alias.go +++ b/internal/service/quicksight/template_alias.go @@ -86,7 +86,7 @@ func (r *templateAliasResource) Create(ctx context.Context, req resource.CreateR } if plan.AWSAccountID.IsUnknown() || plan.AWSAccountID.IsNull() { - plan.AWSAccountID = types.StringValue(r.Meta().AccountID) + plan.AWSAccountID = types.StringValue(r.Meta().AccountID(ctx)) } awsAccountID, templateID, aliasName := flex.StringValueFromFramework(ctx, plan.AWSAccountID), flex.StringValueFromFramework(ctx, plan.TemplateID), flex.StringValueFromFramework(ctx, plan.AliasName) in := &quicksight.CreateTemplateAliasInput{ diff --git a/internal/service/quicksight/template_alias_test.go b/internal/service/quicksight/template_alias_test.go index ee3e548ac5e..99a467a75fd 100644 --- a/internal/service/quicksight/template_alias_test.go +++ b/internal/service/quicksight/template_alias_test.go @@ -44,7 +44,7 @@ func TestAccQuickSightTemplateAlias_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "alias_name", aliasName), resource.TestCheckResourceAttrPair(resourceName, "template_id", resourceTemplateName, "template_id"), resource.TestCheckResourceAttrPair(resourceName, "template_version_number", resourceTemplateName, "version_number"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "quicksight", fmt.Sprintf("template/%[1]s/alias/%[2]s", rId, aliasName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "quicksight", fmt.Sprintf("template/%[1]s/alias/%[2]s", rId, aliasName)), ), }, { diff --git a/internal/service/quicksight/template_test.go b/internal/service/quicksight/template_test.go index 1ec55ac605f..e48b83edf8c 100644 --- a/internal/service/quicksight/template_test.go +++ b/internal/service/quicksight/template_test.go @@ -185,7 +185,7 @@ func TestAccQuickSightTemplate_sourceEntity(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "template_id", rId), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrStatus, string(awstypes.ResourceStatusCreationSuccessful)), - acctest.CheckResourceAttrRegionalARN(resourceName, "source_entity.0.source_template.0.arn", "quicksight", fmt.Sprintf("template/%s", sourceId)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, "source_entity.0.source_template.0.arn", "quicksight", fmt.Sprintf("template/%s", sourceId)), ), }, { @@ -223,7 +223,7 @@ func TestAccQuickSightTemplate_update(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "template_id", rId), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrStatus, string(awstypes.ResourceStatusCreationSuccessful)), - acctest.CheckResourceAttrRegionalARN(resourceName, "source_entity.0.source_template.0.arn", "quicksight", fmt.Sprintf("template/%s", sourceId)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, "source_entity.0.source_template.0.arn", "quicksight", fmt.Sprintf("template/%s", sourceId)), resource.TestCheckResourceAttr(resourceName, "version_number", "1"), ), }, @@ -241,7 +241,7 @@ func TestAccQuickSightTemplate_update(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "template_id", rId), resource.TestCheckResourceAttr(resourceName, names.AttrName, rNameUpdated), resource.TestCheckResourceAttr(resourceName, names.AttrStatus, string(awstypes.ResourceStatusCreationSuccessful)), - acctest.CheckResourceAttrRegionalARN(resourceName, "source_entity.0.source_template.0.arn", "quicksight", fmt.Sprintf("template/%s", sourceId)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, "source_entity.0.source_template.0.arn", "quicksight", fmt.Sprintf("template/%s", sourceId)), resource.TestCheckResourceAttr(resourceName, "version_number", "2"), ), }, diff --git a/internal/service/quicksight/theme.go b/internal/service/quicksight/theme.go index 7b7b4c13fca..8798e9dcb7a 100644 --- a/internal/service/quicksight/theme.go +++ b/internal/service/quicksight/theme.go @@ -114,7 +114,7 @@ func resourceThemeCreate(ctx context.Context, d *schema.ResourceData, meta inter var diags diag.Diagnostics conn := meta.(*conns.AWSClient).QuickSightClient(ctx) - awsAccountID := meta.(*conns.AWSClient).AccountID + awsAccountID := meta.(*conns.AWSClient).AccountID(ctx) if v, ok := d.GetOk(names.AttrAWSAccountID); ok { awsAccountID = v.(string) } diff --git a/internal/service/quicksight/theme_data_source.go b/internal/service/quicksight/theme_data_source.go index 7d9d3df8c93..5e41ba5bbfe 100644 --- a/internal/service/quicksight/theme_data_source.go +++ b/internal/service/quicksight/theme_data_source.go @@ -78,7 +78,7 @@ func dataSourceThemeRead(ctx context.Context, d *schema.ResourceData, meta inter var diags diag.Diagnostics conn := meta.(*conns.AWSClient).QuickSightClient(ctx) - awsAccountID := meta.(*conns.AWSClient).AccountID + awsAccountID := meta.(*conns.AWSClient).AccountID(ctx) if v, ok := d.GetOk(names.AttrAWSAccountID); ok { awsAccountID = v.(string) } diff --git a/internal/service/quicksight/user.go b/internal/service/quicksight/user.go index ed9f6d22173..8ab6ff926aa 100644 --- a/internal/service/quicksight/user.go +++ b/internal/service/quicksight/user.go @@ -112,7 +112,7 @@ func resourceUserCreate(ctx context.Context, d *schema.ResourceData, meta interf var diags diag.Diagnostics conn := meta.(*conns.AWSClient).QuickSightClient(ctx) - awsAccountID := meta.(*conns.AWSClient).AccountID + awsAccountID := meta.(*conns.AWSClient).AccountID(ctx) if v, ok := d.GetOk(names.AttrAWSAccountID); ok { awsAccountID = v.(string) } diff --git a/internal/service/quicksight/user_data_source.go b/internal/service/quicksight/user_data_source.go index 810bf9963c2..78726fdfd81 100644 --- a/internal/service/quicksight/user_data_source.go +++ b/internal/service/quicksight/user_data_source.go @@ -73,7 +73,7 @@ func dataSourceUserRead(ctx context.Context, d *schema.ResourceData, meta interf var diags diag.Diagnostics conn := meta.(*conns.AWSClient).QuickSightClient(ctx) - awsAccountID := meta.(*conns.AWSClient).AccountID + awsAccountID := meta.(*conns.AWSClient).AccountID(ctx) if v, ok := d.GetOk(names.AttrAWSAccountID); ok { awsAccountID = v.(string) } diff --git a/internal/service/quicksight/user_test.go b/internal/service/quicksight/user_test.go index 236483ea5ce..31251922f0c 100644 --- a/internal/service/quicksight/user_test.go +++ b/internal/service/quicksight/user_test.go @@ -39,7 +39,7 @@ func TestAccQuickSightUser_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckUserExists(ctx, resourceName1, &user), resource.TestCheckResourceAttr(resourceName1, names.AttrUserName, rName1), - acctest.CheckResourceAttrRegionalARN(resourceName1, names.AttrARN, "quicksight", fmt.Sprintf("user/default/%s", rName1)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName1, names.AttrARN, "quicksight", fmt.Sprintf("user/default/%s", rName1)), ), }, { @@ -47,7 +47,7 @@ func TestAccQuickSightUser_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckUserExists(ctx, resourceName2, &user), resource.TestCheckResourceAttr(resourceName2, names.AttrUserName, rName2), - acctest.CheckResourceAttrRegionalARN(resourceName2, names.AttrARN, "quicksight", fmt.Sprintf("user/default/%s", rName2)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName2, names.AttrARN, "quicksight", fmt.Sprintf("user/default/%s", rName2)), ), }, }, diff --git a/internal/service/quicksight/vpc_connection.go b/internal/service/quicksight/vpc_connection.go index 5db0e656aba..8607c6dc0dd 100644 --- a/internal/service/quicksight/vpc_connection.go +++ b/internal/service/quicksight/vpc_connection.go @@ -163,7 +163,7 @@ func (r *vpcConnectionResource) Create(ctx context.Context, req resource.CreateR } if plan.AWSAccountID.IsUnknown() || plan.AWSAccountID.IsNull() { - plan.AWSAccountID = types.StringValue(r.Meta().AccountID) + plan.AWSAccountID = types.StringValue(r.Meta().AccountID(ctx)) } awsAccountID, vpcConnectionID := flex.StringValueFromFramework(ctx, plan.AWSAccountID), flex.StringValueFromFramework(ctx, plan.VPCConnectionID) in := &quicksight.CreateVPCConnectionInput{ diff --git a/internal/service/quicksight/vpc_connection_test.go b/internal/service/quicksight/vpc_connection_test.go index 5196a95a924..fd37c84371b 100644 --- a/internal/service/quicksight/vpc_connection_test.go +++ b/internal/service/quicksight/vpc_connection_test.go @@ -36,7 +36,7 @@ func TestAccQuickSightVPCConnection_basic(t *testing.T) { Config: testAccVPCConnectionConfig_basic(rId, rName), Check: resource.ComposeTestCheckFunc( testAccCheckVPCConnectionExists(ctx, resourceName, &vpcConnection), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "quicksight", fmt.Sprintf("vpcConnection/%[1]s", rId)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "quicksight", fmt.Sprintf("vpcConnection/%[1]s", rId)), resource.TestCheckResourceAttr(resourceName, "vpc_connection_id", rId), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "subnet_ids.#", "2"), From fbf431fc9a4b46adfcc2c8215ac372d6cb2fdc75 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:55 -0500 Subject: [PATCH 129/304] Make 'AWSClient.AccountID' a getter - ram. --- internal/service/ram/resource_share_accepter.go | 2 +- internal/service/ram/resource_share_accepter_test.go | 4 ++-- internal/service/ram/resource_share_data_source_test.go | 2 +- internal/service/ram/resource_share_test.go | 4 ++-- internal/service/ram/sharing_with_organization.go | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/internal/service/ram/resource_share_accepter.go b/internal/service/ram/resource_share_accepter.go index d632e623b81..61db4b8693c 100644 --- a/internal/service/ram/resource_share_accepter.go +++ b/internal/service/ram/resource_share_accepter.go @@ -145,7 +145,7 @@ func resourceResourceShareAccepterCreate(ctx context.Context, d *schema.Resource func resourceResourceShareAccepterRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - accountID := meta.(*conns.AWSClient).AccountID + accountID := meta.(*conns.AWSClient).AccountID(ctx) conn := meta.(*conns.AWSClient).RAMClient(ctx) maybeInvitation, err := findMaybeResourceShareInvitationByResourceShareARNAndStatus(ctx, conn, d.Id(), string(awstypes.ResourceShareInvitationStatusAccepted)) diff --git a/internal/service/ram/resource_share_accepter_test.go b/internal/service/ram/resource_share_accepter_test.go index a15d4b2b3aa..05dcedda503 100644 --- a/internal/service/ram/resource_share_accepter_test.go +++ b/internal/service/ram/resource_share_accepter_test.go @@ -54,7 +54,7 @@ func TestAccRAMResourceShareAccepter_basic(t *testing.T) { acctest.MatchResourceAttrRegionalARNAccountID(resourceName, "invitation_arn", "ram", `\d{12}`, regexache.MustCompile(fmt.Sprintf("resource-share-invitation/%s$", verify.UUIDRegexPattern))), resource.TestMatchResourceAttr(resourceName, "share_id", regexache.MustCompile(fmt.Sprintf(`^rs-%s$`, verify.UUIDRegexPattern))), resource.TestCheckResourceAttr(resourceName, names.AttrStatus, string(awstypes.ResourceShareStatusActive)), - acctest.CheckResourceAttrAccountID(resourceName, "receiver_account_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "receiver_account_id"), resource.TestMatchResourceAttr(resourceName, "sender_account_id", regexache.MustCompile(`\d{12}`)), resource.TestCheckResourceAttr(resourceName, "share_name", rName), resource.TestCheckResourceAttr(resourceName, "resources.%", "0"), @@ -119,7 +119,7 @@ func TestAccRAMResourceShareAccepter_resourceAssociation(t *testing.T) { acctest.MatchResourceAttrRegionalARNAccountID(resourceName, "invitation_arn", "ram", `\d{12}`, regexache.MustCompile(fmt.Sprintf("resource-share-invitation/%s$", verify.UUIDRegexPattern))), resource.TestMatchResourceAttr(resourceName, "share_id", regexache.MustCompile(fmt.Sprintf(`^rs-%s$`, verify.UUIDRegexPattern))), resource.TestCheckResourceAttr(resourceName, names.AttrStatus, string(awstypes.ResourceShareStatusActive)), - acctest.CheckResourceAttrAccountID(resourceName, "receiver_account_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "receiver_account_id"), resource.TestMatchResourceAttr(resourceName, "sender_account_id", regexache.MustCompile(`\d{12}`)), resource.TestCheckResourceAttr(resourceName, "share_name", rName), resource.TestCheckResourceAttr(resourceName, "resources.%", "0"), diff --git a/internal/service/ram/resource_share_data_source_test.go b/internal/service/ram/resource_share_data_source_test.go index c4aa32f8490..ac72889c7e3 100644 --- a/internal/service/ram/resource_share_data_source_test.go +++ b/internal/service/ram/resource_share_data_source_test.go @@ -30,7 +30,7 @@ func TestAccRAMResourceShareDataSource_basic(t *testing.T) { resource.TestCheckResourceAttrPair(datasourceName, names.AttrARN, resourceName, names.AttrARN), resource.TestCheckResourceAttrPair(datasourceName, names.AttrID, resourceName, names.AttrID), resource.TestCheckResourceAttrPair(datasourceName, names.AttrName, resourceName, names.AttrName), - acctest.CheckResourceAttrAccountID(datasourceName, "owning_account_id"), + acctest.CheckResourceAttrAccountID(ctx, datasourceName, "owning_account_id"), resource.TestCheckResourceAttr(datasourceName, "resource_arns.#", "0"), ), }, diff --git a/internal/service/ram/resource_share_test.go b/internal/service/ram/resource_share_test.go index 43977940eb3..79e964b20cf 100644 --- a/internal/service/ram/resource_share_test.go +++ b/internal/service/ram/resource_share_test.go @@ -36,7 +36,7 @@ func TestAccRAMResourceShare_basic(t *testing.T) { Config: testAccResourceShareConfig_name(rName), Check: resource.ComposeTestCheckFunc( testAccCheckResourceShareExists(ctx, resourceName, &resourceShare), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ram", regexache.MustCompile(`resource-share/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ram", regexache.MustCompile(`resource-share/.+`)), resource.TestCheckResourceAttr(resourceName, "allow_external_principals", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "permission_arns.#", "0"), @@ -68,7 +68,7 @@ func TestAccRAMResourceShare_permission(t *testing.T) { Config: testAccResourceShareConfig_namePermission(rName), Check: resource.ComposeTestCheckFunc( testAccCheckResourceShareExists(ctx, resourceName, &resourceShare), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ram", regexache.MustCompile(`resource-share/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ram", regexache.MustCompile(`resource-share/.+`)), resource.TestCheckResourceAttr(resourceName, "allow_external_principals", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "permission_arns.#", "1"), diff --git a/internal/service/ram/sharing_with_organization.go b/internal/service/ram/sharing_with_organization.go index 3931b98879d..18f60399c06 100644 --- a/internal/service/ram/sharing_with_organization.go +++ b/internal/service/ram/sharing_with_organization.go @@ -55,7 +55,7 @@ func resourceSharingWithOrganizationCreate(ctx context.Context, d *schema.Resour return sdkdiag.AppendErrorf(diags, "RAM Sharing With Organization failed") } - d.SetId(meta.(*conns.AWSClient).AccountID) + d.SetId(meta.(*conns.AWSClient).AccountID(ctx)) return append(diags, resourceSharingWithOrganizationRead(ctx, d, meta)...) } From a3c10867dc67f224a51f732c69a345a2c7a0665d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:55 -0500 Subject: [PATCH 130/304] Make 'AWSClient.AccountID' a getter - rbin. --- internal/service/rbin/rule.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/rbin/rule.go b/internal/service/rbin/rule.go index 0ddbe950c32..980c5f7e33d 100644 --- a/internal/service/rbin/rule.go +++ b/internal/service/rbin/rule.go @@ -214,7 +214,7 @@ func resourceRuleRead(ctx context.Context, d *schema.ResourceData, meta interfac Partition: meta.(*conns.AWSClient).Partition(ctx), Service: rbin.ServiceID, Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("rule/%s", aws.ToString(out.Identifier)), }.String() d.Set(names.AttrARN, ruleArn) From f60479110b654ba0df75d16f6f0121f3836f427d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:55 -0500 Subject: [PATCH 131/304] Make 'AWSClient.AccountID' a getter - rds. --- internal/service/rds/cluster_endpoint_test.go | 4 ++-- internal/service/rds/cluster_instance_test.go | 2 +- .../service/rds/cluster_parameter_group_test.go | 4 ++-- internal/service/rds/cluster_snapshot_test.go | 2 +- internal/service/rds/cluster_test.go | 14 +++++++------- .../service/rds/custom_db_engine_version_test.go | 6 +++--- internal/service/rds/event_subscription_test.go | 16 ++++++++-------- internal/service/rds/global_cluster_test.go | 4 ++-- internal/service/rds/instance_test.go | 4 ++-- internal/service/rds/option_group_test.go | 2 +- internal/service/rds/parameter_group_test.go | 4 ++-- .../rds/proxy_default_target_group_test.go | 4 ++-- internal/service/rds/proxy_endpoint_test.go | 2 +- internal/service/rds/proxy_test.go | 2 +- internal/service/rds/reserved_instance_test.go | 2 +- internal/service/rds/snapshot_test.go | 2 +- internal/service/rds/subnet_group_test.go | 2 +- 17 files changed, 38 insertions(+), 38 deletions(-) diff --git a/internal/service/rds/cluster_endpoint_test.go b/internal/service/rds/cluster_endpoint_test.go index 296c4fc677a..265d2270e7b 100644 --- a/internal/service/rds/cluster_endpoint_test.go +++ b/internal/service/rds/cluster_endpoint_test.go @@ -43,9 +43,9 @@ func TestAccRDSClusterEndpoint_basic(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckClusterEndpointExists(ctx, readerResourceName, &customReaderEndpoint), testAccCheckClusterEndpointExists(ctx, defaultResourceName, &customEndpoint), - acctest.MatchResourceAttrRegionalARN(readerResourceName, names.AttrARN, "rds", regexache.MustCompile(`cluster-endpoint:.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, readerResourceName, names.AttrARN, "rds", regexache.MustCompile(`cluster-endpoint:.+`)), resource.TestCheckResourceAttrSet(readerResourceName, names.AttrEndpoint), - acctest.MatchResourceAttrRegionalARN(defaultResourceName, names.AttrARN, "rds", regexache.MustCompile(`cluster-endpoint:.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, defaultResourceName, names.AttrARN, "rds", regexache.MustCompile(`cluster-endpoint:.+`)), resource.TestCheckResourceAttrSet(defaultResourceName, names.AttrEndpoint), resource.TestCheckResourceAttr(defaultResourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttr(readerResourceName, acctest.CtTagsPercent, "0"), diff --git a/internal/service/rds/cluster_instance_test.go b/internal/service/rds/cluster_instance_test.go index 8e9caf219c8..db26d310215 100644 --- a/internal/service/rds/cluster_instance_test.go +++ b/internal/service/rds/cluster_instance_test.go @@ -43,7 +43,7 @@ func TestAccRDSClusterInstance_basic(t *testing.T) { Config: testAccClusterInstanceConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckClusterInstanceExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "rds", regexache.MustCompile(`db:.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "rds", regexache.MustCompile(`db:.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrAutoMinorVersionUpgrade, acctest.CtTrue), resource.TestCheckResourceAttrSet(resourceName, names.AttrAvailabilityZone), resource.TestCheckResourceAttr(resourceName, names.AttrClusterIdentifier, rName), diff --git a/internal/service/rds/cluster_parameter_group_test.go b/internal/service/rds/cluster_parameter_group_test.go index 14a64f68f08..7965b95b3d6 100644 --- a/internal/service/rds/cluster_parameter_group_test.go +++ b/internal/service/rds/cluster_parameter_group_test.go @@ -39,7 +39,7 @@ func TestAccRDSClusterParameterGroup_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckClusterParameterGroupExists(ctx, resourceName, &v), testAccCheckClusterParameterGroupAttributes(&v, rName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "rds", fmt.Sprintf("cluster-pg:%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "rds", fmt.Sprintf("cluster-pg:%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrFamily, "aurora5.6"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Test cluster parameter group for terraform"), @@ -208,7 +208,7 @@ func TestAccRDSClusterParameterGroup_withApplyMethod(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckClusterParameterGroupExists(ctx, resourceName, &v), testAccCheckClusterParameterGroupAttributes(&v, rName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "rds", fmt.Sprintf("cluster-pg:%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "rds", fmt.Sprintf("cluster-pg:%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrFamily, "aurora5.6"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Test cluster parameter group for terraform"), diff --git a/internal/service/rds/cluster_snapshot_test.go b/internal/service/rds/cluster_snapshot_test.go index 61e2af341ff..0393fde4b3e 100644 --- a/internal/service/rds/cluster_snapshot_test.go +++ b/internal/service/rds/cluster_snapshot_test.go @@ -38,7 +38,7 @@ func TestAccRDSClusterSnapshot_basic(t *testing.T) { testAccCheckClusterSnapshotExists(ctx, resourceName, &dbClusterSnapshot), resource.TestCheckResourceAttrSet(resourceName, names.AttrAllocatedStorage), resource.TestCheckResourceAttrSet(resourceName, "availability_zones.#"), - acctest.MatchResourceAttrRegionalARN(resourceName, "db_cluster_snapshot_arn", "rds", regexache.MustCompile(fmt.Sprintf("cluster-snapshot:%s$", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "db_cluster_snapshot_arn", "rds", regexache.MustCompile(fmt.Sprintf("cluster-snapshot:%s$", rName))), resource.TestCheckResourceAttrSet(resourceName, names.AttrEngine), resource.TestCheckResourceAttrSet(resourceName, names.AttrEngineVersion), resource.TestCheckResourceAttr(resourceName, names.AttrKMSKeyID, ""), diff --git a/internal/service/rds/cluster_test.go b/internal/service/rds/cluster_test.go index b7d937c83f7..893e6d61db2 100644 --- a/internal/service/rds/cluster_test.go +++ b/internal/service/rds/cluster_test.go @@ -77,7 +77,7 @@ func TestAccRDSCluster_basic(t *testing.T) { Config: testAccClusterConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckClusterExists(ctx, resourceName, &dbCluster), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "rds", fmt.Sprintf("cluster:%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "rds", fmt.Sprintf("cluster:%s", rName)), resource.TestCheckResourceAttr(resourceName, "backtrack_window", "0"), resource.TestCheckNoResourceAttr(resourceName, "ca_certificate_identifier"), resource.TestCheckNoResourceAttr(resourceName, "ca_certificate_valid_till"), @@ -1800,7 +1800,7 @@ func TestAccRDSCluster_ManagedMasterPassword_managed(t *testing.T) { Config: testAccClusterConfig_managedMasterPassword(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckClusterExists(ctx, resourceName, &dbCluster), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "rds", fmt.Sprintf("cluster:%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "rds", fmt.Sprintf("cluster:%s", rName)), resource.TestCheckResourceAttrSet(resourceName, "cluster_resource_id"), resource.TestCheckResourceAttr(resourceName, names.AttrEngine, tfrds.ClusterEngineAuroraMySQL), resource.TestCheckResourceAttrSet(resourceName, names.AttrEngineVersion), @@ -1832,7 +1832,7 @@ func TestAccRDSCluster_ManagedMasterPassword_managedSpecificKMSKey(t *testing.T) Config: testAccClusterConfig_managedMasterPasswordKMSKey(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckClusterExists(ctx, resourceName, &dbCluster), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "rds", fmt.Sprintf("cluster:%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "rds", fmt.Sprintf("cluster:%s", rName)), resource.TestCheckResourceAttrSet(resourceName, "cluster_resource_id"), resource.TestCheckResourceAttr(resourceName, names.AttrEngine, tfrds.ClusterEngineAuroraMySQL), resource.TestCheckResourceAttrSet(resourceName, names.AttrEngineVersion), @@ -1868,7 +1868,7 @@ func TestAccRDSCluster_ManagedMasterPassword_convertToManaged(t *testing.T) { Config: testAccClusterConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckClusterExists(ctx, resourceName, &dbCluster1), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "rds", fmt.Sprintf("cluster:%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "rds", fmt.Sprintf("cluster:%s", rName)), resource.TestCheckResourceAttrSet(resourceName, "cluster_resource_id"), resource.TestCheckNoResourceAttr(resourceName, "manage_master_user_password"), ), @@ -1878,7 +1878,7 @@ func TestAccRDSCluster_ManagedMasterPassword_convertToManaged(t *testing.T) { Config: testAccClusterConfig_managedMasterPassword(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckClusterExists(ctx, resourceName, &dbCluster2), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "rds", fmt.Sprintf("cluster:%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "rds", fmt.Sprintf("cluster:%s", rName)), resource.TestCheckResourceAttrSet(resourceName, "cluster_resource_id"), resource.TestCheckResourceAttrSet(resourceName, "manage_master_user_password"), resource.TestCheckResourceAttr(resourceName, "manage_master_user_password", acctest.CtTrue), @@ -2744,7 +2744,7 @@ func TestAccRDSCluster_engineLifecycleSupport_disabled(t *testing.T) { Config: testAccClusterConfig_engineLifecycleSupport_disabled(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckClusterExists(ctx, resourceName, &dbCluster), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "rds", fmt.Sprintf("cluster:%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "rds", fmt.Sprintf("cluster:%s", rName)), resource.TestCheckResourceAttr(resourceName, "backtrack_window", "0"), resource.TestCheckResourceAttr(resourceName, names.AttrClusterIdentifier, rName), resource.TestCheckResourceAttr(resourceName, names.AttrEngine, tfrds.ClusterEngineAuroraPostgreSQL), @@ -3009,7 +3009,7 @@ func TestAccRDSCluster_localWriteForwarding(t *testing.T) { Config: testAccClusterConfig_localWriteForwarding(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckClusterExists(ctx, resourceName, &dbCluster), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "rds", fmt.Sprintf("cluster:%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "rds", fmt.Sprintf("cluster:%s", rName)), resource.TestCheckResourceAttr(resourceName, "enable_local_write_forwarding", acctest.CtTrue), ), }, diff --git a/internal/service/rds/custom_db_engine_version_test.go b/internal/service/rds/custom_db_engine_version_test.go index 65f6cc1ea79..ada1724d62f 100644 --- a/internal/service/rds/custom_db_engine_version_test.go +++ b/internal/service/rds/custom_db_engine_version_test.go @@ -54,7 +54,7 @@ func TestAccRDSCustomDBEngineVersion_sqlServer(t *testing.T) { testAccCheckCustomDBEngineVersionExists(ctx, resourceName, &customdbengineversion), resource.TestCheckResourceAttr(resourceName, names.AttrEngineVersion, rName), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreateTime), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "rds", + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "rds", regexache.MustCompile(fmt.Sprintf(`cev:custom-sqlserver.+%s.+`, rName))), ), }, @@ -154,7 +154,7 @@ func TestAccRDSCustomDBEngineVersion_oracle(t *testing.T) { testAccCheckCustomDBEngineVersionExists(ctx, resourceName, &customdbengineversion), resource.TestCheckResourceAttr(resourceName, names.AttrEngineVersion, rName), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreateTime), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "rds", regexache.MustCompile(fmt.Sprintf(`cev:custom-oracle.+%s.+`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "rds", regexache.MustCompile(fmt.Sprintf(`cev:custom-oracle.+%s.+`, rName))), ), }, { @@ -200,7 +200,7 @@ func TestAccRDSCustomDBEngineVersion_manifestFile(t *testing.T) { testAccCheckCustomDBEngineVersionExists(ctx, resourceName, &customdbengineversion), resource.TestCheckResourceAttr(resourceName, names.AttrEngineVersion, rName), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreateTime), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "rds", regexache.MustCompile(fmt.Sprintf(`cev:custom-oracle.+%s.+`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "rds", regexache.MustCompile(fmt.Sprintf(`cev:custom-oracle.+%s.+`, rName))), ), }, { diff --git a/internal/service/rds/event_subscription_test.go b/internal/service/rds/event_subscription_test.go index d2082ae3b8d..ff124cbac79 100644 --- a/internal/service/rds/event_subscription_test.go +++ b/internal/service/rds/event_subscription_test.go @@ -35,8 +35,8 @@ func TestAccRDSEventSubscription_basic(t *testing.T) { Config: testAccEventSubscriptionConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckEventSubscriptionExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "rds", fmt.Sprintf("es:%s", rName)), - acctest.CheckResourceAttrAccountID(resourceName, "customer_aws_id"), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "rds", fmt.Sprintf("es:%s", rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "customer_aws_id"), resource.TestCheckResourceAttr(resourceName, names.AttrEnabled, acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, "event_categories.#", "0"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), @@ -200,8 +200,8 @@ func TestAccRDSEventSubscription_categories(t *testing.T) { Config: testAccEventSubscriptionConfig_categories(rName), Check: resource.ComposeTestCheckFunc( testAccCheckEventSubscriptionExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "rds", fmt.Sprintf("es:%s", rName)), - acctest.CheckResourceAttrAccountID(resourceName, "customer_aws_id"), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "rds", fmt.Sprintf("es:%s", rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "customer_aws_id"), resource.TestCheckResourceAttr(resourceName, names.AttrEnabled, acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "event_categories.#", "5"), resource.TestCheckTypeSetElemAttr(resourceName, "event_categories.*", "availability"), @@ -226,8 +226,8 @@ func TestAccRDSEventSubscription_categories(t *testing.T) { Config: testAccEventSubscriptionConfig_categoriesUpdated(rName), Check: resource.ComposeTestCheckFunc( testAccCheckEventSubscriptionExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "rds", fmt.Sprintf("es:%s", rName)), - acctest.CheckResourceAttrAccountID(resourceName, "customer_aws_id"), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "rds", fmt.Sprintf("es:%s", rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "customer_aws_id"), resource.TestCheckResourceAttr(resourceName, names.AttrEnabled, acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, "event_categories.#", "1"), resource.TestCheckTypeSetElemAttr(resourceName, "event_categories.*", "creation"), @@ -243,8 +243,8 @@ func TestAccRDSEventSubscription_categories(t *testing.T) { Config: testAccEventSubscriptionConfig_categoriesAndSourceTypeUpdated(rName), Check: resource.ComposeTestCheckFunc( testAccCheckEventSubscriptionExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "rds", fmt.Sprintf("es:%s", rName)), - acctest.CheckResourceAttrAccountID(resourceName, "customer_aws_id"), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "rds", fmt.Sprintf("es:%s", rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "customer_aws_id"), resource.TestCheckResourceAttr(resourceName, names.AttrEnabled, acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, "event_categories.#", "2"), resource.TestCheckTypeSetElemAttr(resourceName, "event_categories.*", "creation"), diff --git a/internal/service/rds/global_cluster_test.go b/internal/service/rds/global_cluster_test.go index 83e53ad8493..910d9253518 100644 --- a/internal/service/rds/global_cluster_test.go +++ b/internal/service/rds/global_cluster_test.go @@ -115,7 +115,7 @@ func TestAccRDSGlobalCluster_basic(t *testing.T) { Config: testAccGlobalClusterConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckGlobalClusterExists(ctx, resourceName, &globalCluster1), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrARN, "rds", fmt.Sprintf("global-cluster:%s", rName)), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "rds", fmt.Sprintf("global-cluster:%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrDatabaseName, ""), resource.TestCheckResourceAttr(resourceName, names.AttrDeletionProtection, acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, names.AttrEngine, "aurora-postgresql"), @@ -248,7 +248,7 @@ func TestAccRDSGlobalCluster_engineLifecycleSupport_disabled(t *testing.T) { Config: testAccGlobalClusterConfig_engineLifecycleSupport_disabled(rName), Check: resource.ComposeTestCheckFunc( testAccCheckGlobalClusterExists(ctx, resourceName, &globalCluster1), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrARN, "rds", fmt.Sprintf("global-cluster:%s", rName)), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "rds", fmt.Sprintf("global-cluster:%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrDatabaseName, ""), resource.TestCheckResourceAttr(resourceName, names.AttrEngine, "aurora-postgresql"), resource.TestCheckResourceAttr(resourceName, "engine_lifecycle_support", "open-source-rds-extended-support-disabled"), diff --git a/internal/service/rds/instance_test.go b/internal/service/rds/instance_test.go index 61ad5a62631..6972ad3a1c3 100644 --- a/internal/service/rds/instance_test.go +++ b/internal/service/rds/instance_test.go @@ -55,7 +55,7 @@ func TestAccRDSInstance_basic(t *testing.T) { testAccCheckInstanceAttributes(&v), resource.TestCheckResourceAttr(resourceName, names.AttrAllocatedStorage, "10"), resource.TestCheckNoResourceAttr(resourceName, names.AttrAllowMajorVersionUpgrade), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "rds", regexache.MustCompile(`db:.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "rds", regexache.MustCompile(`db:.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrAutoMinorVersionUpgrade, acctest.CtTrue), resource.TestCheckResourceAttrSet(resourceName, names.AttrAvailabilityZone), resource.TestCheckResourceAttr(resourceName, "backup_retention_period", "0"), @@ -234,7 +234,7 @@ func TestAccRDSInstance_engineLifecycleSupport_disabled(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckDBInstanceExists(ctx, resourceName, &v), testAccCheckInstanceAttributes(&v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "rds", regexache.MustCompile(`db:.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "rds", regexache.MustCompile(`db:.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrEngine, tfrds.InstanceEngineMySQL), resource.TestCheckResourceAttr(resourceName, "engine_lifecycle_support", "open-source-rds-extended-support-disabled"), resource.TestCheckResourceAttrSet(resourceName, names.AttrEngineVersion), diff --git a/internal/service/rds/option_group_test.go b/internal/service/rds/option_group_test.go index 31db96043b8..1755b52a3aa 100644 --- a/internal/service/rds/option_group_test.go +++ b/internal/service/rds/option_group_test.go @@ -39,7 +39,7 @@ func TestAccRDSOptionGroup_basic(t *testing.T) { Config: testAccOptionGroupConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckOptionGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "rds", regexache.MustCompile(`og:.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "rds", regexache.MustCompile(`og:.+`)), resource.TestCheckResourceAttr(resourceName, "engine_name", "mysql"), resource.TestCheckResourceAttr(resourceName, "major_engine_version", "8.0"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), diff --git a/internal/service/rds/parameter_group_test.go b/internal/service/rds/parameter_group_test.go index 991dfd70c96..079b4ca0bc8 100644 --- a/internal/service/rds/parameter_group_test.go +++ b/internal/service/rds/parameter_group_test.go @@ -283,7 +283,7 @@ func TestAccRDSParameterGroup_basic(t *testing.T) { names.AttrName: "character_set_client", names.AttrValue: "utf8", }), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "rds", regexache.MustCompile(fmt.Sprintf("pg:%s$", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "rds", regexache.MustCompile(fmt.Sprintf("pg:%s$", rName))), ), }, { @@ -318,7 +318,7 @@ func TestAccRDSParameterGroup_basic(t *testing.T) { names.AttrName: "character_set_client", names.AttrValue: "utf8", }), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "rds", regexache.MustCompile(fmt.Sprintf("pg:%s$", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "rds", regexache.MustCompile(fmt.Sprintf("pg:%s$", rName))), ), }, { diff --git a/internal/service/rds/proxy_default_target_group_test.go b/internal/service/rds/proxy_default_target_group_test.go index 4476fef39f3..f165632fd66 100644 --- a/internal/service/rds/proxy_default_target_group_test.go +++ b/internal/service/rds/proxy_default_target_group_test.go @@ -40,7 +40,7 @@ func TestAccRDSProxyDefaultTargetGroup_basic(t *testing.T) { Config: testAccProxyDefaultTargetGroupConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckProxyTargetGroupExists(ctx, resourceName, &dbProxyTargetGroup), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "rds", regexache.MustCompile(`target-group:.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "rds", regexache.MustCompile(`target-group:.+`)), resource.TestCheckResourceAttr(resourceName, "connection_pool_config.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "connection_pool_config.*", map[string]string{ "connection_borrow_timeout": "120", @@ -80,7 +80,7 @@ func TestAccRDSProxyDefaultTargetGroup_emptyConnectionPool(t *testing.T) { Config: testAccProxyDefaultTargetGroupConfig_emptyConnectionPoolConfig(rName), Check: resource.ComposeTestCheckFunc( testAccCheckProxyTargetGroupExists(ctx, resourceName, &dbProxyTargetGroup), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "rds", regexache.MustCompile(`target-group:.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "rds", regexache.MustCompile(`target-group:.+`)), resource.TestCheckResourceAttr(resourceName, "connection_pool_config.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "connection_pool_config.*", map[string]string{ "connection_borrow_timeout": "120", diff --git a/internal/service/rds/proxy_endpoint_test.go b/internal/service/rds/proxy_endpoint_test.go index d0cd85ca955..88b25c42ebf 100644 --- a/internal/service/rds/proxy_endpoint_test.go +++ b/internal/service/rds/proxy_endpoint_test.go @@ -45,7 +45,7 @@ func TestAccRDSProxyEndpoint_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "db_proxy_endpoint_name", rName), resource.TestCheckResourceAttrPair(resourceName, "db_proxy_name", "aws_db_proxy.test", names.AttrName), resource.TestCheckResourceAttr(resourceName, "target_role", "READ_WRITE"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "rds", regexache.MustCompile(`db-proxy-endpoint:.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "rds", regexache.MustCompile(`db-proxy-endpoint:.+`)), resource.TestCheckResourceAttr(resourceName, "vpc_subnet_ids.#", "2"), resource.TestCheckTypeSetElemAttrPair(resourceName, "vpc_subnet_ids.*", "aws_subnet.test.0", names.AttrID), resource.TestCheckTypeSetElemAttrPair(resourceName, "vpc_subnet_ids.*", "aws_subnet.test.1", names.AttrID), diff --git a/internal/service/rds/proxy_test.go b/internal/service/rds/proxy_test.go index c245b5f5ce0..884f83084b8 100644 --- a/internal/service/rds/proxy_test.go +++ b/internal/service/rds/proxy_test.go @@ -44,7 +44,7 @@ func TestAccRDSProxy_basic(t *testing.T) { testAccCheckProxyExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "engine_family", "MYSQL"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "rds", regexache.MustCompile(`db-proxy:.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "rds", regexache.MustCompile(`db-proxy:.+`)), resource.TestCheckResourceAttr(resourceName, "auth.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "auth.*", map[string]string{ "auth_scheme": "SECRETS", diff --git a/internal/service/rds/reserved_instance_test.go b/internal/service/rds/reserved_instance_test.go index 3d3afa7bfe9..0f6f6f15f72 100644 --- a/internal/service/rds/reserved_instance_test.go +++ b/internal/service/rds/reserved_instance_test.go @@ -43,7 +43,7 @@ func TestAccRDSReservedInstance_basic(t *testing.T) { Config: testAccReservedInstanceConfig_basic(rName, "1"), Check: resource.ComposeTestCheckFunc( testAccReservedInstanceExists(ctx, resourceName, &reservation), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "rds", regexache.MustCompile(`ri:.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "rds", regexache.MustCompile(`ri:.+`)), resource.TestCheckResourceAttrPair(dataSourceName, "currency_code", resourceName, "currency_code"), resource.TestCheckResourceAttrPair(dataSourceName, "db_instance_class", resourceName, "db_instance_class"), resource.TestCheckResourceAttrPair(dataSourceName, names.AttrDuration, resourceName, names.AttrDuration), diff --git a/internal/service/rds/snapshot_test.go b/internal/service/rds/snapshot_test.go index 907a6150143..cc7d8e7a8ad 100644 --- a/internal/service/rds/snapshot_test.go +++ b/internal/service/rds/snapshot_test.go @@ -40,7 +40,7 @@ func TestAccRDSSnapshot_basic(t *testing.T) { Config: testAccSnapshotConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckDBSnapshotExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, "db_snapshot_arn", "rds", regexache.MustCompile(`snapshot:.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "db_snapshot_arn", "rds", regexache.MustCompile(`snapshot:.+`)), resource.TestCheckResourceAttr(resourceName, "shared_accounts.#", "0"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), diff --git a/internal/service/rds/subnet_group_test.go b/internal/service/rds/subnet_group_test.go index e676049af6b..e1b574435a2 100644 --- a/internal/service/rds/subnet_group_test.go +++ b/internal/service/rds/subnet_group_test.go @@ -37,7 +37,7 @@ func TestAccRDSSubnetGroup_basic(t *testing.T) { Config: testAccSubnetGroupConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSubnetGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "rds", regexache.MustCompile(fmt.Sprintf("subgrp:%s$", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "rds", regexache.MustCompile(fmt.Sprintf("subgrp:%s$", rName))), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Managed by Terraform"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrNamePrefix, ""), From 0e07c4f17c5e0a0b5867d74b7a05949f4fba2426 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:55 -0500 Subject: [PATCH 132/304] Make 'AWSClient.AccountID' a getter - redshift. --- internal/service/redshift/cluster.go | 2 +- internal/service/redshift/cluster_data_source.go | 2 +- internal/service/redshift/cluster_snapshot_test.go | 6 +++--- .../service/redshift/data_share_authorization_test.go | 4 ++-- .../redshift/data_share_consumer_association_test.go | 8 ++++---- internal/service/redshift/endpoint_access_test.go | 2 +- internal/service/redshift/endpoint_authorization_test.go | 2 +- internal/service/redshift/event_subscription.go | 2 +- internal/service/redshift/event_subscription_test.go | 6 +++--- internal/service/redshift/hsm_client_certificate.go | 2 +- internal/service/redshift/hsm_client_certificate_test.go | 2 +- internal/service/redshift/hsm_configuration.go | 2 +- internal/service/redshift/hsm_configuration_test.go | 2 +- internal/service/redshift/parameter_group.go | 2 +- internal/service/redshift/parameter_group_test.go | 6 +++--- internal/service/redshift/partner_test.go | 2 +- internal/service/redshift/snapshot_copy_grant.go | 2 +- internal/service/redshift/snapshot_schedule.go | 2 +- internal/service/redshift/subnet_group.go | 2 +- internal/service/redshift/subnet_group_data_source.go | 2 +- internal/service/redshift/usage_limit.go | 2 +- 21 files changed, 31 insertions(+), 31 deletions(-) diff --git a/internal/service/redshift/cluster.go b/internal/service/redshift/cluster.go index 10b94152367..a9f5101fa5c 100644 --- a/internal/service/redshift/cluster.go +++ b/internal/service/redshift/cluster.go @@ -661,7 +661,7 @@ func resourceClusterRead(ctx context.Context, d *schema.ResourceData, meta inter Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.Redshift, Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("cluster:%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/redshift/cluster_data_source.go b/internal/service/redshift/cluster_data_source.go index 9286d0f308c..4889f13206e 100644 --- a/internal/service/redshift/cluster_data_source.go +++ b/internal/service/redshift/cluster_data_source.go @@ -224,7 +224,7 @@ func dataSourceClusterRead(ctx context.Context, d *schema.ResourceData, meta int Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.Redshift, Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("cluster:%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/redshift/cluster_snapshot_test.go b/internal/service/redshift/cluster_snapshot_test.go index 390cc7fad00..a737844e11c 100644 --- a/internal/service/redshift/cluster_snapshot_test.go +++ b/internal/service/redshift/cluster_snapshot_test.go @@ -36,8 +36,8 @@ func TestAccRedshiftClusterSnapshot_basic(t *testing.T) { Config: testAccClusterSnapshotConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckClusterSnapshotExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "redshift", regexache.MustCompile(`snapshot:.+`)), - acctest.CheckResourceAttrAccountID(resourceName, "owner_account"), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "redshift", regexache.MustCompile(`snapshot:.+`)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "owner_account"), resource.TestCheckResourceAttr(resourceName, names.AttrClusterIdentifier, rName), resource.TestCheckResourceAttr(resourceName, "snapshot_identifier", rName), resource.TestCheckResourceAttr(resourceName, "manual_snapshot_retention_period", "-1"), @@ -53,7 +53,7 @@ func TestAccRedshiftClusterSnapshot_basic(t *testing.T) { Config: testAccClusterSnapshotConfig_retention(rName, 1), Check: resource.ComposeTestCheckFunc( testAccCheckClusterSnapshotExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "redshift", regexache.MustCompile(`snapshot:.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "redshift", regexache.MustCompile(`snapshot:.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrClusterIdentifier, rName), resource.TestCheckResourceAttr(resourceName, "snapshot_identifier", rName), resource.TestCheckResourceAttr(resourceName, "manual_snapshot_retention_period", "1"), diff --git a/internal/service/redshift/data_share_authorization_test.go b/internal/service/redshift/data_share_authorization_test.go index 80d441b5c60..9f4337a91ab 100644 --- a/internal/service/redshift/data_share_authorization_test.go +++ b/internal/service/redshift/data_share_authorization_test.go @@ -42,8 +42,8 @@ func TestAccRedshiftDataShareAuthorization_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( 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(ctx, resourceName, "data_share_arn", "redshift", regexache.MustCompile(`datashare:+.`)), + acctest.MatchResourceAttrRegionalARN(ctx, 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 ff16db4ee42..025bd891ae3 100644 --- a/internal/service/redshift/data_share_consumer_association_test.go +++ b/internal/service/redshift/data_share_consumer_association_test.go @@ -42,8 +42,8 @@ func TestAccRedshiftDataShareConsumerAssociation_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( 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(ctx, resourceName, "data_share_arn", "redshift", regexache.MustCompile(`datashare:+.`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "producer_arn", "redshift-serverless", regexache.MustCompile(`namespace/.+$`)), ), }, { @@ -100,8 +100,8 @@ func TestAccRedshiftDataShareConsumerAssociation_associateEntireAccount(t *testi Check: resource.ComposeTestCheckFunc( 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(ctx, resourceName, "data_share_arn", "redshift", regexache.MustCompile(`datashare:+.`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "producer_arn", "redshift-serverless", regexache.MustCompile(`namespace/.+$`)), ), }, { diff --git a/internal/service/redshift/endpoint_access_test.go b/internal/service/redshift/endpoint_access_test.go index ef22c3e48d9..49bf00c104b 100644 --- a/internal/service/redshift/endpoint_access_test.go +++ b/internal/service/redshift/endpoint_access_test.go @@ -39,7 +39,7 @@ func TestAccRedshiftEndpointAccess_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrPort, "5439"), resource.TestCheckResourceAttr(resourceName, "vpc_security_group_ids.#", "1"), resource.TestCheckResourceAttr(resourceName, "vpc_endpoint.#", "1"), - acctest.CheckResourceAttrAccountID(resourceName, acctest.CtResourceOwner), + acctest.CheckResourceAttrAccountID(ctx, resourceName, acctest.CtResourceOwner), resource.TestCheckResourceAttrPair(resourceName, "subnet_group_name", "aws_redshift_subnet_group.test", names.AttrID), resource.TestCheckResourceAttrPair(resourceName, names.AttrClusterIdentifier, "aws_redshift_cluster.test", names.AttrClusterIdentifier), resource.TestCheckResourceAttrSet(resourceName, names.AttrAddress), diff --git a/internal/service/redshift/endpoint_authorization_test.go b/internal/service/redshift/endpoint_authorization_test.go index 98e4151c611..7cd49e5a605 100644 --- a/internal/service/redshift/endpoint_authorization_test.go +++ b/internal/service/redshift/endpoint_authorization_test.go @@ -42,7 +42,7 @@ func TestAccRedshiftEndpointAuthorization_basic(t *testing.T) { resource.TestCheckResourceAttrPair(resourceName, "account", "data.aws_caller_identity.test", names.AttrAccountID), resource.TestCheckResourceAttr(resourceName, "allowed_all_vpcs", acctest.CtTrue), resource.TestCheckResourceAttrPair(resourceName, "grantee", "data.aws_caller_identity.test", names.AttrAccountID), - acctest.CheckResourceAttrAccountID(resourceName, "grantor"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "grantor"), ), }, { diff --git a/internal/service/redshift/event_subscription.go b/internal/service/redshift/event_subscription.go index cb2e3acd425..b8dd04b05b8 100644 --- a/internal/service/redshift/event_subscription.go +++ b/internal/service/redshift/event_subscription.go @@ -173,7 +173,7 @@ func resourceEventSubscriptionRead(ctx context.Context, d *schema.ResourceData, Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.Redshift, Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("eventsubscription:%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/redshift/event_subscription_test.go b/internal/service/redshift/event_subscription_test.go index 8d28cafc761..433fa090ad3 100644 --- a/internal/service/redshift/event_subscription_test.go +++ b/internal/service/redshift/event_subscription_test.go @@ -36,12 +36,12 @@ func TestAccRedshiftEventSubscription_basic(t *testing.T) { Config: testAccEventSubscriptionConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckEventSubscriptionExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "redshift", regexache.MustCompile(`eventsubscription:.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "redshift", regexache.MustCompile(`eventsubscription:.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrEnabled, acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "severity", "INFO"), resource.TestCheckResourceAttr(resourceName, names.AttrStatus, "active"), - acctest.CheckResourceAttrAccountID(resourceName, "customer_aws_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "customer_aws_id"), resource.TestCheckResourceAttr(resourceName, "event_categories.#", "0"), resource.TestCheckResourceAttr(resourceName, "source_ids.#", "0"), resource.TestCheckResourceAttrPair(resourceName, names.AttrSNSTopicARN, "aws_sns_topic.test", names.AttrARN), @@ -62,7 +62,7 @@ func TestAccRedshiftEventSubscription_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrSourceType, "cluster-snapshot"), resource.TestCheckTypeSetElemAttr(resourceName, "event_categories.*", "monitoring"), resource.TestCheckResourceAttrPair(resourceName, names.AttrSNSTopicARN, "aws_sns_topic.test", names.AttrARN), - acctest.CheckResourceAttrAccountID(resourceName, "customer_aws_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "customer_aws_id"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, diff --git a/internal/service/redshift/hsm_client_certificate.go b/internal/service/redshift/hsm_client_certificate.go index 140c2616bca..32e7bdda4e9 100644 --- a/internal/service/redshift/hsm_client_certificate.go +++ b/internal/service/redshift/hsm_client_certificate.go @@ -99,7 +99,7 @@ func resourceHSMClientCertificateRead(ctx context.Context, d *schema.ResourceDat Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.Redshift, Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("hsmclientcertificate:%s", d.Id()), }.String() diff --git a/internal/service/redshift/hsm_client_certificate_test.go b/internal/service/redshift/hsm_client_certificate_test.go index b1715a9b1ee..bd375b2c9ff 100644 --- a/internal/service/redshift/hsm_client_certificate_test.go +++ b/internal/service/redshift/hsm_client_certificate_test.go @@ -34,7 +34,7 @@ func TestAccRedshiftHSMClientCertificate_basic(t *testing.T) { Config: testAccHSMClientCertificateConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckHSMClientCertificateExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "redshift", regexache.MustCompile(`hsmclientcertificate:.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "redshift", regexache.MustCompile(`hsmclientcertificate:.+`)), resource.TestCheckResourceAttr(resourceName, "hsm_client_certificate_identifier", rName), resource.TestCheckResourceAttrSet(resourceName, "hsm_client_certificate_public_key"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), diff --git a/internal/service/redshift/hsm_configuration.go b/internal/service/redshift/hsm_configuration.go index 850e076187f..7507fcebb30 100644 --- a/internal/service/redshift/hsm_configuration.go +++ b/internal/service/redshift/hsm_configuration.go @@ -126,7 +126,7 @@ func resourceHSMConfigurationRead(ctx context.Context, d *schema.ResourceData, m Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.Redshift, Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("hsmconfiguration:%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/redshift/hsm_configuration_test.go b/internal/service/redshift/hsm_configuration_test.go index 66f0dd7019e..b837b639dc4 100644 --- a/internal/service/redshift/hsm_configuration_test.go +++ b/internal/service/redshift/hsm_configuration_test.go @@ -34,7 +34,7 @@ func TestAccRedshiftHSMConfiguration_basic(t *testing.T) { Config: testAccHSMConfigurationConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckHSMConfigurationExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "redshift", regexache.MustCompile(`hsmconfiguration:.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "redshift", regexache.MustCompile(`hsmconfiguration:.+`)), resource.TestCheckResourceAttr(resourceName, "hsm_configuration_identifier", rName), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), diff --git a/internal/service/redshift/parameter_group.go b/internal/service/redshift/parameter_group.go index 54483a22772..36d67d9cb65 100644 --- a/internal/service/redshift/parameter_group.go +++ b/internal/service/redshift/parameter_group.go @@ -151,7 +151,7 @@ func resourceParameterGroupRead(ctx context.Context, d *schema.ResourceData, met Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.Redshift, Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("parametergroup:%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/redshift/parameter_group_test.go b/internal/service/redshift/parameter_group_test.go index 286c980c577..7dd4f02a496 100644 --- a/internal/service/redshift/parameter_group_test.go +++ b/internal/service/redshift/parameter_group_test.go @@ -35,7 +35,7 @@ func TestAccRedshiftParameterGroup_basic(t *testing.T) { Config: testAccParameterGroupConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckParameterGroupExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "redshift", fmt.Sprintf("parametergroup:%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "redshift", fmt.Sprintf("parametergroup:%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Managed by Terraform"), resource.TestCheckResourceAttr(resourceName, names.AttrFamily, "redshift-1.0"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), @@ -104,7 +104,7 @@ func TestAccRedshiftParameterGroup_update(t *testing.T) { Config: testAccParameterGroupConfig_noParameters(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckParameterGroupExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "redshift", fmt.Sprintf("parametergroup:%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "redshift", fmt.Sprintf("parametergroup:%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Managed by Terraform"), resource.TestCheckResourceAttr(resourceName, names.AttrFamily, "redshift-1.0"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), @@ -121,7 +121,7 @@ func TestAccRedshiftParameterGroup_update(t *testing.T) { Config: testAccParameterGroupConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckParameterGroupExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "redshift", fmt.Sprintf("parametergroup:%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "redshift", fmt.Sprintf("parametergroup:%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Managed by Terraform"), resource.TestCheckResourceAttr(resourceName, names.AttrFamily, "redshift-1.0"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), diff --git a/internal/service/redshift/partner_test.go b/internal/service/redshift/partner_test.go index 65c93d3e4a7..0710dd0f595 100644 --- a/internal/service/redshift/partner_test.go +++ b/internal/service/redshift/partner_test.go @@ -36,7 +36,7 @@ func TestAccRedshiftPartner_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "partner_name", "Datacoral"), resource.TestCheckResourceAttrPair(resourceName, names.AttrDatabaseName, "aws_redshift_cluster.test", names.AttrDatabaseName), resource.TestCheckResourceAttrPair(resourceName, names.AttrClusterIdentifier, "aws_redshift_cluster.test", names.AttrID), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrAccountID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrAccountID), ), }, { diff --git a/internal/service/redshift/snapshot_copy_grant.go b/internal/service/redshift/snapshot_copy_grant.go index f3afd0785a0..c3f21ff592b 100644 --- a/internal/service/redshift/snapshot_copy_grant.go +++ b/internal/service/redshift/snapshot_copy_grant.go @@ -115,7 +115,7 @@ func resourceSnapshotCopyGrantRead(ctx context.Context, d *schema.ResourceData, Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.Redshift, Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("snapshotcopygrant:%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/redshift/snapshot_schedule.go b/internal/service/redshift/snapshot_schedule.go index 63408aa23a3..58d22eaf25f 100644 --- a/internal/service/redshift/snapshot_schedule.go +++ b/internal/service/redshift/snapshot_schedule.go @@ -126,7 +126,7 @@ func resourceSnapshotScheduleRead(ctx context.Context, d *schema.ResourceData, m Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.Redshift, Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("snapshotschedule:%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/redshift/subnet_group.go b/internal/service/redshift/subnet_group.go index f1663cad7cf..d7ac1ff65bf 100644 --- a/internal/service/redshift/subnet_group.go +++ b/internal/service/redshift/subnet_group.go @@ -121,7 +121,7 @@ func resourceSubnetGroupRead(ctx context.Context, d *schema.ResourceData, meta i Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.Redshift, Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("subnetgroup:%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/redshift/subnet_group_data_source.go b/internal/service/redshift/subnet_group_data_source.go index 216ee80516a..db85e95f177 100644 --- a/internal/service/redshift/subnet_group_data_source.go +++ b/internal/service/redshift/subnet_group_data_source.go @@ -61,7 +61,7 @@ func dataSourceSubnetGroupRead(ctx context.Context, d *schema.ResourceData, meta Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.Redshift, Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("subnetgroup:%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/redshift/usage_limit.go b/internal/service/redshift/usage_limit.go index b1b7b12dbc6..bc9767635d1 100644 --- a/internal/service/redshift/usage_limit.go +++ b/internal/service/redshift/usage_limit.go @@ -136,7 +136,7 @@ func resourceUsageLimitRead(ctx context.Context, d *schema.ResourceData, meta in Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.Redshift, Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("usagelimit:%s", d.Id()), }.String() From 4ed4b50e2bee23694010951a058b03ab454a2ff3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:56 -0500 Subject: [PATCH 133/304] Make 'AWSClient.AccountID' a getter - redshiftserverless. --- internal/service/redshiftserverless/endpoint_access_test.go | 4 ++-- internal/service/redshiftserverless/namespace_test.go | 4 ++-- internal/service/redshiftserverless/snapshot_test.go | 4 ++-- internal/service/redshiftserverless/workgroup_test.go | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/internal/service/redshiftserverless/endpoint_access_test.go b/internal/service/redshiftserverless/endpoint_access_test.go index fee1e21ef8d..660298b4595 100644 --- a/internal/service/redshiftserverless/endpoint_access_test.go +++ b/internal/service/redshiftserverless/endpoint_access_test.go @@ -34,7 +34,7 @@ func TestAccRedshiftServerlessEndpointAccess_basic(t *testing.T) { Config: testAccEndpointAccessConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckEndpointAccessExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "redshift-serverless", regexache.MustCompile("managedvpcendpoint/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "redshift-serverless", regexache.MustCompile("managedvpcendpoint/.+$")), resource.TestCheckResourceAttr(resourceName, "endpoint_name", rName), resource.TestCheckResourceAttr(resourceName, "owner_account", ""), resource.TestCheckResourceAttrSet(resourceName, names.AttrPort), @@ -51,7 +51,7 @@ func TestAccRedshiftServerlessEndpointAccess_basic(t *testing.T) { Config: testAccEndpointAccessConfig_updated(rName), Check: resource.ComposeTestCheckFunc( testAccCheckEndpointAccessExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "redshift-serverless", regexache.MustCompile("managedvpcendpoint/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "redshift-serverless", regexache.MustCompile("managedvpcendpoint/.+$")), resource.TestCheckResourceAttr(resourceName, "endpoint_name", rName), resource.TestCheckResourceAttrSet(resourceName, names.AttrPort), resource.TestCheckResourceAttr(resourceName, "owner_account", ""), diff --git a/internal/service/redshiftserverless/namespace_test.go b/internal/service/redshiftserverless/namespace_test.go index 26d32277c30..8d9aa30125a 100644 --- a/internal/service/redshiftserverless/namespace_test.go +++ b/internal/service/redshiftserverless/namespace_test.go @@ -34,7 +34,7 @@ func TestAccRedshiftServerlessNamespace_basic(t *testing.T) { Config: testAccNamespaceConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckNamespaceExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "redshift-serverless", regexache.MustCompile("namespace/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "redshift-serverless", regexache.MustCompile("namespace/.+$")), resource.TestCheckResourceAttr(resourceName, "namespace_name", rName), resource.TestCheckResourceAttrSet(resourceName, "namespace_id"), resource.TestCheckResourceAttr(resourceName, "log_exports.#", "0"), @@ -51,7 +51,7 @@ func TestAccRedshiftServerlessNamespace_basic(t *testing.T) { Config: testAccNamespaceConfig_updated(rName), Check: resource.ComposeTestCheckFunc( testAccCheckNamespaceExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "redshift-serverless", regexache.MustCompile("namespace/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "redshift-serverless", regexache.MustCompile("namespace/.+$")), resource.TestCheckResourceAttr(resourceName, "namespace_name", rName), resource.TestCheckResourceAttrSet(resourceName, "namespace_id"), resource.TestCheckResourceAttr(resourceName, "log_exports.#", "0"), diff --git a/internal/service/redshiftserverless/snapshot_test.go b/internal/service/redshiftserverless/snapshot_test.go index 913aeb2a073..cb199e36c85 100644 --- a/internal/service/redshiftserverless/snapshot_test.go +++ b/internal/service/redshiftserverless/snapshot_test.go @@ -37,7 +37,7 @@ func TestAccRedshiftServerlessSnapshot_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "snapshot_name", rName), resource.TestCheckResourceAttr(resourceName, names.AttrRetentionPeriod, "-1"), resource.TestCheckResourceAttr(resourceName, "admin_username", "admin"), - acctest.CheckResourceAttrAccountID(resourceName, "owner_account"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "owner_account"), resource.TestCheckResourceAttr(resourceName, "accounts_with_provisioned_restore_access.#", "0"), resource.TestCheckResourceAttr(resourceName, "accounts_with_restore_access.#", "0"), ), @@ -54,7 +54,7 @@ func TestAccRedshiftServerlessSnapshot_basic(t *testing.T) { resource.TestCheckResourceAttrPair(resourceName, "namespace_name", "aws_redshiftserverless_namespace.test", names.AttrID), resource.TestCheckResourceAttr(resourceName, "snapshot_name", rName), resource.TestCheckResourceAttr(resourceName, names.AttrRetentionPeriod, "10"), - acctest.CheckResourceAttrAccountID(resourceName, "owner_account"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "owner_account"), ), }, }, diff --git a/internal/service/redshiftserverless/workgroup_test.go b/internal/service/redshiftserverless/workgroup_test.go index 1409f305f20..2989a3f0b12 100644 --- a/internal/service/redshiftserverless/workgroup_test.go +++ b/internal/service/redshiftserverless/workgroup_test.go @@ -34,7 +34,7 @@ func TestAccRedshiftServerlessWorkgroup_basic(t *testing.T) { Config: testAccWorkgroupConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckWorkgroupExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "redshift-serverless", regexache.MustCompile("workgroup/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "redshift-serverless", regexache.MustCompile("workgroup/.+$")), resource.TestCheckResourceAttr(resourceName, "namespace_name", rName), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, "workgroup_id"), From aee2c0413d1bab764b3cf8099fc5b09b16bd603d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:56 -0500 Subject: [PATCH 134/304] Make 'AWSClient.AccountID' a getter - resiliencehub. --- internal/service/resiliencehub/resiliency_policy_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/resiliencehub/resiliency_policy_test.go b/internal/service/resiliencehub/resiliency_policy_test.go index d778366aa5b..732de3f685c 100644 --- a/internal/service/resiliencehub/resiliency_policy_test.go +++ b/internal/service/resiliencehub/resiliency_policy_test.go @@ -53,7 +53,7 @@ func TestAccResilienceHubResiliencyPolicy_basic(t *testing.T) { Config: testAccResiliencyPolicyConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckResiliencyPolicyExists(ctx, resourceName, &policy), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, names.ResilienceHubServiceID, regexache.MustCompile(`resiliency-policy/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, names.ResilienceHubServiceID, regexache.MustCompile(`resiliency-policy/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckNoResourceAttr(resourceName, names.AttrDescription), resource.TestCheckResourceAttr(resourceName, "tier", "NotApplicable"), From 7890f35ab177767af2c2ff7d40a18f29789966c3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:56 -0500 Subject: [PATCH 135/304] Make 'AWSClient.AccountID' a getter - resourceexplorer2. --- internal/service/resourceexplorer2/index_test.go | 2 +- internal/service/resourceexplorer2/view_test.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/resourceexplorer2/index_test.go b/internal/service/resourceexplorer2/index_test.go index 93205bb2cc8..30b49d7e9e6 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(ctx, 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 d63b1682451..1bafbcaeea9 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(ctx, resourceName, names.AttrARN, "resource-explorer-2", regexache.MustCompile(`view/.+$`)), resource.TestCheckResourceAttr(resourceName, "default_view", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "filters.#", "0"), resource.TestCheckResourceAttr(resourceName, "included_property.#", "0"), @@ -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(ctx, resourceName, names.AttrARN, "resource-explorer-2", regexache.MustCompile(`view/.+$`)), resource.TestCheckResourceAttr(resourceName, "default_view", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "filters.#", "1"), 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(ctx, resourceName, names.AttrARN, "resource-explorer-2", regexache.MustCompile(`view/.+$`)), resource.TestCheckResourceAttr(resourceName, "default_view", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "filters.#", "1"), resource.TestCheckResourceAttr(resourceName, "filters.0.filter_string", "region:global"), From bb20b4bbbfda59b0d912bf0a884ce873cfa70871 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:56 -0500 Subject: [PATCH 136/304] Make 'AWSClient.AccountID' a getter - rolesanywhere. --- internal/service/rolesanywhere/profile_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/rolesanywhere/profile_test.go b/internal/service/rolesanywhere/profile_test.go index a6237b3b42a..28a568fc7a0 100644 --- a/internal/service/rolesanywhere/profile_test.go +++ b/internal/service/rolesanywhere/profile_test.go @@ -36,7 +36,7 @@ func TestAccRolesAnywhereProfile_basic(t *testing.T) { testAccCheckProfileExists(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "role_arns.#", "1"), - acctest.CheckResourceAttrGlobalARN(resourceName, "role_arns.0", "iam", fmt.Sprintf("role/%s", roleName)), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, "role_arns.0", "iam", fmt.Sprintf("role/%s", roleName)), resource.TestCheckResourceAttr(resourceName, "duration_seconds", "3600"), ), }, @@ -80,7 +80,7 @@ func TestAccRolesAnywhereProfile_noRoleARNs(t *testing.T) { testAccCheckProfileExists(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "role_arns.#", "1"), - acctest.CheckResourceAttrGlobalARN(resourceName, "role_arns.0", "iam", fmt.Sprintf("role/%s", roleName)), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, "role_arns.0", "iam", fmt.Sprintf("role/%s", roleName)), resource.TestCheckResourceAttr(resourceName, "duration_seconds", "3600"), ), }, From 8ff095cf9dd87ffca15bc379350e173ae84854a3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:57 -0500 Subject: [PATCH 137/304] Make 'AWSClient.AccountID' a getter - route53recoveryreadiness. --- .../service/route53recoveryreadiness/cell_test.go | 10 +++++----- .../route53recoveryreadiness/readiness_check_test.go | 4 ++-- .../route53recoveryreadiness/recovery_group_test.go | 6 +++--- .../route53recoveryreadiness/resource_set_test.go | 12 ++++++------ 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/internal/service/route53recoveryreadiness/cell_test.go b/internal/service/route53recoveryreadiness/cell_test.go index 52622645ec6..250151c3c96 100644 --- a/internal/service/route53recoveryreadiness/cell_test.go +++ b/internal/service/route53recoveryreadiness/cell_test.go @@ -35,7 +35,7 @@ func TestAccRoute53RecoveryReadinessCell_basic(t *testing.T) { Config: testAccCellConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckCellExists(ctx, resourceName), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "route53-recovery-readiness", regexache.MustCompile(`cell/.+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "route53-recovery-readiness", regexache.MustCompile(`cell/.+`)), resource.TestCheckResourceAttr(resourceName, "cells.#", "0"), resource.TestCheckResourceAttr(resourceName, "parent_readiness_scopes.#", "0"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), @@ -90,18 +90,18 @@ func TestAccRoute53RecoveryReadinessCell_nestedCell(t *testing.T) { Config: testAccCellConfig_child(rNameChild), Check: resource.ComposeTestCheckFunc( testAccCheckCellExists(ctx, resourceNameChild), - acctest.MatchResourceAttrGlobalARN(resourceNameChild, names.AttrARN, "route53-recovery-readiness", regexache.MustCompile(`cell/.+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceNameChild, names.AttrARN, "route53-recovery-readiness", regexache.MustCompile(`cell/.+`)), ), }, { Config: testAccCellConfig_parent(rNameChild, rNameParent), Check: resource.ComposeTestCheckFunc( testAccCheckCellExists(ctx, resourceNameParent), - acctest.MatchResourceAttrGlobalARN(resourceNameParent, names.AttrARN, "route53-recovery-readiness", regexache.MustCompile(`cell/.+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceNameParent, names.AttrARN, "route53-recovery-readiness", regexache.MustCompile(`cell/.+`)), resource.TestCheckResourceAttr(resourceNameParent, "cells.#", "1"), resource.TestCheckResourceAttr(resourceNameParent, "parent_readiness_scopes.#", "0"), testAccCheckCellExists(ctx, resourceNameChild), - acctest.MatchResourceAttrGlobalARN(resourceNameChild, names.AttrARN, "route53-recovery-readiness", regexache.MustCompile(`cell/.+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceNameChild, names.AttrARN, "route53-recovery-readiness", regexache.MustCompile(`cell/.+`)), resource.TestCheckResourceAttr(resourceNameChild, "cells.#", "0"), ), }, @@ -185,7 +185,7 @@ func TestAccRoute53RecoveryReadinessCell_timeout(t *testing.T) { Config: testAccCellConfig_timeout(rName), Check: resource.ComposeTestCheckFunc( testAccCheckCellExists(ctx, resourceName), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "route53-recovery-readiness", regexache.MustCompile(`cell/.+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "route53-recovery-readiness", regexache.MustCompile(`cell/.+`)), resource.TestCheckResourceAttr(resourceName, "cells.#", "0"), resource.TestCheckResourceAttr(resourceName, "parent_readiness_scopes.#", "0"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), diff --git a/internal/service/route53recoveryreadiness/readiness_check_test.go b/internal/service/route53recoveryreadiness/readiness_check_test.go index 7d4f98fb8c9..68e74309b8f 100644 --- a/internal/service/route53recoveryreadiness/readiness_check_test.go +++ b/internal/service/route53recoveryreadiness/readiness_check_test.go @@ -43,7 +43,7 @@ func TestAccRoute53RecoveryReadinessReadinessCheck_basic(t *testing.T) { Config: testAccReadinessCheckConfig_basic(rName, rSetName, cwArn), Check: resource.ComposeTestCheckFunc( testAccCheckReadinessCheckExists(ctx, resourceName), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "route53-recovery-readiness", regexache.MustCompile(`readiness-check/.+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "route53-recovery-readiness", regexache.MustCompile(`readiness-check/.+`)), resource.TestCheckResourceAttr(resourceName, "resource_set_name", rSetName), ), }, @@ -162,7 +162,7 @@ func TestAccRoute53RecoveryReadinessReadinessCheck_timeout(t *testing.T) { Config: testAccReadinessCheckConfig_timeout(rName, rSetName, cwArn), Check: resource.ComposeTestCheckFunc( testAccCheckReadinessCheckExists(ctx, resourceName), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "route53-recovery-readiness", regexache.MustCompile(`readiness-check/.+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "route53-recovery-readiness", regexache.MustCompile(`readiness-check/.+`)), resource.TestCheckResourceAttr(resourceName, "resource_set_name", rSetName), ), }, diff --git a/internal/service/route53recoveryreadiness/recovery_group_test.go b/internal/service/route53recoveryreadiness/recovery_group_test.go index a3cc5aede5a..90a543f3505 100644 --- a/internal/service/route53recoveryreadiness/recovery_group_test.go +++ b/internal/service/route53recoveryreadiness/recovery_group_test.go @@ -34,7 +34,7 @@ func TestAccRoute53RecoveryReadinessRecoveryGroup_basic(t *testing.T) { Config: testAccRecoveryGroupConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckRecoveryGroupExists(ctx, resourceName), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "route53-recovery-readiness", regexache.MustCompile(`recovery-group/.+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "route53-recovery-readiness", regexache.MustCompile(`recovery-group/.+`)), resource.TestCheckResourceAttr(resourceName, "cells.#", "0"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), @@ -86,7 +86,7 @@ func TestAccRoute53RecoveryReadinessRecoveryGroup_nestedCell(t *testing.T) { Config: testAccRecoveryGroupConfig_andCell(rName, rNameCell), Check: resource.ComposeTestCheckFunc( testAccCheckRecoveryGroupExists(ctx, resourceName), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "route53-recovery-readiness", regexache.MustCompile(`recovery-group/.+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "route53-recovery-readiness", regexache.MustCompile(`recovery-group/.+`)), resource.TestCheckResourceAttr(resourceName, "cells.#", "1"), ), }, @@ -157,7 +157,7 @@ func TestAccRoute53RecoveryReadinessRecoveryGroup_timeout(t *testing.T) { Config: testAccRecoveryGroupConfig_timeout(rName), Check: resource.ComposeTestCheckFunc( testAccCheckRecoveryGroupExists(ctx, resourceName), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "route53-recovery-readiness", regexache.MustCompile(`recovery-group/.+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "route53-recovery-readiness", regexache.MustCompile(`recovery-group/.+`)), resource.TestCheckResourceAttr(resourceName, "cells.#", "0"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), diff --git a/internal/service/route53recoveryreadiness/resource_set_test.go b/internal/service/route53recoveryreadiness/resource_set_test.go index 7d2cf081169..718a4bc298b 100644 --- a/internal/service/route53recoveryreadiness/resource_set_test.go +++ b/internal/service/route53recoveryreadiness/resource_set_test.go @@ -43,7 +43,7 @@ func TestAccRoute53RecoveryReadinessResourceSet_basic(t *testing.T) { Config: testAccResourceSetConfig_basic(rName, cwArn), Check: resource.ComposeTestCheckFunc( testAccCheckResourceSetExists(ctx, resourceName), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "route53-recovery-readiness", regexache.MustCompile(`resource-set.+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "route53-recovery-readiness", regexache.MustCompile(`resource-set.+`)), resource.TestCheckResourceAttr(resourceName, "resources.#", "1"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), @@ -161,7 +161,7 @@ func TestAccRoute53RecoveryReadinessResourceSet_readinessScope(t *testing.T) { Config: testAccResourceSetConfig_readinessScopes(rName, cwArn), Check: resource.ComposeTestCheckFunc( testAccCheckResourceSetExists(ctx, resourceName), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "route53-recovery-readiness", regexache.MustCompile(`resource-set.+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "route53-recovery-readiness", regexache.MustCompile(`resource-set.+`)), resource.TestCheckResourceAttr(resourceName, "resources.0.readiness_scopes.#", "1"), ), }, @@ -202,7 +202,7 @@ func TestAccRoute53RecoveryReadinessResourceSet_basicDNSTargetResource(t *testin Config: testAccResourceSetConfig_basicDNSTarget(rName, domainName, hzArn, recordType, recordSetId), Check: resource.ComposeTestCheckFunc( testAccCheckResourceSetExists(ctx, resourceName), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "route53-recovery-readiness", regexache.MustCompile(`resource-set.+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "route53-recovery-readiness", regexache.MustCompile(`resource-set.+`)), resource.TestCheckResourceAttr(resourceName, "resources.0.dns_target_resource.0.domain_name", domainName), resource.TestCheckResourceAttrSet(resourceName, "resources.0.dns_target_resource.0.hosted_zone_arn"), resource.TestCheckResourceAttr(resourceName, "resources.0.dns_target_resource.0.record_type", recordType), @@ -243,7 +243,7 @@ func TestAccRoute53RecoveryReadinessResourceSet_dnsTargetResourceNLBTarget(t *te Config: testAccResourceSetConfig_dnsTargetNlbTarget(rName, hzArn), Check: resource.ComposeTestCheckFunc( testAccCheckResourceSetExists(ctx, resourceName), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "route53-recovery-readiness", regexache.MustCompile(`resource-set.+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "route53-recovery-readiness", regexache.MustCompile(`resource-set.+`)), resource.TestCheckResourceAttrSet(resourceName, "resources.0.dns_target_resource.0.target_resource.0.nlb_resource.0.arn"), ), }, @@ -283,7 +283,7 @@ func TestAccRoute53RecoveryReadinessResourceSet_dnsTargetResourceR53Target(t *te Config: testAccResourceSetConfig_dnsTargetR53Target(rName, hzArn, domainName, recordSetId), Check: resource.ComposeTestCheckFunc( testAccCheckResourceSetExists(ctx, resourceName), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "route53-recovery-readiness", regexache.MustCompile(`resource-set.+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "route53-recovery-readiness", regexache.MustCompile(`resource-set.+`)), resource.TestCheckResourceAttr(resourceName, "resources.0.dns_target_resource.0.target_resource.0.r53_resource.0.domain_name", domainName), resource.TestCheckResourceAttr(resourceName, "resources.0.dns_target_resource.0.target_resource.0.r53_resource.0.record_set_id", recordSetId), ), @@ -319,7 +319,7 @@ func TestAccRoute53RecoveryReadinessResourceSet_timeout(t *testing.T) { Config: testAccResourceSetConfig_timeout(rName, cwArn), Check: resource.ComposeTestCheckFunc( testAccCheckResourceSetExists(ctx, resourceName), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "route53-recovery-readiness", regexache.MustCompile(`resource-set.+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "route53-recovery-readiness", regexache.MustCompile(`resource-set.+`)), resource.TestCheckResourceAttr(resourceName, "resources.#", "1"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), From 4e3277c819b4541bfe8769948cc192cf425ed066 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:57 -0500 Subject: [PATCH 138/304] Make 'AWSClient.AccountID' a getter - route53resolver. --- internal/service/route53resolver/config_test.go | 4 ++-- internal/service/route53resolver/dnssec_config_test.go | 2 +- internal/service/route53resolver/firewall_config_test.go | 2 +- .../service/route53resolver/firewall_rule_group_test.go | 8 ++++---- internal/service/route53resolver/query_log_config_test.go | 8 ++++---- internal/service/route53resolver/rule_test.go | 6 +++--- internal/service/route53resolver/sweep.go | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/internal/service/route53resolver/config_test.go b/internal/service/route53resolver/config_test.go index bd160f26799..a347a7868a3 100644 --- a/internal/service/route53resolver/config_test.go +++ b/internal/service/route53resolver/config_test.go @@ -37,7 +37,7 @@ func TestAccRoute53ResolverConfig_basic(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckConfigExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "autodefined_reverse_flag", string(awstypes.AutodefinedReverseFlagDisable)), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttrPair(resourceName, names.AttrResourceID, vpcResourceName, names.AttrID), ), }, @@ -51,7 +51,7 @@ func TestAccRoute53ResolverConfig_basic(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckConfigExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "autodefined_reverse_flag", string(awstypes.AutodefinedReverseFlagEnable)), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttrPair(resourceName, names.AttrResourceID, vpcResourceName, names.AttrID), ), }, diff --git a/internal/service/route53resolver/dnssec_config_test.go b/internal/service/route53resolver/dnssec_config_test.go index 6859c9ae6cf..1b1a8faf1da 100644 --- a/internal/service/route53resolver/dnssec_config_test.go +++ b/internal/service/route53resolver/dnssec_config_test.go @@ -35,7 +35,7 @@ func TestAccRoute53ResolverDNSSECConfig_basic(t *testing.T) { Config: testAccDNSSECConfigConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckDNSSECConfigExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "route53resolver", regexache.MustCompile(`resolver-dnssec-config/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "route53resolver", regexache.MustCompile(`resolver-dnssec-config/.+$`)), resource.TestCheckResourceAttrSet(resourceName, names.AttrID), resource.TestCheckResourceAttrSet(resourceName, names.AttrOwnerID), resource.TestCheckResourceAttrSet(resourceName, names.AttrResourceID), diff --git a/internal/service/route53resolver/firewall_config_test.go b/internal/service/route53resolver/firewall_config_test.go index 18237c405d7..036d8faa05e 100644 --- a/internal/service/route53resolver/firewall_config_test.go +++ b/internal/service/route53resolver/firewall_config_test.go @@ -36,7 +36,7 @@ func TestAccRoute53ResolverFirewallConfig_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckFirewallConfigExists(ctx, resourceName, &v), resource.TestCheckResourceAttr(resourceName, "firewall_fail_open", "ENABLED"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), ), }, { diff --git a/internal/service/route53resolver/firewall_rule_group_test.go b/internal/service/route53resolver/firewall_rule_group_test.go index 00f1ef1a732..ae8740d6ae8 100644 --- a/internal/service/route53resolver/firewall_rule_group_test.go +++ b/internal/service/route53resolver/firewall_rule_group_test.go @@ -37,7 +37,7 @@ func TestAccRoute53ResolverFirewallRuleGroup_basic(t *testing.T) { testAccCheckFirewallRuleGroupExists(ctx, resourceName, &v), resource.TestCheckResourceAttrSet(resourceName, names.AttrID), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "share_status", "NOT_SHARED"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), @@ -93,7 +93,7 @@ func TestAccRoute53ResolverFirewallRuleGroup_tags(t *testing.T) { testAccCheckFirewallRuleGroupExists(ctx, resourceName, &v), resource.TestCheckResourceAttrSet(resourceName, names.AttrID), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "share_status", "NOT_SHARED"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsKey1, acctest.CtValue1), @@ -110,7 +110,7 @@ func TestAccRoute53ResolverFirewallRuleGroup_tags(t *testing.T) { testAccCheckFirewallRuleGroupExists(ctx, resourceName, &v), resource.TestCheckResourceAttrSet(resourceName, names.AttrID), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "share_status", "NOT_SHARED"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "2"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsKey1, acctest.CtValue1Updated), @@ -123,7 +123,7 @@ func TestAccRoute53ResolverFirewallRuleGroup_tags(t *testing.T) { testAccCheckFirewallRuleGroupExists(ctx, resourceName, &v), resource.TestCheckResourceAttrSet(resourceName, names.AttrID), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "share_status", "NOT_SHARED"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsKey2, acctest.CtValue2), diff --git a/internal/service/route53resolver/query_log_config_test.go b/internal/service/route53resolver/query_log_config_test.go index b2abaf93ddc..aea6e9fffc3 100644 --- a/internal/service/route53resolver/query_log_config_test.go +++ b/internal/service/route53resolver/query_log_config_test.go @@ -38,7 +38,7 @@ func TestAccRoute53ResolverQueryLogConfig_basic(t *testing.T) { testAccCheckQueryLogConfigExists(ctx, resourceName, &v), resource.TestCheckResourceAttrPair(resourceName, names.AttrDestinationARN, s3BucketResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "share_status", "NOT_SHARED"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), @@ -95,7 +95,7 @@ func TestAccRoute53ResolverQueryLogConfig_tags(t *testing.T) { testAccCheckQueryLogConfigExists(ctx, resourceName, &v), resource.TestCheckResourceAttrPair(resourceName, names.AttrDestinationARN, cwLogGroupResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "share_status", "NOT_SHARED"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsKey1, acctest.CtValue1), @@ -112,7 +112,7 @@ func TestAccRoute53ResolverQueryLogConfig_tags(t *testing.T) { testAccCheckQueryLogConfigExists(ctx, resourceName, &v), resource.TestCheckResourceAttrPair(resourceName, names.AttrDestinationARN, cwLogGroupResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "share_status", "NOT_SHARED"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "2"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsKey1, acctest.CtValue1Updated), @@ -125,7 +125,7 @@ func TestAccRoute53ResolverQueryLogConfig_tags(t *testing.T) { testAccCheckQueryLogConfigExists(ctx, resourceName, &v), resource.TestCheckResourceAttrPair(resourceName, names.AttrDestinationARN, cwLogGroupResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "share_status", "NOT_SHARED"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsKey2, acctest.CtValue2), diff --git a/internal/service/route53resolver/rule_test.go b/internal/service/route53resolver/rule_test.go index 1e0a14076a2..b7495208385 100644 --- a/internal/service/route53resolver/rule_test.go +++ b/internal/service/route53resolver/rule_test.go @@ -39,7 +39,7 @@ func TestAccRoute53ResolverRule_basic(t *testing.T) { resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrDomainName, domainName), resource.TestCheckResourceAttr(resourceName, names.AttrName, ""), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "resolver_endpoint_id", ""), resource.TestCheckResourceAttr(resourceName, "rule_type", "SYSTEM"), resource.TestCheckResourceAttr(resourceName, "share_status", "NOT_SHARED"), @@ -144,7 +144,7 @@ func TestAccRoute53ResolverRule_justDotDomainName(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrDomainName, "."), resource.TestCheckResourceAttr(resourceName, "rule_type", "SYSTEM"), resource.TestCheckResourceAttr(resourceName, "share_status", "NOT_SHARED"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -175,7 +175,7 @@ func TestAccRoute53ResolverRule_trailingDotDomainName(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrDomainName, "example.com"), resource.TestCheckResourceAttr(resourceName, "rule_type", "SYSTEM"), resource.TestCheckResourceAttr(resourceName, "share_status", "NOT_SHARED"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, diff --git a/internal/service/route53resolver/sweep.go b/internal/service/route53resolver/sweep.go index 0a657f7de2f..fd390b29ae5 100644 --- a/internal/service/route53resolver/sweep.go +++ b/internal/service/route53resolver/sweep.go @@ -567,7 +567,7 @@ func sweepRules(region string) error { } for _, v := range page.ResolverRules { - if aws.ToString(v.OwnerId) != client.AccountID { + if aws.ToString(v.OwnerId) != client.AccountID(ctx) { continue } From 9a06c138b6d70d14552c53406eb079e097fa732a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:57 -0500 Subject: [PATCH 139/304] Make 'AWSClient.AccountID' a getter - rum. --- internal/service/rum/app_monitor.go | 2 +- internal/service/rum/app_monitor_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/service/rum/app_monitor.go b/internal/service/rum/app_monitor.go index 1b51a1a7106..1b7241af92b 100644 --- a/internal/service/rum/app_monitor.go +++ b/internal/service/rum/app_monitor.go @@ -212,7 +212,7 @@ func resourceAppMonitorRead(ctx context.Context, d *schema.ResourceData, meta in Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "rum", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: "appmonitor/" + name, }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/rum/app_monitor_test.go b/internal/service/rum/app_monitor_test.go index 19b5560a237..f1b37f4a19e 100644 --- a/internal/service/rum/app_monitor_test.go +++ b/internal/service/rum/app_monitor_test.go @@ -39,7 +39,7 @@ func TestAccRUMAppMonitor_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "app_monitor_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "app_monitor_configuration.0.session_sample_rate", "0.1"), resource.TestCheckResourceAttrSet(resourceName, "app_monitor_id"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "rum", fmt.Sprintf("appmonitor/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "rum", fmt.Sprintf("appmonitor/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cw_log_enabled", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, names.AttrDomain, "localhost"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), @@ -59,7 +59,7 @@ func TestAccRUMAppMonitor_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "app_monitor_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "app_monitor_configuration.0.session_sample_rate", "0.1"), resource.TestCheckResourceAttrSet(resourceName, "app_monitor_id"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "rum", fmt.Sprintf("appmonitor/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "rum", fmt.Sprintf("appmonitor/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cw_log_enabled", acctest.CtTrue), resource.TestCheckResourceAttrSet(resourceName, "cw_log_group"), resource.TestCheckResourceAttr(resourceName, names.AttrDomain, "localhost"), From 62fc3f269d68884927f6aa8d577abb2919983a31 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:57 -0500 Subject: [PATCH 140/304] Make 'AWSClient.AccountID' a getter - s3. --- internal/service/s3/bucket_inventory_test.go | 2 +- internal/service/s3/bucket_logging_test.go | 2 +- internal/service/s3/bucket_policy_test.go | 4 ++-- internal/service/s3/bucket_test.go | 2 +- internal/service/s3/directory_bucket_test.go | 2 +- internal/service/s3/object_test.go | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/internal/service/s3/bucket_inventory_test.go b/internal/service/s3/bucket_inventory_test.go index 29c059bdd2d..b0db2cc6248 100644 --- a/internal/service/s3/bucket_inventory_test.go +++ b/internal/service/s3/bucket_inventory_test.go @@ -52,7 +52,7 @@ func TestAccS3BucketInventory_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "destination.#", "1"), resource.TestCheckResourceAttr(resourceName, "destination.0.bucket.#", "1"), acctest.CheckResourceAttrGlobalARNNoAccount(resourceName, "destination.0.bucket.0.bucket_arn", "s3", rName), - acctest.CheckResourceAttrAccountID(resourceName, "destination.0.bucket.0.account_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "destination.0.bucket.0.account_id"), resource.TestCheckResourceAttr(resourceName, "destination.0.bucket.0.format", "ORC"), resource.TestCheckResourceAttr(resourceName, "destination.0.bucket.0.prefix", "inventory"), ), diff --git a/internal/service/s3/bucket_logging_test.go b/internal/service/s3/bucket_logging_test.go index e70b4f44d09..ce4175df886 100644 --- a/internal/service/s3/bucket_logging_test.go +++ b/internal/service/s3/bucket_logging_test.go @@ -373,7 +373,7 @@ func TestAccS3BucketLogging_withExpectedBucketOwner(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckBucketLoggingExists(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, names.AttrBucket, rName), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrExpectedBucketOwner), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrExpectedBucketOwner), resource.TestCheckResourceAttrPair(resourceName, "target_bucket", "aws_s3_bucket.log_bucket", names.AttrBucket), resource.TestCheckResourceAttr(resourceName, "target_grant.#", "0"), resource.TestCheckResourceAttr(resourceName, "target_object_key_format.#", "0"), diff --git a/internal/service/s3/bucket_policy_test.go b/internal/service/s3/bucket_policy_test.go index 6d6921918af..6e7639bcb5f 100644 --- a/internal/service/s3/bucket_policy_test.go +++ b/internal/service/s3/bucket_policy_test.go @@ -499,8 +499,8 @@ func testAccCheckBucketHasPolicy(ctx context.Context, n string, expectedPolicyTe } // Policy text must be generated inside a resource.TestCheckFunc in order for - // the acctest.AccountID() helper to function properly. - expectedPolicyText := fmt.Sprintf(expectedPolicyTemplate, acctest.AccountID(), acctest.Partition(), bucketName) + // the acctest.AccountID(ctx) helper to function properly. + expectedPolicyText := fmt.Sprintf(expectedPolicyTemplate, acctest.AccountID(ctx), acctest.Partition(), bucketName) equivalent, err := awspolicy.PoliciesAreEquivalent(policy, expectedPolicyText) if err != nil { return fmt.Errorf("Error testing policy equivalence: %s", err) diff --git a/internal/service/s3/bucket_test.go b/internal/service/s3/bucket_test.go index 80fb15f9812..f436a82207e 100644 --- a/internal/service/s3/bucket_test.go +++ b/internal/service/s3/bucket_test.go @@ -1708,7 +1708,7 @@ func TestAccS3Bucket_Replication_schemaV2SameRegion(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckBucketExists(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, "replication_configuration.#", "1"), - acctest.CheckResourceAttrGlobalARN(resourceName, "replication_configuration.0.role", "iam", fmt.Sprintf("role/%s", rName)), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, "replication_configuration.0.role", "iam", fmt.Sprintf("role/%s", rName)), resource.TestCheckResourceAttr(resourceName, "replication_configuration.0.rules.#", "1"), testAccCheckBucketExists(ctx, destinationResourceName), ), diff --git a/internal/service/s3/directory_bucket_test.go b/internal/service/s3/directory_bucket_test.go index a5a1d9db261..872f66de277 100644 --- a/internal/service/s3/directory_bucket_test.go +++ b/internal/service/s3/directory_bucket_test.go @@ -34,7 +34,7 @@ func TestAccS3DirectoryBucket_basic(t *testing.T) { Config: testAccDirectoryBucketConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckDirectoryBucketExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "s3express", regexache.MustCompile(fmt.Sprintf(`bucket/%s--.*-x-s3`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "s3express", regexache.MustCompile(fmt.Sprintf(`bucket/%s--.*-x-s3`, rName))), resource.TestCheckResourceAttr(resourceName, "data_redundancy", "SingleAvailabilityZone"), resource.TestCheckResourceAttr(resourceName, "location.#", "1"), resource.TestCheckResourceAttrSet(resourceName, "location.0.name"), diff --git a/internal/service/s3/object_test.go b/internal/service/s3/object_test.go index 41e3b49f92a..871d9bfc99b 100644 --- a/internal/service/s3/object_test.go +++ b/internal/service/s3/object_test.go @@ -652,7 +652,7 @@ func TestAccS3Object_updatesWithVersioningViaAccessPoint(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckObjectExists(ctx, resourceName, &originalObj), testAccCheckObjectBody(&originalObj, "initial versioned object state"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "s3", fmt.Sprintf("accesspoint/%s/updateable-key", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "s3", fmt.Sprintf("accesspoint/%s/updateable-key", rName)), resource.TestCheckResourceAttrPair(resourceName, names.AttrBucket, accessPointResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "etag", "cee4407fa91906284e2a5e5e03e86b1b"), ), From 330f8db799bac0fde3514aa5b5331a89ab8a98a8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:57 -0500 Subject: [PATCH 141/304] Make 'AWSClient.AccountID' a getter - s3control. --- internal/service/s3control/access_grant.go | 2 +- .../service/s3control/access_grant_test.go | 2 +- .../s3control/access_grants_instance.go | 2 +- .../access_grants_instance_resource_policy.go | 2 +- ...ss_grants_instance_resource_policy_test.go | 2 +- .../s3control/access_grants_instance_test.go | 2 +- .../s3control/access_grants_location.go | 2 +- .../s3control/access_grants_location_test.go | 2 +- internal/service/s3control/access_point.go | 2 +- .../service/s3control/access_point_test.go | 26 +++++++++---------- .../s3control/account_public_access_block.go | 2 +- ...account_public_access_block_data_source.go | 2 +- .../account_public_access_block_test.go | 4 +-- internal/service/s3control/bucket_test.go | 2 +- .../s3control/multi_region_access_point.go | 2 +- .../multi_region_access_point_data_source.go | 2 +- .../multi_region_access_point_policy.go | 2 +- .../multi_region_access_point_policy_test.go | 2 +- .../multi_region_access_point_test.go | 6 ++--- .../s3control/object_lambda_access_point.go | 2 +- .../object_lambda_access_point_policy.go | 2 +- .../object_lambda_access_point_policy_test.go | 6 ++--- .../object_lambda_access_point_test.go | 12 ++++----- .../s3control/storage_lens_configuration.go | 2 +- .../storage_lens_configuration_test.go | 24 ++++++++--------- internal/service/s3control/sweep.go | 14 +++++----- 26 files changed, 65 insertions(+), 65 deletions(-) diff --git a/internal/service/s3control/access_grant.go b/internal/service/s3control/access_grant.go index 6bd3274a3fa..4f7e38caed8 100644 --- a/internal/service/s3control/access_grant.go +++ b/internal/service/s3control/access_grant.go @@ -167,7 +167,7 @@ func (r *accessGrantResource) Create(ctx context.Context, request resource.Creat conn := r.Meta().S3ControlClient(ctx) if data.AccountID.ValueString() == "" { - data.AccountID = types.StringValue(r.Meta().AccountID) + data.AccountID = types.StringValue(r.Meta().AccountID(ctx)) } input := &s3control.CreateAccessGrantInput{} response.Diagnostics.Append(fwflex.Expand(ctx, data, input)...) diff --git a/internal/service/s3control/access_grant_test.go b/internal/service/s3control/access_grant_test.go index a1e8ae4f241..8474999fdf3 100644 --- a/internal/service/s3control/access_grant_test.go +++ b/internal/service/s3control/access_grant_test.go @@ -37,7 +37,7 @@ func testAccAccessGrant_basic(t *testing.T) { resource.TestCheckResourceAttrSet(resourceName, "access_grant_id"), resource.TestCheckResourceAttrSet(resourceName, "access_grants_location_id"), resource.TestCheckResourceAttr(resourceName, "access_grants_location_configuration.#", "0"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrAccountID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrAccountID), resource.TestCheckResourceAttrSet(resourceName, "grant_scope"), resource.TestCheckResourceAttr(resourceName, "permission", "READ"), resource.TestCheckNoResourceAttr(resourceName, "s3_prefix_type"), diff --git a/internal/service/s3control/access_grants_instance.go b/internal/service/s3control/access_grants_instance.go index 5f13ed28592..24ce989902a 100644 --- a/internal/service/s3control/access_grants_instance.go +++ b/internal/service/s3control/access_grants_instance.go @@ -99,7 +99,7 @@ func (r *accessGrantsInstanceResource) Create(ctx context.Context, request resou conn := r.Meta().S3ControlClient(ctx) if data.AccountID.ValueString() == "" { - data.AccountID = types.StringValue(r.Meta().AccountID) + data.AccountID = types.StringValue(r.Meta().AccountID(ctx)) } input := &s3control.CreateAccessGrantsInstanceInput{ AccountId: flex.StringFromFramework(ctx, data.AccountID), diff --git a/internal/service/s3control/access_grants_instance_resource_policy.go b/internal/service/s3control/access_grants_instance_resource_policy.go index d01af9e594f..abc90bc3ddb 100644 --- a/internal/service/s3control/access_grants_instance_resource_policy.go +++ b/internal/service/s3control/access_grants_instance_resource_policy.go @@ -77,7 +77,7 @@ func (r *accessGrantsInstanceResourcePolicyResource) Create(ctx context.Context, conn := r.Meta().S3ControlClient(ctx) if data.AccountID.ValueString() == "" { - data.AccountID = types.StringValue(r.Meta().AccountID) + data.AccountID = types.StringValue(r.Meta().AccountID(ctx)) } input := &s3control.PutAccessGrantsInstanceResourcePolicyInput{ AccountId: flex.StringFromFramework(ctx, data.AccountID), diff --git a/internal/service/s3control/access_grants_instance_resource_policy_test.go b/internal/service/s3control/access_grants_instance_resource_policy_test.go index c213ee29024..bfd9da857f0 100644 --- a/internal/service/s3control/access_grants_instance_resource_policy_test.go +++ b/internal/service/s3control/access_grants_instance_resource_policy_test.go @@ -31,7 +31,7 @@ func testAccAccessGrantsInstanceResourcePolicy_basic(t *testing.T) { Config: testAccAccessGrantsInstanceResourcePolicyConfig_basic(`"s3:ListAccessGrants","s3:ListAccessGrantsLocations","s3:GetDataAccess"`), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckAccessGrantsInstanceResourcePolicyExists(ctx, resourceName), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrAccountID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrAccountID), resource.TestCheckResourceAttrSet(resourceName, names.AttrPolicy), ), }, diff --git a/internal/service/s3control/access_grants_instance_test.go b/internal/service/s3control/access_grants_instance_test.go index 15734f5f866..4c9b5e01d70 100644 --- a/internal/service/s3control/access_grants_instance_test.go +++ b/internal/service/s3control/access_grants_instance_test.go @@ -33,7 +33,7 @@ func testAccAccessGrantsInstance_basic(t *testing.T) { testAccCheckAccessGrantsInstanceExists(ctx, resourceName), resource.TestCheckResourceAttrSet(resourceName, "access_grants_instance_arn"), resource.TestCheckResourceAttrSet(resourceName, "access_grants_instance_id"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrAccountID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrAccountID), resource.TestCheckNoResourceAttr(resourceName, "identity_center_application_arn"), resource.TestCheckNoResourceAttr(resourceName, "identity_center_arn"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), diff --git a/internal/service/s3control/access_grants_location.go b/internal/service/s3control/access_grants_location.go index 9443dfb0910..e29fdacea73 100644 --- a/internal/service/s3control/access_grants_location.go +++ b/internal/service/s3control/access_grants_location.go @@ -100,7 +100,7 @@ func (r *accessGrantsLocationResource) Create(ctx context.Context, request resou conn := r.Meta().S3ControlClient(ctx) if data.AccountID.ValueString() == "" { - data.AccountID = types.StringValue(r.Meta().AccountID) + data.AccountID = types.StringValue(r.Meta().AccountID(ctx)) } input := &s3control.CreateAccessGrantsLocationInput{} response.Diagnostics.Append(fwflex.Expand(ctx, data, input)...) diff --git a/internal/service/s3control/access_grants_location_test.go b/internal/service/s3control/access_grants_location_test.go index d3922b6c729..596db14291a 100644 --- a/internal/service/s3control/access_grants_location_test.go +++ b/internal/service/s3control/access_grants_location_test.go @@ -35,7 +35,7 @@ func testAccAccessGrantsLocation_basic(t *testing.T) { testAccCheckAccessGrantsLocationExists(ctx, resourceName), resource.TestCheckResourceAttrSet(resourceName, "access_grants_location_arn"), resource.TestCheckResourceAttrSet(resourceName, "access_grants_location_id"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrAccountID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrAccountID), resource.TestCheckResourceAttr(resourceName, "location_scope", "s3://"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), diff --git a/internal/service/s3control/access_point.go b/internal/service/s3control/access_point.go index 91e88623098..4d37b7aec58 100644 --- a/internal/service/s3control/access_point.go +++ b/internal/service/s3control/access_point.go @@ -162,7 +162,7 @@ func resourceAccessPointCreate(ctx context.Context, d *schema.ResourceData, meta var diags diag.Diagnostics conn := meta.(*conns.AWSClient).S3ControlClient(ctx) - accountID := meta.(*conns.AWSClient).AccountID + accountID := meta.(*conns.AWSClient).AccountID(ctx) if v, ok := d.GetOk(names.AttrAccountID); ok { accountID = v.(string) } diff --git a/internal/service/s3control/access_point_test.go b/internal/service/s3control/access_point_test.go index 9239a6a6c8a..24cfc78f276 100644 --- a/internal/service/s3control/access_point_test.go +++ b/internal/service/s3control/access_point_test.go @@ -38,12 +38,12 @@ func TestAccS3ControlAccessPoint_basic(t *testing.T) { Config: testAccAccessPointConfig_basic(bucketName, accessPointName), Check: resource.ComposeTestCheckFunc( testAccCheckAccessPointExists(ctx, resourceName, &v), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrAccountID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrAccountID), // https://docs.aws.amazon.com/AmazonS3/latest/userguide/access-points-alias.html: resource.TestMatchResourceAttr(resourceName, names.AttrAlias, regexache.MustCompile(`^.*-s3alias$`)), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "s3", fmt.Sprintf("accesspoint/%s", accessPointName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "s3", fmt.Sprintf("accesspoint/%s", accessPointName)), resource.TestCheckResourceAttr(resourceName, names.AttrBucket, bucketName), - acctest.CheckResourceAttrAccountID(resourceName, "bucket_account_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "bucket_account_id"), acctest.MatchResourceAttrRegionalHostname(resourceName, names.AttrDomainName, "s3-accesspoint", regexache.MustCompile(fmt.Sprintf("^%s-\\d{12}", accessPointName))), resource.TestCheckResourceAttr(resourceName, "endpoints.%", "4"), resource.TestCheckResourceAttr(resourceName, "has_public_access_policy", acctest.CtFalse), @@ -108,8 +108,8 @@ func TestAccS3ControlAccessPoint_Bucket_arn(t *testing.T) { Config: testAccAccessPointConfig_bucketARN(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAccessPointExists(ctx, resourceName, &v), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrAccountID), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "s3-outposts", fmt.Sprintf("outpost/[^/]+/accesspoint/%s", rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrAccountID), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "s3-outposts", fmt.Sprintf("outpost/[^/]+/accesspoint/%s", rName)), resource.TestCheckResourceAttrPair(resourceName, names.AttrBucket, "aws_s3control_bucket.test", names.AttrARN), acctest.MatchResourceAttrRegionalHostname(resourceName, names.AttrDomainName, "s3-accesspoint", regexache.MustCompile(fmt.Sprintf("^%s-\\d{12}", rName))), resource.TestCheckResourceAttr(resourceName, "has_public_access_policy", acctest.CtFalse), @@ -156,7 +156,7 @@ func TestAccS3ControlAccessPoint_policy(t *testing.T) { ] } ] -}`, acctest.Partition(), acctest.Region(), acctest.AccountID(), rName) +}`, acctest.Partition(), acctest.Region(), acctest.AccountID(ctx), rName) } expectedPolicyText2 := func() string { return fmt.Sprintf(`{ @@ -177,7 +177,7 @@ func TestAccS3ControlAccessPoint_policy(t *testing.T) { ] } ] -}`, acctest.Partition(), acctest.Region(), acctest.AccountID(), rName) +}`, acctest.Partition(), acctest.Region(), acctest.AccountID(ctx), rName) } resource.ParallelTest(t, resource.TestCase{ @@ -191,8 +191,8 @@ func TestAccS3ControlAccessPoint_policy(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAccessPointExists(ctx, resourceName, &v), testAccCheckAccessPointHasPolicy(ctx, resourceName, expectedPolicyText1), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrAccountID), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "s3", fmt.Sprintf("accesspoint/%s", rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrAccountID), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "s3", fmt.Sprintf("accesspoint/%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrBucket, rName), resource.TestCheckResourceAttr(resourceName, "has_public_access_policy", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), @@ -244,8 +244,8 @@ func TestAccS3ControlAccessPoint_publicAccessBlock(t *testing.T) { Config: testAccAccessPointConfig_publicBlock(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAccessPointExists(ctx, resourceName, &v), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrAccountID), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "s3", fmt.Sprintf("accesspoint/%s", rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrAccountID), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "s3", fmt.Sprintf("accesspoint/%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrBucket, rName), resource.TestCheckResourceAttr(resourceName, "has_public_access_policy", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), @@ -285,8 +285,8 @@ func TestAccS3ControlAccessPoint_vpc(t *testing.T) { Config: testAccAccessPointConfig_vpc(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAccessPointExists(ctx, resourceName, &v), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrAccountID), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "s3", fmt.Sprintf("accesspoint/%s", rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrAccountID), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "s3", fmt.Sprintf("accesspoint/%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrBucket, rName), resource.TestCheckResourceAttr(resourceName, "has_public_access_policy", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), diff --git a/internal/service/s3control/account_public_access_block.go b/internal/service/s3control/account_public_access_block.go index fa3e60497a0..dc39feb6aa6 100644 --- a/internal/service/s3control/account_public_access_block.go +++ b/internal/service/s3control/account_public_access_block.go @@ -72,7 +72,7 @@ func resourceAccountPublicAccessBlockCreate(ctx context.Context, d *schema.Resou var diags diag.Diagnostics conn := meta.(*conns.AWSClient).S3ControlClient(ctx) - accountID := meta.(*conns.AWSClient).AccountID + accountID := meta.(*conns.AWSClient).AccountID(ctx) if v, ok := d.GetOk(names.AttrAccountID); ok { accountID = v.(string) } diff --git a/internal/service/s3control/account_public_access_block_data_source.go b/internal/service/s3control/account_public_access_block_data_source.go index 4f43908828c..e93bed5c718 100644 --- a/internal/service/s3control/account_public_access_block_data_source.go +++ b/internal/service/s3control/account_public_access_block_data_source.go @@ -49,7 +49,7 @@ func dataSourceAccountPublicAccessBlockRead(ctx context.Context, d *schema.Resou var diags diag.Diagnostics conn := meta.(*conns.AWSClient).S3ControlClient(ctx) - accountID := meta.(*conns.AWSClient).AccountID + accountID := meta.(*conns.AWSClient).AccountID(ctx) if v, ok := d.GetOk(names.AttrAccountID); ok { accountID = v.(string) } diff --git a/internal/service/s3control/account_public_access_block_test.go b/internal/service/s3control/account_public_access_block_test.go index 841957214a0..307919df80f 100644 --- a/internal/service/s3control/account_public_access_block_test.go +++ b/internal/service/s3control/account_public_access_block_test.go @@ -55,7 +55,7 @@ func testAccAccountPublicAccessBlock_basic(t *testing.T) { Config: testAccAccountPublicAccessBlockConfig_basic(), Check: resource.ComposeTestCheckFunc( testAccCheckAccountPublicAccessBlockExists(ctx, resourceName, &v), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrAccountID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrAccountID), resource.TestCheckResourceAttr(resourceName, "block_public_acls", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "block_public_policy", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "ignore_public_acls", acctest.CtFalse), @@ -109,7 +109,7 @@ func testAccAccountPublicAccessBlock_AccountID(t *testing.T) { Config: testAccAccountPublicAccessBlockConfig_id(), Check: resource.ComposeTestCheckFunc( testAccCheckAccountPublicAccessBlockExists(ctx, resourceName, &v), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrAccountID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrAccountID), ), }, { diff --git a/internal/service/s3control/bucket_test.go b/internal/service/s3control/bucket_test.go index 8a35257c86d..6ba054a4c37 100644 --- a/internal/service/s3control/bucket_test.go +++ b/internal/service/s3control/bucket_test.go @@ -35,7 +35,7 @@ func TestAccS3ControlBucket_basic(t *testing.T) { Config: testAccBucketConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckBucketExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "s3-outposts", regexache.MustCompile(fmt.Sprintf("outpost/[^/]+/bucket/%s", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "s3-outposts", regexache.MustCompile(fmt.Sprintf("outpost/[^/]+/bucket/%s", rName))), resource.TestCheckResourceAttr(resourceName, names.AttrBucket, rName), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreationDate), resource.TestCheckResourceAttrPair(resourceName, "outpost_id", "data.aws_outposts_outpost.test", names.AttrID), diff --git a/internal/service/s3control/multi_region_access_point.go b/internal/service/s3control/multi_region_access_point.go index 40c13b19519..3adad262e91 100644 --- a/internal/service/s3control/multi_region_access_point.go +++ b/internal/service/s3control/multi_region_access_point.go @@ -155,7 +155,7 @@ func resourceMultiRegionAccessPointCreate(ctx context.Context, d *schema.Resourc var diags diag.Diagnostics conn := meta.(*conns.AWSClient).S3ControlClient(ctx) - accountID := meta.(*conns.AWSClient).AccountID + accountID := meta.(*conns.AWSClient).AccountID(ctx) if v, ok := d.GetOk(names.AttrAccountID); ok { accountID = v.(string) } diff --git a/internal/service/s3control/multi_region_access_point_data_source.go b/internal/service/s3control/multi_region_access_point_data_source.go index 35a60c62a42..b1566ca28ee 100644 --- a/internal/service/s3control/multi_region_access_point_data_source.go +++ b/internal/service/s3control/multi_region_access_point_data_source.go @@ -106,7 +106,7 @@ func dataSourceMultiRegionAccessPointBlockRead(ctx context.Context, d *schema.Re var diags diag.Diagnostics conn := meta.(*conns.AWSClient).S3ControlClient(ctx) - accountID := meta.(*conns.AWSClient).AccountID + accountID := meta.(*conns.AWSClient).AccountID(ctx) if v, ok := d.GetOk(names.AttrAccountID); ok { accountID = v.(string) } diff --git a/internal/service/s3control/multi_region_access_point_policy.go b/internal/service/s3control/multi_region_access_point_policy.go index 975f9f11e29..4b1071554c4 100644 --- a/internal/service/s3control/multi_region_access_point_policy.go +++ b/internal/service/s3control/multi_region_access_point_policy.go @@ -92,7 +92,7 @@ func resourceMultiRegionAccessPointPolicyCreate(ctx context.Context, d *schema.R var diags diag.Diagnostics conn := meta.(*conns.AWSClient).S3ControlClient(ctx) - accountID := meta.(*conns.AWSClient).AccountID + accountID := meta.(*conns.AWSClient).AccountID(ctx) if v, ok := d.GetOk(names.AttrAccountID); ok { accountID = v.(string) } diff --git a/internal/service/s3control/multi_region_access_point_policy_test.go b/internal/service/s3control/multi_region_access_point_policy_test.go index 8193fb37d23..1403f9f91f2 100644 --- a/internal/service/s3control/multi_region_access_point_policy_test.go +++ b/internal/service/s3control/multi_region_access_point_policy_test.go @@ -39,7 +39,7 @@ func TestAccS3ControlMultiRegionAccessPointPolicy_basic(t *testing.T) { Config: testAccMultiRegionAccessPointPolicyConfig_basic(bucketName, multiRegionAccessPointName), Check: resource.ComposeTestCheckFunc( testAccCheckMultiRegionAccessPointPolicyExists(ctx, resourceName, &v), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrAccountID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrAccountID), resource.TestCheckResourceAttr(resourceName, "details.#", "1"), resource.TestCheckResourceAttr(resourceName, "details.0.name", multiRegionAccessPointName), resource.TestCheckResourceAttrSet(resourceName, "details.0.policy"), diff --git a/internal/service/s3control/multi_region_access_point_test.go b/internal/service/s3control/multi_region_access_point_test.go index 7045119cb14..05a1060c9ba 100644 --- a/internal/service/s3control/multi_region_access_point_test.go +++ b/internal/service/s3control/multi_region_access_point_test.go @@ -39,9 +39,9 @@ func TestAccS3ControlMultiRegionAccessPoint_basic(t *testing.T) { Config: testAccMultiRegionAccessPointConfig_basic(bucketName, rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckMultiRegionAccessPointExists(ctx, resourceName, &v), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrAccountID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrAccountID), resource.TestMatchResourceAttr(resourceName, names.AttrAlias, regexache.MustCompile(`^[a-z][0-9a-z]*[.]mrap$`)), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "s3", regexache.MustCompile(`accesspoint\/[a-z][0-9a-z]*[.]mrap$`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "s3", regexache.MustCompile(`accesspoint\/[a-z][0-9a-z]*[.]mrap$`)), acctest.MatchResourceAttrGlobalHostname(resourceName, names.AttrDomainName, "accesspoint.s3-global", regexache.MustCompile(`^[a-z][0-9a-z]*[.]mrap`)), resource.TestCheckResourceAttr(resourceName, "details.#", "1"), resource.TestCheckResourceAttr(resourceName, "details.0.name", rName), @@ -53,7 +53,7 @@ func TestAccS3ControlMultiRegionAccessPoint_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "details.0.region.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "details.0.region.*", map[string]string{ names.AttrBucket: bucketName, - "bucket_account_id": acctest.AccountID(), + "bucket_account_id": acctest.AccountID(ctx), names.AttrRegion: acctest.Region(), }), resource.TestCheckResourceAttr(resourceName, names.AttrStatus, string(types.MultiRegionAccessPointStatusReady)), diff --git a/internal/service/s3control/object_lambda_access_point.go b/internal/service/s3control/object_lambda_access_point.go index 2f58a7ff898..371bb3b35a2 100644 --- a/internal/service/s3control/object_lambda_access_point.go +++ b/internal/service/s3control/object_lambda_access_point.go @@ -137,7 +137,7 @@ func resourceObjectLambdaAccessPointCreate(ctx context.Context, d *schema.Resour var diags diag.Diagnostics conn := meta.(*conns.AWSClient).S3ControlClient(ctx) - accountID := meta.(*conns.AWSClient).AccountID + accountID := meta.(*conns.AWSClient).AccountID(ctx) if v, ok := d.GetOk(names.AttrAccountID); ok { accountID = v.(string) } diff --git a/internal/service/s3control/object_lambda_access_point_policy.go b/internal/service/s3control/object_lambda_access_point_policy.go index cbadf48daa4..75069789684 100644 --- a/internal/service/s3control/object_lambda_access_point_policy.go +++ b/internal/service/s3control/object_lambda_access_point_policy.go @@ -75,7 +75,7 @@ func resourceObjectLambdaAccessPointPolicyCreate(ctx context.Context, d *schema. return sdkdiag.AppendFromErr(diags, err) } - accountID := meta.(*conns.AWSClient).AccountID + accountID := meta.(*conns.AWSClient).AccountID(ctx) if v, ok := d.GetOk(names.AttrAccountID); ok { accountID = v.(string) } diff --git a/internal/service/s3control/object_lambda_access_point_policy_test.go b/internal/service/s3control/object_lambda_access_point_policy_test.go index dfc5e1ba27c..6f53664f8ee 100644 --- a/internal/service/s3control/object_lambda_access_point_policy_test.go +++ b/internal/service/s3control/object_lambda_access_point_policy_test.go @@ -33,7 +33,7 @@ func TestAccS3ControlObjectLambdaAccessPointPolicy_basic(t *testing.T) { Config: testAccObjectLambdaAccessPointPolicyConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckObjectLambdaAccessPointPolicyExists(ctx, resourceName), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrAccountID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrAccountID), resource.TestCheckResourceAttr(resourceName, "has_public_access_policy", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttrSet(resourceName, names.AttrPolicy), @@ -110,7 +110,7 @@ func TestAccS3ControlObjectLambdaAccessPointPolicy_update(t *testing.T) { Config: testAccObjectLambdaAccessPointPolicyConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckObjectLambdaAccessPointPolicyExists(ctx, resourceName), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrAccountID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrAccountID), resource.TestCheckResourceAttr(resourceName, "has_public_access_policy", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttrSet(resourceName, names.AttrPolicy), @@ -125,7 +125,7 @@ func TestAccS3ControlObjectLambdaAccessPointPolicy_update(t *testing.T) { Config: testAccObjectLambdaAccessPointPolicyConfig_updated(rName), Check: resource.ComposeTestCheckFunc( testAccCheckObjectLambdaAccessPointPolicyExists(ctx, resourceName), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrAccountID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrAccountID), resource.TestCheckResourceAttr(resourceName, "has_public_access_policy", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttrSet(resourceName, names.AttrPolicy), diff --git a/internal/service/s3control/object_lambda_access_point_test.go b/internal/service/s3control/object_lambda_access_point_test.go index ed5efe36236..4bc38f580dc 100644 --- a/internal/service/s3control/object_lambda_access_point_test.go +++ b/internal/service/s3control/object_lambda_access_point_test.go @@ -38,9 +38,9 @@ func TestAccS3ControlObjectLambdaAccessPoint_basic(t *testing.T) { Config: testAccObjectLambdaAccessPointConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckObjectLambdaAccessPointExists(ctx, resourceName, &v), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrAccountID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrAccountID), resource.TestMatchResourceAttr(resourceName, names.AttrAlias, regexache.MustCompile("^.{1,20}-.*--ol-s3$")), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "s3-object-lambda", fmt.Sprintf("accesspoint/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "s3-object-lambda", fmt.Sprintf("accesspoint/%s", rName)), resource.TestCheckResourceAttr(resourceName, "configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "configuration.0.allowed_features.#", "0"), resource.TestCheckResourceAttr(resourceName, "configuration.0.cloud_watch_metrics_enabled", acctest.CtFalse), @@ -107,8 +107,8 @@ func TestAccS3ControlObjectLambdaAccessPoint_update(t *testing.T) { Config: testAccObjectLambdaAccessPointConfig_optionals(rName), Check: resource.ComposeTestCheckFunc( testAccCheckObjectLambdaAccessPointExists(ctx, resourceName, &v), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrAccountID), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "s3-object-lambda", fmt.Sprintf("accesspoint/%s", rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrAccountID), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "s3-object-lambda", fmt.Sprintf("accesspoint/%s", rName)), resource.TestCheckResourceAttr(resourceName, "configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "configuration.0.allowed_features.#", "2"), resource.TestCheckTypeSetElemAttr(resourceName, "configuration.0.allowed_features.*", "GetObject-PartNumber"), @@ -135,8 +135,8 @@ func TestAccS3ControlObjectLambdaAccessPoint_update(t *testing.T) { Config: testAccObjectLambdaAccessPointConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckObjectLambdaAccessPointExists(ctx, resourceName, &v), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrAccountID), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "s3-object-lambda", fmt.Sprintf("accesspoint/%s", rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrAccountID), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "s3-object-lambda", fmt.Sprintf("accesspoint/%s", rName)), resource.TestCheckResourceAttr(resourceName, "configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "configuration.0.allowed_features.#", "0"), resource.TestCheckResourceAttr(resourceName, "configuration.0.cloud_watch_metrics_enabled", acctest.CtFalse), diff --git a/internal/service/s3control/storage_lens_configuration.go b/internal/service/s3control/storage_lens_configuration.go index c1f95e1a3b2..7c6d919263f 100644 --- a/internal/service/s3control/storage_lens_configuration.go +++ b/internal/service/s3control/storage_lens_configuration.go @@ -398,7 +398,7 @@ func resourceStorageLensConfigurationCreate(ctx context.Context, d *schema.Resou var diags diag.Diagnostics conn := meta.(*conns.AWSClient).S3ControlClient(ctx) - accountID := meta.(*conns.AWSClient).AccountID + accountID := meta.(*conns.AWSClient).AccountID(ctx) if v, ok := d.GetOk(names.AttrAccountID); ok { accountID = v.(string) } diff --git a/internal/service/s3control/storage_lens_configuration_test.go b/internal/service/s3control/storage_lens_configuration_test.go index 9ac0efdfc3d..fee3df78070 100644 --- a/internal/service/s3control/storage_lens_configuration_test.go +++ b/internal/service/s3control/storage_lens_configuration_test.go @@ -33,8 +33,8 @@ func TestAccS3ControlStorageLensConfiguration_basic(t *testing.T) { Config: testAccStorageLensConfigurationConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckStorageLensConfigurationExists(ctx, resourceName), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrAccountID), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "s3", fmt.Sprintf("storage-lens/%s", rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrAccountID), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "s3", fmt.Sprintf("storage-lens/%s", rName)), resource.TestCheckResourceAttr(resourceName, "storage_lens_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "storage_lens_configuration.0.account_level.#", "1"), resource.TestCheckResourceAttr(resourceName, "storage_lens_configuration.0.account_level.0.activity_metrics.#", "0"), @@ -147,8 +147,8 @@ func TestAccS3ControlStorageLensConfiguration_update(t *testing.T) { Config: testAccStorageLensConfigurationConfig_allAttributes(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckStorageLensConfigurationExists(ctx, resourceName), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrAccountID), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "s3", fmt.Sprintf("storage-lens/%s", rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrAccountID), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "s3", fmt.Sprintf("storage-lens/%s", rName)), resource.TestCheckResourceAttr(resourceName, "storage_lens_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "storage_lens_configuration.0.account_level.#", "1"), resource.TestCheckResourceAttr(resourceName, "storage_lens_configuration.0.account_level.0.activity_metrics.#", "1"), @@ -174,7 +174,7 @@ func TestAccS3ControlStorageLensConfiguration_update(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "storage_lens_configuration.0.data_export.0.cloud_watch_metrics.#", "1"), resource.TestCheckResourceAttr(resourceName, "storage_lens_configuration.0.data_export.0.cloud_watch_metrics.0.enabled", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "storage_lens_configuration.0.data_export.0.s3_bucket_destination.#", "1"), - acctest.CheckResourceAttrAccountID(resourceName, "storage_lens_configuration.0.data_export.0.s3_bucket_destination.0.account_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "storage_lens_configuration.0.data_export.0.s3_bucket_destination.0.account_id"), resource.TestCheckResourceAttrSet(resourceName, "storage_lens_configuration.0.data_export.0.s3_bucket_destination.0.arn"), resource.TestCheckResourceAttr(resourceName, "storage_lens_configuration.0.data_export.0.s3_bucket_destination.0.encryption.#", "0"), resource.TestCheckResourceAttr(resourceName, "storage_lens_configuration.0.data_export.0.s3_bucket_destination.0.format", "CSV"), @@ -197,8 +197,8 @@ func TestAccS3ControlStorageLensConfiguration_update(t *testing.T) { Config: testAccStorageLensConfigurationConfig_allAttributesUpdated(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckStorageLensConfigurationExists(ctx, resourceName), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrAccountID), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "s3", fmt.Sprintf("storage-lens/%s", rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrAccountID), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "s3", fmt.Sprintf("storage-lens/%s", rName)), resource.TestCheckResourceAttr(resourceName, "storage_lens_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "storage_lens_configuration.0.account_level.#", "1"), resource.TestCheckResourceAttr(resourceName, "storage_lens_configuration.0.account_level.0.activity_metrics.#", "1"), @@ -218,7 +218,7 @@ func TestAccS3ControlStorageLensConfiguration_update(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "storage_lens_configuration.0.data_export.0.cloud_watch_metrics.#", "1"), resource.TestCheckResourceAttr(resourceName, "storage_lens_configuration.0.data_export.0.cloud_watch_metrics.0.enabled", acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, "storage_lens_configuration.0.data_export.0.s3_bucket_destination.#", "1"), - acctest.CheckResourceAttrAccountID(resourceName, "storage_lens_configuration.0.data_export.0.s3_bucket_destination.0.account_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "storage_lens_configuration.0.data_export.0.s3_bucket_destination.0.account_id"), resource.TestCheckResourceAttrSet(resourceName, "storage_lens_configuration.0.data_export.0.s3_bucket_destination.0.arn"), resource.TestCheckResourceAttr(resourceName, "storage_lens_configuration.0.data_export.0.s3_bucket_destination.0.encryption.#", "1"), resource.TestCheckResourceAttr(resourceName, "storage_lens_configuration.0.data_export.0.s3_bucket_destination.0.encryption.0.sse_kms.#", "0"), @@ -253,8 +253,8 @@ func TestAccS3ControlStorageLensConfiguration_advancedMetrics(t *testing.T) { Config: testAccStorageLensConfigurationConfig_advancedMetrics(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckStorageLensConfigurationExists(ctx, resourceName), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrAccountID), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "s3", fmt.Sprintf("storage-lens/%s", rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrAccountID), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "s3", fmt.Sprintf("storage-lens/%s", rName)), resource.TestCheckResourceAttr(resourceName, "storage_lens_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "storage_lens_configuration.0.account_level.#", "1"), resource.TestCheckResourceAttr(resourceName, "storage_lens_configuration.0.account_level.0.activity_metrics.#", "1"), @@ -295,8 +295,8 @@ func TestAccS3ControlStorageLensConfiguration_advancedMetrics(t *testing.T) { Config: testAccStorageLensConfigurationConfig_freeMetrics(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckStorageLensConfigurationExists(ctx, resourceName), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrAccountID), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "s3", fmt.Sprintf("storage-lens/%s", rName)), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrAccountID), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "s3", fmt.Sprintf("storage-lens/%s", rName)), resource.TestCheckResourceAttr(resourceName, "storage_lens_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "storage_lens_configuration.0.account_level.#", "1"), resource.TestCheckResourceAttr(resourceName, "storage_lens_configuration.0.account_level.0.activity_metrics.#", "0"), diff --git a/internal/service/s3control/sweep.go b/internal/service/s3control/sweep.go index 127f3416133..86a435a8725 100644 --- a/internal/service/s3control/sweep.go +++ b/internal/service/s3control/sweep.go @@ -70,7 +70,7 @@ func sweepAccessGrants(region string) error { return fmt.Errorf("error getting client: %s", err) } conn := client.S3ControlClient(ctx) - accountID := client.AccountID + accountID := client.AccountID(ctx) input := &s3control.ListAccessGrantsInput{ AccountId: aws.String(accountID), } @@ -112,7 +112,7 @@ func sweepAccessGrantsInstances(region string) error { return fmt.Errorf("error getting client: %s", err) } conn := client.S3ControlClient(ctx) - accountID := client.AccountID + accountID := client.AccountID(ctx) input := &s3control.ListAccessGrantsInstancesInput{ AccountId: aws.String(accountID), } @@ -154,7 +154,7 @@ func sweepAccessGrantsLocations(region string) error { return fmt.Errorf("error getting client: %s", err) } conn := client.S3ControlClient(ctx) - accountID := client.AccountID + accountID := client.AccountID(ctx) input := &s3control.ListAccessGrantsLocationsInput{ AccountId: aws.String(accountID), } @@ -196,7 +196,7 @@ func sweepAccessPoints(region string) error { return fmt.Errorf("error getting client: %s", err) } conn := client.S3ControlClient(ctx) - accountID := client.AccountID + accountID := client.AccountID(ctx) input := &s3control.ListAccessPointsInput{ AccountId: aws.String(accountID), } @@ -251,7 +251,7 @@ func sweepMultiRegionAccessPoints(region string) error { return fmt.Errorf("error getting client: %s", err) } conn := client.S3ControlClient(ctx) - accountID := client.AccountID + accountID := client.AccountID(ctx) input := &s3control.ListMultiRegionAccessPointsInput{ AccountId: aws.String(accountID), } @@ -295,7 +295,7 @@ func sweepObjectLambdaAccessPoints(region string) error { return fmt.Errorf("error getting client: %s", err) } conn := client.S3ControlClient(ctx) - accountID := client.AccountID + accountID := client.AccountID(ctx) input := &s3control.ListAccessPointsForObjectLambdaInput{ AccountId: aws.String(accountID), } @@ -343,7 +343,7 @@ func sweepStorageLensConfigurations(region string) error { return fmt.Errorf("error getting client: %s", err) } conn := client.S3ControlClient(ctx) - accountID := client.AccountID + accountID := client.AccountID(ctx) input := &s3control.ListStorageLensConfigurationsInput{ AccountId: aws.String(accountID), } From 9ba888ec90f47efe7f20f421561a293b10be234b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:57 -0500 Subject: [PATCH 142/304] Make 'AWSClient.AccountID' a getter - s3outposts. --- internal/service/s3outposts/endpoint_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/service/s3outposts/endpoint_test.go b/internal/service/s3outposts/endpoint_test.go index 92f266a999f..9f47d083eef 100644 --- a/internal/service/s3outposts/endpoint_test.go +++ b/internal/service/s3outposts/endpoint_test.go @@ -35,7 +35,7 @@ func TestAccS3OutpostsEndpoint_basic(t *testing.T) { Config: testAccEndpointConfig_basic(rName, rInt), Check: resource.ComposeTestCheckFunc( testAccCheckEndpointExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "s3-outposts", regexache.MustCompile(`outpost/[^/]+/endpoint/[0-9a-z]+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "s3-outposts", regexache.MustCompile(`outpost/[^/]+/endpoint/[0-9a-z]+`)), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreationTime), resource.TestCheckResourceAttrPair(resourceName, names.AttrCIDRBlock, "aws_vpc.test", names.AttrCIDRBlock), resource.TestCheckResourceAttr(resourceName, "network_interfaces.#", "4"), @@ -71,7 +71,7 @@ func TestAccS3OutpostsEndpoint_private(t *testing.T) { Config: testAccEndpointConfig_private(rName, rInt), Check: resource.ComposeTestCheckFunc( testAccCheckEndpointExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "s3-outposts", regexache.MustCompile(`outpost/[^/]+/endpoint/[0-9a-z]+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "s3-outposts", regexache.MustCompile(`outpost/[^/]+/endpoint/[0-9a-z]+`)), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreationTime), resource.TestCheckResourceAttrPair(resourceName, names.AttrCIDRBlock, "aws_vpc.test", names.AttrCIDRBlock), resource.TestCheckResourceAttr(resourceName, "network_interfaces.#", "4"), @@ -107,7 +107,7 @@ func TestAccS3OutpostsEndpoint_customerOwnedIPv4Pool(t *testing.T) { Config: testAccEndpointConfig_customerOwnedIPv4Pool(rName, rInt), Check: resource.ComposeTestCheckFunc( testAccCheckEndpointExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "s3-outposts", regexache.MustCompile(`outpost/[^/]+/endpoint/[0-9a-z]+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "s3-outposts", regexache.MustCompile(`outpost/[^/]+/endpoint/[0-9a-z]+`)), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreationTime), resource.TestCheckResourceAttrPair(resourceName, names.AttrCIDRBlock, "aws_vpc.test", names.AttrCIDRBlock), resource.TestCheckResourceAttr(resourceName, "network_interfaces.#", "4"), From 5f5838dd2ead2112f71574b277d209468403942d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:57 -0500 Subject: [PATCH 143/304] Make 'AWSClient.AccountID' a getter - sagemaker. --- .../sagemaker/app_image_config_test.go | 2 +- internal/service/sagemaker/app_test.go | 2 +- .../service/sagemaker/code_repository_test.go | 8 +++---- .../data_quality_job_definition_test.go | 2 +- .../service/sagemaker/device_fleet_test.go | 2 +- internal/service/sagemaker/device_test.go | 2 +- internal/service/sagemaker/domain_test.go | 4 ++-- internal/service/sagemaker/endpoint_test.go | 2 +- .../service/sagemaker/feature_group_test.go | 2 +- .../service/sagemaker/flow_definition_test.go | 2 +- internal/service/sagemaker/hub_test.go | 4 ++-- .../service/sagemaker/human_task_ui_test.go | 2 +- internal/service/sagemaker/image_test.go | 2 +- .../service/sagemaker/image_version_test.go | 4 ++-- .../sagemaker/mlflow_tracking_server_test.go | 4 ++-- .../sagemaker/model_package_group_test.go | 2 +- internal/service/sagemaker/model_test.go | 2 +- .../sagemaker/monitoring_schedule_test.go | 2 +- ...k_instance_lifecycle_configuration_test.go | 2 +- internal/service/sagemaker/pipeline_test.go | 4 ++-- internal/service/sagemaker/project_test.go | 2 +- internal/service/sagemaker/space_test.go | 2 +- .../sagemaker/studio_lifecycle_config_test.go | 2 +- .../service/sagemaker/user_profile_test.go | 2 +- internal/service/sagemaker/workforce_test.go | 10 ++++---- internal/service/sagemaker/workteam_test.go | 24 +++++++++---------- 26 files changed, 49 insertions(+), 49 deletions(-) diff --git a/internal/service/sagemaker/app_image_config_test.go b/internal/service/sagemaker/app_image_config_test.go index cffdbbb3e98..717931ba9b5 100644 --- a/internal/service/sagemaker/app_image_config_test.go +++ b/internal/service/sagemaker/app_image_config_test.go @@ -36,7 +36,7 @@ func TestAccSageMakerAppImageConfig_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckAppImageConfigExists(ctx, resourceName, &config), resource.TestCheckResourceAttr(resourceName, "app_image_config_name", rName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "sagemaker", fmt.Sprintf("app-image-config/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sagemaker", fmt.Sprintf("app-image-config/%s", rName)), resource.TestCheckResourceAttr(resourceName, "kernel_gateway_image_config.#", "0"), resource.TestCheckResourceAttr(resourceName, "jupyter_lab_image_config.#", "0"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), diff --git a/internal/service/sagemaker/app_test.go b/internal/service/sagemaker/app_test.go index c981ef668bc..123a1355735 100644 --- a/internal/service/sagemaker/app_test.go +++ b/internal/service/sagemaker/app_test.go @@ -81,7 +81,7 @@ func testAccApp_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "app_name", rName), resource.TestCheckResourceAttrPair(resourceName, "domain_id", "aws_sagemaker_domain.test", names.AttrID), resource.TestCheckResourceAttrPair(resourceName, "user_profile_name", "aws_sagemaker_user_profile.test", "user_profile_name"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "sagemaker", regexache.MustCompile(`app/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sagemaker", regexache.MustCompile(`app/.+`)), resource.TestCheckResourceAttr(resourceName, "resource_spec.#", "1"), resource.TestCheckResourceAttrSet(resourceName, "resource_spec.0.sagemaker_image_arn"), resource.TestCheckResourceAttr(resourceName, "resource_spec.0.instance_type", "system"), diff --git a/internal/service/sagemaker/code_repository_test.go b/internal/service/sagemaker/code_repository_test.go index 24f84a468b0..ac6502a2315 100644 --- a/internal/service/sagemaker/code_repository_test.go +++ b/internal/service/sagemaker/code_repository_test.go @@ -36,7 +36,7 @@ func TestAccSageMakerCodeRepository_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckCodeRepositoryExists(ctx, resourceName, &repo), resource.TestCheckResourceAttr(resourceName, "code_repository_name", rName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "sagemaker", fmt.Sprintf("code-repository/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sagemaker", fmt.Sprintf("code-repository/%s", rName)), resource.TestCheckResourceAttr(resourceName, "git_config.#", "1"), resource.TestCheckResourceAttr(resourceName, "git_config.0.repository_url", "https://github.com/hashicorp/terraform-provider-aws.git"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), @@ -68,7 +68,7 @@ func TestAccSageMakerCodeRepository_Git_branch(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckCodeRepositoryExists(ctx, resourceName, &repo), resource.TestCheckResourceAttr(resourceName, "code_repository_name", rName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "sagemaker", fmt.Sprintf("code-repository/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sagemaker", fmt.Sprintf("code-repository/%s", rName)), resource.TestCheckResourceAttr(resourceName, "git_config.#", "1"), resource.TestCheckResourceAttr(resourceName, "git_config.0.repository_url", "https://github.com/hashicorp/terraform-provider-aws.git"), resource.TestCheckResourceAttr(resourceName, "git_config.0.branch", "master"), @@ -100,7 +100,7 @@ func TestAccSageMakerCodeRepository_Git_secret(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckCodeRepositoryExists(ctx, resourceName, &repo), resource.TestCheckResourceAttr(resourceName, "code_repository_name", rName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "sagemaker", fmt.Sprintf("code-repository/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sagemaker", fmt.Sprintf("code-repository/%s", rName)), resource.TestCheckResourceAttr(resourceName, "git_config.#", "1"), resource.TestCheckResourceAttr(resourceName, "git_config.0.repository_url", "https://github.com/hashicorp/terraform-provider-aws.git"), resource.TestCheckResourceAttrPair(resourceName, "git_config.0.secret_arn", "aws_secretsmanager_secret.test", names.AttrARN), @@ -116,7 +116,7 @@ func TestAccSageMakerCodeRepository_Git_secret(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckCodeRepositoryExists(ctx, resourceName, &repo), resource.TestCheckResourceAttr(resourceName, "code_repository_name", rName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "sagemaker", fmt.Sprintf("code-repository/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sagemaker", fmt.Sprintf("code-repository/%s", rName)), resource.TestCheckResourceAttr(resourceName, "git_config.#", "1"), resource.TestCheckResourceAttr(resourceName, "git_config.0.repository_url", "https://github.com/hashicorp/terraform-provider-aws.git"), resource.TestCheckResourceAttrPair(resourceName, "git_config.0.secret_arn", "aws_secretsmanager_secret.test2", names.AttrARN), diff --git a/internal/service/sagemaker/data_quality_job_definition_test.go b/internal/service/sagemaker/data_quality_job_definition_test.go index 0f67e4236f0..28807313a1e 100644 --- a/internal/service/sagemaker/data_quality_job_definition_test.go +++ b/internal/service/sagemaker/data_quality_job_definition_test.go @@ -35,7 +35,7 @@ func TestAccSageMakerDataQualityJobDefinition_endpoint(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckDataQualityJobDefinitionExists(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "sagemaker", fmt.Sprintf("data-quality-job-definition/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sagemaker", fmt.Sprintf("data-quality-job-definition/%s", rName)), resource.TestCheckResourceAttr(resourceName, "data_quality_app_specification.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "data_quality_app_specification.0.image_uri", "data.aws_sagemaker_prebuilt_ecr_image.monitor", "registry_path"), resource.TestCheckResourceAttr(resourceName, "data_quality_job_input.#", "1"), diff --git a/internal/service/sagemaker/device_fleet_test.go b/internal/service/sagemaker/device_fleet_test.go index 3361e2d57e8..3d04ecd4bed 100644 --- a/internal/service/sagemaker/device_fleet_test.go +++ b/internal/service/sagemaker/device_fleet_test.go @@ -38,7 +38,7 @@ func TestAccSageMakerDeviceFleet_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckDeviceFleetExists(ctx, resourceName, &deviceFleet), resource.TestCheckResourceAttr(resourceName, "device_fleet_name", rName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "sagemaker", fmt.Sprintf("device-fleet/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sagemaker", fmt.Sprintf("device-fleet/%s", rName)), resource.TestCheckResourceAttrPair(resourceName, names.AttrRoleARN, "aws_iam_role.test", names.AttrARN), resource.TestCheckResourceAttr(resourceName, "output_config.#", "1"), resource.TestCheckResourceAttr(resourceName, "output_config.0.s3_output_location", fmt.Sprintf("s3://%s/prefix/", rName)), diff --git a/internal/service/sagemaker/device_test.go b/internal/service/sagemaker/device_test.go index 31146de8ad6..fdd7abacdbc 100644 --- a/internal/service/sagemaker/device_test.go +++ b/internal/service/sagemaker/device_test.go @@ -38,7 +38,7 @@ func TestAccSageMakerDevice_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckDeviceExists(ctx, resourceName, &device), resource.TestCheckResourceAttr(resourceName, "device_fleet_name", rName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "sagemaker", fmt.Sprintf("device-fleet/%[1]s/device/%[1]s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sagemaker", fmt.Sprintf("device-fleet/%[1]s/device/%[1]s", rName)), resource.TestCheckResourceAttr(resourceName, "device.#", "1"), resource.TestCheckResourceAttr(resourceName, "device.0.device_name", rName), ), diff --git a/internal/service/sagemaker/domain_test.go b/internal/service/sagemaker/domain_test.go index e2210f04322..d1b5f06129b 100644 --- a/internal/service/sagemaker/domain_test.go +++ b/internal/service/sagemaker/domain_test.go @@ -45,7 +45,7 @@ func testAccDomain_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "default_user_settings.#", "1"), resource.TestCheckResourceAttr(resourceName, "default_user_settings.0.auto_mount_home_efs", "Enabled"), resource.TestCheckResourceAttrPair(resourceName, "default_user_settings.0.execution_role", "aws_iam_role.test", names.AttrARN), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "sagemaker", regexache.MustCompile(`domain/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sagemaker", regexache.MustCompile(`domain/.+`)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttr(resourceName, "tag_propagation", "DISABLED"), resource.TestCheckResourceAttrPair(resourceName, names.AttrVPCID, "aws_vpc.test", names.AttrID), @@ -1271,7 +1271,7 @@ func testAccDomain_defaultUserSettingsUpdated(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "subnet_ids.#", "1"), resource.TestCheckResourceAttr(resourceName, "default_user_settings.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "default_user_settings.0.execution_role", "aws_iam_role.test", names.AttrARN), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "sagemaker", regexache.MustCompile(`domain/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sagemaker", regexache.MustCompile(`domain/.+`)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrPair(resourceName, names.AttrVPCID, "aws_vpc.test", names.AttrID), resource.TestCheckResourceAttrSet(resourceName, names.AttrURL), diff --git a/internal/service/sagemaker/endpoint_test.go b/internal/service/sagemaker/endpoint_test.go index 3cf4823ac6b..fe197b93dd6 100644 --- a/internal/service/sagemaker/endpoint_test.go +++ b/internal/service/sagemaker/endpoint_test.go @@ -34,7 +34,7 @@ func TestAccSageMakerEndpoint_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckEndpointExists(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "sagemaker", fmt.Sprintf("endpoint/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sagemaker", fmt.Sprintf("endpoint/%s", rName)), resource.TestCheckResourceAttr(resourceName, "endpoint_config_name", rName), resource.TestCheckResourceAttr(resourceName, "deployment_config.#", "0"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), diff --git a/internal/service/sagemaker/feature_group_test.go b/internal/service/sagemaker/feature_group_test.go index c4da46c2b40..45d512fa037 100644 --- a/internal/service/sagemaker/feature_group_test.go +++ b/internal/service/sagemaker/feature_group_test.go @@ -69,7 +69,7 @@ func testAccFeatureGroup_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "feature_definition.#", "1"), resource.TestCheckResourceAttr(resourceName, "feature_definition.0.feature_name", rName), resource.TestCheckResourceAttr(resourceName, "feature_definition.0.feature_type", "String"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "sagemaker", fmt.Sprintf("feature-group/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sagemaker", fmt.Sprintf("feature-group/%s", rName)), resource.TestCheckResourceAttr(resourceName, "offline_store_config.#", "0"), ), }, diff --git a/internal/service/sagemaker/flow_definition_test.go b/internal/service/sagemaker/flow_definition_test.go index 7988af5dae3..dd1062f7960 100644 --- a/internal/service/sagemaker/flow_definition_test.go +++ b/internal/service/sagemaker/flow_definition_test.go @@ -36,7 +36,7 @@ func testAccFlowDefinition_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckFlowDefinitionExists(ctx, resourceName, &flowDefinition), resource.TestCheckResourceAttr(resourceName, "flow_definition_name", rName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "sagemaker", fmt.Sprintf("flow-definition/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sagemaker", fmt.Sprintf("flow-definition/%s", rName)), resource.TestCheckResourceAttrPair(resourceName, names.AttrRoleARN, "aws_iam_role.test", names.AttrARN), resource.TestCheckResourceAttr(resourceName, "human_loop_request_source.#", "0"), resource.TestCheckResourceAttr(resourceName, "human_loop_activation_config.#", "0"), diff --git a/internal/service/sagemaker/hub_test.go b/internal/service/sagemaker/hub_test.go index d19afdee40e..117615bf221 100644 --- a/internal/service/sagemaker/hub_test.go +++ b/internal/service/sagemaker/hub_test.go @@ -40,7 +40,7 @@ func TestAccSageMakerHub_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "hub_description", rName), resource.TestCheckResourceAttr(resourceName, "hub_search_keywords.#", "0"), resource.TestCheckResourceAttr(resourceName, "s3_storage_config.#", "0"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "sagemaker", fmt.Sprintf("hub/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sagemaker", fmt.Sprintf("hub/%s", rName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -55,7 +55,7 @@ func TestAccSageMakerHub_basic(t *testing.T) { testAccCheckHubExists(ctx, resourceName, &mpg), resource.TestCheckResourceAttr(resourceName, "hub_name", rName), resource.TestCheckResourceAttr(resourceName, "hub_description", rNameUpdated), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "sagemaker", fmt.Sprintf("hub/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sagemaker", fmt.Sprintf("hub/%s", rName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, diff --git a/internal/service/sagemaker/human_task_ui_test.go b/internal/service/sagemaker/human_task_ui_test.go index a2330e58ae5..a1340ce2958 100644 --- a/internal/service/sagemaker/human_task_ui_test.go +++ b/internal/service/sagemaker/human_task_ui_test.go @@ -36,7 +36,7 @@ func TestAccSageMakerHumanTaskUI_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckHumanTaskUIExists(ctx, resourceName, &humanTaskUi), resource.TestCheckResourceAttr(resourceName, "human_task_ui_name", rName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "sagemaker", fmt.Sprintf("human-task-ui/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sagemaker", fmt.Sprintf("human-task-ui/%s", rName)), resource.TestCheckResourceAttr(resourceName, "ui_template.#", "1"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), diff --git a/internal/service/sagemaker/image_test.go b/internal/service/sagemaker/image_test.go index c27d47c59f8..257ff96c9af 100644 --- a/internal/service/sagemaker/image_test.go +++ b/internal/service/sagemaker/image_test.go @@ -36,7 +36,7 @@ func TestAccSageMakerImage_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckImageExists(ctx, resourceName, &image), resource.TestCheckResourceAttr(resourceName, "image_name", rName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "sagemaker", fmt.Sprintf("image/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sagemaker", fmt.Sprintf("image/%s", rName)), resource.TestCheckResourceAttrPair(resourceName, names.AttrRoleARN, "aws_iam_role.test", names.AttrARN), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), diff --git a/internal/service/sagemaker/image_version_test.go b/internal/service/sagemaker/image_version_test.go index 869f6eb9453..fbd7be7cd24 100644 --- a/internal/service/sagemaker/image_version_test.go +++ b/internal/service/sagemaker/image_version_test.go @@ -44,8 +44,8 @@ func TestAccSageMakerImageVersion_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "image_name", rName), resource.TestCheckResourceAttr(resourceName, "base_image", baseImage), resource.TestCheckResourceAttr(resourceName, names.AttrVersion, "1"), - acctest.CheckResourceAttrRegionalARN(resourceName, "image_arn", "sagemaker", fmt.Sprintf("image/%s", rName)), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "sagemaker", fmt.Sprintf("image-version/%s/1", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, "image_arn", "sagemaker", fmt.Sprintf("image/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sagemaker", fmt.Sprintf("image-version/%s/1", rName)), resource.TestCheckResourceAttrSet(resourceName, "container_image"), ), }, diff --git a/internal/service/sagemaker/mlflow_tracking_server_test.go b/internal/service/sagemaker/mlflow_tracking_server_test.go index 45a718253db..495dc8ceb50 100644 --- a/internal/service/sagemaker/mlflow_tracking_server_test.go +++ b/internal/service/sagemaker/mlflow_tracking_server_test.go @@ -40,7 +40,7 @@ func TestAccSageMakerMlflowTrackingServer_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "tracking_server_size", "Small"), resource.TestCheckResourceAttrSet(resourceName, "tracking_server_url"), resource.TestCheckResourceAttrPair(resourceName, names.AttrRoleARN, "aws_iam_role.test", names.AttrARN), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "sagemaker", fmt.Sprintf("mlflow-tracking-server/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sagemaker", fmt.Sprintf("mlflow-tracking-server/%s", rName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -59,7 +59,7 @@ func TestAccSageMakerMlflowTrackingServer_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "weekly_maintenance_window_start", "Sun:01:00"), resource.TestCheckResourceAttrSet(resourceName, "tracking_server_url"), resource.TestCheckResourceAttrPair(resourceName, names.AttrRoleARN, "aws_iam_role.test", names.AttrARN), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "sagemaker", fmt.Sprintf("mlflow-tracking-server/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sagemaker", fmt.Sprintf("mlflow-tracking-server/%s", rName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, diff --git a/internal/service/sagemaker/model_package_group_test.go b/internal/service/sagemaker/model_package_group_test.go index 8f1aa5105e1..c39507ab3b5 100644 --- a/internal/service/sagemaker/model_package_group_test.go +++ b/internal/service/sagemaker/model_package_group_test.go @@ -36,7 +36,7 @@ func TestAccSageMakerModelPackageGroup_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckModelPackageGroupExists(ctx, resourceName, &mpg), resource.TestCheckResourceAttr(resourceName, "model_package_group_name", rName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "sagemaker", fmt.Sprintf("model-package-group/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sagemaker", fmt.Sprintf("model-package-group/%s", rName)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, diff --git a/internal/service/sagemaker/model_test.go b/internal/service/sagemaker/model_test.go index 7b897be51e8..1d69097090f 100644 --- a/internal/service/sagemaker/model_test.go +++ b/internal/service/sagemaker/model_test.go @@ -39,7 +39,7 @@ func TestAccSageMakerModel_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "primary_container.0.mode", "SingleModel"), resource.TestCheckResourceAttr(resourceName, "primary_container.0.environment.%", "0"), resource.TestCheckResourceAttrPair(resourceName, names.AttrExecutionRoleARN, "aws_iam_role.test", names.AttrARN), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "sagemaker", fmt.Sprintf("model/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sagemaker", fmt.Sprintf("model/%s", rName)), resource.TestCheckResourceAttr(resourceName, "enable_network_isolation", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttr(resourceName, "inference_execution_config.#", "0"), diff --git a/internal/service/sagemaker/monitoring_schedule_test.go b/internal/service/sagemaker/monitoring_schedule_test.go index cea6a589fd8..72dae7fb7e0 100644 --- a/internal/service/sagemaker/monitoring_schedule_test.go +++ b/internal/service/sagemaker/monitoring_schedule_test.go @@ -34,7 +34,7 @@ func TestAccSageMakerMonitoringSchedule_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckMonitoringScheduleExists(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "sagemaker", fmt.Sprintf("monitoring-schedule/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sagemaker", fmt.Sprintf("monitoring-schedule/%s", rName)), resource.TestCheckResourceAttr(resourceName, "monitoring_schedule_config.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "monitoring_schedule_config.0.monitoring_job_definition_name", "aws_sagemaker_data_quality_job_definition.test", names.AttrName), resource.TestCheckResourceAttr(resourceName, "monitoring_schedule_config.0.monitoring_type", "DataQuality"), diff --git a/internal/service/sagemaker/notebook_instance_lifecycle_configuration_test.go b/internal/service/sagemaker/notebook_instance_lifecycle_configuration_test.go index d885e19d020..d42a4af9b8e 100644 --- a/internal/service/sagemaker/notebook_instance_lifecycle_configuration_test.go +++ b/internal/service/sagemaker/notebook_instance_lifecycle_configuration_test.go @@ -40,7 +40,7 @@ func TestAccSageMakerNotebookInstanceLifecycleConfiguration_basic(t *testing.T) resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckNoResourceAttr(resourceName, "on_create"), resource.TestCheckNoResourceAttr(resourceName, "on_start"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "sagemaker", fmt.Sprintf("notebook-instance-lifecycle-config/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sagemaker", fmt.Sprintf("notebook-instance-lifecycle-config/%s", rName)), ), }, { diff --git a/internal/service/sagemaker/pipeline_test.go b/internal/service/sagemaker/pipeline_test.go index 249334e7d56..6c4fe97db1e 100644 --- a/internal/service/sagemaker/pipeline_test.go +++ b/internal/service/sagemaker/pipeline_test.go @@ -39,7 +39,7 @@ func TestAccSageMakerPipeline_basic(t *testing.T) { testAccCheckPipelineExists(ctx, resourceName, &pipeline), resource.TestCheckResourceAttr(resourceName, "pipeline_name", rName), resource.TestCheckResourceAttr(resourceName, "pipeline_display_name", rName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "sagemaker", regexache.MustCompile(`pipeline/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sagemaker", regexache.MustCompile(`pipeline/.+`)), resource.TestCheckResourceAttrPair(resourceName, names.AttrRoleARN, "aws_iam_role.test", names.AttrARN), resource.TestCheckResourceAttr(resourceName, "parallelism_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), @@ -56,7 +56,7 @@ func TestAccSageMakerPipeline_basic(t *testing.T) { testAccCheckPipelineExists(ctx, resourceName, &pipeline), resource.TestCheckResourceAttr(resourceName, "pipeline_name", rName), resource.TestCheckResourceAttr(resourceName, "pipeline_display_name", rNameUpdated), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "sagemaker", regexache.MustCompile(`pipeline/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sagemaker", regexache.MustCompile(`pipeline/.+`)), resource.TestCheckResourceAttrPair(resourceName, names.AttrRoleARN, "aws_iam_role.test", names.AttrARN), resource.TestCheckResourceAttr(resourceName, "parallelism_configuration.#", "0"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), diff --git a/internal/service/sagemaker/project_test.go b/internal/service/sagemaker/project_test.go index 5ef14eaf34e..0870d136d58 100644 --- a/internal/service/sagemaker/project_test.go +++ b/internal/service/sagemaker/project_test.go @@ -36,7 +36,7 @@ func TestAccSageMakerProject_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckProjectExists(ctx, resourceName, &mpg), resource.TestCheckResourceAttr(resourceName, "project_name", rName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "sagemaker", fmt.Sprintf("project/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sagemaker", fmt.Sprintf("project/%s", rName)), resource.TestCheckResourceAttr(resourceName, "service_catalog_provisioning_details.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "service_catalog_provisioning_details.0.product_id", "aws_servicecatalog_product.test", names.AttrID), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), diff --git a/internal/service/sagemaker/space_test.go b/internal/service/sagemaker/space_test.go index e6f71f0c433..bfd211d2863 100644 --- a/internal/service/sagemaker/space_test.go +++ b/internal/service/sagemaker/space_test.go @@ -42,7 +42,7 @@ func testAccSpace_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "space_settings.#", "0"), resource.TestCheckResourceAttr(resourceName, "space_sharing_settings.#", "0"), resource.TestCheckResourceAttr(resourceName, "ownership_settings.#", "0"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "sagemaker", regexache.MustCompile(`space/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sagemaker", regexache.MustCompile(`space/.+`)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, "home_efs_file_system_uid"), ), diff --git a/internal/service/sagemaker/studio_lifecycle_config_test.go b/internal/service/sagemaker/studio_lifecycle_config_test.go index c43cef1df2b..4912b45f175 100644 --- a/internal/service/sagemaker/studio_lifecycle_config_test.go +++ b/internal/service/sagemaker/studio_lifecycle_config_test.go @@ -36,7 +36,7 @@ func TestAccSageMakerStudioLifecycleConfig_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckStudioLifecycleExistsConfig(ctx, resourceName, &config), resource.TestCheckResourceAttr(resourceName, "studio_lifecycle_config_name", rName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "sagemaker", fmt.Sprintf("studio-lifecycle-config/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sagemaker", fmt.Sprintf("studio-lifecycle-config/%s", rName)), resource.TestCheckResourceAttr(resourceName, "studio_lifecycle_config_app_type", "JupyterServer"), resource.TestCheckResourceAttrSet(resourceName, "studio_lifecycle_config_content"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), diff --git a/internal/service/sagemaker/user_profile_test.go b/internal/service/sagemaker/user_profile_test.go index fc2a5b9aefb..1d8fe4acfdd 100644 --- a/internal/service/sagemaker/user_profile_test.go +++ b/internal/service/sagemaker/user_profile_test.go @@ -40,7 +40,7 @@ func testAccUserProfile_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "user_profile_name", rName), resource.TestCheckResourceAttrPair(resourceName, "domain_id", "aws_sagemaker_domain.test", names.AttrID), resource.TestCheckResourceAttr(resourceName, "user_settings.#", "0"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "sagemaker", regexache.MustCompile(`user-profile/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sagemaker", regexache.MustCompile(`user-profile/.+`)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttrSet(resourceName, "home_efs_file_system_uid"), ), diff --git a/internal/service/sagemaker/workforce_test.go b/internal/service/sagemaker/workforce_test.go index d7a70180bf2..2288867d7d1 100644 --- a/internal/service/sagemaker/workforce_test.go +++ b/internal/service/sagemaker/workforce_test.go @@ -37,7 +37,7 @@ func testAccWorkforce_cognitoConfig(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckWorkforceExists(ctx, resourceName, &workforce), resource.TestCheckResourceAttr(resourceName, "workforce_name", rName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "sagemaker", regexache.MustCompile(`workforce/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sagemaker", regexache.MustCompile(`workforce/.+`)), resource.TestCheckResourceAttr(resourceName, "cognito_config.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "cognito_config.0.client_id", "aws_cognito_user_pool_client.test", names.AttrID), resource.TestCheckResourceAttrPair(resourceName, "cognito_config.0.user_pool", "aws_cognito_user_pool.test", names.AttrID), @@ -76,7 +76,7 @@ func testAccWorkforce_oidcConfig(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckWorkforceExists(ctx, resourceName, &workforce), resource.TestCheckResourceAttr(resourceName, "workforce_name", rName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "sagemaker", regexache.MustCompile(`workforce/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sagemaker", regexache.MustCompile(`workforce/.+`)), resource.TestCheckResourceAttr(resourceName, "cognito_config.#", "0"), resource.TestCheckResourceAttr(resourceName, "oidc_config.#", "1"), resource.TestCheckResourceAttr(resourceName, "oidc_config.0.authorization_endpoint", endpoint1), @@ -103,7 +103,7 @@ func testAccWorkforce_oidcConfig(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckWorkforceExists(ctx, resourceName, &workforce), resource.TestCheckResourceAttr(resourceName, "workforce_name", rName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "sagemaker", regexache.MustCompile(`workforce/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sagemaker", regexache.MustCompile(`workforce/.+`)), resource.TestCheckResourceAttr(resourceName, "cognito_config.#", "0"), resource.TestCheckResourceAttr(resourceName, "oidc_config.#", "1"), resource.TestCheckResourceAttr(resourceName, "oidc_config.0.authorization_endpoint", endpoint2), @@ -142,7 +142,7 @@ func testAccWorkforce_oidcConfig_full(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckWorkforceExists(ctx, resourceName, &workforce), resource.TestCheckResourceAttr(resourceName, "workforce_name", rName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "sagemaker", regexache.MustCompile(`workforce/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sagemaker", regexache.MustCompile(`workforce/.+`)), resource.TestCheckResourceAttr(resourceName, "cognito_config.#", "0"), resource.TestCheckResourceAttr(resourceName, "oidc_config.#", "1"), resource.TestCheckResourceAttr(resourceName, "oidc_config.0.authorization_endpoint", endpoint1), @@ -172,7 +172,7 @@ func testAccWorkforce_oidcConfig_full(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckWorkforceExists(ctx, resourceName, &workforce), resource.TestCheckResourceAttr(resourceName, "workforce_name", rName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "sagemaker", regexache.MustCompile(`workforce/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sagemaker", regexache.MustCompile(`workforce/.+`)), resource.TestCheckResourceAttr(resourceName, "cognito_config.#", "0"), resource.TestCheckResourceAttr(resourceName, "oidc_config.#", "1"), resource.TestCheckResourceAttr(resourceName, "oidc_config.0.authorization_endpoint", endpoint2), diff --git a/internal/service/sagemaker/workteam_test.go b/internal/service/sagemaker/workteam_test.go index 16d0f0e3184..b31664114f3 100644 --- a/internal/service/sagemaker/workteam_test.go +++ b/internal/service/sagemaker/workteam_test.go @@ -37,7 +37,7 @@ func testAccWorkteam_cognitoConfig(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckWorkteamExists(ctx, resourceName, &workteam), resource.TestCheckResourceAttr(resourceName, "workteam_name", rName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "sagemaker", regexache.MustCompile(`workteam/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sagemaker", regexache.MustCompile(`workteam/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, rName), resource.TestCheckResourceAttr(resourceName, "member_definition.#", "1"), resource.TestCheckResourceAttr(resourceName, "member_definition.0.cognito_member_definition.#", "1"), @@ -59,7 +59,7 @@ func testAccWorkteam_cognitoConfig(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckWorkteamExists(ctx, resourceName, &workteam), resource.TestCheckResourceAttr(resourceName, "workteam_name", rName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "sagemaker", regexache.MustCompile(`workteam/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sagemaker", regexache.MustCompile(`workteam/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, rName), resource.TestCheckResourceAttr(resourceName, "member_definition.#", "2"), resource.TestCheckResourceAttr(resourceName, "member_definition.0.cognito_member_definition.#", "1"), @@ -78,7 +78,7 @@ func testAccWorkteam_cognitoConfig(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckWorkteamExists(ctx, resourceName, &workteam), resource.TestCheckResourceAttr(resourceName, "workteam_name", rName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "sagemaker", regexache.MustCompile(`workteam/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sagemaker", regexache.MustCompile(`workteam/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, rName), resource.TestCheckResourceAttr(resourceName, "member_definition.#", "1"), resource.TestCheckResourceAttr(resourceName, "member_definition.0.cognito_member_definition.#", "1"), @@ -109,7 +109,7 @@ func testAccWorkteam_cognitoOmitWorkforceName(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckWorkteamExists(ctx, resourceName, &workteam), resource.TestCheckResourceAttr(resourceName, "workteam_name", rName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "sagemaker", regexache.MustCompile(`workteam/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sagemaker", regexache.MustCompile(`workteam/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, rName), resource.TestCheckResourceAttr(resourceName, "member_definition.#", "1"), resource.TestCheckResourceAttr(resourceName, "member_definition.0.cognito_member_definition.#", "1"), @@ -141,7 +141,7 @@ func testAccWorkteam_oidcConfig(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckWorkteamExists(ctx, resourceName, &workteam), resource.TestCheckResourceAttr(resourceName, "workteam_name", rName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "sagemaker", regexache.MustCompile(`workteam/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sagemaker", regexache.MustCompile(`workteam/.+`)), resource.TestCheckResourceAttr(resourceName, "member_definition.#", "1"), resource.TestCheckResourceAttr(resourceName, "member_definition.0.oidc_member_definition.#", "1"), resource.TestCheckResourceAttr(resourceName, "member_definition.0.oidc_member_definition.0.groups.#", "1"), @@ -159,7 +159,7 @@ func testAccWorkteam_oidcConfig(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckWorkteamExists(ctx, resourceName, &workteam), resource.TestCheckResourceAttr(resourceName, "workteam_name", rName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "sagemaker", regexache.MustCompile(`workteam/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sagemaker", regexache.MustCompile(`workteam/.+`)), resource.TestCheckResourceAttr(resourceName, "member_definition.#", "1"), resource.TestCheckResourceAttr(resourceName, "member_definition.0.oidc_member_definition.#", "1"), resource.TestCheckResourceAttr(resourceName, "member_definition.0.oidc_member_definition.0.groups.#", "2"), @@ -172,7 +172,7 @@ func testAccWorkteam_oidcConfig(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckWorkteamExists(ctx, resourceName, &workteam), resource.TestCheckResourceAttr(resourceName, "workteam_name", rName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "sagemaker", regexache.MustCompile(`workteam/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sagemaker", regexache.MustCompile(`workteam/.+`)), resource.TestCheckResourceAttr(resourceName, "member_definition.#", "1"), resource.TestCheckResourceAttr(resourceName, "member_definition.0.oidc_member_definition.#", "1"), resource.TestCheckResourceAttr(resourceName, "member_definition.0.oidc_member_definition.0.groups.#", "1"), @@ -246,7 +246,7 @@ func testAccWorkteam_notificationConfig(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckWorkteamExists(ctx, resourceName, &workteam), resource.TestCheckResourceAttr(resourceName, "workteam_name", rName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "sagemaker", regexache.MustCompile(`workteam/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sagemaker", regexache.MustCompile(`workteam/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, rName), resource.TestCheckResourceAttr(resourceName, "notification_configuration.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "notification_configuration.0.notification_topic_arn", "aws_sns_topic.test", names.AttrARN), @@ -263,7 +263,7 @@ func testAccWorkteam_notificationConfig(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckWorkteamExists(ctx, resourceName, &workteam), resource.TestCheckResourceAttr(resourceName, "workteam_name", rName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "sagemaker", regexache.MustCompile(`workteam/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sagemaker", regexache.MustCompile(`workteam/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, rName), resource.TestCheckResourceAttr(resourceName, "notification_configuration.#", "1"), ), @@ -273,7 +273,7 @@ func testAccWorkteam_notificationConfig(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckWorkteamExists(ctx, resourceName, &workteam), resource.TestCheckResourceAttr(resourceName, "workteam_name", rName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "sagemaker", regexache.MustCompile(`workteam/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sagemaker", regexache.MustCompile(`workteam/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, rName), resource.TestCheckResourceAttr(resourceName, "notification_configuration.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "notification_configuration.0.notification_topic_arn", "aws_sns_topic.test", names.AttrARN), @@ -300,7 +300,7 @@ func testAccWorkteam_workerAccessConfiguration(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckWorkteamExists(ctx, resourceName, &workteam), resource.TestCheckResourceAttr(resourceName, "workteam_name", rName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "sagemaker", regexache.MustCompile(`workteam/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sagemaker", regexache.MustCompile(`workteam/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, rName), resource.TestCheckResourceAttr(resourceName, "worker_access_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "worker_access_configuration.0.s3_presign.#", "1"), @@ -319,7 +319,7 @@ func testAccWorkteam_workerAccessConfiguration(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckWorkteamExists(ctx, resourceName, &workteam), resource.TestCheckResourceAttr(resourceName, "workteam_name", rName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "sagemaker", regexache.MustCompile(`workteam/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sagemaker", regexache.MustCompile(`workteam/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, rName), resource.TestCheckResourceAttr(resourceName, "worker_access_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "worker_access_configuration.0.s3_presign.#", "1"), From 5664e7070e555c3d237baddb440e4581f0cc1358 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:57 -0500 Subject: [PATCH 144/304] Make 'AWSClient.AccountID' a getter - scheduler. --- internal/service/scheduler/schedule_group_test.go | 2 +- internal/service/scheduler/schedule_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/scheduler/schedule_group_test.go b/internal/service/scheduler/schedule_group_test.go index fb60d67eee7..9443bb9f428 100644 --- a/internal/service/scheduler/schedule_group_test.go +++ b/internal/service/scheduler/schedule_group_test.go @@ -46,7 +46,7 @@ func TestAccSchedulerScheduleGroup_basic(t *testing.T) { Config: testAccScheduleGroupConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckScheduleGroupExists(ctx, resourceName, &scheduleGroup), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "scheduler", regexache.MustCompile(regexp.QuoteMeta(`schedule-group/`+rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "scheduler", regexache.MustCompile(regexp.QuoteMeta(`schedule-group/`+rName))), resource.TestCheckResourceAttrWith(resourceName, names.AttrCreationDate, func(actual string) error { expect := scheduleGroup.CreationDate.Format(time.RFC3339) if actual != expect { diff --git a/internal/service/scheduler/schedule_test.go b/internal/service/scheduler/schedule_test.go index c915c9079f9..0db89a8da9f 100644 --- a/internal/service/scheduler/schedule_test.go +++ b/internal/service/scheduler/schedule_test.go @@ -200,7 +200,7 @@ func TestAccSchedulerSchedule_basic(t *testing.T) { Config: testAccScheduleConfig_basic(name), Check: resource.ComposeTestCheckFunc( testAccCheckScheduleExists(ctx, t, resourceName, &schedule), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "scheduler", regexache.MustCompile(regexp.QuoteMeta(`schedule/default/`+name))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "scheduler", regexache.MustCompile(regexp.QuoteMeta(`schedule/default/`+name))), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttr(resourceName, "end_date", ""), resource.TestCheckResourceAttr(resourceName, "flexible_time_window.0.maximum_window_in_minutes", "0"), From 9a87f6936a82abdfcfa64b3ed486b6c3a56706c1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:57 -0500 Subject: [PATCH 145/304] Make 'AWSClient.AccountID' a getter - schemas. --- internal/service/schemas/discoverer_test.go | 2 +- internal/service/schemas/registry_policy_test.go | 2 +- internal/service/schemas/registry_test.go | 2 +- internal/service/schemas/schema_test.go | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/service/schemas/discoverer_test.go b/internal/service/schemas/discoverer_test.go index 4b03507f751..0d035c39f10 100644 --- a/internal/service/schemas/discoverer_test.go +++ b/internal/service/schemas/discoverer_test.go @@ -35,7 +35,7 @@ func TestAccSchemasDiscoverer_basic(t *testing.T) { Config: testAccDiscovererConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckDiscovererExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "schemas", fmt.Sprintf("discoverer/events-event-bus-%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "schemas", fmt.Sprintf("discoverer/events-event-bus-%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), diff --git a/internal/service/schemas/registry_policy_test.go b/internal/service/schemas/registry_policy_test.go index 551a9ffa2f5..d3a59177aff 100644 --- a/internal/service/schemas/registry_policy_test.go +++ b/internal/service/schemas/registry_policy_test.go @@ -175,7 +175,7 @@ func testAccCheckRegistryPolicy(ctx context.Context, name string, expectedSid st return func(s *terraform.State) error { partition := acctest.Partition() region := acctest.Region() - account_id := acctest.AccountID() + account_id := acctest.AccountID(ctx) rs, ok := s.RootModule().Resources[name] if !ok { diff --git a/internal/service/schemas/registry_test.go b/internal/service/schemas/registry_test.go index 34a0267cc74..25c21b99f72 100644 --- a/internal/service/schemas/registry_test.go +++ b/internal/service/schemas/registry_test.go @@ -35,7 +35,7 @@ func TestAccSchemasRegistry_basic(t *testing.T) { Config: testAccRegistryConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckRegistryExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "schemas", fmt.Sprintf("registry/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "schemas", fmt.Sprintf("registry/%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), diff --git a/internal/service/schemas/schema_test.go b/internal/service/schemas/schema_test.go index b410fbf3491..ff9d14c8fc3 100644 --- a/internal/service/schemas/schema_test.go +++ b/internal/service/schemas/schema_test.go @@ -109,7 +109,7 @@ func TestAccSchemasSchema_openAPI3(t *testing.T) { Config: testAccSchemaConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckSchemaExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "schemas", fmt.Sprintf("schema/%s/%s", rName, rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "schemas", fmt.Sprintf("schema/%s/%s", rName, rName)), resource.TestCheckResourceAttrSet(resourceName, names.AttrContent), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttrSet(resourceName, "last_modified"), @@ -146,7 +146,7 @@ func TestAccSchemasSchema_jsonSchemaDraftv4(t *testing.T) { Config: testAccSchemaConfig_jsonSchema(rName), Check: resource.ComposeTestCheckFunc( testAccCheckSchemaExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "schemas", fmt.Sprintf("schema/%s/%s", rName, rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "schemas", fmt.Sprintf("schema/%s/%s", rName, rName)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttr(resourceName, names.AttrContent, testAccJSONSchemaContent), resource.TestCheckResourceAttrSet(resourceName, "last_modified"), From 8b8c88771f4a65f94ad7a79b6696fa6b72a5f6ef Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:57 -0500 Subject: [PATCH 146/304] Make 'AWSClient.AccountID' a getter - secretsmanager. --- internal/service/secretsmanager/secret_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/secretsmanager/secret_test.go b/internal/service/secretsmanager/secret_test.go index 006bbd9ab83..b4ce1fefc2a 100644 --- a/internal/service/secretsmanager/secret_test.go +++ b/internal/service/secretsmanager/secret_test.go @@ -39,7 +39,7 @@ func TestAccSecretsManagerSecret_basic(t *testing.T) { Config: testAccSecretConfig_name(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSecretExists(ctx, resourceName, &secret), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "secretsmanager", regexache.MustCompile(fmt.Sprintf("secret:%s-[[:alnum:]]+$", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "secretsmanager", regexache.MustCompile(fmt.Sprintf("secret:%s-[[:alnum:]]+$", rName))), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttr(resourceName, "force_overwrite_replica_secret", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, names.AttrKMSKeyID, ""), From 15636138effc041f61dcf8328d8fe98e5c6d3627 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:58 -0500 Subject: [PATCH 147/304] Make 'AWSClient.AccountID' a getter - securityhub. --- internal/service/securityhub/account.go | 2 +- internal/service/securityhub/action_target_test.go | 2 +- internal/service/securityhub/automation_rule_test.go | 4 ++-- internal/service/securityhub/insight_test.go | 10 +++++----- internal/service/securityhub/invite_accepter.go | 2 +- .../securityhub/organization_admin_account_test.go | 2 +- .../service/securityhub/organization_configuration.go | 2 +- .../service/securityhub/product_subscription_test.go | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/securityhub/account.go b/internal/service/securityhub/account.go index 733f1372d33..b3c28c9b450 100644 --- a/internal/service/securityhub/account.go +++ b/internal/service/securityhub/account.go @@ -95,7 +95,7 @@ func resourceAccountCreate(ctx context.Context, d *schema.ResourceData, meta int return sdkdiag.AppendErrorf(diags, "creating Security Hub Account: %s", err) } - d.SetId(meta.(*conns.AWSClient).AccountID) + d.SetId(meta.(*conns.AWSClient).AccountID(ctx)) autoEnableControls := d.Get("auto_enable_controls").(bool) inputU := &securityhub.UpdateSecurityHubConfigurationInput{ diff --git a/internal/service/securityhub/action_target_test.go b/internal/service/securityhub/action_target_test.go index bbe9971b1ac..2d9313b9735 100644 --- a/internal/service/securityhub/action_target_test.go +++ b/internal/service/securityhub/action_target_test.go @@ -31,7 +31,7 @@ func testAccActionTarget_basic(t *testing.T) { Config: testAccActionTargetConfig_identifier("testaction"), Check: resource.ComposeTestCheckFunc( testAccCheckActionTargetExists(ctx, resourceName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "securityhub", "action/custom/testaction"), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "securityhub", "action/custom/testaction"), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "This is a test custom action"), resource.TestCheckResourceAttr(resourceName, names.AttrIdentifier, "testaction"), resource.TestCheckResourceAttr(resourceName, names.AttrName, "Test action"), diff --git a/internal/service/securityhub/automation_rule_test.go b/internal/service/securityhub/automation_rule_test.go index b150e8b1c0f..43ac7126ef7 100644 --- a/internal/service/securityhub/automation_rule_test.go +++ b/internal/service/securityhub/automation_rule_test.go @@ -72,7 +72,7 @@ func testAccAutomationRule_full(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "actions.0.finding_fields_update.0.note.0.updated_by", "sechub-automation"), resource.TestCheckResourceAttr(resourceName, "actions.0.finding_fields_update.0.related_findings.#", "1"), resource.TestCheckResourceAttr(resourceName, "actions.0.finding_fields_update.0.related_findings.0.id", rName), - acctest.MatchResourceAttrRegionalARN(resourceName, "actions.0.finding_fields_update.0.related_findings.0.product_arn", "securityhub", regexache.MustCompile("product/aws/inspector")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "actions.0.finding_fields_update.0.related_findings.0.product_arn", "securityhub", regexache.MustCompile("product/aws/inspector")), resource.TestCheckResourceAttr(resourceName, "actions.0.finding_fields_update.0.severity.#", "1"), resource.TestCheckResourceAttr(resourceName, "actions.0.finding_fields_update.0.severity.0.label", string(types.SeverityLabelCritical)), resource.TestCheckResourceAttr(resourceName, "actions.0.finding_fields_update.0.severity.0.product", "0"), @@ -98,7 +98,7 @@ func testAccAutomationRule_full(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "actions.0.finding_fields_update.0.note.0.updated_by", "sechub-automation"), resource.TestCheckResourceAttr(resourceName, "actions.0.finding_fields_update.0.related_findings.#", "1"), resource.TestCheckResourceAttr(resourceName, "actions.0.finding_fields_update.0.related_findings.0.id", rName), - acctest.MatchResourceAttrRegionalARN(resourceName, "actions.0.finding_fields_update.0.related_findings.0.product_arn", "securityhub", regexache.MustCompile("product/aws/inspector")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "actions.0.finding_fields_update.0.related_findings.0.product_arn", "securityhub", regexache.MustCompile("product/aws/inspector")), resource.TestCheckResourceAttr(resourceName, "actions.0.finding_fields_update.0.severity.#", "1"), resource.TestCheckResourceAttr(resourceName, "actions.0.finding_fields_update.0.severity.0.label", string(types.SeverityLabelLow)), resource.TestCheckResourceAttr(resourceName, "actions.0.finding_fields_update.0.severity.0.product", "15.5"), diff --git a/internal/service/securityhub/insight_test.go b/internal/service/securityhub/insight_test.go index d990a50a593..025a85a0a52 100644 --- a/internal/service/securityhub/insight_test.go +++ b/internal/service/securityhub/insight_test.go @@ -36,7 +36,7 @@ func testAccInsight_basic(t *testing.T) { Config: testAccInsightConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckInsightExists(ctx, resourceName), - testAccCheckInsightARN(resourceName), + testAccCheckInsightARN(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "filters.#", "1"), resource.TestCheckResourceAttr(resourceName, "filters.0.aws_account_id.#", "1"), @@ -303,7 +303,7 @@ func testAccInsight_Name(t *testing.T) { Config: testAccInsightConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckInsightExists(ctx, resourceName), - testAccCheckInsightARN(resourceName), + testAccCheckInsightARN(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), ), }, @@ -311,7 +311,7 @@ func testAccInsight_Name(t *testing.T) { Config: testAccInsightConfig_basic(rNameUpdated), Check: resource.ComposeTestCheckFunc( testAccCheckInsightExists(ctx, resourceName), - testAccCheckInsightARN(resourceName), + testAccCheckInsightARN(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, names.AttrName, rNameUpdated), ), }, @@ -495,9 +495,9 @@ func testAccCheckInsightExists(ctx context.Context, n string) resource.TestCheck // testAccCheckInsightARN checks the computed ARN value // and accounts for differences in SecurityHub on GovCloud where the partition portion // of the ARN is still "aws" while other services utilize the "aws-us-gov" partition -func testAccCheckInsightARN(resourceName string) resource.TestCheckFunc { +func testAccCheckInsightARN(ctx context.Context, resourceName string) resource.TestCheckFunc { return func(s *terraform.State) error { - expectedArn := fmt.Sprintf(`^arn:aws[^:]*:securityhub:%s:%s:insight/%s/custom/.+$`, acctest.Region(), acctest.AccountID(), acctest.AccountID()) + expectedArn := fmt.Sprintf(`^arn:aws[^:]*:securityhub:%s:%s:insight/%s/custom/.+$`, acctest.Region(), acctest.AccountID(ctx), acctest.AccountID(ctx)) //lintignore:AWSAT001 return resource.TestMatchResourceAttr(resourceName, names.AttrARN, regexache.MustCompile(expectedArn))(s) } diff --git a/internal/service/securityhub/invite_accepter.go b/internal/service/securityhub/invite_accepter.go index 5afe4ef68b0..82d3a65ffa9 100644 --- a/internal/service/securityhub/invite_accepter.go +++ b/internal/service/securityhub/invite_accepter.go @@ -70,7 +70,7 @@ func resourceInviteAccepterCreate(ctx context.Context, d *schema.ResourceData, m return sdkdiag.AppendErrorf(diags, "accepting Security Hub Invitation (%s): %s", invitationID, err) } - d.SetId(meta.(*conns.AWSClient).AccountID) + d.SetId(meta.(*conns.AWSClient).AccountID(ctx)) return append(diags, resourceInviteAccepterRead(ctx, d, meta)...) } diff --git a/internal/service/securityhub/organization_admin_account_test.go b/internal/service/securityhub/organization_admin_account_test.go index 341e5c00ced..ab159126154 100644 --- a/internal/service/securityhub/organization_admin_account_test.go +++ b/internal/service/securityhub/organization_admin_account_test.go @@ -34,7 +34,7 @@ func testAccOrganizationAdminAccount_basic(t *testing.T) { Config: testAccOrganizationAdminAccountConfig_self(), Check: resource.ComposeTestCheckFunc( testAccCheckOrganizationAdminAccountExists(ctx, resourceName), - acctest.CheckResourceAttrAccountID(resourceName, "admin_account_id"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "admin_account_id"), ), }, { diff --git a/internal/service/securityhub/organization_configuration.go b/internal/service/securityhub/organization_configuration.go index 305e2a25fbf..d6c647559d3 100644 --- a/internal/service/securityhub/organization_configuration.go +++ b/internal/service/securityhub/organization_configuration.go @@ -102,7 +102,7 @@ func resourceOrganizationConfigurationUpdate(ctx context.Context, d *schema.Reso } if d.IsNewResource() { - d.SetId(meta.(*conns.AWSClient).AccountID) + d.SetId(meta.(*conns.AWSClient).AccountID(ctx)) } configurationType := types.OrganizationConfigurationConfigurationTypeLocal diff --git a/internal/service/securityhub/product_subscription_test.go b/internal/service/securityhub/product_subscription_test.go index c0e3df09c4d..d1e60d89e1d 100644 --- a/internal/service/securityhub/product_subscription_test.go +++ b/internal/service/securityhub/product_subscription_test.go @@ -48,7 +48,7 @@ func testAccProductSubscription_basic(t *testing.T) { Partition: acctest.Partition(), Service: "securityhub", Region: acctest.Region(), - AccountID: acctest.AccountID(), + AccountID: acctest.AccountID(ctx), Resource: "product-subscription/aws/guardduty", }.String() input := &securityhub.DisableImportFindingsForProductInput{ From 94e9421d7ffc6ce09385f34ae1fbb4bb95197ed2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:58 -0500 Subject: [PATCH 148/304] Make 'AWSClient.AccountID' a getter - securitylake. --- internal/service/securitylake/aws_log_source_test.go | 4 ++-- internal/service/securitylake/custom_log_source_test.go | 8 ++++---- .../service/securitylake/subscriber_notification_test.go | 2 +- internal/service/securitylake/subscriber_test.go | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/internal/service/securitylake/aws_log_source_test.go b/internal/service/securitylake/aws_log_source_test.go index b7a6468f9f9..7c225eebe04 100644 --- a/internal/service/securitylake/aws_log_source_test.go +++ b/internal/service/securitylake/aws_log_source_test.go @@ -41,9 +41,9 @@ func testAccAWSLogSource_basic(t *testing.T) { testAccCheckAWSLogSourceExists(ctx, resourceName, &logSource), resource.TestCheckResourceAttr(resourceName, "source.#", "1"), resource.TestCheckResourceAttrSet(resourceName, "source.0.accounts.#"), - acctest.CheckResourceAttrAccountID(resourceName, "source.0.accounts.0"), + acctest.CheckResourceAttrAccountID(ctx, resourceName, "source.0.accounts.0"), func(s *terraform.State) error { - return resource.TestCheckTypeSetElemAttr(resourceName, "source.0.accounts.*", acctest.AccountID())(s) + return resource.TestCheckTypeSetElemAttr(resourceName, "source.0.accounts.*", acctest.AccountID(ctx))(s) }, resource.TestCheckResourceAttr(resourceName, "source.0.regions.#", "1"), resource.TestCheckTypeSetElemAttr(resourceName, "source.0.regions.*", acctest.Region()), diff --git a/internal/service/securitylake/custom_log_source_test.go b/internal/service/securitylake/custom_log_source_test.go index 9fc30ef0db9..7f7e79068e6 100644 --- a/internal/service/securitylake/custom_log_source_test.go +++ b/internal/service/securitylake/custom_log_source_test.go @@ -43,9 +43,9 @@ func testAccCustomLogSource_basic(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCustomLogSourceExists(ctx, resourceName, &customLogSource), resource.TestCheckResourceAttr(resourceName, "attributes.#", "1"), - acctest.CheckResourceAttrRegionalARN(resourceName, "attributes.0.crawler_arn", "glue", fmt.Sprintf("crawler/%s", rName)), - acctest.CheckResourceAttrRegionalARN(resourceName, "attributes.0.database_arn", "glue", fmt.Sprintf("database/amazon_security_lake_glue_db_%s", strings.Replace(acctest.Region(), "-", "_", -1))), - acctest.CheckResourceAttrRegionalARN(resourceName, "attributes.0.table_arn", "glue", fmt.Sprintf("table/amazon_security_lake_table_%s_ext_%s", strings.Replace(acctest.Region(), "-", "_", -1), strings.Replace(rName, "-", "_", -1))), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, "attributes.0.crawler_arn", "glue", fmt.Sprintf("crawler/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, "attributes.0.database_arn", "glue", fmt.Sprintf("database/amazon_security_lake_glue_db_%s", strings.Replace(acctest.Region(), "-", "_", -1))), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, "attributes.0.table_arn", "glue", fmt.Sprintf("table/amazon_security_lake_table_%s_ext_%s", strings.Replace(acctest.Region(), "-", "_", -1), strings.Replace(rName, "-", "_", -1))), resource.TestCheckResourceAttr(resourceName, "configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "configuration.0.crawler_configuration.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "configuration.0.crawler_configuration.0.role_arn", "aws_iam_role.test", names.AttrARN), @@ -54,7 +54,7 @@ func testAccCustomLogSource_basic(t *testing.T) { resource.TestCheckNoResourceAttr(resourceName, "event_classes"), resource.TestCheckResourceAttr(resourceName, "provider_details.#", "1"), resource.TestMatchResourceAttr(resourceName, "provider_details.0.location", regexache.MustCompile(fmt.Sprintf(`^s3://aws-security-data-lake-%s-[a-z0-9]{30}/ext/%s/$`, acctest.Region(), rName))), - acctest.CheckResourceAttrGlobalARN(resourceName, "provider_details.0.role_arn", "iam", fmt.Sprintf("role/AmazonSecurityLake-Provider-%s-%s", rName, acctest.Region())), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, "provider_details.0.role_arn", "iam", fmt.Sprintf("role/AmazonSecurityLake-Provider-%s-%s", rName, acctest.Region())), resource.TestCheckResourceAttr(resourceName, "source_name", rName), resource.TestCheckNoResourceAttr(resourceName, "source_version"), ), diff --git a/internal/service/securitylake/subscriber_notification_test.go b/internal/service/securitylake/subscriber_notification_test.go index 8d6fb2d10de..e69220ec203 100644 --- a/internal/service/securitylake/subscriber_notification_test.go +++ b/internal/service/securitylake/subscriber_notification_test.go @@ -48,7 +48,7 @@ func testAccSubscriberNotification_sqs_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "configuration.0.sqs_notification_configuration.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "endpoint_id", resourceName, "subscriber_endpoint"), func(s *terraform.State) error { - return acctest.CheckResourceAttrRegionalARN(resourceName, "subscriber_endpoint", "sqs", fmt.Sprintf("AmazonSecurityLake-%s-Main-Queue", aws.ToString(subscriber.SubscriberId)))(s) + return acctest.CheckResourceAttrRegionalARN(ctx, resourceName, "subscriber_endpoint", "sqs", fmt.Sprintf("AmazonSecurityLake-%s-Main-Queue", aws.ToString(subscriber.SubscriberId)))(s) }, ), }, diff --git a/internal/service/securitylake/subscriber_test.go b/internal/service/securitylake/subscriber_test.go index e8daab58ba7..853327793fa 100644 --- a/internal/service/securitylake/subscriber_test.go +++ b/internal/service/securitylake/subscriber_test.go @@ -49,12 +49,12 @@ func testAccSubscriber_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "access_type", "S3"), func(s *terraform.State) error { id := aws.ToString(subscriber.SubscriberId) - return acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "securitylake", fmt.Sprintf("subscriber/%s", id))(s) + return acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "securitylake", fmt.Sprintf("subscriber/%s", id))(s) }, resource.TestCheckResourceAttr(resourceName, "resource_share_arn", ""), func(s *terraform.State) error { id := aws.ToString(subscriber.SubscriberId) - return acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrRoleARN, "iam", fmt.Sprintf("role/AmazonSecurityLake-%s", id))(s) + return acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrRoleARN, "iam", fmt.Sprintf("role/AmazonSecurityLake-%s", id))(s) }, acctest.MatchResourceAttrGlobalARNNoAccount(resourceName, "s3_bucket_arn", "s3", regexache.MustCompile(fmt.Sprintf(`aws-security-data-lake-%s-[a-z0-9]{30}$`, acctest.Region()))), resource.TestCheckResourceAttrSet(resourceName, names.AttrID), From f84a852745199b6d86fbae4b49f095c2ca029b88 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:58 -0500 Subject: [PATCH 149/304] Make 'AWSClient.AccountID' a getter - servicecatalog. --- internal/service/servicecatalog/organizations_access.go | 2 +- internal/service/servicecatalog/portfolio_test.go | 2 +- internal/service/servicecatalog/product_test.go | 6 +++--- internal/service/servicecatalog/provisioned_product_test.go | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/internal/service/servicecatalog/organizations_access.go b/internal/service/servicecatalog/organizations_access.go index 2a6953c16ad..63c2cb70a23 100644 --- a/internal/service/servicecatalog/organizations_access.go +++ b/internal/service/servicecatalog/organizations_access.go @@ -42,7 +42,7 @@ func resourceOrganizationsAccessCreate(ctx context.Context, d *schema.ResourceDa var diags diag.Diagnostics conn := meta.(*conns.AWSClient).ServiceCatalogClient(ctx) - d.SetId(meta.(*conns.AWSClient).AccountID) + d.SetId(meta.(*conns.AWSClient).AccountID(ctx)) // During create, if enabled = "true", then Enable Access and vice versa // During delete, the opposite diff --git a/internal/service/servicecatalog/portfolio_test.go b/internal/service/servicecatalog/portfolio_test.go index 923f2930521..e307a2175a6 100644 --- a/internal/service/servicecatalog/portfolio_test.go +++ b/internal/service/servicecatalog/portfolio_test.go @@ -36,7 +36,7 @@ func TestAccServiceCatalogPortfolio_basic(t *testing.T) { Config: testAccPortfolioConfig_basic(name), Check: resource.ComposeTestCheckFunc( testAccCheckPortfolioExists(ctx, resourceName, &dpo), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "catalog", regexache.MustCompile(`portfolio/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "catalog", regexache.MustCompile(`portfolio/.+`)), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreatedTime), resource.TestCheckResourceAttr(resourceName, names.AttrName, name), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "test-2"), diff --git a/internal/service/servicecatalog/product_test.go b/internal/service/servicecatalog/product_test.go index 72482520125..f1031b75470 100644 --- a/internal/service/servicecatalog/product_test.go +++ b/internal/service/servicecatalog/product_test.go @@ -44,7 +44,7 @@ func TestAccServiceCatalogProduct_basic(t *testing.T) { Config: testAccProductConfig_basic(rName, "beskrivning", "supportbeskrivning", domain, acctest.DefaultEmailAddress), Check: resource.ComposeTestCheckFunc( testAccCheckProductExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "catalog", regexache.MustCompile(`product/prod-.*`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "catalog", regexache.MustCompile(`product/prod-.*`)), resource.TestCheckResourceAttr(resourceName, "accept_language", tfservicecatalog.AcceptLanguageEnglish), acctest.CheckResourceAttrRFC3339(resourceName, names.AttrCreatedTime), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "beskrivning"), @@ -162,12 +162,12 @@ func TestAccServiceCatalogProduct_physicalID(t *testing.T) { Config: testAccProductConfig_physicalID(rName, domain, acctest.DefaultEmailAddress), Check: resource.ComposeTestCheckFunc( testAccCheckProductExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "catalog", regexache.MustCompile(`product/prod-.*`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "catalog", regexache.MustCompile(`product/prod-.*`)), resource.TestCheckResourceAttr(resourceName, "provisioning_artifact_parameters.#", "1"), resource.TestCheckResourceAttr(resourceName, "provisioning_artifact_parameters.0.description", "artefaktbeskrivning"), resource.TestCheckResourceAttr(resourceName, "provisioning_artifact_parameters.0.name", rName), resource.TestCheckResourceAttrSet(resourceName, "provisioning_artifact_parameters.0.template_physical_id"), - acctest.MatchResourceAttrRegionalARN( + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "provisioning_artifact_parameters.0.template_physical_id", "cloudformation", diff --git a/internal/service/servicecatalog/provisioned_product_test.go b/internal/service/servicecatalog/provisioned_product_test.go index 730365d1aee..3e7a837675c 100644 --- a/internal/service/servicecatalog/provisioned_product_test.go +++ b/internal/service/servicecatalog/provisioned_product_test.go @@ -40,7 +40,7 @@ func TestAccServiceCatalogProvisionedProduct_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckProvisionedProductExists(ctx, resourceName, &pprod), resource.TestCheckResourceAttr(resourceName, "accept_language", tfservicecatalog.AcceptLanguageEnglish), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "servicecatalog", regexache.MustCompile(fmt.Sprintf(`stack/%s/pp-.*`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "servicecatalog", regexache.MustCompile(fmt.Sprintf(`stack/%s/pp-.*`, rName))), acctest.CheckResourceAttrRFC3339(resourceName, names.AttrCreatedTime), resource.TestCheckResourceAttrSet(resourceName, "last_provisioning_record_id"), resource.TestCheckResourceAttrSet(resourceName, "last_record_id"), @@ -106,7 +106,7 @@ func TestAccServiceCatalogProvisionedProduct_update(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckProvisionedProductExists(ctx, resourceName, &pprod), resource.TestCheckResourceAttr(resourceName, "accept_language", tfservicecatalog.AcceptLanguageEnglish), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "servicecatalog", regexache.MustCompile(fmt.Sprintf(`stack/%s/pp-.*`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "servicecatalog", regexache.MustCompile(fmt.Sprintf(`stack/%s/pp-.*`, rName))), acctest.CheckResourceAttrRFC3339(resourceName, names.AttrCreatedTime), resource.TestCheckResourceAttrSet(resourceName, "last_provisioning_record_id"), resource.TestCheckResourceAttrSet(resourceName, "last_record_id"), From 8899f812bb62195414e09d484e667cb3cb3a7eec Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:58 -0500 Subject: [PATCH 150/304] Make 'AWSClient.AccountID' a getter - servicecatalogappregistry. --- .../servicecatalogappregistry/application_data_source_test.go | 2 +- internal/service/servicecatalogappregistry/application_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/servicecatalogappregistry/application_data_source_test.go b/internal/service/servicecatalogappregistry/application_data_source_test.go index 9b987b6f2b2..c4e399f4447 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(ctx, dataSourceName, names.AttrARN, "servicecatalog", regexache.MustCompile(`/applications/.+$`)), ), }, }, diff --git a/internal/service/servicecatalogappregistry/application_test.go b/internal/service/servicecatalogappregistry/application_test.go index e71b201cd89..d95269b900d 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(ctx, resourceName, names.AttrARN, "servicecatalog", regexache.MustCompile(`/applications/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), ), }, From c5213738f04c50a1ad089d84bc0e4eb11a0aa417 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:58 -0500 Subject: [PATCH 151/304] Make 'AWSClient.AccountID' a getter - servicediscovery. --- .../servicediscovery/http_namespace_test.go | 2 +- .../servicediscovery/private_dns_namespace_test.go | 2 +- .../servicediscovery/public_dns_namespace_test.go | 2 +- internal/service/servicediscovery/service_test.go | 14 +++++++------- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/internal/service/servicediscovery/http_namespace_test.go b/internal/service/servicediscovery/http_namespace_test.go index cb0f5aed3f2..c9dc8d10c01 100644 --- a/internal/service/servicediscovery/http_namespace_test.go +++ b/internal/service/servicediscovery/http_namespace_test.go @@ -38,7 +38,7 @@ func TestAccServiceDiscoveryHTTPNamespace_basic(t *testing.T) { Config: testAccHTTPNamespaceConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckHTTPNamespaceExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "servicediscovery", regexache.MustCompile(`namespace/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "servicediscovery", regexache.MustCompile(`namespace/.+`)), resource.TestCheckResourceAttrSet(resourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), diff --git a/internal/service/servicediscovery/private_dns_namespace_test.go b/internal/service/servicediscovery/private_dns_namespace_test.go index 16e09334d21..c68ec7e2240 100644 --- a/internal/service/servicediscovery/private_dns_namespace_test.go +++ b/internal/service/servicediscovery/private_dns_namespace_test.go @@ -39,7 +39,7 @@ func TestAccServiceDiscoveryPrivateDNSNamespace_basic(t *testing.T) { Config: testAccPrivateDNSNamespaceConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckPrivateDNSNamespaceExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "servicediscovery", regexache.MustCompile(`namespace/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "servicediscovery", regexache.MustCompile(`namespace/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttrSet(resourceName, "hosted_zone"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), diff --git a/internal/service/servicediscovery/public_dns_namespace_test.go b/internal/service/servicediscovery/public_dns_namespace_test.go index d50d42a02d1..3445a19ed22 100644 --- a/internal/service/servicediscovery/public_dns_namespace_test.go +++ b/internal/service/servicediscovery/public_dns_namespace_test.go @@ -38,7 +38,7 @@ func TestAccServiceDiscoveryPublicDNSNamespace_basic(t *testing.T) { Config: testAccPublicDNSNamespaceConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckPublicDNSNamespaceExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "servicediscovery", regexache.MustCompile(`namespace/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "servicediscovery", regexache.MustCompile(`namespace/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttrSet(resourceName, "hosted_zone"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), diff --git a/internal/service/servicediscovery/service_test.go b/internal/service/servicediscovery/service_test.go index e7557b98722..a633a5f79a3 100644 --- a/internal/service/servicediscovery/service_test.go +++ b/internal/service/servicediscovery/service_test.go @@ -38,7 +38,7 @@ func TestAccServiceDiscoveryService_private(t *testing.T) { Config: testAccServiceConfig_private(rName, 1), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckServiceExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "servicediscovery", regexache.MustCompile(`service/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "servicediscovery", regexache.MustCompile(`service/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttr(resourceName, "dns_config.#", "1"), resource.TestCheckResourceAttr(resourceName, "dns_config.0.dns_records.#", "1"), @@ -63,7 +63,7 @@ func TestAccServiceDiscoveryService_private(t *testing.T) { Config: testAccServiceConfig_privateUpdate(rName, 1), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckServiceExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "servicediscovery", regexache.MustCompile(`service/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "servicediscovery", regexache.MustCompile(`service/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "test"), resource.TestCheckResourceAttr(resourceName, "dns_config.#", "1"), resource.TestCheckResourceAttr(resourceName, "dns_config.0.dns_records.#", "2"), @@ -102,7 +102,7 @@ func TestAccServiceDiscoveryService_public(t *testing.T) { Config: testAccServiceConfig_public(rName, 5, "/path"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckServiceExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "servicediscovery", regexache.MustCompile(`service/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "servicediscovery", regexache.MustCompile(`service/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "test"), resource.TestCheckResourceAttr(resourceName, "dns_config.#", "1"), resource.TestCheckResourceAttr(resourceName, "dns_config.0.routing_policy", "WEIGHTED"), @@ -124,7 +124,7 @@ func TestAccServiceDiscoveryService_public(t *testing.T) { Config: testAccServiceConfig_public(rName, 3, "/updated-path"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckServiceExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "servicediscovery", regexache.MustCompile(`service/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "servicediscovery", regexache.MustCompile(`service/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "test"), resource.TestCheckResourceAttr(resourceName, "dns_config.#", "1"), resource.TestCheckResourceAttr(resourceName, "health_check_config.#", "1"), @@ -139,7 +139,7 @@ func TestAccServiceDiscoveryService_public(t *testing.T) { Config: testAccServiceConfig_publicUpdateNoHealthCheck(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckServiceExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "servicediscovery", regexache.MustCompile(`service/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "servicediscovery", regexache.MustCompile(`service/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttr(resourceName, "dns_config.#", "1"), resource.TestCheckResourceAttr(resourceName, "health_check_config.#", "0"), @@ -169,7 +169,7 @@ func TestAccServiceDiscoveryService_private_http(t *testing.T) { Config: testAccServiceConfig_private_http(rName), Check: resource.ComposeTestCheckFunc( testAccCheckServiceExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "servicediscovery", regexache.MustCompile(`service/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "servicediscovery", regexache.MustCompile(`service/.+`)), resource.TestCheckResourceAttrSet(resourceName, "namespace_id"), resource.TestCheckResourceAttr(resourceName, names.AttrType, "HTTP"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), @@ -203,7 +203,7 @@ func TestAccServiceDiscoveryService_http(t *testing.T) { Config: testAccServiceConfig_http(rName), Check: resource.ComposeTestCheckFunc( testAccCheckServiceExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "servicediscovery", regexache.MustCompile(`service/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "servicediscovery", regexache.MustCompile(`service/.+`)), resource.TestCheckResourceAttrSet(resourceName, "namespace_id"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), From 5c66d3b380e77526b3c4b443f4d0a81f902e103d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:58 -0500 Subject: [PATCH 152/304] Make 'AWSClient.AccountID' a getter - servicequotas. --- .../servicequotas/service_quota_data_source_test.go | 8 ++++---- internal/service/servicequotas/template_association.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/service/servicequotas/service_quota_data_source_test.go b/internal/service/servicequotas/service_quota_data_source_test.go index d000af76246..665203a7ca1 100644 --- a/internal/service/servicequotas/service_quota_data_source_test.go +++ b/internal/service/servicequotas/service_quota_data_source_test.go @@ -30,7 +30,7 @@ func TestAccServiceQuotasServiceQuotaDataSource_quotaCode(t *testing.T) { Config: testAccServiceQuotaDataSourceConfig_code(setQuotaServiceCode, setQuotaQuotaCode), Check: resource.ComposeAggregateTestCheckFunc( resource.TestCheckResourceAttr(dataSourceName, "adjustable", acctest.CtTrue), - acctest.CheckResourceAttrRegionalARN(dataSourceName, names.AttrARN, "servicequotas", fmt.Sprintf("%s/%s", setQuotaServiceCode, setQuotaQuotaCode)), + acctest.CheckResourceAttrRegionalARN(ctx, dataSourceName, names.AttrARN, "servicequotas", fmt.Sprintf("%s/%s", setQuotaServiceCode, setQuotaQuotaCode)), resource.TestCheckResourceAttr(dataSourceName, names.AttrDefaultValue, "5"), resource.TestCheckResourceAttr(dataSourceName, "global_quota", acctest.CtFalse), resource.TestCheckResourceAttr(dataSourceName, "quota_code", setQuotaQuotaCode), @@ -94,7 +94,7 @@ func TestAccServiceQuotasServiceQuotaDataSource_quotaCode_hasUsageMetric(t *test { Config: testAccServiceQuotaDataSourceConfig_code(hasUsageMetricServiceCode, hasUsageMetricQuotaCode), Check: resource.ComposeAggregateTestCheckFunc( - acctest.CheckResourceAttrRegionalARN(dataSourceName, names.AttrARN, "servicequotas", fmt.Sprintf("%s/%s", hasUsageMetricServiceCode, hasUsageMetricQuotaCode)), + acctest.CheckResourceAttrRegionalARN(ctx, dataSourceName, names.AttrARN, "servicequotas", fmt.Sprintf("%s/%s", hasUsageMetricServiceCode, hasUsageMetricQuotaCode)), resource.TestCheckResourceAttr(dataSourceName, "adjustable", acctest.CtTrue), resource.TestCheckResourceAttr(dataSourceName, names.AttrDefaultValue, "500"), resource.TestCheckResourceAttr(dataSourceName, "global_quota", acctest.CtFalse), @@ -155,7 +155,7 @@ func TestAccServiceQuotasServiceQuotaDataSource_quotaName(t *testing.T) { Config: testAccServiceQuotaDataSourceConfig_name("vpc", setQuotaQuotaName), Check: resource.ComposeAggregateTestCheckFunc( resource.TestCheckResourceAttr(dataSourceName, "adjustable", acctest.CtTrue), - acctest.CheckResourceAttrRegionalARN(dataSourceName, names.AttrARN, "servicequotas", fmt.Sprintf("%s/%s", setQuotaServiceCode, setQuotaQuotaCode)), + acctest.CheckResourceAttrRegionalARN(ctx, dataSourceName, names.AttrARN, "servicequotas", fmt.Sprintf("%s/%s", setQuotaServiceCode, setQuotaQuotaCode)), resource.TestCheckResourceAttr(dataSourceName, names.AttrDefaultValue, "5"), resource.TestCheckResourceAttr(dataSourceName, "global_quota", acctest.CtFalse), resource.TestCheckResourceAttr(dataSourceName, "quota_code", setQuotaQuotaCode), @@ -219,7 +219,7 @@ func TestAccServiceQuotasServiceQuotaDataSource_quotaName_hasUsageMetric(t *test { Config: testAccServiceQuotaDataSourceConfig_name(hasUsageMetricServiceCode, hasUsageMetricQuotaName), Check: resource.ComposeAggregateTestCheckFunc( - acctest.CheckResourceAttrRegionalARN(dataSourceName, names.AttrARN, "servicequotas", fmt.Sprintf("%s/%s", hasUsageMetricServiceCode, hasUsageMetricQuotaCode)), + acctest.CheckResourceAttrRegionalARN(ctx, dataSourceName, names.AttrARN, "servicequotas", fmt.Sprintf("%s/%s", hasUsageMetricServiceCode, hasUsageMetricQuotaCode)), resource.TestCheckResourceAttr(dataSourceName, "adjustable", acctest.CtTrue), resource.TestCheckResourceAttr(dataSourceName, names.AttrDefaultValue, "500"), resource.TestCheckResourceAttr(dataSourceName, "global_quota", acctest.CtFalse), diff --git a/internal/service/servicequotas/template_association.go b/internal/service/servicequotas/template_association.go index eb10a83402a..e62f15cd890 100644 --- a/internal/service/servicequotas/template_association.go +++ b/internal/service/servicequotas/template_association.go @@ -58,7 +58,7 @@ func (r *resourceTemplateAssociation) Create(ctx context.Context, req resource.C return } - plan.ID = types.StringValue(r.Meta().AccountID) + plan.ID = types.StringValue(r.Meta().AccountID(ctx)) _, err := conn.AssociateServiceQuotaTemplate(ctx, &servicequotas.AssociateServiceQuotaTemplateInput{}) if err != nil { From 1480f54dc1ca3313e96e7eec6036fdc783d7b223 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:58 -0500 Subject: [PATCH 153/304] Make 'AWSClient.AccountID' a getter - ses. --- internal/service/ses/active_receipt_rule_set.go | 4 ++-- internal/service/ses/active_receipt_rule_set_data_source.go | 2 +- .../service/ses/active_receipt_rule_set_data_source_test.go | 2 +- internal/service/ses/active_receipt_rule_set_test.go | 2 +- internal/service/ses/configuration_set.go | 2 +- internal/service/ses/configuration_set_test.go | 2 +- internal/service/ses/domain_identity.go | 2 +- internal/service/ses/domain_identity_data_source.go | 2 +- internal/service/ses/domain_identity_verification.go | 2 +- internal/service/ses/email_identity.go | 2 +- internal/service/ses/email_identity_data_source.go | 2 +- internal/service/ses/email_identity_data_source_test.go | 4 ++-- internal/service/ses/email_identity_test.go | 4 ++-- internal/service/ses/event_destination.go | 2 +- internal/service/ses/receipt_filter.go | 2 +- internal/service/ses/receipt_filter_test.go | 2 +- internal/service/ses/receipt_rule.go | 2 +- internal/service/ses/receipt_rule_set.go | 2 +- internal/service/ses/receipt_rule_set_test.go | 2 +- internal/service/ses/receipt_rule_test.go | 2 +- internal/service/ses/template.go | 2 +- internal/service/ses/template_test.go | 2 +- 22 files changed, 25 insertions(+), 25 deletions(-) diff --git a/internal/service/ses/active_receipt_rule_set.go b/internal/service/ses/active_receipt_rule_set.go index 023bc3e924d..9e151203d47 100644 --- a/internal/service/ses/active_receipt_rule_set.go +++ b/internal/service/ses/active_receipt_rule_set.go @@ -89,7 +89,7 @@ func resourceActiveReceiptRuleSetRead(ctx context.Context, d *schema.ResourceDat Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "ses", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("receipt-rule-set/%s", d.Id()), }.String() d.Set(names.AttrARN, arn) @@ -135,7 +135,7 @@ func resourceActiveReceiptRuleSetImport(ctx context.Context, d *schema.ResourceD Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "ses", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("receipt-rule-set/%s", d.Id()), }.String() d.Set(names.AttrARN, arnValue) diff --git a/internal/service/ses/active_receipt_rule_set_data_source.go b/internal/service/ses/active_receipt_rule_set_data_source.go index 4eef919c8dc..9dc5b7c3cd8 100644 --- a/internal/service/ses/active_receipt_rule_set_data_source.go +++ b/internal/service/ses/active_receipt_rule_set_data_source.go @@ -50,7 +50,7 @@ func dataSourceActiveReceiptRuleSetRead(ctx context.Context, d *schema.ResourceD Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "ses", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("receipt-rule-set/%s", name), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/ses/active_receipt_rule_set_data_source_test.go b/internal/service/ses/active_receipt_rule_set_data_source_test.go index 87ef29447aa..395b97d8109 100644 --- a/internal/service/ses/active_receipt_rule_set_data_source_test.go +++ b/internal/service/ses/active_receipt_rule_set_data_source_test.go @@ -36,7 +36,7 @@ func testAccActiveReceiptRuleSetDataSource_basic(t *testing.T) { Config: testAccActiveReceiptRuleSetDataSourceConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckActiveReceiptRuleSetExists(ctx, resourceName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "ses", fmt.Sprintf("receipt-rule-set/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ses", fmt.Sprintf("receipt-rule-set/%s", rName)), ), }, }, diff --git a/internal/service/ses/active_receipt_rule_set_test.go b/internal/service/ses/active_receipt_rule_set_test.go index e1df766936e..9e8b6222aa7 100644 --- a/internal/service/ses/active_receipt_rule_set_test.go +++ b/internal/service/ses/active_receipt_rule_set_test.go @@ -56,7 +56,7 @@ func testAccActiveReceiptRuleSet_basic(t *testing.T) { Config: testAccActiveReceiptRuleSetConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckActiveReceiptRuleSetExists(ctx, resourceName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "ses", fmt.Sprintf("receipt-rule-set/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ses", fmt.Sprintf("receipt-rule-set/%s", rName)), ), }, { diff --git a/internal/service/ses/configuration_set.go b/internal/service/ses/configuration_set.go index 3e8e0b0f3c3..b30934eba63 100644 --- a/internal/service/ses/configuration_set.go +++ b/internal/service/ses/configuration_set.go @@ -199,7 +199,7 @@ func resourceConfigurationSetRead(ctx context.Context, d *schema.ResourceData, m Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "ses", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("configuration-set/%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/ses/configuration_set_test.go b/internal/service/ses/configuration_set_test.go index ed7036f08d7..ec395bfba85 100644 --- a/internal/service/ses/configuration_set_test.go +++ b/internal/service/ses/configuration_set_test.go @@ -37,7 +37,7 @@ func TestAccSESConfigurationSet_basic(t *testing.T) { Config: testAccConfigurationSetConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckConfigurationSetExists(ctx, resourceName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "ses", fmt.Sprintf("configuration-set/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ses", fmt.Sprintf("configuration-set/%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "delivery_options.#", "0"), resource.TestCheckResourceAttr(resourceName, "tracking_options.#", "0"), diff --git a/internal/service/ses/domain_identity.go b/internal/service/ses/domain_identity.go index c4ace7609ed..4fb2ad63043 100644 --- a/internal/service/ses/domain_identity.go +++ b/internal/service/ses/domain_identity.go @@ -90,7 +90,7 @@ func resourceDomainIdentityRead(ctx context.Context, d *schema.ResourceData, met Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "ses", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("identity/%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/ses/domain_identity_data_source.go b/internal/service/ses/domain_identity_data_source.go index a6d192a03e6..3728ab2ba27 100644 --- a/internal/service/ses/domain_identity_data_source.go +++ b/internal/service/ses/domain_identity_data_source.go @@ -56,7 +56,7 @@ func dataSourceDomainIdentityRead(ctx context.Context, d *schema.ResourceData, m Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "ses", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("identity/%s", domainName), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/ses/domain_identity_verification.go b/internal/service/ses/domain_identity_verification.go index 65f291829e3..3dc5a6eb841 100644 --- a/internal/service/ses/domain_identity_verification.go +++ b/internal/service/ses/domain_identity_verification.go @@ -100,7 +100,7 @@ func resourceDomainIdentityVerificationRead(ctx context.Context, d *schema.Resou Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "ses", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("identity/%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/ses/email_identity.go b/internal/service/ses/email_identity.go index c3427851ba7..7362b35f0e5 100644 --- a/internal/service/ses/email_identity.go +++ b/internal/service/ses/email_identity.go @@ -87,7 +87,7 @@ func resourceEmailIdentityRead(ctx context.Context, d *schema.ResourceData, meta } arn := arn.ARN{ - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, Resource: fmt.Sprintf("identity/%s", d.Id()), diff --git a/internal/service/ses/email_identity_data_source.go b/internal/service/ses/email_identity_data_source.go index 4f9fccfeb5f..2938904e5ee 100644 --- a/internal/service/ses/email_identity_data_source.go +++ b/internal/service/ses/email_identity_data_source.go @@ -50,7 +50,7 @@ func dataSourceEmailIdentityRead(ctx context.Context, d *schema.ResourceData, me d.SetId(email) arn := arn.ARN{ - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, Resource: fmt.Sprintf("identity/%s", email), diff --git a/internal/service/ses/email_identity_data_source_test.go b/internal/service/ses/email_identity_data_source_test.go index 9bedeea26bc..511af93fc22 100644 --- a/internal/service/ses/email_identity_data_source_test.go +++ b/internal/service/ses/email_identity_data_source_test.go @@ -28,7 +28,7 @@ func testAccEmailIdentityDataSource_basic(t *testing.T) { { Config: testAccEmailIdentityDataDourceConfig_source(email), Check: resource.ComposeTestCheckFunc( - acctest.MatchResourceAttrRegionalARN("data.aws_ses_email_identity.test", names.AttrARN, "ses", regexache.MustCompile(fmt.Sprintf("identity/%s$", regexp.QuoteMeta(email)))), + acctest.MatchResourceAttrRegionalARN(ctx, "data.aws_ses_email_identity.test", names.AttrARN, "ses", regexache.MustCompile(fmt.Sprintf("identity/%s$", regexp.QuoteMeta(email)))), ), }, }, @@ -48,7 +48,7 @@ func testAccEmailIdentityDataSource_trailingPeriod(t *testing.T) { { Config: testAccEmailIdentityDataDourceConfig_source(email), Check: resource.ComposeTestCheckFunc( - acctest.MatchResourceAttrRegionalARN("data.aws_ses_email_identity.test", names.AttrARN, "ses", regexache.MustCompile(fmt.Sprintf("identity/%s$", regexp.QuoteMeta(strings.TrimSuffix(email, "."))))), + acctest.MatchResourceAttrRegionalARN(ctx, "data.aws_ses_email_identity.test", names.AttrARN, "ses", regexache.MustCompile(fmt.Sprintf("identity/%s$", regexp.QuoteMeta(strings.TrimSuffix(email, "."))))), ), }, }, diff --git a/internal/service/ses/email_identity_test.go b/internal/service/ses/email_identity_test.go index 1b9b00fd702..b0b505f5595 100644 --- a/internal/service/ses/email_identity_test.go +++ b/internal/service/ses/email_identity_test.go @@ -49,7 +49,7 @@ func testAccEmailIdentity_basic(t *testing.T) { Config: testAccEmailIdentityConfig_basic(email), Check: resource.ComposeTestCheckFunc( testAccCheckEmailIdentityExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ses", regexache.MustCompile(fmt.Sprintf("identity/%s$", regexp.QuoteMeta(email)))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ses", regexache.MustCompile(fmt.Sprintf("identity/%s$", regexp.QuoteMeta(email)))), ), }, { @@ -99,7 +99,7 @@ func testAccEmailIdentity_trailingPeriod(t *testing.T) { Config: testAccEmailIdentityConfig_basic(email), Check: resource.ComposeTestCheckFunc( testAccCheckEmailIdentityExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ses", regexache.MustCompile(fmt.Sprintf("identity/%s$", regexp.QuoteMeta(strings.TrimSuffix(email, "."))))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ses", regexache.MustCompile(fmt.Sprintf("identity/%s$", regexp.QuoteMeta(strings.TrimSuffix(email, "."))))), ), }, { diff --git a/internal/service/ses/event_destination.go b/internal/service/ses/event_destination.go index 83bb0d08f4d..cd351163f57 100644 --- a/internal/service/ses/event_destination.go +++ b/internal/service/ses/event_destination.go @@ -212,7 +212,7 @@ func resourceEventDestinationRead(ctx context.Context, d *schema.ResourceData, m Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "ses", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("configuration-set/%s:event-destination/%s", configurationSetName, d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/ses/receipt_filter.go b/internal/service/ses/receipt_filter.go index 19d3906e37c..fc7672657fd 100644 --- a/internal/service/ses/receipt_filter.go +++ b/internal/service/ses/receipt_filter.go @@ -116,7 +116,7 @@ func resourceReceiptFilterRead(ctx context.Context, d *schema.ResourceData, meta Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "ses", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("receipt-filter/%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/ses/receipt_filter_test.go b/internal/service/ses/receipt_filter_test.go index 59477907062..eca0b9954a5 100644 --- a/internal/service/ses/receipt_filter_test.go +++ b/internal/service/ses/receipt_filter_test.go @@ -33,7 +33,7 @@ func TestAccSESReceiptFilter_basic(t *testing.T) { Config: testAccReceiptFilterConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckReceiptFilterExists(ctx, resourceName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "ses", fmt.Sprintf("receipt-filter/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ses", fmt.Sprintf("receipt-filter/%s", rName)), resource.TestCheckResourceAttr(resourceName, "cidr", "10.10.10.10"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrPolicy, "Block"), diff --git a/internal/service/ses/receipt_rule.go b/internal/service/ses/receipt_rule.go index e6d04690ab3..ff29db9438d 100644 --- a/internal/service/ses/receipt_rule.go +++ b/internal/service/ses/receipt_rule.go @@ -339,7 +339,7 @@ func resourceReceiptRuleRead(ctx context.Context, d *schema.ResourceData, meta i Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "ses", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("receipt-rule-set/%s:receipt-rule/%s", ruleSetName, d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/ses/receipt_rule_set.go b/internal/service/ses/receipt_rule_set.go index 12038f058be..3bd1a7ea8b3 100644 --- a/internal/service/ses/receipt_rule_set.go +++ b/internal/service/ses/receipt_rule_set.go @@ -90,7 +90,7 @@ func resourceReceiptRuleSetRead(ctx context.Context, d *schema.ResourceData, met Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "ses", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("receipt-rule-set/%s", name), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/ses/receipt_rule_set_test.go b/internal/service/ses/receipt_rule_set_test.go index 224c7318c42..922398c00c0 100644 --- a/internal/service/ses/receipt_rule_set_test.go +++ b/internal/service/ses/receipt_rule_set_test.go @@ -34,7 +34,7 @@ func TestAccSESReceiptRuleSet_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckReceiptRuleSetExists(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, "rule_set_name", rName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "ses", fmt.Sprintf("receipt-rule-set/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ses", fmt.Sprintf("receipt-rule-set/%s", rName)), ), }, { diff --git a/internal/service/ses/receipt_rule_test.go b/internal/service/ses/receipt_rule_test.go index 1f5c45fe5fa..98401c3c994 100644 --- a/internal/service/ses/receipt_rule_test.go +++ b/internal/service/ses/receipt_rule_test.go @@ -44,7 +44,7 @@ func TestAccSESReceiptRule_basic(t *testing.T) { testAccCheckReceiptRuleExists(ctx, resourceName, &rule), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "rule_set_name", rName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "ses", fmt.Sprintf("receipt-rule-set/%s:receipt-rule/%s", rName, rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ses", fmt.Sprintf("receipt-rule-set/%s:receipt-rule/%s", rName, rName)), resource.TestCheckResourceAttr(resourceName, "add_header_action.#", "0"), resource.TestCheckResourceAttr(resourceName, "bounce_action.#", "0"), resource.TestCheckResourceAttr(resourceName, "lambda_action.#", "0"), diff --git a/internal/service/ses/template.go b/internal/service/ses/template.go index 8a044896b21..8f0962f275c 100644 --- a/internal/service/ses/template.go +++ b/internal/service/ses/template.go @@ -119,7 +119,7 @@ func resourceTemplateRead(ctx context.Context, d *schema.ResourceData, meta inte Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "ses", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("template/%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/ses/template_test.go b/internal/service/ses/template_test.go index b6644e88180..b530d284c32 100644 --- a/internal/service/ses/template_test.go +++ b/internal/service/ses/template_test.go @@ -66,7 +66,7 @@ func TestAccSESTemplate_update(t *testing.T) { Config: testAccTemplateConfig_resourceBasic1(rName), Check: resource.ComposeTestCheckFunc( testAccCheckTemplateExists(ctx, resourceName, &template), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "ses", fmt.Sprintf("template/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ses", fmt.Sprintf("template/%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "html", "html"), resource.TestCheckResourceAttr(resourceName, "subject", "subject"), From 0c147b482b74989e6f2c12645b437127874de159 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:58 -0500 Subject: [PATCH 154/304] Make 'AWSClient.AccountID' a getter - sesv2. --- internal/service/sesv2/account_suppression_attributes.go | 2 +- internal/service/sesv2/configuration_set_test.go | 2 +- internal/service/sesv2/contact_list.go | 2 +- internal/service/sesv2/dedicated_ip_pool_data_source_test.go | 2 +- internal/service/sesv2/dedicated_ip_pool_test.go | 2 +- internal/service/sesv2/email_identity_test.go | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/internal/service/sesv2/account_suppression_attributes.go b/internal/service/sesv2/account_suppression_attributes.go index 564fabfef28..66a36d24681 100644 --- a/internal/service/sesv2/account_suppression_attributes.go +++ b/internal/service/sesv2/account_suppression_attributes.go @@ -59,7 +59,7 @@ func (r *accountSuppressionAttributesResource) Create(ctx context.Context, reque conn := r.Meta().SESV2Client(ctx) - id := r.Meta().AccountID + id := r.Meta().AccountID(ctx) input := &sesv2.PutAccountSuppressionAttributesInput{} response.Diagnostics.Append(fwflex.Expand(ctx, data, input)...) if response.Diagnostics.HasError() { diff --git a/internal/service/sesv2/configuration_set_test.go b/internal/service/sesv2/configuration_set_test.go index db44853d3a1..dc4f16e2f4e 100644 --- a/internal/service/sesv2/configuration_set_test.go +++ b/internal/service/sesv2/configuration_set_test.go @@ -36,7 +36,7 @@ func TestAccSESV2ConfigurationSet_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckConfigurationSetExists(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, "configuration_set_name", rName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ses", regexache.MustCompile(`configuration-set/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ses", regexache.MustCompile(`configuration-set/.+`)), ), }, { diff --git a/internal/service/sesv2/contact_list.go b/internal/service/sesv2/contact_list.go index a89faa09deb..019002a4b11 100644 --- a/internal/service/sesv2/contact_list.go +++ b/internal/service/sesv2/contact_list.go @@ -151,7 +151,7 @@ func resourceContactListRead(ctx context.Context, d *schema.ResourceData, meta i Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "ses", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("contact-list/%s", d.Id()), }.String() diff --git a/internal/service/sesv2/dedicated_ip_pool_data_source_test.go b/internal/service/sesv2/dedicated_ip_pool_data_source_test.go index c33860580fa..6118ab8e6d0 100644 --- a/internal/service/sesv2/dedicated_ip_pool_data_source_test.go +++ b/internal/service/sesv2/dedicated_ip_pool_data_source_test.go @@ -33,7 +33,7 @@ func TestAccSESV2DedicatedIPPoolDataSource_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckDedicatedIPPoolExists(ctx, dataSourceName), resource.TestCheckResourceAttr(dataSourceName, "pool_name", rName), - acctest.MatchResourceAttrRegionalARN(dataSourceName, names.AttrARN, "ses", regexache.MustCompile(`dedicated-ip-pool/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, dataSourceName, names.AttrARN, "ses", regexache.MustCompile(`dedicated-ip-pool/.+`)), ), }, }, diff --git a/internal/service/sesv2/dedicated_ip_pool_test.go b/internal/service/sesv2/dedicated_ip_pool_test.go index 4dac0aa3571..556246b5a49 100644 --- a/internal/service/sesv2/dedicated_ip_pool_test.go +++ b/internal/service/sesv2/dedicated_ip_pool_test.go @@ -37,7 +37,7 @@ func TestAccSESV2DedicatedIPPool_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckDedicatedIPPoolExists(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, "pool_name", rName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ses", regexache.MustCompile(`dedicated-ip-pool/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ses", regexache.MustCompile(`dedicated-ip-pool/.+`)), ), }, { diff --git a/internal/service/sesv2/email_identity_test.go b/internal/service/sesv2/email_identity_test.go index 510d85c36e4..495b84386a4 100644 --- a/internal/service/sesv2/email_identity_test.go +++ b/internal/service/sesv2/email_identity_test.go @@ -37,7 +37,7 @@ func TestAccSESV2EmailIdentity_basic_emailAddress(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckEmailIdentityExists(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, "email_identity", rName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ses", regexache.MustCompile(`identity/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ses", regexache.MustCompile(`identity/.+`)), resource.TestCheckResourceAttr(resourceName, "dkim_signing_attributes.#", "1"), resource.TestCheckResourceAttr(resourceName, "dkim_signing_attributes.0.current_signing_key_length", ""), resource.TestCheckResourceAttr(resourceName, "dkim_signing_attributes.0.last_key_generation_timestamp", ""), @@ -74,7 +74,7 @@ func TestAccSESV2EmailIdentity_basic_domain(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckEmailIdentityExists(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, "email_identity", rName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ses", regexache.MustCompile(`identity/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ses", regexache.MustCompile(`identity/.+`)), resource.TestCheckResourceAttr(resourceName, "dkim_signing_attributes.#", "1"), resource.TestCheckResourceAttr(resourceName, "dkim_signing_attributes.0.current_signing_key_length", "RSA_2048_BIT"), acctest.CheckResourceAttrRFC3339(resourceName, "dkim_signing_attributes.0.last_key_generation_timestamp"), From 9985831e09d8dfa67cecb58f858ceb1c972f94f4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:58 -0500 Subject: [PATCH 155/304] Make 'AWSClient.AccountID' a getter - sfn. --- internal/service/sfn/alias_test.go | 2 +- internal/service/sfn/state_machine_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/service/sfn/alias_test.go b/internal/service/sfn/alias_test.go index 1a42ca5bceb..9d64c57a7ad 100644 --- a/internal/service/sfn/alias_test.go +++ b/internal/service/sfn/alias_test.go @@ -45,7 +45,7 @@ func TestAccSFNAlias_basic(t *testing.T) { testAccCheckAliasAttributes(&alias), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreationDate), resource.TestCheckResourceAttr(resourceName, names.AttrName, aliasName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "states", functionArnResourcePart), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "states", functionArnResourcePart), ), }, { diff --git a/internal/service/sfn/state_machine_test.go b/internal/service/sfn/state_machine_test.go index 0834cab547c..96add1c278c 100644 --- a/internal/service/sfn/state_machine_test.go +++ b/internal/service/sfn/state_machine_test.go @@ -41,7 +41,7 @@ func TestAccSFNStateMachine_createUpdate(t *testing.T) { Config: testAccStateMachineConfig_basic(rName, 5), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckExists(ctx, resourceName, &sm), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "states", fmt.Sprintf("stateMachine:%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "states", fmt.Sprintf("stateMachine:%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrStatus, string(awstypes.StateMachineStatusActive)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrNamePrefix, ""), @@ -71,7 +71,7 @@ func TestAccSFNStateMachine_createUpdate(t *testing.T) { Config: testAccStateMachineConfig_basic(rName, 10), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckExists(ctx, resourceName, &sm), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "states", fmt.Sprintf("stateMachine:%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "states", fmt.Sprintf("stateMachine:%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrStatus, string(awstypes.StateMachineStatusActive)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttrSet(resourceName, names.AttrCreationDate), From 7bf5ec4ccd34143649bd857a3760105b4e0fe5dd Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:58 -0500 Subject: [PATCH 156/304] Make 'AWSClient.AccountID' a getter - shield. --- internal/service/shield/drt_access_role_arn_association.go | 2 +- internal/service/shield/proactive_engagement.go | 2 +- internal/service/shield/protection_data_source_test.go | 4 ++-- internal/service/shield/protection_group_test.go | 2 +- internal/service/shield/subscription.go | 2 +- internal/service/shield/sweep.go | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/service/shield/drt_access_role_arn_association.go b/internal/service/shield/drt_access_role_arn_association.go index cb681b6daf3..17315a9fb5c 100644 --- a/internal/service/shield/drt_access_role_arn_association.go +++ b/internal/service/shield/drt_access_role_arn_association.go @@ -89,7 +89,7 @@ func (r *resourceDRTAccessRoleARNAssociation) Create(ctx context.Context, reques } // Set values for unknowns. - data.ID = types.StringValue(r.Meta().AccountID) + data.ID = types.StringValue(r.Meta().AccountID(ctx)) _, err = tfresource.RetryWhenNotFound(ctx, r.CreateTimeout(ctx, data.Timeouts), func() (interface{}, error) { return findDRTRoleARNAssociation(ctx, conn, roleARN) diff --git a/internal/service/shield/proactive_engagement.go b/internal/service/shield/proactive_engagement.go index 6b4e03b7034..3e796bd539a 100644 --- a/internal/service/shield/proactive_engagement.go +++ b/internal/service/shield/proactive_engagement.go @@ -109,7 +109,7 @@ func (r *proactiveEngagementResource) Create(ctx context.Context, request resour } // Set values for unknowns. - data.ID = types.StringValue(r.Meta().AccountID) + data.ID = types.StringValue(r.Meta().AccountID(ctx)) response.Diagnostics.Append(updateEmergencyContactSettings(ctx, conn, &data)...) if response.Diagnostics.HasError() { diff --git a/internal/service/shield/protection_data_source_test.go b/internal/service/shield/protection_data_source_test.go index ec50cf9e937..c324f80fd04 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(ctx, 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(ctx, dataSourceName, "protection_arn", "shield", regexache.MustCompile(`protection/.+$`)), ), }, }, diff --git a/internal/service/shield/protection_group_test.go b/internal/service/shield/protection_group_test.go index a8348c574e4..869e6f3c508 100644 --- a/internal/service/shield/protection_group_test.go +++ b/internal/service/shield/protection_group_test.go @@ -148,7 +148,7 @@ func TestAccShieldProtectionGroup_members(t *testing.T) { testAccCheckProtectionGroupExists(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, "pattern", string(awstypes.ProtectionGroupPatternArbitrary)), resource.TestCheckResourceAttr(resourceName, "members.#", "1"), - acctest.MatchResourceAttrRegionalARN(resourceName, "members.0", "ec2", regexache.MustCompile(`eip-allocation/eipalloc-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "members.0", "ec2", regexache.MustCompile(`eip-allocation/eipalloc-.+`)), ), }, { diff --git a/internal/service/shield/subscription.go b/internal/service/shield/subscription.go index d2e1a5169e4..90c09af282e 100644 --- a/internal/service/shield/subscription.go +++ b/internal/service/shield/subscription.go @@ -67,7 +67,7 @@ func (r *resourceSubscription) Create(ctx context.Context, req resource.CreateRe if resp.Diagnostics.HasError() { return } - plan.ID = types.StringValue(r.Meta().AccountID) + plan.ID = types.StringValue(r.Meta().AccountID(ctx)) if plan.AutoRenew.Equal(types.StringValue(string(awstypes.AutoRenewDisabled))) { resp.Diagnostics.AddError( diff --git a/internal/service/shield/sweep.go b/internal/service/shield/sweep.go index 55cc0ad6baa..d944f172e56 100644 --- a/internal/service/shield/sweep.go +++ b/internal/service/shield/sweep.go @@ -100,7 +100,7 @@ func sweepDRTAccessRoleARNAssociations(region string) error { if v := aws.ToString(output.RoleArn); v != "" { log.Printf("[INFO] Deleting Shield DRT Role ARN Association: %s", v) sweepResources = append(sweepResources, framework.NewSweepResource(newDRTAccessRoleARNAssociationResource, client, - framework.NewAttribute(names.AttrID, client.AccountID), + framework.NewAttribute(names.AttrID, client.AccountID(ctx)), )) } @@ -137,7 +137,7 @@ func sweepProactiveEngagements(region string) error { if output.Subscription.ProactiveEngagementStatus != "" { log.Printf("[INFO] Deleting Shield Proactive Engagement") sweepResources = append(sweepResources, framework.NewSweepResource(newProactiveEngagementResource, client, - framework.NewAttribute(names.AttrID, client.AccountID), + framework.NewAttribute(names.AttrID, client.AccountID(ctx)), )) } From a97340c3988324591d050c130b07967b349ffcc4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:59 -0500 Subject: [PATCH 157/304] Make 'AWSClient.AccountID' a getter - sns. --- .../service/sns/platform_application_test.go | 8 ++++---- internal/service/sns/topic_policy_test.go | 4 ++-- internal/service/sns/topic_subscription_test.go | 16 ++++++++-------- internal/service/sns/topic_test.go | 8 ++++---- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/internal/service/sns/platform_application_test.go b/internal/service/sns/platform_application_test.go index 7c77dd9acad..8407d4ae53c 100644 --- a/internal/service/sns/platform_application_test.go +++ b/internal/service/sns/platform_application_test.go @@ -191,7 +191,7 @@ func TestAccSNSPlatformApplication_GCM_basic(t *testing.T) { testAccCheckPlatformApplicationExists(ctx, resourceName), resource.TestCheckNoResourceAttr(resourceName, "apple_platform_bundle_id"), resource.TestCheckNoResourceAttr(resourceName, "apple_platform_team_id"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "sns", fmt.Sprintf("app/GCM/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sns", fmt.Sprintf("app/GCM/%s", rName)), resource.TestCheckNoResourceAttr(resourceName, "event_delivery_failure_topic_arn"), resource.TestCheckNoResourceAttr(resourceName, "event_endpoint_created_topic_arn"), resource.TestCheckNoResourceAttr(resourceName, "event_endpoint_deleted_topic_arn"), @@ -259,7 +259,7 @@ func TestAccSNSPlatformApplication_GCM_allAttributes(t *testing.T) { testAccCheckPlatformApplicationExists(ctx, resourceName), resource.TestCheckNoResourceAttr(resourceName, "apple_platform_bundle_id"), resource.TestCheckNoResourceAttr(resourceName, "apple_platform_team_id"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "sns", fmt.Sprintf("app/GCM/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sns", fmt.Sprintf("app/GCM/%s", rName)), resource.TestCheckResourceAttrPair(resourceName, "event_delivery_failure_topic_arn", topic0ResourceName, names.AttrARN), resource.TestCheckResourceAttrPair(resourceName, "event_endpoint_created_topic_arn", topic1ResourceName, names.AttrARN), resource.TestCheckResourceAttrPair(resourceName, "event_endpoint_deleted_topic_arn", topic0ResourceName, names.AttrARN), @@ -283,7 +283,7 @@ func TestAccSNSPlatformApplication_GCM_allAttributes(t *testing.T) { testAccCheckPlatformApplicationExists(ctx, resourceName), resource.TestCheckNoResourceAttr(resourceName, "apple_platform_bundle_id"), resource.TestCheckNoResourceAttr(resourceName, "apple_platform_team_id"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "sns", fmt.Sprintf("app/GCM/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sns", fmt.Sprintf("app/GCM/%s", rName)), resource.TestCheckResourceAttrPair(resourceName, "event_delivery_failure_topic_arn", topic1ResourceName, names.AttrARN), resource.TestCheckResourceAttrPair(resourceName, "event_endpoint_created_topic_arn", topic0ResourceName, names.AttrARN), resource.TestCheckResourceAttrPair(resourceName, "event_endpoint_deleted_topic_arn", topic1ResourceName, names.AttrARN), @@ -322,7 +322,7 @@ func TestAccSNSPlatformApplication_basic(t *testing.T) { Config: testAccPlatformApplicationConfig_basic(name, platform), Check: resource.ComposeTestCheckFunc( testAccCheckPlatformApplicationExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "sns", regexache.MustCompile(fmt.Sprintf("app/%s/%s$", platform.Name, name))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sns", regexache.MustCompile(fmt.Sprintf("app/%s/%s$", platform.Name, name))), resource.TestCheckResourceAttr(resourceName, names.AttrName, name), resource.TestCheckResourceAttr(resourceName, "platform", platform.Name), resource.TestCheckResourceAttrSet(resourceName, "platform_credential"), diff --git a/internal/service/sns/topic_policy_test.go b/internal/service/sns/topic_policy_test.go index b23f51a57ea..4b092986da2 100644 --- a/internal/service/sns/topic_policy_test.go +++ b/internal/service/sns/topic_policy_test.go @@ -36,7 +36,7 @@ func TestAccSNSTopicPolicy_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckTopicExists(ctx, "aws_sns_topic.test", &attributes), resource.TestCheckResourceAttrPair(resourceName, names.AttrARN, "aws_sns_topic.test", names.AttrARN), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwner), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwner), resource.TestMatchResourceAttr(resourceName, names.AttrPolicy, regexache.MustCompile(fmt.Sprintf("\"Sid\":\"%[1]s\"", rName))), ), }, @@ -151,7 +151,7 @@ func TestAccSNSTopicPolicy_ignoreEquivalent(t *testing.T) { testAccCheckTopicExists(ctx, "aws_sns_topic.test", &attributes), resource.TestCheckResourceAttrPair(resourceName, names.AttrARN, "aws_sns_topic.test", names.AttrARN), resource.TestMatchResourceAttr(resourceName, names.AttrPolicy, regexache.MustCompile(fmt.Sprintf("\"Sid\":\"%[1]s\"", rName))), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwner), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwner), ), }, { diff --git a/internal/service/sns/topic_subscription_test.go b/internal/service/sns/topic_subscription_test.go index 6a40cd4dfa1..9b18b8c3b71 100644 --- a/internal/service/sns/topic_subscription_test.go +++ b/internal/service/sns/topic_subscription_test.go @@ -87,7 +87,7 @@ func TestAccSNSTopicSubscription_basic(t *testing.T) { Config: testAccTopicSubscriptionConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTopicSubscriptionExists(ctx, resourceName, &attributes), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "sns", regexache.MustCompile(fmt.Sprintf("%s:.+", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sns", regexache.MustCompile(fmt.Sprintf("%s:.+", rName))), resource.TestCheckResourceAttr(resourceName, "confirmation_timeout_in_minutes", "1"), resource.TestCheckResourceAttr(resourceName, "confirmation_was_authenticated", acctest.CtTrue), resource.TestCheckResourceAttr(resourceName, "delivery_policy", ""), @@ -95,7 +95,7 @@ func TestAccSNSTopicSubscription_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "endpoint_auto_confirms", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "filter_policy", ""), resource.TestCheckResourceAttr(resourceName, "filter_policy_scope", ""), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwnerID), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwnerID), resource.TestCheckResourceAttr(resourceName, "pending_confirmation", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, names.AttrProtocol, "sqs"), resource.TestCheckResourceAttr(resourceName, "raw_message_delivery", acctest.CtFalse), @@ -438,7 +438,7 @@ func TestAccSNSTopicSubscription_redrivePolicy(t *testing.T) { Config: testAccTopicSubscriptionConfig_redrivePolicy(rName, dlqName), Check: resource.ComposeTestCheckFunc( testAccCheckTopicSubscriptionExists(ctx, resourceName, &attributes), - testAccCheckTopicSubscriptionRedrivePolicyAttribute(&attributes, dlqName), + testAccCheckTopicSubscriptionRedrivePolicyAttribute(ctx, &attributes, dlqName), ), }, { @@ -455,7 +455,7 @@ func TestAccSNSTopicSubscription_redrivePolicy(t *testing.T) { Config: testAccTopicSubscriptionConfig_redrivePolicy(rName, updatedDlqName), Check: resource.ComposeTestCheckFunc( testAccCheckTopicSubscriptionExists(ctx, resourceName, &attributes), - testAccCheckTopicSubscriptionRedrivePolicyAttribute(&attributes, updatedDlqName), + testAccCheckTopicSubscriptionRedrivePolicyAttribute(ctx, &attributes, updatedDlqName), ), }, { @@ -605,7 +605,7 @@ func TestAccSNSTopicSubscription_email(t *testing.T) { Config: testAccTopicSubscriptionConfig_email(rName, acctest.DefaultEmailAddress), Check: resource.ComposeTestCheckFunc( testAccCheckTopicSubscriptionExists(ctx, resourceName, &attributes), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "sns", regexache.MustCompile(fmt.Sprintf("%s:.+", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sns", regexache.MustCompile(fmt.Sprintf("%s:.+", rName))), resource.TestCheckResourceAttr(resourceName, "confirmation_was_authenticated", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "delivery_policy", ""), resource.TestCheckResourceAttr(resourceName, names.AttrEndpoint, acctest.DefaultEmailAddress), @@ -636,7 +636,7 @@ func TestAccSNSTopicSubscription_firehose(t *testing.T) { Config: testAccTopicSubscriptionConfig_firehose(rName), Check: resource.ComposeTestCheckFunc( testAccCheckTopicSubscriptionExists(ctx, resourceName, &attributes), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "sns", regexache.MustCompile(fmt.Sprintf("%s:.+", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sns", regexache.MustCompile(fmt.Sprintf("%s:.+", rName))), resource.TestCheckResourceAttr(resourceName, "delivery_policy", ""), resource.TestCheckResourceAttrPair(resourceName, names.AttrEndpoint, "aws_kinesis_firehose_delivery_stream.test_stream", names.AttrARN), resource.TestCheckResourceAttr(resourceName, "filter_policy", ""), @@ -770,7 +770,7 @@ func testAccCheckTopicSubscriptionDeliveryPolicyAttribute(attributes *map[string } } -func testAccCheckTopicSubscriptionRedrivePolicyAttribute(attributes *map[string]string, expectedRedrivePolicyResource string) resource.TestCheckFunc { +func testAccCheckTopicSubscriptionRedrivePolicyAttribute(ctx context.Context, attributes *map[string]string, expectedRedrivePolicyResource string) resource.TestCheckFunc { return func(s *terraform.State) error { apiRedrivePolicyJSONString, ok := (*attributes)["RedrivePolicy"] @@ -785,7 +785,7 @@ func testAccCheckTopicSubscriptionRedrivePolicyAttribute(attributes *map[string] expectedRedrivePolicy := tfsns.TopicSubscriptionRedrivePolicy{ DeadLetterTargetArn: arn.ARN{ - AccountID: acctest.AccountID(), + AccountID: acctest.AccountID(ctx), Partition: acctest.Partition(), Region: acctest.Region(), Resource: expectedRedrivePolicyResource, diff --git a/internal/service/sns/topic_test.go b/internal/service/sns/topic_test.go index 81a75d6c4ed..81d286c8e94 100644 --- a/internal/service/sns/topic_test.go +++ b/internal/service/sns/topic_test.go @@ -54,7 +54,7 @@ func TestAccSNSTopic_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "application_success_feedback_role_arn", ""), resource.TestCheckResourceAttr(resourceName, "application_success_feedback_sample_rate", "0"), resource.TestCheckResourceAttr(resourceName, "archive_policy", ""), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "sns", regexache.MustCompile(`terraform-.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sns", regexache.MustCompile(`terraform-.+$`)), resource.TestCheckResourceAttr(resourceName, "beginning_archive_time", ""), resource.TestCheckResourceAttr(resourceName, "content_based_deduplication", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "delivery_policy", ""), @@ -72,7 +72,7 @@ func TestAccSNSTopic_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "lambda_success_feedback_sample_rate", "0"), acctest.CheckResourceAttrNameGenerated(resourceName, names.AttrName), resource.TestCheckResourceAttr(resourceName, names.AttrNamePrefix, "terraform-"), - acctest.CheckResourceAttrAccountID(resourceName, names.AttrOwner), + acctest.CheckResourceAttrAccountID(ctx, resourceName, names.AttrOwner), resource.TestCheckResourceAttrSet(resourceName, names.AttrPolicy), resource.TestCheckResourceAttr(resourceName, "signature_version", "0"), resource.TestCheckResourceAttr(resourceName, "sqs_failure_feedback_role_arn", ""), @@ -133,7 +133,7 @@ func TestAccSNSTopic_name(t *testing.T) { Config: testAccTopicConfig_name(rName), Check: resource.ComposeTestCheckFunc( testAccCheckTopicExists(ctx, resourceName, &attributes), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "sns", rName), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sns", rName), resource.TestCheckResourceAttr(resourceName, "fifo_topic", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), ), @@ -163,7 +163,7 @@ func TestAccSNSTopic_namePrefix(t *testing.T) { Config: testAccTopicConfig_namePrefix(rName), Check: resource.ComposeTestCheckFunc( testAccCheckTopicExists(ctx, resourceName, &attributes), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "sns", regexache.MustCompile(fmt.Sprintf(`%s.+$`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sns", regexache.MustCompile(fmt.Sprintf(`%s.+$`, rName))), acctest.CheckResourceAttrNameFromPrefix(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrNamePrefix, rName), resource.TestCheckResourceAttr(resourceName, "fifo_topic", acctest.CtFalse), From fff9e03dda99eefec6ffc0564d8dd8c9a6fe03dc Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:59 -0500 Subject: [PATCH 158/304] Make 'AWSClient.AccountID' a getter - sqs. --- internal/service/sqs/queue_test.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/internal/service/sqs/queue_test.go b/internal/service/sqs/queue_test.go index 90d386f5e40..ccb7747d54b 100644 --- a/internal/service/sqs/queue_test.go +++ b/internal/service/sqs/queue_test.go @@ -108,7 +108,7 @@ func TestAccSQSQueue_basic(t *testing.T) { Config: testAccQueueConfig_name(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckQueueExists(ctx, resourceName, &queueAttributes), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "sqs", rName), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sqs", rName), resource.TestCheckResourceAttr(resourceName, "content_based_deduplication", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "deduplication_scope", ""), resource.TestCheckResourceAttr(resourceName, "delay_seconds", strconv.Itoa(tfsqs.DefaultQueueDelaySeconds)), @@ -297,7 +297,7 @@ func TestAccSQSQueue_update(t *testing.T) { Config: testAccQueueConfig_name(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckQueueExists(ctx, resourceName, &queueAttributes), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "sqs", rName), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sqs", rName), resource.TestCheckResourceAttr(resourceName, "content_based_deduplication", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "deduplication_scope", ""), resource.TestCheckResourceAttr(resourceName, "delay_seconds", strconv.Itoa(tfsqs.DefaultQueueDelaySeconds)), @@ -319,7 +319,7 @@ func TestAccSQSQueue_update(t *testing.T) { Config: testAccQueueConfig_updated(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckQueueExists(ctx, resourceName, &queueAttributes), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "sqs", rName), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "sqs", rName), resource.TestCheckResourceAttr(resourceName, "content_based_deduplication", acctest.CtFalse), resource.TestCheckResourceAttr(resourceName, "deduplication_scope", ""), resource.TestCheckResourceAttr(resourceName, "delay_seconds", "90"), @@ -379,7 +379,7 @@ func TestAccSQSQueue_Policy_basic(t *testing.T) { Config: testAccQueueConfig_policy(rName), Check: resource.ComposeTestCheckFunc( testAccCheckQueueExists(ctx, resourceName, &queueAttributes), - testAccCheckQueuePolicyAttribute(&queueAttributes, rName, expectedPolicy), + testAccCheckQueuePolicyAttribute(ctx, &queueAttributes, rName, expectedPolicy), resource.TestCheckResourceAttr(resourceName, "delay_seconds", "90"), resource.TestCheckResourceAttr(resourceName, "max_message_size", "2048"), resource.TestCheckResourceAttr(resourceName, "message_retention_seconds", "86400"), @@ -433,7 +433,7 @@ func TestAccSQSQueue_Policy_ignoreEquivalent(t *testing.T) { Config: testAccQueueConfig_policyEquivalent(rName), Check: resource.ComposeTestCheckFunc( testAccCheckQueueExists(ctx, resourceName, &queueAttributes), - testAccCheckQueuePolicyAttribute(&queueAttributes, rName, expectedPolicy), + testAccCheckQueuePolicyAttribute(ctx, &queueAttributes, rName, expectedPolicy), resource.TestCheckResourceAttr(resourceName, "delay_seconds", "90"), resource.TestCheckResourceAttr(resourceName, "max_message_size", "2048"), resource.TestCheckResourceAttr(resourceName, "message_retention_seconds", "86400"), @@ -820,9 +820,9 @@ func TestAccSQSQueue_defaultKMSDataKeyReusePeriodSeconds(t *testing.T) { }) } -func testAccCheckQueuePolicyAttribute(queueAttributes *map[types.QueueAttributeName]string, rName, policyTemplate string) resource.TestCheckFunc { +func testAccCheckQueuePolicyAttribute(ctx context.Context, queueAttributes *map[types.QueueAttributeName]string, rName, policyTemplate string) resource.TestCheckFunc { return func(s *terraform.State) error { - expectedPolicy := fmt.Sprintf(policyTemplate, acctest.Partition(), acctest.Region(), acctest.AccountID(), rName) + expectedPolicy := fmt.Sprintf(policyTemplate, acctest.Partition(), acctest.Region(), acctest.AccountID(ctx), rName) var actualPolicyText string for key, value := range *queueAttributes { From c9017be3452d9579876a96eba5271308543919d2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:59 -0500 Subject: [PATCH 159/304] Make 'AWSClient.AccountID' a getter - ssm. --- internal/service/ssm/association.go | 2 +- internal/service/ssm/association_test.go | 2 +- internal/service/ssm/document_test.go | 4 ++-- internal/service/ssm/maintenance_window_task.go | 2 +- internal/service/ssm/maintenance_window_task_test.go | 2 +- internal/service/ssm/parameter_test.go | 6 +++--- internal/service/ssm/patch_baseline.go | 2 +- internal/service/ssm/patch_baseline_test.go | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/internal/service/ssm/association.go b/internal/service/ssm/association.go index fd491082a2c..aede41ecb70 100644 --- a/internal/service/ssm/association.go +++ b/internal/service/ssm/association.go @@ -280,7 +280,7 @@ func resourceAssociationRead(ctx context.Context, d *schema.ResourceData, meta i Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "ssm", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: "association/" + aws.ToString(association.AssociationId), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/ssm/association_test.go b/internal/service/ssm/association_test.go index 15228fc4567..8a9436d39c4 100644 --- a/internal/service/ssm/association_test.go +++ b/internal/service/ssm/association_test.go @@ -34,7 +34,7 @@ func TestAccSSMAssociation_basic(t *testing.T) { Config: testAccAssociationConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckAssociationExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ssm", regexache.MustCompile(`association/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ssm", regexache.MustCompile(`association/.+`)), resource.TestCheckResourceAttr(resourceName, "apply_only_at_cron_interval", acctest.CtFalse), resource.TestCheckResourceAttrPair(resourceName, names.AttrInstanceID, "aws_instance.test", names.AttrID), resource.TestCheckResourceAttr(resourceName, "output_location.#", "0"), diff --git a/internal/service/ssm/document_test.go b/internal/service/ssm/document_test.go index 0dd5e787192..7774fb24da9 100644 --- a/internal/service/ssm/document_test.go +++ b/internal/service/ssm/document_test.go @@ -37,7 +37,7 @@ func TestAccSSMDocument_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckDocumentExists(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, "document_format", "JSON"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "ssm", fmt.Sprintf("document/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ssm", fmt.Sprintf("document/%s", rName)), acctest.CheckResourceAttrRFC3339(resourceName, names.AttrCreatedDate), resource.TestCheckResourceAttrSet(resourceName, "document_version"), resource.TestCheckResourceAttr(resourceName, "version_name", ""), @@ -387,7 +387,7 @@ func TestAccSSMDocument_automation(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckDocumentExists(ctx, resourceName), resource.TestCheckResourceAttr(resourceName, "document_type", "Automation"), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "ssm", fmt.Sprintf("automation-definition/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ssm", fmt.Sprintf("automation-definition/%s", rName)), ), }, { diff --git a/internal/service/ssm/maintenance_window_task.go b/internal/service/ssm/maintenance_window_task.go index 809b208834e..5dd8ebd7de3 100644 --- a/internal/service/ssm/maintenance_window_task.go +++ b/internal/service/ssm/maintenance_window_task.go @@ -400,7 +400,7 @@ func resourceMaintenanceWindowTaskRead(ctx context.Context, d *schema.ResourceDa Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "ssm", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: "windowtask/" + windowTaskID, }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/ssm/maintenance_window_task_test.go b/internal/service/ssm/maintenance_window_task_test.go index 0f64a4e362a..1c264d3cad3 100644 --- a/internal/service/ssm/maintenance_window_task_test.go +++ b/internal/service/ssm/maintenance_window_task_test.go @@ -37,7 +37,7 @@ func TestAccSSMMaintenanceWindowTask_basic(t *testing.T) { Config: testAccMaintenanceWindowTaskConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckMaintenanceWindowTaskExists(ctx, resourceName, &before), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ssm", regexache.MustCompile(`windowtask/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ssm", regexache.MustCompile(`windowtask/.+`)), resource.TestCheckResourceAttrSet(resourceName, "window_task_id"), resource.TestCheckResourceAttrPair(resourceName, "window_id", "aws_ssm_maintenance_window.test", names.AttrID), resource.TestCheckResourceAttr(resourceName, "targets.#", "1"), diff --git a/internal/service/ssm/parameter_test.go b/internal/service/ssm/parameter_test.go index d71e413f22e..899b2ffabc5 100644 --- a/internal/service/ssm/parameter_test.go +++ b/internal/service/ssm/parameter_test.go @@ -41,7 +41,7 @@ func TestAccSSMParameter_basic(t *testing.T) { Config: testAccParameterConfig_basic(name, "String", "test2"), Check: resource.ComposeTestCheckFunc( testAccCheckParameterExists(ctx, resourceName, ¶m), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "ssm", fmt.Sprintf("parameter/%s", name)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ssm", fmt.Sprintf("parameter/%s", name)), resource.TestCheckResourceAttr(resourceName, names.AttrValue, "test2"), resource.TestCheckResourceAttr(resourceName, names.AttrType, "String"), resource.TestCheckResourceAttr(resourceName, "tier", string(awstypes.ParameterTierStandard)), @@ -90,7 +90,7 @@ func TestAccSSMParameter_multiple(t *testing.T) { Config: testAccParameterConfig_multiple(rName, "String", "test2"), Check: resource.ComposeTestCheckFunc( testAccCheckParameterExists(ctx, resourceName, ¶m), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "ssm", fmt.Sprintf("parameter/%s-1", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ssm", fmt.Sprintf("parameter/%s-1", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrValue, "test2"), resource.TestCheckResourceAttr(resourceName, names.AttrType, "String"), resource.TestCheckResourceAttr(resourceName, "tier", string(awstypes.ParameterTierStandard)), @@ -765,7 +765,7 @@ func TestAccSSMParameter_fullPath(t *testing.T) { Config: testAccParameterConfig_basic(name, "String", "test2"), Check: resource.ComposeTestCheckFunc( testAccCheckParameterExists(ctx, resourceName, ¶m), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "ssm", fmt.Sprintf("parameter%s", name)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ssm", fmt.Sprintf("parameter%s", name)), resource.TestCheckResourceAttr(resourceName, names.AttrValue, "test2"), resource.TestCheckResourceAttr(resourceName, names.AttrType, "String"), ), diff --git a/internal/service/ssm/patch_baseline.go b/internal/service/ssm/patch_baseline.go index 03d46f88b2d..eaeb32a85c1 100644 --- a/internal/service/ssm/patch_baseline.go +++ b/internal/service/ssm/patch_baseline.go @@ -331,7 +331,7 @@ func resourcePatchBaselineRead(ctx context.Context, d *schema.ResourceData, meta Partition: meta.(*conns.AWSClient).Partition(ctx), Region: meta.(*conns.AWSClient).Region, Service: "ssm", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: "patchbaseline/" + strings.TrimPrefix(d.Id(), "/"), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/ssm/patch_baseline_test.go b/internal/service/ssm/patch_baseline_test.go index 63da2629205..ed27ddee2de 100644 --- a/internal/service/ssm/patch_baseline_test.go +++ b/internal/service/ssm/patch_baseline_test.go @@ -47,7 +47,7 @@ func TestAccSSMPatchBaseline_basic(t *testing.T) { }, Check: resource.ComposeTestCheckFunc( testAccCheckPatchBaselineExists(ctx, resourceName, &before), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ssm", regexache.MustCompile(`patchbaseline/pb-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ssm", regexache.MustCompile(`patchbaseline/pb-.+`)), resource.TestCheckResourceAttr(resourceName, "approved_patches.#", "1"), resource.TestCheckTypeSetElemAttr(resourceName, "approved_patches.*", "KB123456"), resource.TestCheckResourceAttr(resourceName, names.AttrName, fmt.Sprintf("patch-baseline-%s", name)), @@ -81,7 +81,7 @@ func TestAccSSMPatchBaseline_basic(t *testing.T) { }, Check: resource.ComposeTestCheckFunc( testAccCheckPatchBaselineExists(ctx, resourceName, &after), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ssm", regexache.MustCompile(`patchbaseline/pb-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ssm", regexache.MustCompile(`patchbaseline/pb-.+`)), resource.TestCheckResourceAttr(resourceName, "approved_patches.#", "2"), resource.TestCheckTypeSetElemAttr(resourceName, "approved_patches.*", "KB123456"), resource.TestCheckTypeSetElemAttr(resourceName, "approved_patches.*", "KB456789"), From a79a831112111195475bf815e3ed8d3c09d43a66 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:59 -0500 Subject: [PATCH 160/304] Make 'AWSClient.AccountID' a getter - ssmcontacts. --- .../service/ssmcontacts/contact_channel_test.go | 2 +- internal/service/ssmcontacts/contact_test.go | 2 +- internal/service/ssmcontacts/plan_test.go | 14 +++++++------- internal/service/ssmcontacts/rotation_test.go | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/internal/service/ssmcontacts/contact_channel_test.go b/internal/service/ssmcontacts/contact_channel_test.go index 672b7a2cd3b..e4add97e5a4 100644 --- a/internal/service/ssmcontacts/contact_channel_test.go +++ b/internal/service/ssmcontacts/contact_channel_test.go @@ -52,7 +52,7 @@ func testAccContactChannel_basic(t *testing.T) { resource.TestCheckResourceAttr(channelResourceName, names.AttrName, rName), resource.TestCheckResourceAttr(channelResourceName, names.AttrType, "EMAIL"), resource.TestCheckResourceAttrPair(channelResourceName, "contact_id", contactResourceName, names.AttrARN), - acctest.MatchResourceAttrRegionalARN(channelResourceName, names.AttrARN, "ssm-contacts", regexache.MustCompile("contact-channel/test-contact-for-"+rName+"/.")), + acctest.MatchResourceAttrRegionalARN(ctx, channelResourceName, names.AttrARN, "ssm-contacts", regexache.MustCompile("contact-channel/test-contact-for-"+rName+"/.")), ), }, { diff --git a/internal/service/ssmcontacts/contact_test.go b/internal/service/ssmcontacts/contact_test.go index 8af1ce96473..9a5f0b92aa5 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(ctx, resourceName, names.AttrARN, "ssm-contacts", regexache.MustCompile(`contact/.+$`)), ), }, { diff --git a/internal/service/ssmcontacts/plan_test.go b/internal/service/ssmcontacts/plan_test.go index 1191231ce56..0c22af2586c 100644 --- a/internal/service/ssmcontacts/plan_test.go +++ b/internal/service/ssmcontacts/plan_test.go @@ -49,7 +49,7 @@ func testAccPlan_basic(t *testing.T) { testAccCheckPlanExists(ctx, planResourceName), resource.TestCheckResourceAttr(planResourceName, "stage.#", "1"), resource.TestCheckResourceAttr(planResourceName, "stage.0.duration_in_minutes", "1"), - acctest.CheckResourceAttrRegionalARN( + acctest.CheckResourceAttrRegionalARN(ctx, planResourceName, "contact_id", "ssm-contacts", @@ -317,7 +317,7 @@ func testAccPlan_updateTargets(t *testing.T) { "stage.0.target.0.contact_target_info.0.is_essential", acctest.CtFalse, ), - acctest.CheckResourceAttrRegionalARN( + acctest.CheckResourceAttrRegionalARN(ctx, planResourceName, "stage.0.target.0.contact_target_info.0.contact_id", "ssm-contacts", @@ -341,7 +341,7 @@ func testAccPlan_updateTargets(t *testing.T) { "stage.0.target.0.contact_target_info.0.is_essential", acctest.CtFalse, ), - acctest.CheckResourceAttrRegionalARN( + acctest.CheckResourceAttrRegionalARN(ctx, planResourceName, "stage.0.target.0.contact_target_info.0.contact_id", "ssm-contacts", @@ -352,7 +352,7 @@ func testAccPlan_updateTargets(t *testing.T) { "stage.0.target.1.contact_target_info.0.is_essential", acctest.CtTrue, ), - acctest.CheckResourceAttrRegionalARN( + acctest.CheckResourceAttrRegionalARN(ctx, planResourceName, "stage.0.target.1.contact_target_info.0.contact_id", "ssm-contacts", @@ -376,7 +376,7 @@ func testAccPlan_updateTargets(t *testing.T) { "stage.0.target.0.contact_target_info.0.is_essential", acctest.CtFalse, ), - acctest.CheckResourceAttrRegionalARN( + acctest.CheckResourceAttrRegionalARN(ctx, planResourceName, "stage.0.target.0.contact_target_info.0.contact_id", "ssm-contacts", @@ -425,7 +425,7 @@ func testAccPlan_updateContactTargetInfo(t *testing.T) { "stage.0.target.0.contact_target_info.0.is_essential", acctest.CtFalse, ), - acctest.CheckResourceAttrRegionalARN( + acctest.CheckResourceAttrRegionalARN(ctx, planResourceName, "stage.0.target.0.contact_target_info.0.contact_id", "ssm-contacts", @@ -449,7 +449,7 @@ func testAccPlan_updateContactTargetInfo(t *testing.T) { "stage.0.target.0.contact_target_info.0.is_essential", acctest.CtTrue, ), - acctest.CheckResourceAttrRegionalARN( + acctest.CheckResourceAttrRegionalARN(ctx, planResourceName, "stage.0.target.0.contact_target_info.0.contact_id", "ssm-contacts", diff --git a/internal/service/ssmcontacts/rotation_test.go b/internal/service/ssmcontacts/rotation_test.go index f54b544cd6b..363bafe3363 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", "1"), resource.TestCheckResourceAttr(resourceName, "recurrence.0.daily_settings.0.minute_of_hour", "0"), resource.TestCheckResourceAttr(resourceName, "contact_ids.#", "1"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "ssm-contacts", regexache.MustCompile(`rotation/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "ssm-contacts", regexache.MustCompile(`rotation/.+$`)), ), }, { From b9b829a65896a082b2afe93203e911881456b696 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:59 -0500 Subject: [PATCH 161/304] Make 'AWSClient.AccountID' a getter - ssmincidents. --- .../replication_set_data_source_test.go | 2 +- .../ssmincidents/replication_set_test.go | 26 +++++++++---------- .../response_plan_data_source_test.go | 2 +- .../ssmincidents/response_plan_test.go | 8 +++--- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/internal/service/ssmincidents/replication_set_data_source_test.go b/internal/service/ssmincidents/replication_set_data_source_test.go index f33bb20bfbd..a4d6a149716 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(ctx, 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 ffa11f3220d..cd6e1dd6153 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(ctx, 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(ctx, 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(ctx, 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(ctx, 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(ctx, 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(ctx, 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(ctx, 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, "2"), resource.TestCheckResourceAttr(resourceName, "tags_all."+rProviderKey1, rProviderVal1Ini), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "ssm-incidents", regexache.MustCompile(`replication-set/.+$`)), + acctest.MatchResourceAttrGlobalARN(ctx, 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, "2"), resource.TestCheckResourceAttr(resourceName, "tags_all."+rProviderKey1, rProviderVal1Upd), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "ssm-incidents", regexache.MustCompile(`replication-set/.+$`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "ssm-incidents", regexache.MustCompile(`replication-set/.+$`)), ), }, { @@ -312,7 +312,7 @@ func testAccReplicationSet_updateTags(t *testing.T) { resource.TestCheckResourceAttr(resourceName, acctest.CtTagsAllPercent, "4"), 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(ctx, 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, "1"), resource.TestCheckResourceAttr(resourceName, "tags."+rKey1, ""), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "ssm-incidents", regexache.MustCompile(`replication-set/.+$`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "ssm-incidents", regexache.MustCompile(`replication-set/.+$`)), ), }, { @@ -365,7 +365,7 @@ func testAccReplicationSet_updateEmptyTags(t *testing.T) { resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "2"), resource.TestCheckResourceAttr(resourceName, "tags."+rKey1, ""), resource.TestCheckResourceAttr(resourceName, "tags."+rKey2, ""), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "ssm-incidents", regexache.MustCompile(`replication-set/.+$`)), + acctest.MatchResourceAttrGlobalARN(ctx, 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, "1"), resource.TestCheckResourceAttr(resourceName, "tags."+rKey1, ""), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "ssm-incidents", regexache.MustCompile(`replication-set/.+$`)), + acctest.MatchResourceAttrGlobalARN(ctx, 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 341d2382406..48b466c7308 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(ctx, dataSourceName, names.AttrARN, "ssm-incidents", regexache.MustCompile(`response-plan/.+$`)), ), }, }, diff --git a/internal/service/ssmincidents/response_plan_test.go b/internal/service/ssmincidents/response_plan_test.go index b45c448b606..537f59678f6 100644 --- a/internal/service/ssmincidents/response_plan_test.go +++ b/internal/service/ssmincidents/response_plan_test.go @@ -48,7 +48,7 @@ func testAccResponsePlan_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "incident_template.0.title", rTitle), resource.TestCheckResourceAttr(resourceName, "incident_template.0.impact", "3"), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrARN, "ssm-incidents", fmt.Sprintf("response-plan/%s", rName)), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "ssm-incidents", fmt.Sprintf("response-plan/%s", rName)), ), }, { @@ -100,7 +100,7 @@ func testAccResponsePlan_updateRequiredFields(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "incident_template.0.title", iniTitle), resource.TestCheckResourceAttr(resourceName, "incident_template.0.impact", "1"), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrARN, "ssm-incidents", fmt.Sprintf("response-plan/%s", iniName)), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "ssm-incidents", fmt.Sprintf("response-plan/%s", iniName)), ), }, { @@ -117,7 +117,7 @@ func testAccResponsePlan_updateRequiredFields(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "incident_template.0.title", updTitle), resource.TestCheckResourceAttr(resourceName, "incident_template.0.impact", updImpact), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrARN, "ssm-incidents", fmt.Sprintf("response-plan/%s", iniName)), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "ssm-incidents", fmt.Sprintf("response-plan/%s", iniName)), ), }, { @@ -134,7 +134,7 @@ func testAccResponsePlan_updateRequiredFields(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "incident_template.0.title", updTitle), resource.TestCheckResourceAttr(resourceName, "incident_template.0.impact", updImpact), - acctest.CheckResourceAttrGlobalARN(resourceName, names.AttrARN, "ssm-incidents", fmt.Sprintf("response-plan/%s", updName)), + acctest.CheckResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "ssm-incidents", fmt.Sprintf("response-plan/%s", updName)), ), }, { From a792bd774c154e8df59ecc3f3d95ba762a110d36 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:59 -0500 Subject: [PATCH 162/304] Make 'AWSClient.AccountID' a getter - ssmquicksetup. --- internal/service/ssmquicksetup/configuration_manager_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/ssmquicksetup/configuration_manager_test.go b/internal/service/ssmquicksetup/configuration_manager_test.go index a9fd7151362..67b19135600 100644 --- a/internal/service/ssmquicksetup/configuration_manager_test.go +++ b/internal/service/ssmquicksetup/configuration_manager_test.go @@ -51,7 +51,7 @@ func TestAccSSMQuickSetupConfigurationManager_basic(t *testing.T) { resource.TestCheckTypeSetElemNestedAttrs(resourceName, "configuration_definition.*", map[string]string{ names.AttrType: "AWSQuickSetupType-PatchPolicy", }), - acctest.MatchResourceAttrRegionalARN(resourceName, "manager_arn", "ssm-quicksetup", regexache.MustCompile(`configuration-manager/+.`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "manager_arn", "ssm-quicksetup", regexache.MustCompile(`configuration-manager/+.`)), ), }, { From 19aa01c64b2778874eab7ad40e22ccb9b4716ef4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:59 -0500 Subject: [PATCH 163/304] Make 'AWSClient.AccountID' a getter - ssoadmin. --- internal/service/ssoadmin/application_test.go | 2 +- internal/service/ssoadmin/sweep.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/ssoadmin/application_test.go b/internal/service/ssoadmin/application_test.go index 47a6a83a173..0ff6ec6b805 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(ctx, resourceName, "application_arn", "sso", regexache.MustCompile(`application/.+$`)), ), }, { diff --git a/internal/service/ssoadmin/sweep.go b/internal/service/ssoadmin/sweep.go index 705a7f5c068..0d1ac540dd5 100644 --- a/internal/service/ssoadmin/sweep.go +++ b/internal/service/ssoadmin/sweep.go @@ -92,7 +92,7 @@ func sweepAccountAssignments(region string) error { for _, permissionSetArn := range permissionSetArns { input := &ssoadmin.ListAccountAssignmentsInput{ - AccountId: aws.String(client.AccountID), + AccountId: aws.String(client.AccountID(ctx)), InstanceArn: aws.String(instanceArn), PermissionSetArn: aws.String(permissionSetArn), } From 2a1f3db666f4a8aec674af87f44b6bc3054ec567 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:23:59 -0500 Subject: [PATCH 164/304] Make 'AWSClient.AccountID' a getter - storagegateway. --- .../cached_iscsi_volume_test.go | 32 +++++++++---------- .../file_system_association_test.go | 8 ++--- .../service/storagegateway/gateway_test.go | 12 +++---- .../storagegateway/nfs_file_share_test.go | 8 ++--- .../storagegateway/smb_file_share_test.go | 4 +-- .../stored_iscsi_volume_test.go | 14 ++++---- .../service/storagegateway/tape_pool_test.go | 4 +-- 7 files changed, 41 insertions(+), 41 deletions(-) diff --git a/internal/service/storagegateway/cached_iscsi_volume_test.go b/internal/service/storagegateway/cached_iscsi_volume_test.go index d4935397fc7..5de34547616 100644 --- a/internal/service/storagegateway/cached_iscsi_volume_test.go +++ b/internal/service/storagegateway/cached_iscsi_volume_test.go @@ -94,17 +94,17 @@ func TestAccStorageGatewayCachediSCSIVolume_basic(t *testing.T) { Config: testAccCachediSCSIVolumeConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckCachediSCSIVolumeExists(ctx, resourceName, &cachedIscsiVolume), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`gateway/sgw-.+/volume/vol-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`gateway/sgw-.+/volume/vol-.+`)), resource.TestCheckResourceAttr(resourceName, "chap_enabled", acctest.CtFalse), - acctest.MatchResourceAttrRegionalARN(resourceName, "gateway_arn", "storagegateway", regexache.MustCompile(`gateway/sgw-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "gateway_arn", "storagegateway", regexache.MustCompile(`gateway/sgw-.+`)), resource.TestCheckResourceAttr(resourceName, "lun_number", "0"), resource.TestMatchResourceAttr(resourceName, names.AttrNetworkInterfaceID, regexache.MustCompile(`^\d+\.\d+\.\d+\.\d+$`)), resource.TestMatchResourceAttr(resourceName, "network_interface_port", regexache.MustCompile(`^\d+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrSnapshotID, ""), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrTargetARN, "storagegateway", regexache.MustCompile(fmt.Sprintf(`gateway/sgw-.+/target/iqn.1997-05.com.amazon:%s`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrTargetARN, "storagegateway", regexache.MustCompile(fmt.Sprintf(`gateway/sgw-.+/target/iqn.1997-05.com.amazon:%s`, rName))), resource.TestCheckResourceAttr(resourceName, "target_name", rName), resource.TestMatchResourceAttr(resourceName, "volume_id", regexache.MustCompile(`^vol-.+$`)), - acctest.MatchResourceAttrRegionalARN(resourceName, "volume_arn", "storagegateway", regexache.MustCompile(`gateway/sgw-.+/volume/vol-.`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "volume_arn", "storagegateway", regexache.MustCompile(`gateway/sgw-.+/volume/vol-.`)), resource.TestCheckResourceAttr(resourceName, "volume_size_in_bytes", "5368709120"), resource.TestCheckResourceAttr(resourceName, "kms_encrypted", acctest.CtFalse), ), @@ -164,7 +164,7 @@ func TestAccStorageGatewayCachediSCSIVolume_tags(t *testing.T) { Config: testAccCachediSCSIVolumeConfig_tags1(rName, acctest.CtKey1, acctest.CtValue1), Check: resource.ComposeTestCheckFunc( testAccCheckCachediSCSIVolumeExists(ctx, resourceName, &cachedIscsiVolume), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`gateway/sgw-.+/volume/vol-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`gateway/sgw-.+/volume/vol-.+`)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsKey1, acctest.CtValue1), ), @@ -178,7 +178,7 @@ func TestAccStorageGatewayCachediSCSIVolume_tags(t *testing.T) { Config: testAccCachediSCSIVolumeConfig_tags2(rName, acctest.CtKey1, acctest.CtValue1Updated, acctest.CtKey2, acctest.CtValue2), Check: resource.ComposeTestCheckFunc( testAccCheckCachediSCSIVolumeExists(ctx, resourceName, &cachedIscsiVolume), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`gateway/sgw-.+/volume/vol-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`gateway/sgw-.+/volume/vol-.+`)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "2"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsKey1, acctest.CtValue1Updated), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsKey2, acctest.CtValue2), @@ -188,7 +188,7 @@ func TestAccStorageGatewayCachediSCSIVolume_tags(t *testing.T) { Config: testAccCachediSCSIVolumeConfig_tags1(rName, acctest.CtKey2, acctest.CtValue2), Check: resource.ComposeTestCheckFunc( testAccCheckCachediSCSIVolumeExists(ctx, resourceName, &cachedIscsiVolume), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`gateway/sgw-.+/volume/vol-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`gateway/sgw-.+/volume/vol-.+`)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsKey2, acctest.CtValue2), ), @@ -213,17 +213,17 @@ func TestAccStorageGatewayCachediSCSIVolume_snapshotID(t *testing.T) { Config: testAccCachediSCSIVolumeConfig_snapshotID(rName), Check: resource.ComposeTestCheckFunc( testAccCheckCachediSCSIVolumeExists(ctx, resourceName, &cachedIscsiVolume), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`gateway/sgw-.+/volume/vol-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`gateway/sgw-.+/volume/vol-.+`)), resource.TestCheckResourceAttr(resourceName, "chap_enabled", acctest.CtFalse), - acctest.MatchResourceAttrRegionalARN(resourceName, "gateway_arn", "storagegateway", regexache.MustCompile(`gateway/sgw-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "gateway_arn", "storagegateway", regexache.MustCompile(`gateway/sgw-.+`)), resource.TestCheckResourceAttr(resourceName, "lun_number", "0"), resource.TestMatchResourceAttr(resourceName, names.AttrNetworkInterfaceID, regexache.MustCompile(`^\d+\.\d+\.\d+\.\d+$`)), resource.TestMatchResourceAttr(resourceName, "network_interface_port", regexache.MustCompile(`^\d+$`)), resource.TestMatchResourceAttr(resourceName, names.AttrSnapshotID, regexache.MustCompile(`^snap-.+$`)), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrTargetARN, "storagegateway", regexache.MustCompile(fmt.Sprintf(`gateway/sgw-.+/target/iqn.1997-05.com.amazon:%s`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrTargetARN, "storagegateway", regexache.MustCompile(fmt.Sprintf(`gateway/sgw-.+/target/iqn.1997-05.com.amazon:%s`, rName))), resource.TestCheckResourceAttr(resourceName, "target_name", rName), resource.TestMatchResourceAttr(resourceName, "volume_id", regexache.MustCompile(`^vol-.+$`)), - acctest.MatchResourceAttrRegionalARN(resourceName, "volume_arn", "storagegateway", regexache.MustCompile(`gateway/sgw-.+/volume/vol-.`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "volume_arn", "storagegateway", regexache.MustCompile(`gateway/sgw-.+/volume/vol-.`)), resource.TestCheckResourceAttr(resourceName, "volume_size_in_bytes", "5368709120"), ), }, @@ -253,16 +253,16 @@ func TestAccStorageGatewayCachediSCSIVolume_sourceVolumeARN(t *testing.T) { Config: testAccCachediSCSIVolumeConfig_sourceARN(rName), Check: resource.ComposeTestCheckFunc( testAccCheckCachediSCSIVolumeExists(ctx, resourceName, &cachedIscsiVolume), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`gateway/sgw-.+/volume/vol-.+`)), - acctest.MatchResourceAttrRegionalARN(resourceName, "gateway_arn", "storagegateway", regexache.MustCompile(`gateway/sgw-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`gateway/sgw-.+/volume/vol-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "gateway_arn", "storagegateway", regexache.MustCompile(`gateway/sgw-.+`)), resource.TestMatchResourceAttr(resourceName, names.AttrNetworkInterfaceID, regexache.MustCompile(`^\d+\.\d+\.\d+\.\d+$`)), resource.TestMatchResourceAttr(resourceName, "network_interface_port", regexache.MustCompile(`^\d+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrSnapshotID, ""), - acctest.MatchResourceAttrRegionalARN(resourceName, "source_volume_arn", "storagegateway", regexache.MustCompile(`gateway/sgw-.+/volume/vol-.+`)), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrTargetARN, "storagegateway", regexache.MustCompile(fmt.Sprintf(`gateway/sgw-.+/target/iqn.1997-05.com.amazon:%s`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "source_volume_arn", "storagegateway", regexache.MustCompile(`gateway/sgw-.+/volume/vol-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrTargetARN, "storagegateway", regexache.MustCompile(fmt.Sprintf(`gateway/sgw-.+/target/iqn.1997-05.com.amazon:%s`, rName))), resource.TestCheckResourceAttr(resourceName, "target_name", rName), resource.TestMatchResourceAttr(resourceName, "volume_id", regexache.MustCompile(`^vol-.+$`)), - acctest.MatchResourceAttrRegionalARN(resourceName, "volume_arn", "storagegateway", regexache.MustCompile(`gateway/sgw-.+/volume/vol-.`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "volume_arn", "storagegateway", regexache.MustCompile(`gateway/sgw-.+/volume/vol-.`)), resource.TestCheckResourceAttr(resourceName, "volume_size_in_bytes", "1073741824"), ), }, diff --git a/internal/service/storagegateway/file_system_association_test.go b/internal/service/storagegateway/file_system_association_test.go index a19a5aa3f1a..e8add6349d2 100644 --- a/internal/service/storagegateway/file_system_association_test.go +++ b/internal/service/storagegateway/file_system_association_test.go @@ -41,7 +41,7 @@ func TestAccStorageGatewayFileSystemAssociation_basic(t *testing.T) { Config: testAccFileSystemAssociationConfig_required(rName, domainName, username), Check: resource.ComposeTestCheckFunc( testAccCheckFileSystemAssociationExists(ctx, resourceName, &fileSystemAssociation), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`fs-association/fsa-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`fs-association/fsa-.+`)), resource.TestCheckResourceAttrPair(resourceName, "gateway_arn", gatewayResourceName, names.AttrARN), resource.TestCheckResourceAttrPair(resourceName, "location_arn", fsxResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, names.AttrUsername, username), @@ -77,7 +77,7 @@ func TestAccStorageGatewayFileSystemAssociation_tags(t *testing.T) { Config: testAccFileSystemAssociationConfig_tags1(rName, domainName, username, acctest.CtKey1, acctest.CtValue1), Check: resource.ComposeTestCheckFunc( testAccCheckFileSystemAssociationExists(ctx, resourceName, &fileSystemAssociation), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`fs-association/fsa-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`fs-association/fsa-.+`)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsKey1, acctest.CtValue1), ), @@ -92,7 +92,7 @@ func TestAccStorageGatewayFileSystemAssociation_tags(t *testing.T) { Config: testAccFileSystemAssociationConfig_tags2(rName, domainName, username, acctest.CtKey1, acctest.CtValue1Updated, acctest.CtKey2, acctest.CtValue2), Check: resource.ComposeTestCheckFunc( testAccCheckFileSystemAssociationExists(ctx, resourceName, &fileSystemAssociation), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`fs-association/fsa-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`fs-association/fsa-.+`)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "2"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsKey1, acctest.CtValue1Updated), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsKey2, acctest.CtValue2), @@ -102,7 +102,7 @@ func TestAccStorageGatewayFileSystemAssociation_tags(t *testing.T) { Config: testAccFileSystemAssociationConfig_tags1(rName, domainName, username, acctest.CtKey2, acctest.CtValue2), Check: resource.ComposeTestCheckFunc( testAccCheckFileSystemAssociationExists(ctx, resourceName, &fileSystemAssociation), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`fs-association/fsa-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`fs-association/fsa-.+`)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsKey2, acctest.CtValue2), ), diff --git a/internal/service/storagegateway/gateway_test.go b/internal/service/storagegateway/gateway_test.go index 3824582f1dd..d099f8afc05 100644 --- a/internal/service/storagegateway/gateway_test.go +++ b/internal/service/storagegateway/gateway_test.go @@ -37,7 +37,7 @@ func TestAccStorageGatewayGateway_GatewayType_cached(t *testing.T) { Config: testAccGatewayConfig_typeCached(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGatewayExists(ctx, resourceName, &gateway), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`gateway/sgw-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`gateway/sgw-.+`)), resource.TestCheckResourceAttrPair(resourceName, "ec2_instance_id", "aws_instance.test", names.AttrID), resource.TestCheckResourceAttr(resourceName, names.AttrEndpointType, "STANDARD"), resource.TestCheckResourceAttrSet(resourceName, "gateway_id"), @@ -80,7 +80,7 @@ func TestAccStorageGatewayGateway_GatewayType_fileFSxSMB(t *testing.T) { Config: testAccGatewayConfig_typeFileFSxSMB(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGatewayExists(ctx, resourceName, &gateway), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`gateway/sgw-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`gateway/sgw-.+`)), resource.TestCheckResourceAttrPair(resourceName, "ec2_instance_id", "aws_instance.test", names.AttrID), resource.TestCheckResourceAttr(resourceName, names.AttrEndpointType, "STANDARD"), resource.TestCheckResourceAttrSet(resourceName, "gateway_id"), @@ -123,7 +123,7 @@ func TestAccStorageGatewayGateway_GatewayType_fileS3(t *testing.T) { Config: testAccGatewayConfig_typeFileS3(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGatewayExists(ctx, resourceName, &gateway), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`gateway/sgw-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`gateway/sgw-.+`)), resource.TestCheckResourceAttrPair(resourceName, "ec2_instance_id", "aws_instance.test", names.AttrID), resource.TestCheckResourceAttr(resourceName, names.AttrEndpointType, "STANDARD"), resource.TestCheckResourceAttrSet(resourceName, "gateway_id"), @@ -166,7 +166,7 @@ func TestAccStorageGatewayGateway_GatewayType_stored(t *testing.T) { Config: testAccGatewayConfig_typeStored(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGatewayExists(ctx, resourceName, &gateway), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`gateway/sgw-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`gateway/sgw-.+`)), resource.TestCheckResourceAttrPair(resourceName, "ec2_instance_id", "aws_instance.test", names.AttrID), resource.TestCheckResourceAttr(resourceName, names.AttrEndpointType, "STANDARD"), resource.TestCheckResourceAttrSet(resourceName, "gateway_id"), @@ -209,7 +209,7 @@ func TestAccStorageGatewayGateway_GatewayType_vtl(t *testing.T) { Config: testAccGatewayConfig_typeVtl(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGatewayExists(ctx, resourceName, &gateway), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`gateway/sgw-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`gateway/sgw-.+`)), resource.TestCheckResourceAttrPair(resourceName, "ec2_instance_id", "aws_instance.test", names.AttrID), resource.TestCheckResourceAttr(resourceName, names.AttrEndpointType, "STANDARD"), resource.TestCheckResourceAttrSet(resourceName, "gateway_id"), @@ -250,7 +250,7 @@ func TestAccStorageGatewayGateway_tags(t *testing.T) { Config: testAccGatewayConfig_tags1(rName, acctest.CtKey1, acctest.CtValue1), Check: resource.ComposeTestCheckFunc( testAccCheckGatewayExists(ctx, resourceName, &gateway), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`gateway/sgw-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`gateway/sgw-.+`)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsKey1, acctest.CtValue1), ), diff --git a/internal/service/storagegateway/nfs_file_share_test.go b/internal/service/storagegateway/nfs_file_share_test.go index 6ea855a1ec1..12726f747a2 100644 --- a/internal/service/storagegateway/nfs_file_share_test.go +++ b/internal/service/storagegateway/nfs_file_share_test.go @@ -39,7 +39,7 @@ func TestAccStorageGatewayNFSFileShare_basic(t *testing.T) { Config: testAccNFSFileShareConfig_required(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckNFSFileShareExists(ctx, resourceName, &nfsFileShare), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`share/share-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`share/share-.+`)), resource.TestCheckResourceAttr(resourceName, "bucket_region", ""), resource.TestCheckResourceAttr(resourceName, "cache_attributes.#", "0"), resource.TestCheckResourceAttr(resourceName, "client_list.#", "1"), @@ -126,7 +126,7 @@ func TestAccStorageGatewayNFSFileShare_tags(t *testing.T) { Config: testAccNFSFileShareConfig_tags1(rName, acctest.CtKey1, acctest.CtValue1), Check: resource.ComposeTestCheckFunc( testAccCheckNFSFileShareExists(ctx, resourceName, &nfsFileShare), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`share/share-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`share/share-.+`)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsKey1, acctest.CtValue1), ), @@ -140,7 +140,7 @@ func TestAccStorageGatewayNFSFileShare_tags(t *testing.T) { Config: testAccNFSFileShareConfig_tags2(rName, acctest.CtKey1, acctest.CtValue1Updated, acctest.CtKey2, acctest.CtValue2), Check: resource.ComposeTestCheckFunc( testAccCheckNFSFileShareExists(ctx, resourceName, &nfsFileShare), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`share/share-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`share/share-.+`)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "2"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsKey1, acctest.CtValue1Updated), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsKey2, acctest.CtValue2), @@ -150,7 +150,7 @@ func TestAccStorageGatewayNFSFileShare_tags(t *testing.T) { Config: testAccNFSFileShareConfig_tags1(rName, acctest.CtKey2, acctest.CtValue2), Check: resource.ComposeTestCheckFunc( testAccCheckNFSFileShareExists(ctx, resourceName, &nfsFileShare), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`share/share-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`share/share-.+`)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsKey2, acctest.CtValue2), ), diff --git a/internal/service/storagegateway/smb_file_share_test.go b/internal/service/storagegateway/smb_file_share_test.go index 2f274cc853b..44204eeeede 100644 --- a/internal/service/storagegateway/smb_file_share_test.go +++ b/internal/service/storagegateway/smb_file_share_test.go @@ -40,7 +40,7 @@ func TestAccStorageGatewaySMBFileShare_Authentication_activeDirectory(t *testing Config: testAccSMBFileShareConfig_authenticationActiveDirectory(rName, domainName), Check: resource.ComposeTestCheckFunc( testAccCheckSMBFileShareExists(ctx, resourceName, &smbFileShare), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`share/share-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`share/share-.+`)), resource.TestCheckResourceAttr(resourceName, "authentication", "ActiveDirectory"), resource.TestCheckResourceAttr(resourceName, "default_storage_class", "S3_STANDARD"), resource.TestMatchResourceAttr(resourceName, "fileshare_id", regexache.MustCompile(`^share-`)), @@ -91,7 +91,7 @@ func TestAccStorageGatewaySMBFileShare_Authentication_guestAccess(t *testing.T) Check: resource.ComposeTestCheckFunc( testAccCheckSMBFileShareExists(ctx, resourceName, &smbFileShare), resource.TestCheckResourceAttr(resourceName, "admin_user_list.#", "0"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`share/share-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`share/share-.+`)), resource.TestCheckResourceAttr(resourceName, "authentication", "GuestAccess"), resource.TestCheckResourceAttr(resourceName, "cache_attributes.#", "0"), resource.TestCheckResourceAttr(resourceName, "case_sensitivity", "ClientSpecified"), diff --git a/internal/service/storagegateway/stored_iscsi_volume_test.go b/internal/service/storagegateway/stored_iscsi_volume_test.go index a8c8b4b851f..39c3f0a9022 100644 --- a/internal/service/storagegateway/stored_iscsi_volume_test.go +++ b/internal/service/storagegateway/stored_iscsi_volume_test.go @@ -38,14 +38,14 @@ func TestAccStorageGatewayStorediSCSIVolume_basic(t *testing.T) { testAccCheckStorediSCSIVolumeExists(ctx, resourceName, &storedIscsiVolume), resource.TestCheckResourceAttr(resourceName, "preserve_existing_data", acctest.CtFalse), resource.TestCheckResourceAttrPair(resourceName, "disk_id", "data.aws_storagegateway_local_disk.test", names.AttrID), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`gateway/sgw-.+/volume/vol-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`gateway/sgw-.+/volume/vol-.+`)), resource.TestCheckResourceAttr(resourceName, "chap_enabled", acctest.CtFalse), resource.TestCheckResourceAttrPair(resourceName, "gateway_arn", "aws_storagegateway_gateway.test", names.AttrARN), resource.TestCheckResourceAttr(resourceName, "lun_number", "0"), resource.TestCheckResourceAttrPair(resourceName, names.AttrNetworkInterfaceID, "aws_instance.test", "private_ip"), resource.TestMatchResourceAttr(resourceName, "network_interface_port", regexache.MustCompile(`^\d+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrSnapshotID, ""), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrTargetARN, "storagegateway", regexache.MustCompile(fmt.Sprintf(`gateway/sgw-.+/target/iqn.1997-05.com.amazon:%s`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrTargetARN, "storagegateway", regexache.MustCompile(fmt.Sprintf(`gateway/sgw-.+/target/iqn.1997-05.com.amazon:%s`, rName))), resource.TestCheckResourceAttr(resourceName, "target_name", rName), resource.TestMatchResourceAttr(resourceName, "volume_id", regexache.MustCompile(`^vol-+`)), resource.TestCheckResourceAttr(resourceName, "volume_size_in_bytes", "10737418240"), @@ -108,7 +108,7 @@ func TestAccStorageGatewayStorediSCSIVolume_tags(t *testing.T) { Config: testAccStorediSCSIVolumeConfig_tags1(rName, acctest.CtKey1, acctest.CtValue1), Check: resource.ComposeTestCheckFunc( testAccCheckStorediSCSIVolumeExists(ctx, resourceName, &storedIscsiVolume), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`gateway/sgw-.+/volume/vol-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`gateway/sgw-.+/volume/vol-.+`)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsKey1, acctest.CtValue1), ), @@ -122,7 +122,7 @@ func TestAccStorageGatewayStorediSCSIVolume_tags(t *testing.T) { Config: testAccStorediSCSIVolumeConfig_tags2(rName, acctest.CtKey1, acctest.CtValue1Updated, acctest.CtKey2, acctest.CtValue2), Check: resource.ComposeTestCheckFunc( testAccCheckStorediSCSIVolumeExists(ctx, resourceName, &storedIscsiVolume), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`gateway/sgw-.+/volume/vol-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`gateway/sgw-.+/volume/vol-.+`)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "2"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsKey1, acctest.CtValue1Updated), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsKey2, acctest.CtValue2), @@ -132,7 +132,7 @@ func TestAccStorageGatewayStorediSCSIVolume_tags(t *testing.T) { Config: testAccStorediSCSIVolumeConfig_tags1(rName, acctest.CtKey2, acctest.CtValue2), Check: resource.ComposeTestCheckFunc( testAccCheckStorediSCSIVolumeExists(ctx, resourceName, &storedIscsiVolume), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`gateway/sgw-.+/volume/vol-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`gateway/sgw-.+/volume/vol-.+`)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsKey2, acctest.CtValue2), ), @@ -157,14 +157,14 @@ func TestAccStorageGatewayStorediSCSIVolume_snapshotID(t *testing.T) { Config: testAccStorediSCSIVolumeConfig_snapshotID(rName), Check: resource.ComposeTestCheckFunc( testAccCheckStorediSCSIVolumeExists(ctx, resourceName, &storedIscsiVolume), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`gateway/sgw-.+/volume/vol-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`gateway/sgw-.+/volume/vol-.+`)), resource.TestCheckResourceAttr(resourceName, "chap_enabled", acctest.CtFalse), resource.TestCheckResourceAttrPair(resourceName, "gateway_arn", "aws_storagegateway_gateway.test", names.AttrARN), resource.TestCheckResourceAttr(resourceName, "lun_number", "0"), resource.TestCheckResourceAttrPair(resourceName, names.AttrNetworkInterfaceID, "aws_instance.test", "private_ip"), resource.TestMatchResourceAttr(resourceName, "network_interface_port", regexache.MustCompile(`^\d+$`)), resource.TestCheckResourceAttrPair(resourceName, names.AttrSnapshotID, "aws_ebs_snapshot.test", names.AttrID), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrTargetARN, "storagegateway", regexache.MustCompile(fmt.Sprintf(`gateway/sgw-.+/target/iqn.1997-05.com.amazon:%s`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrTargetARN, "storagegateway", regexache.MustCompile(fmt.Sprintf(`gateway/sgw-.+/target/iqn.1997-05.com.amazon:%s`, rName))), resource.TestCheckResourceAttr(resourceName, "target_name", rName), resource.TestMatchResourceAttr(resourceName, "volume_id", regexache.MustCompile(`^vol-+`)), resource.TestCheckResourceAttr(resourceName, "volume_size_in_bytes", "10737418240"), diff --git a/internal/service/storagegateway/tape_pool_test.go b/internal/service/storagegateway/tape_pool_test.go index 3e52ac8fdab..a826ac4147c 100644 --- a/internal/service/storagegateway/tape_pool_test.go +++ b/internal/service/storagegateway/tape_pool_test.go @@ -36,7 +36,7 @@ func TestAccStorageGatewayTapePool_basic(t *testing.T) { Config: testAccTapePoolConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckTapePoolExists(ctx, resourceName, &TapePool), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`tapepool/pool-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`tapepool/pool-.+`)), resource.TestCheckResourceAttr(resourceName, "pool_name", rName), resource.TestCheckResourceAttr(resourceName, names.AttrStorageClass, "GLACIER"), resource.TestCheckResourceAttr(resourceName, "retention_lock_type", "NONE"), @@ -68,7 +68,7 @@ func TestAccStorageGatewayTapePool_retention(t *testing.T) { Config: testAccTapePoolConfig_retention(rName), Check: resource.ComposeTestCheckFunc( testAccCheckTapePoolExists(ctx, resourceName, &TapePool), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`tapepool/pool-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "storagegateway", regexache.MustCompile(`tapepool/pool-.+`)), resource.TestCheckResourceAttr(resourceName, "pool_name", rName), resource.TestCheckResourceAttr(resourceName, names.AttrStorageClass, "GLACIER"), resource.TestCheckResourceAttr(resourceName, "retention_lock_type", "GOVERNANCE"), From 882fb4fdee83fb1966da666b89ef014289a98d93 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:24:00 -0500 Subject: [PATCH 165/304] Make 'AWSClient.AccountID' a getter - sts. --- internal/service/sts/caller_identity_data_source_test.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/internal/service/sts/caller_identity_data_source_test.go b/internal/service/sts/caller_identity_data_source_test.go index f32cb0e19d4..931fb6e97c1 100644 --- a/internal/service/sts/caller_identity_data_source_test.go +++ b/internal/service/sts/caller_identity_data_source_test.go @@ -16,6 +16,7 @@ import ( func TestAccSTSCallerIdentityDataSource_basic(t *testing.T) { ctx := acctest.Context(t) + resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.STSServiceID), @@ -24,7 +25,7 @@ func TestAccSTSCallerIdentityDataSource_basic(t *testing.T) { { Config: testAccCallerIdentityConfig_basic, Check: resource.ComposeTestCheckFunc( - acctest.CheckCallerIdentityAccountID("data.aws_caller_identity.current"), + acctest.CheckCallerIdentityAccountID(ctx, "data.aws_caller_identity.current"), ), }, }, @@ -52,7 +53,7 @@ func TestAccSTSCallerIdentityDataSource_alternateRegion(t *testing.T) { { Config: testAccCallerIdentityConfig_alternateRegion(defaultRegion, alternateRegion), Check: resource.ComposeTestCheckFunc( - acctest.CheckCallerIdentityAccountID("data.aws_caller_identity.current"), + acctest.CheckCallerIdentityAccountID(ctx, "data.aws_caller_identity.current"), ), }, }, From 8e3d30f217dbe5d367d45d44fe0f4f69379a8d03 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:24:00 -0500 Subject: [PATCH 166/304] Make 'AWSClient.AccountID' a getter - swf. --- internal/service/swf/domain_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/swf/domain_test.go b/internal/service/swf/domain_test.go index bdf4a701aa1..ed11fb78011 100644 --- a/internal/service/swf/domain_test.go +++ b/internal/service/swf/domain_test.go @@ -49,7 +49,7 @@ func TestAccSWFDomain_basic(t *testing.T) { Config: testAccDomainConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckDomainExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "swf", regexache.MustCompile(`/domain/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "swf", regexache.MustCompile(`/domain/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrNamePrefix, ""), From da41b71bf911fbb2a06368c3e446d5ed823bdfcc Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:24:00 -0500 Subject: [PATCH 167/304] Make 'AWSClient.AccountID' a getter - synthetics. --- internal/service/synthetics/canary.go | 2 +- internal/service/synthetics/canary_test.go | 18 +++++++++--------- .../synthetics/group_association_test.go | 4 ++-- internal/service/synthetics/group_test.go | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/synthetics/canary.go b/internal/service/synthetics/canary.go index a28d326e863..09fe6775d67 100644 --- a/internal/service/synthetics/canary.go +++ b/internal/service/synthetics/canary.go @@ -381,7 +381,7 @@ func resourceCanaryRead(ctx context.Context, d *schema.ResourceData, meta interf Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "synthetics", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("canary:%s", aws.ToString(canary.Name)), }.String() d.Set(names.AttrARN, canaryArn) diff --git a/internal/service/synthetics/canary_test.go b/internal/service/synthetics/canary_test.go index 5048d668172..319bbfae527 100644 --- a/internal/service/synthetics/canary_test.go +++ b/internal/service/synthetics/canary_test.go @@ -37,7 +37,7 @@ func TestAccSyntheticsCanary_basic(t *testing.T) { Config: testAccCanaryConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCanaryExists(ctx, resourceName, &conf1), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "synthetics", regexache.MustCompile(`canary:.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "synthetics", regexache.MustCompile(`canary:.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttrPair(resourceName, "runtime_version", runtimeVersionDataSourceName, "version_name"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), @@ -49,8 +49,8 @@ func TestAccSyntheticsCanary_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "vpc_config.#", "0"), resource.TestCheckResourceAttr(resourceName, "schedule.0.duration_in_seconds", "0"), resource.TestCheckResourceAttr(resourceName, "schedule.0.expression", "rate(0 hour)"), - acctest.MatchResourceAttrRegionalARN(resourceName, "engine_arn", "lambda", regexache.MustCompile(fmt.Sprintf(`function:cwsyn-%s.+`, rName))), - acctest.MatchResourceAttrRegionalARN(resourceName, "source_location_arn", "lambda", regexache.MustCompile(fmt.Sprintf(`layer:cwsyn-%s.+`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "engine_arn", "lambda", regexache.MustCompile(fmt.Sprintf(`function:cwsyn-%s.+`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "source_location_arn", "lambda", regexache.MustCompile(fmt.Sprintf(`layer:cwsyn-%s.+`, rName))), resource.TestCheckResourceAttrPair(resourceName, names.AttrExecutionRoleARN, "aws_iam_role.test", names.AttrARN), resource.TestCheckResourceAttr(resourceName, "artifact_s3_location", fmt.Sprintf("%s/", rName)), resource.TestCheckResourceAttr(resourceName, "timeline.#", "1"), @@ -69,7 +69,7 @@ func TestAccSyntheticsCanary_basic(t *testing.T) { Config: testAccCanaryConfig_zipUpdated(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCanaryExists(ctx, resourceName, &conf2), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "synthetics", regexache.MustCompile(`canary:.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "synthetics", regexache.MustCompile(`canary:.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttrPair(resourceName, "runtime_version", runtimeVersionDataSourceName, "version_name"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), @@ -81,8 +81,8 @@ func TestAccSyntheticsCanary_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "vpc_config.#", "0"), resource.TestCheckResourceAttr(resourceName, "schedule.0.duration_in_seconds", "0"), resource.TestCheckResourceAttr(resourceName, "schedule.0.expression", "rate(0 hour)"), - acctest.MatchResourceAttrRegionalARN(resourceName, "engine_arn", "lambda", regexache.MustCompile(fmt.Sprintf(`function:cwsyn-%s.+`, rName))), - acctest.MatchResourceAttrRegionalARN(resourceName, "source_location_arn", "lambda", regexache.MustCompile(fmt.Sprintf(`layer:cwsyn-%s.+`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "engine_arn", "lambda", regexache.MustCompile(fmt.Sprintf(`function:cwsyn-%s.+`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "source_location_arn", "lambda", regexache.MustCompile(fmt.Sprintf(`layer:cwsyn-%s.+`, rName))), resource.TestCheckResourceAttrPair(resourceName, names.AttrExecutionRoleARN, "aws_iam_role.test", names.AttrARN), resource.TestCheckResourceAttr(resourceName, "artifact_s3_location", fmt.Sprintf("%s/test/", rName)), resource.TestCheckResourceAttr(resourceName, "timeline.#", "1"), @@ -326,7 +326,7 @@ func TestAccSyntheticsCanary_s3(t *testing.T) { Config: testAccCanaryConfig_basicS3Code(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckCanaryExists(ctx, resourceName, &conf), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "synthetics", regexache.MustCompile(`canary:.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "synthetics", regexache.MustCompile(`canary:.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttrPair(resourceName, "runtime_version", runtimeVersionDataSourceName, "version_name"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), @@ -339,8 +339,8 @@ func TestAccSyntheticsCanary_s3(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "vpc_config.#", "0"), resource.TestCheckResourceAttr(resourceName, "schedule.0.duration_in_seconds", "0"), resource.TestCheckResourceAttr(resourceName, "schedule.0.expression", "rate(0 hour)"), - acctest.MatchResourceAttrRegionalARN(resourceName, "engine_arn", "lambda", regexache.MustCompile(fmt.Sprintf(`function:cwsyn-%s.+`, rName))), - acctest.MatchResourceAttrRegionalARN(resourceName, "source_location_arn", "lambda", regexache.MustCompile(fmt.Sprintf(`layer:cwsyn-%s.+`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "engine_arn", "lambda", regexache.MustCompile(fmt.Sprintf(`function:cwsyn-%s.+`, rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "source_location_arn", "lambda", regexache.MustCompile(fmt.Sprintf(`layer:cwsyn-%s.+`, rName))), resource.TestCheckResourceAttrPair(resourceName, names.AttrExecutionRoleARN, "aws_iam_role.test", names.AttrARN), resource.TestCheckResourceAttr(resourceName, "artifact_s3_location", fmt.Sprintf("%s/", rName)), ), diff --git a/internal/service/synthetics/group_association_test.go b/internal/service/synthetics/group_association_test.go index f761b9fa371..25b1549278f 100644 --- a/internal/service/synthetics/group_association_test.go +++ b/internal/service/synthetics/group_association_test.go @@ -36,8 +36,8 @@ func TestAccSyntheticsGroupAssociation_basic(t *testing.T) { Config: testAccGroupAssociationConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckGroupAssociationExists(ctx, resourceName, &groupSummary), - acctest.MatchResourceAttrRegionalARN(resourceName, "canary_arn", "synthetics", regexache.MustCompile(`canary:.+`)), - acctest.MatchResourceAttrRegionalARN(resourceName, "group_arn", "synthetics", regexache.MustCompile(`group:.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "canary_arn", "synthetics", regexache.MustCompile(`canary:.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "group_arn", "synthetics", regexache.MustCompile(`group:.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrGroupName, rName), resource.TestCheckResourceAttrSet(resourceName, "group_id"), ), diff --git a/internal/service/synthetics/group_test.go b/internal/service/synthetics/group_test.go index acd6affa55a..b8c0d7cccc5 100644 --- a/internal/service/synthetics/group_test.go +++ b/internal/service/synthetics/group_test.go @@ -36,7 +36,7 @@ func TestAccSyntheticsGroup_basic(t *testing.T) { Config: testAccGroupConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckGroupExists(ctx, resourceName, &group), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "synthetics", regexache.MustCompile(`group:.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "synthetics", regexache.MustCompile(`group:.+`)), resource.TestCheckResourceAttrSet(resourceName, "group_id"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), ), From bb1b1569a40dba688013d65eca5bd062488caa8f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:24:00 -0500 Subject: [PATCH 168/304] Make 'AWSClient.AccountID' a getter - timestreaminfluxdb. --- internal/service/timestreaminfluxdb/db_instance_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/timestreaminfluxdb/db_instance_test.go b/internal/service/timestreaminfluxdb/db_instance_test.go index 03c3a793d9d..4ff170fafad 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(ctx, 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)), From 3941d0b6f28ec57fcbd6bb734445e8edc999264e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:24:00 -0500 Subject: [PATCH 169/304] Make 'AWSClient.AccountID' a getter - timestreamwrite. --- .../service/timestreamwrite/database_data_source_test.go | 4 ++-- internal/service/timestreamwrite/database_test.go | 8 ++++---- internal/service/timestreamwrite/table_test.go | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/internal/service/timestreamwrite/database_data_source_test.go b/internal/service/timestreamwrite/database_data_source_test.go index b9de6657c04..7d1cee74bce 100644 --- a/internal/service/timestreamwrite/database_data_source_test.go +++ b/internal/service/timestreamwrite/database_data_source_test.go @@ -90,7 +90,7 @@ func TestAccTimestreamWriteDatabaseDataSource_updateKMSKey(t *testing.T) { Config: testAccDatabaseDataSourceConfig_basic(rDatabaseName), Check: resource.ComposeTestCheckFunc( testAccCheckDatabaseExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(dataSourceName, names.AttrKMSKeyID, "kms", regexache.MustCompile(`key/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, dataSourceName, names.AttrKMSKeyID, "kms", regexache.MustCompile(`key/.+`)), ), }, { @@ -104,7 +104,7 @@ func TestAccTimestreamWriteDatabaseDataSource_updateKMSKey(t *testing.T) { Config: testAccDatabaseDataSourceConfig_basic(rDatabaseName), Check: resource.ComposeTestCheckFunc( testAccCheckDatabaseExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(dataSourceName, names.AttrKMSKeyID, "kms", regexache.MustCompile(`key/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, dataSourceName, names.AttrKMSKeyID, "kms", regexache.MustCompile(`key/.+`)), ), }, }, diff --git a/internal/service/timestreamwrite/database_test.go b/internal/service/timestreamwrite/database_test.go index d0a05ccc18b..b5648d6dcf4 100644 --- a/internal/service/timestreamwrite/database_test.go +++ b/internal/service/timestreamwrite/database_test.go @@ -35,9 +35,9 @@ func TestAccTimestreamWriteDatabase_basic(t *testing.T) { Config: testAccDatabaseConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckDatabaseExists(ctx, resourceName), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "timestream", fmt.Sprintf("database/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "timestream", fmt.Sprintf("database/%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrDatabaseName, rName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrKMSKeyID, "kms", regexache.MustCompile(`key/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrKMSKeyID, "kms", regexache.MustCompile(`key/.+`)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), ), }, @@ -118,7 +118,7 @@ func TestAccTimestreamWriteDatabase_updateKMSKey(t *testing.T) { Config: testAccDatabaseConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckDatabaseExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrKMSKeyID, "kms", regexache.MustCompile(`key/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrKMSKeyID, "kms", regexache.MustCompile(`key/.+`)), ), }, { @@ -137,7 +137,7 @@ func TestAccTimestreamWriteDatabase_updateKMSKey(t *testing.T) { Config: testAccDatabaseConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckDatabaseExists(ctx, resourceName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrKMSKeyID, "kms", regexache.MustCompile(`key/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrKMSKeyID, "kms", regexache.MustCompile(`key/.+`)), ), }, }, diff --git a/internal/service/timestreamwrite/table_test.go b/internal/service/timestreamwrite/table_test.go index 76098e5202f..0117bb79784 100644 --- a/internal/service/timestreamwrite/table_test.go +++ b/internal/service/timestreamwrite/table_test.go @@ -38,7 +38,7 @@ func TestAccTimestreamWriteTable_basic(t *testing.T) { Config: testAccTableConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckTableExists(ctx, resourceName, &table), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "timestream", fmt.Sprintf("database/%[1]s/table/%[1]s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "timestream", fmt.Sprintf("database/%[1]s/table/%[1]s", rName)), resource.TestCheckResourceAttrPair(resourceName, names.AttrDatabaseName, dbResourceName, names.AttrDatabaseName), resource.TestCheckResourceAttr(resourceName, "magnetic_store_write_properties.#", "1"), resource.TestCheckResourceAttr(resourceName, "magnetic_store_write_properties.0.enable_magnetic_store_writes", acctest.CtFalse), From 3591071b8c93c77d47461d70919f0f032b627b26 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:24:00 -0500 Subject: [PATCH 170/304] Make 'AWSClient.AccountID' a getter - transcribe. --- internal/service/transcribe/language_model.go | 2 +- internal/service/transcribe/medical_vocabulary.go | 2 +- internal/service/transcribe/vocabulary.go | 2 +- internal/service/transcribe/vocabulary_filter.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/transcribe/language_model.go b/internal/service/transcribe/language_model.go index 71231766130..b33c31e84d0 100644 --- a/internal/service/transcribe/language_model.go +++ b/internal/service/transcribe/language_model.go @@ -166,7 +166,7 @@ func resourceLanguageModelRead(ctx context.Context, d *schema.ResourceData, meta } arn := arn.ARN{ - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "transcribe", Region: meta.(*conns.AWSClient).Region, diff --git a/internal/service/transcribe/medical_vocabulary.go b/internal/service/transcribe/medical_vocabulary.go index 99e575dfc0b..c5ce7ee368f 100644 --- a/internal/service/transcribe/medical_vocabulary.go +++ b/internal/service/transcribe/medical_vocabulary.go @@ -126,7 +126,7 @@ func resourceMedicalVocabularyRead(ctx context.Context, d *schema.ResourceData, } arn := arn.ARN{ - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "transcribe", Region: meta.(*conns.AWSClient).Region, diff --git a/internal/service/transcribe/vocabulary.go b/internal/service/transcribe/vocabulary.go index 2d75aa35414..1b1b9a23b42 100644 --- a/internal/service/transcribe/vocabulary.go +++ b/internal/service/transcribe/vocabulary.go @@ -145,7 +145,7 @@ func resourceVocabularyRead(ctx context.Context, d *schema.ResourceData, meta in } arn := arn.ARN{ - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "transcribe", Region: meta.(*conns.AWSClient).Region, diff --git a/internal/service/transcribe/vocabulary_filter.go b/internal/service/transcribe/vocabulary_filter.go index f37045ca829..6c883c314b8 100644 --- a/internal/service/transcribe/vocabulary_filter.go +++ b/internal/service/transcribe/vocabulary_filter.go @@ -143,7 +143,7 @@ func resourceVocabularyFilterRead(ctx context.Context, d *schema.ResourceData, m } arn := arn.ARN{ - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "transcribe", Region: meta.(*conns.AWSClient).Region, From f176f4182e6c3dc7d58ddebdc5de9891e3a3a842 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:24:00 -0500 Subject: [PATCH 171/304] Make 'AWSClient.AccountID' a getter - transfer. --- internal/service/transfer/server_test.go | 4 ++-- internal/service/transfer/user_test.go | 2 +- internal/service/transfer/workflow_test.go | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/transfer/server_test.go b/internal/service/transfer/server_test.go index e0d9089a913..cbf73b4d122 100644 --- a/internal/service/transfer/server_test.go +++ b/internal/service/transfer/server_test.go @@ -51,7 +51,7 @@ func testAccServer_basic(t *testing.T) { Config: testAccServerConfig_basic, Check: resource.ComposeAggregateTestCheckFunc( testAccCheckServerExists(ctx, resourceName, &conf), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "transfer", regexache.MustCompile(`server/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "transfer", regexache.MustCompile(`server/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrCertificate, ""), acctest.MatchResourceAttrRegionalHostname(resourceName, names.AttrEndpoint, "server.transfer", regexache.MustCompile(`s-[0-9a-z]+`)), resource.TestCheckResourceAttr(resourceName, "endpoint_details.#", "0"), @@ -91,7 +91,7 @@ func testAccServer_basic(t *testing.T) { Config: testAccServerConfig_updated(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckServerExists(ctx, resourceName, &conf), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "transfer", regexache.MustCompile(`server/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "transfer", regexache.MustCompile(`server/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrCertificate, ""), resource.TestCheckResourceAttr(resourceName, names.AttrDomain, "S3"), acctest.MatchResourceAttrRegionalHostname(resourceName, names.AttrEndpoint, "server.transfer", regexache.MustCompile(`s-[0-9a-z]+`)), diff --git a/internal/service/transfer/user_test.go b/internal/service/transfer/user_test.go index ad413d54779..a8354924471 100644 --- a/internal/service/transfer/user_test.go +++ b/internal/service/transfer/user_test.go @@ -36,7 +36,7 @@ func testAccUser_basic(t *testing.T) { Config: testAccUserConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckUserExists(ctx, resourceName, &conf), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "transfer", regexache.MustCompile(`user/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "transfer", regexache.MustCompile(`user/.+`)), resource.TestCheckResourceAttr(resourceName, "posix_profile.#", "0"), resource.TestCheckResourceAttrPair(resourceName, names.AttrRole, "aws_iam_role.test", names.AttrARN), resource.TestCheckResourceAttrPair(resourceName, "server_id", "aws_transfer_server.test", names.AttrID), diff --git a/internal/service/transfer/workflow_test.go b/internal/service/transfer/workflow_test.go index e77a6a91672..d43b1178888 100644 --- a/internal/service/transfer/workflow_test.go +++ b/internal/service/transfer/workflow_test.go @@ -36,7 +36,7 @@ func TestAccTransferWorkflow_basic(t *testing.T) { Config: testAccWorkflowConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckWorkflowExists(ctx, resourceName, &conf), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "transfer", regexache.MustCompile(`workflow/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "transfer", regexache.MustCompile(`workflow/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttr(resourceName, "on_exception_steps.#", "0"), resource.TestCheckResourceAttr(resourceName, "steps.#", "1"), @@ -76,7 +76,7 @@ func TestAccTransferWorkflow_onExceptionSteps(t *testing.T) { Config: testAccWorkflowConfig_onExceptionSteps(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckWorkflowExists(ctx, resourceName, &conf), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "transfer", regexache.MustCompile(`workflow/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "transfer", regexache.MustCompile(`workflow/.+`)), resource.TestCheckResourceAttr(resourceName, "on_exception_steps.#", "1"), resource.TestCheckResourceAttr(resourceName, "on_exception_steps.0.copy_step_details.#", "0"), resource.TestCheckResourceAttr(resourceName, "on_exception_steps.0.custom_step_details.#", "0"), @@ -221,7 +221,7 @@ func TestAccTransferWorkflow_allSteps(t *testing.T) { Config: testAccWorkflowConfig_allSteps(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckWorkflowExists(ctx, resourceName, &conf), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "transfer", regexache.MustCompile(`workflow/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "transfer", regexache.MustCompile(`workflow/.+`)), resource.TestCheckResourceAttr(resourceName, "on_exception_steps.#", "0"), resource.TestCheckResourceAttr(resourceName, "steps.#", "5"), resource.TestCheckResourceAttr(resourceName, "steps.0.copy_step_details.#", "1"), From 2114c290dbba4496a4bce8001f4e5b217d26afd5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:24:00 -0500 Subject: [PATCH 172/304] Make 'AWSClient.AccountID' a getter - verifiedpermissions. --- internal/service/verifiedpermissions/policy_store_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/verifiedpermissions/policy_store_test.go b/internal/service/verifiedpermissions/policy_store_test.go index 239125e3f6b..7baf6a80917 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(ctx, resourceName, names.AttrARN, "verifiedpermissions", regexache.MustCompile(`policy-store/.+$`)), ), }, { From dfffa8bc83b88aaca31898f110274b1f28347fbb Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:24:00 -0500 Subject: [PATCH 173/304] Make 'AWSClient.AccountID' a getter - vpclattice. --- .../access_log_subscription_test.go | 2 +- .../vpclattice/listener_data_source_test.go | 6 ++--- .../service/vpclattice/listener_rule_test.go | 2 +- internal/service/vpclattice/listener_test.go | 22 +++++++++---------- .../service/vpclattice/service_data_source.go | 2 +- .../vpclattice/service_network_data_source.go | 2 +- ...ervice_network_service_association_test.go | 4 ++-- .../vpclattice/service_network_test.go | 4 ++-- .../service_network_vpc_association_test.go | 6 ++--- internal/service/vpclattice/service_test.go | 4 ++-- .../service/vpclattice/target_group_test.go | 12 +++++----- 11 files changed, 33 insertions(+), 33 deletions(-) diff --git a/internal/service/vpclattice/access_log_subscription_test.go b/internal/service/vpclattice/access_log_subscription_test.go index c9aa8e9a165..436609b972d 100644 --- a/internal/service/vpclattice/access_log_subscription_test.go +++ b/internal/service/vpclattice/access_log_subscription_test.go @@ -91,7 +91,7 @@ func TestAccVPCLatticeAccessLogSubscription_basic(t *testing.T) { Config: testAccAccessLogSubscriptionConfig_basicS3(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckAccessLogSubscriptionExists(ctx, resourceName, &accesslogsubscription), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, names.VPCLatticeEndpointID, regexache.MustCompile(`accesslogsubscription/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, names.VPCLatticeEndpointID, regexache.MustCompile(`accesslogsubscription/.+$`)), resource.TestCheckResourceAttrPair(resourceName, names.AttrDestinationARN, s3BucketResourceName, names.AttrARN), resource.TestCheckResourceAttrPair(resourceName, names.AttrResourceARN, serviceNetworkResourceName, names.AttrARN), resource.TestCheckResourceAttrPair(resourceName, "resource_identifier", serviceNetworkResourceName, names.AttrID), diff --git a/internal/service/vpclattice/listener_data_source_test.go b/internal/service/vpclattice/listener_data_source_test.go index 0c705a99048..8ae7c0f4b96 100644 --- a/internal/service/vpclattice/listener_data_source_test.go +++ b/internal/service/vpclattice/listener_data_source_test.go @@ -38,7 +38,7 @@ func TestAccVPCLatticeListenerDataSource_basic(t *testing.T) { resource.TestCheckResourceAttr(dataSourceName, names.AttrName, rName), resource.TestCheckResourceAttr(dataSourceName, names.AttrProtocol, "HTTP"), resource.TestCheckResourceAttr(dataSourceName, "default_action.0.fixed_response.0.status_code", "404"), - acctest.MatchResourceAttrRegionalARN(dataSourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile(`service/svc-.*/listener/listener-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, dataSourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile(`service/svc-.*/listener/listener-.+`)), ), }, }, @@ -69,7 +69,7 @@ func TestAccVPCLatticeListenerDataSource_tags(t *testing.T) { Config: testAccListenerDataSourceConfig_one_tag(rName, tag_name, tag_value), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr(dataSourceName, "tags.tag0", "value0"), - acctest.MatchResourceAttrRegionalARN(dataSourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile(`service/svc-.*/listener/listener-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, dataSourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile(`service/svc-.*/listener/listener-.+`)), ), }, }, @@ -105,7 +105,7 @@ func TestAccVPCLatticeListenerDataSource_forwardMultiTargetGroupHTTP(t *testing. resource.TestCheckResourceAttr(dataSourceName, "default_action.0.forward.0.target_groups.0.weight", "80"), resource.TestCheckResourceAttrPair(dataSourceName, "default_action.0.forward.0.target_groups.1.target_group_identifier", targetGroup1ResourceName, names.AttrID), resource.TestCheckResourceAttr(dataSourceName, "default_action.0.forward.0.target_groups.1.weight", "20"), - acctest.MatchResourceAttrRegionalARN(dataSourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile(`service/svc-.*/listener/listener-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, dataSourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile(`service/svc-.*/listener/listener-.+`)), ), }, }, diff --git a/internal/service/vpclattice/listener_rule_test.go b/internal/service/vpclattice/listener_rule_test.go index aa883590145..66bbeb37e24 100644 --- a/internal/service/vpclattice/listener_rule_test.go +++ b/internal/service/vpclattice/listener_rule_test.go @@ -44,7 +44,7 @@ func TestAccVPCLatticeListenerRule_basic(t *testing.T) { Check: resource.ComposeAggregateTestCheckFunc( testAccCheckListenerRuleExists(ctx, resourceName, &listenerRule), resource.TestCheckResourceAttr(resourceName, names.AttrPriority, "20"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile(`service/svc-.*/listener/listener-.*/rule/rule.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile(`service/svc-.*/listener/listener-.*/rule/rule.+`)), ), }, { diff --git a/internal/service/vpclattice/listener_test.go b/internal/service/vpclattice/listener_test.go index 2a1213ba687..f1af1aa1b9d 100644 --- a/internal/service/vpclattice/listener_test.go +++ b/internal/service/vpclattice/listener_test.go @@ -50,7 +50,7 @@ func TestAccVPCLatticeListener_defaultActionUpdate(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrProtocol, "HTTPS"), resource.TestCheckResourceAttrPair(resourceName, "service_identifier", serviceName, names.AttrID), resource.TestCheckResourceAttr(resourceName, "default_action.0.fixed_response.0.status_code", "404"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile(`service/svc-.*/listener/listener-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile(`service/svc-.*/listener/listener-.+`)), ), }, { @@ -63,7 +63,7 @@ func TestAccVPCLatticeListener_defaultActionUpdate(t *testing.T) { resource.TestCheckResourceAttrPair(resourceName, "service_identifier", serviceName, names.AttrID), resource.TestCheckResourceAttrPair(resourceName, "default_action.0.forward.0.target_groups.0.target_group_identifier", targetGroupResourceName, names.AttrID), resource.TestCheckResourceAttr(resourceName, "default_action.0.forward.0.target_groups.0.weight", "100"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile(`service/svc-.*/listener/listener-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile(`service/svc-.*/listener/listener-.+`)), ), }, { @@ -102,7 +102,7 @@ func TestAccVPCLatticeListener_fixedResponseHTTP(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrProtocol, "HTTP"), resource.TestCheckResourceAttrPair(resourceName, "service_identifier", serviceName, names.AttrID), resource.TestCheckResourceAttr(resourceName, "default_action.0.fixed_response.0.status_code", "404"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile(`service/svc-.*/listener/listener-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile(`service/svc-.*/listener/listener-.+`)), ), }, { @@ -141,7 +141,7 @@ func TestAccVPCLatticeListener_fixedResponseHTTPS(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrProtocol, "HTTPS"), resource.TestCheckResourceAttrPair(resourceName, "service_identifier", serviceName, names.AttrID), resource.TestCheckResourceAttr(resourceName, "default_action.0.fixed_response.0.status_code", "404"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile(`service/svc-.*/listener/listener-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile(`service/svc-.*/listener/listener-.+`)), ), }, { @@ -182,7 +182,7 @@ func TestAccVPCLatticeListener_forwardTLSPassthrough(t *testing.T) { resource.TestCheckResourceAttrPair(resourceName, "service_identifier", serviceName, names.AttrID), resource.TestCheckResourceAttrPair(resourceName, "default_action.0.forward.0.target_groups.0.target_group_identifier", targetGroupResourceName, names.AttrID), resource.TestCheckResourceAttr(resourceName, "default_action.0.forward.0.target_groups.0.weight", "80"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile(`service\/svc-.*\/listener\/listener-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile(`service\/svc-.*\/listener\/listener-.+`)), ), }, { @@ -223,7 +223,7 @@ func TestAccVPCLatticeListener_forwardHTTPTargetGroup(t *testing.T) { resource.TestCheckResourceAttrPair(resourceName, "service_identifier", serviceName, names.AttrID), resource.TestCheckResourceAttrPair(resourceName, "default_action.0.forward.0.target_groups.0.target_group_identifier", targetGroupResourceName, names.AttrID), resource.TestCheckResourceAttr(resourceName, "default_action.0.forward.0.target_groups.0.weight", "100"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile(`service\/svc-.*\/listener\/listener-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile(`service\/svc-.*\/listener\/listener-.+`)), ), }, { @@ -264,7 +264,7 @@ func TestAccVPCLatticeListener_forwardHTTPTargetGroupCustomPort(t *testing.T) { resource.TestCheckResourceAttrPair(resourceName, "service_identifier", serviceName, names.AttrID), resource.TestCheckResourceAttrPair(resourceName, "default_action.0.forward.0.target_groups.0.target_group_identifier", targetGroupResourceName, names.AttrID), resource.TestCheckResourceAttr(resourceName, "default_action.0.forward.0.target_groups.0.weight", "100"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile(`service\/svc-.*\/listener\/listener-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile(`service\/svc-.*\/listener\/listener-.+`)), ), }, { @@ -306,7 +306,7 @@ func TestAccVPCLatticeListener_forwardHTTPSTargetGroupARN(t *testing.T) { resource.TestCheckResourceAttrPair(resourceName, "service_identifier", serviceName, names.AttrID), resource.TestCheckResourceAttrPair(resourceName, "default_action.0.forward.0.target_groups.0.target_group_identifier", targetGroupResourceName, names.AttrID), resource.TestCheckResourceAttr(resourceName, "default_action.0.forward.0.target_groups.0.weight", "100"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile(`service\/svc-.*\/listener\/listener-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile(`service\/svc-.*\/listener\/listener-.+`)), ), }, { @@ -348,7 +348,7 @@ func TestAccVPCLatticeListener_forwardHTTPSTargetGroupCustomPort(t *testing.T) { resource.TestCheckResourceAttrPair(resourceName, "service_identifier", serviceName, names.AttrID), resource.TestCheckResourceAttrPair(resourceName, "default_action.0.forward.0.target_groups.0.target_group_identifier", targetGroupResourceName, names.AttrID), resource.TestCheckResourceAttr(resourceName, "default_action.0.forward.0.target_groups.0.weight", "100"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile(`service\/svc-.*\/listener\/listener-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile(`service\/svc-.*\/listener\/listener-.+`)), ), }, { @@ -393,7 +393,7 @@ func TestAccVPCLatticeListener_forwardHTTPMultipleTargetGroups(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "default_action.0.forward.0.target_groups.0.weight", "80"), resource.TestCheckResourceAttrPair(resourceName, "default_action.0.forward.0.target_groups.1.target_group_identifier", targetGroup1ResourceName, names.AttrID), resource.TestCheckResourceAttr(resourceName, "default_action.0.forward.0.target_groups.1.weight", "20"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile(`service\/svc-.*\/listener\/listener-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile(`service\/svc-.*\/listener\/listener-.+`)), ), }, { @@ -460,7 +460,7 @@ func TestAccVPCLatticeListener_tags(t *testing.T) { testAccCheckListenerExists(ctx, resourceName, &listener), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), resource.TestCheckResourceAttr(resourceName, "tags.key0", "value0"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile(`service\/svc-.*\/listener\/listener-.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile(`service\/svc-.*\/listener\/listener-.+`)), ), }, { diff --git a/internal/service/vpclattice/service_data_source.go b/internal/service/vpclattice/service_data_source.go index 818e4d7a2db..640925a5d83 100644 --- a/internal/service/vpclattice/service_data_source.go +++ b/internal/service/vpclattice/service_data_source.go @@ -136,7 +136,7 @@ func dataSourceServiceRead(ctx context.Context, d *schema.ResourceData, meta int return sdkdiag.AppendFromErr(diags, err) } - if parsedARN.AccountID == meta.(*conns.AWSClient).AccountID { + if parsedARN.AccountID == meta.(*conns.AWSClient).AccountID(ctx) { tags, err := listTags(ctx, conn, serviceARN) if err != nil { diff --git a/internal/service/vpclattice/service_network_data_source.go b/internal/service/vpclattice/service_network_data_source.go index e225bbee803..38c8dbf00a0 100644 --- a/internal/service/vpclattice/service_network_data_source.go +++ b/internal/service/vpclattice/service_network_data_source.go @@ -90,7 +90,7 @@ func dataSourceServiceNetworkRead(ctx context.Context, d *schema.ResourceData, m return sdkdiag.AppendFromErr(diags, err) } - if parsedARN.AccountID == meta.(*conns.AWSClient).AccountID { + if parsedARN.AccountID == meta.(*conns.AWSClient).AccountID(ctx) { tags, err := listTags(ctx, conn, serviceNetworkARN) if err != nil { diff --git a/internal/service/vpclattice/service_network_service_association_test.go b/internal/service/vpclattice/service_network_service_association_test.go index 467f2cd70c8..76d82c28636 100644 --- a/internal/service/vpclattice/service_network_service_association_test.go +++ b/internal/service/vpclattice/service_network_service_association_test.go @@ -43,7 +43,7 @@ func TestAccVPCLatticeServiceNetworkServiceAssociation_basic(t *testing.T) { Config: testAccServiceNetworkServiceAssociationConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckServiceNetworkServiceAssociationExists(ctx, resourceName, &servicenetworkasc), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile("servicenetworkserviceassociation/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile("servicenetworkserviceassociation/.+$")), ), }, { @@ -76,7 +76,7 @@ func TestAccVPCLatticeServiceNetworkServiceAssociation_arn(t *testing.T) { Config: testAccServiceNetworkServiceAssociationConfig_arn(rName), Check: resource.ComposeTestCheckFunc( testAccCheckServiceNetworkServiceAssociationExists(ctx, resourceName, &servicenetworkasc), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile("servicenetworkserviceassociation/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile("servicenetworkserviceassociation/.+$")), ), }, { diff --git a/internal/service/vpclattice/service_network_test.go b/internal/service/vpclattice/service_network_test.go index 511c3abc1d7..a666a36223f 100644 --- a/internal/service/vpclattice/service_network_test.go +++ b/internal/service/vpclattice/service_network_test.go @@ -111,7 +111,7 @@ func TestAccVPCLatticeServiceNetwork_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckServiceNetworkExists(ctx, resourceName, &servicenetwork), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile("servicenetwork/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile("servicenetwork/.+$")), ), }, { @@ -173,7 +173,7 @@ func TestAccVPCLatticeServiceNetwork_full(t *testing.T) { testAccCheckServiceNetworkExists(ctx, resourceName, &servicenetwork), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "auth_type", "AWS_IAM"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile("servicenetwork/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile("servicenetwork/.+$")), ), }, { diff --git a/internal/service/vpclattice/service_network_vpc_association_test.go b/internal/service/vpclattice/service_network_vpc_association_test.go index 1bdf9ad6ece..5796ee4ccc9 100644 --- a/internal/service/vpclattice/service_network_vpc_association_test.go +++ b/internal/service/vpclattice/service_network_vpc_association_test.go @@ -43,7 +43,7 @@ func TestAccVPCLatticeServiceNetworkVPCAssociation_basic(t *testing.T) { Config: testAccServiceNetworkVPCAssociationConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckServiceNetworkVPCAssociationExists(ctx, resourceName, &servicenetworkvpcasc), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile("servicenetworkvpcassociation/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile("servicenetworkvpcassociation/.+$")), ), }, { @@ -76,7 +76,7 @@ func TestAccVPCLatticeServiceNetworkVPCAssociation_arn(t *testing.T) { Config: testAccServiceNetworkVPCAssociationConfig_arn(rName), Check: resource.ComposeTestCheckFunc( testAccCheckServiceNetworkVPCAssociationExists(ctx, resourceName, &servicenetworkvpcasc), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile("servicenetworkvpcassociation/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile("servicenetworkvpcassociation/.+$")), resource.TestCheckResourceAttrSet(resourceName, "service_network_identifier"), ), }, @@ -139,7 +139,7 @@ func TestAccVPCLatticeServiceNetworkVPCAssociation_full(t *testing.T) { Config: testAccServiceNetworkVPCAssociationConfig_full(rName), Check: resource.ComposeTestCheckFunc( testAccCheckServiceNetworkVPCAssociationExists(ctx, resourceName, &servicenetworkvpcasc), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile("servicenetworkvpcassociation/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile("servicenetworkvpcassociation/.+$")), resource.TestCheckResourceAttrSet(resourceName, "service_network_identifier"), resource.TestCheckResourceAttrSet(resourceName, "vpc_identifier"), resource.TestCheckResourceAttr(resourceName, "security_group_ids.#", "1"), diff --git a/internal/service/vpclattice/service_test.go b/internal/service/vpclattice/service_test.go index 8efc2070aa1..adde558b212 100644 --- a/internal/service/vpclattice/service_test.go +++ b/internal/service/vpclattice/service_test.go @@ -44,7 +44,7 @@ func TestAccVPCLatticeService_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckServiceExists(ctx, resourceName, &service), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile("service/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile("service/.+$")), ), }, { @@ -109,7 +109,7 @@ func TestAccVPCLatticeService_full(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "auth_type", "AWS_IAM"), resource.TestCheckResourceAttr(resourceName, "custom_domain_name", "example.com"), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile("service/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile("service/.+$")), ), }, { diff --git a/internal/service/vpclattice/target_group_test.go b/internal/service/vpclattice/target_group_test.go index 756a886e49c..ea5bef0d4ff 100644 --- a/internal/service/vpclattice/target_group_test.go +++ b/internal/service/vpclattice/target_group_test.go @@ -43,7 +43,7 @@ func TestAccVPCLatticeTargetGroup_basic(t *testing.T) { Config: testAccTargetGroupConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTargetGroupExists(ctx, resourceName, &targetGroup), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile("targetgroup/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile("targetgroup/.+$")), resource.TestCheckResourceAttr(resourceName, "config.#", "1"), resource.TestCheckResourceAttr(resourceName, "config.0.health_check.#", "1"), resource.TestCheckResourceAttr(resourceName, "config.0.health_check.0.enabled", acctest.CtTrue), @@ -171,7 +171,7 @@ func TestAccVPCLatticeTargetGroup_lambda(t *testing.T) { Config: testAccTargetGroupConfig_lambda(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTargetGroupExists(ctx, resourceName, &targetGroup), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile("targetgroup/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile("targetgroup/.+$")), resource.TestCheckResourceAttr(resourceName, "config.#", "1"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrStatus, "ACTIVE"), @@ -208,7 +208,7 @@ func TestAccVPCLatticeTargetGroup_lambdaEventStructureVersion(t *testing.T) { Config: testAccTargetGroupConfig_lambdaEventStructureVersion(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTargetGroupExists(ctx, resourceName, &targetGroup), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile("targetgroup/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile("targetgroup/.+$")), resource.TestCheckResourceAttr(resourceName, "config.#", "1"), resource.TestCheckResourceAttr(resourceName, "config.0.lambda_event_structure_version", "V2"), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), @@ -245,7 +245,7 @@ func TestAccVPCLatticeTargetGroup_ip(t *testing.T) { Config: testAccTargetGroupConfig_ip(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTargetGroupExists(ctx, resourceName, &targetGroup), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile("targetgroup/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile("targetgroup/.+$")), resource.TestCheckResourceAttr(resourceName, "config.#", "1"), resource.TestCheckResourceAttr(resourceName, "config.0.health_check.#", "1"), resource.TestCheckResourceAttr(resourceName, "config.0.health_check.0.enabled", acctest.CtTrue), @@ -278,7 +278,7 @@ func TestAccVPCLatticeTargetGroup_ip(t *testing.T) { Config: testAccTargetGroupConfig_ipUpdated(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTargetGroupExists(ctx, resourceName, &targetGroup), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile("targetgroup/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile("targetgroup/.+$")), resource.TestCheckResourceAttr(resourceName, "config.#", "1"), resource.TestCheckResourceAttr(resourceName, "config.0.health_check.#", "1"), resource.TestCheckResourceAttr(resourceName, "config.0.health_check.0.enabled", acctest.CtTrue), @@ -326,7 +326,7 @@ func TestAccVPCLatticeTargetGroup_alb(t *testing.T) { Config: testAccTargetGroupConfig_alb(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckTargetGroupExists(ctx, resourceName, &targetGroup), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile("targetgroup/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "vpc-lattice", regexache.MustCompile("targetgroup/.+$")), resource.TestCheckResourceAttr(resourceName, "config.#", "1"), resource.TestCheckResourceAttr(resourceName, "config.0.health_check.#", "0"), resource.TestCheckResourceAttr(resourceName, "config.0.ip_address_type", ""), From a1258af22c48195915d16833af57650fb5393b12 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:24:00 -0500 Subject: [PATCH 174/304] Make 'AWSClient.AccountID' a getter - waf. --- internal/service/waf/geo_match_set.go | 2 +- internal/service/waf/geo_match_set_test.go | 2 +- internal/service/waf/ipset.go | 2 +- internal/service/waf/ipset_test.go | 2 +- internal/service/waf/rate_based_rule.go | 2 +- internal/service/waf/rate_based_rule_test.go | 4 ++-- internal/service/waf/regex_match_set.go | 2 +- internal/service/waf/regex_match_set_test.go | 2 +- internal/service/waf/regex_pattern_set.go | 2 +- internal/service/waf/regex_pattern_set_test.go | 2 +- internal/service/waf/rule.go | 2 +- internal/service/waf/rule_group.go | 2 +- internal/service/waf/rule_group_test.go | 2 +- internal/service/waf/rule_test.go | 2 +- internal/service/waf/size_constraint_set.go | 2 +- internal/service/waf/size_constraint_set_test.go | 2 +- internal/service/waf/web_acl.go | 2 +- internal/service/waf/web_acl_test.go | 2 +- internal/service/waf/xss_match_set.go | 2 +- internal/service/waf/xss_match_set_test.go | 2 +- 20 files changed, 21 insertions(+), 21 deletions(-) diff --git a/internal/service/waf/geo_match_set.go b/internal/service/waf/geo_match_set.go index 120edac868f..aeed84d89d3 100644 --- a/internal/service/waf/geo_match_set.go +++ b/internal/service/waf/geo_match_set.go @@ -106,7 +106,7 @@ func resourceGeoMatchSetRead(ctx context.Context, d *schema.ResourceData, meta i arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "waf", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: "geomatchset/" + d.Id(), } d.Set(names.AttrARN, arn.String()) diff --git a/internal/service/waf/geo_match_set_test.go b/internal/service/waf/geo_match_set_test.go index 1a7d51177e3..0a8c74537fb 100644 --- a/internal/service/waf/geo_match_set_test.go +++ b/internal/service/waf/geo_match_set_test.go @@ -36,7 +36,7 @@ func TestAccWAFGeoMatchSet_basic(t *testing.T) { Config: testAccGeoMatchSetConfig_basic(geoMatchSet), Check: resource.ComposeTestCheckFunc( testAccCheckGeoMatchSetExists(ctx, resourceName, &v), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "waf", regexache.MustCompile(`geomatchset/.+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "waf", regexache.MustCompile(`geomatchset/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, geoMatchSet), resource.TestCheckResourceAttr(resourceName, "geo_match_constraint.#", "2"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "geo_match_constraint.*", map[string]string{ diff --git a/internal/service/waf/ipset.go b/internal/service/waf/ipset.go index cf0af6a96f8..e8745a011cc 100644 --- a/internal/service/waf/ipset.go +++ b/internal/service/waf/ipset.go @@ -116,7 +116,7 @@ func resourceIPSetRead(ctx context.Context, d *schema.ResourceData, meta interfa arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "waf", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: "ipset/" + d.Id(), } d.Set(names.AttrARN, arn.String()) diff --git a/internal/service/waf/ipset_test.go b/internal/service/waf/ipset_test.go index 46760d09a26..d980197ec80 100644 --- a/internal/service/waf/ipset_test.go +++ b/internal/service/waf/ipset_test.go @@ -43,7 +43,7 @@ func TestAccWAFIPSet_basic(t *testing.T) { names.AttrType: "IPV4", names.AttrValue: "192.0.7.0/24", }), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "waf", regexache.MustCompile("ipset/.+$")), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "waf", regexache.MustCompile("ipset/.+$")), ), }, { diff --git a/internal/service/waf/rate_based_rule.go b/internal/service/waf/rate_based_rule.go index bb9ac9ed2c8..86e2deb6bd8 100644 --- a/internal/service/waf/rate_based_rule.go +++ b/internal/service/waf/rate_based_rule.go @@ -157,7 +157,7 @@ func resourceRateBasedRuleRead(ctx context.Context, d *schema.ResourceData, meta arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "waf", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: "ratebasedrule/" + d.Id(), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/waf/rate_based_rule_test.go b/internal/service/waf/rate_based_rule_test.go index 04dc7b2af81..1efe1de981e 100644 --- a/internal/service/waf/rate_based_rule_test.go +++ b/internal/service/waf/rate_based_rule_test.go @@ -56,7 +56,7 @@ func testAccWAFRateBasedRule_basic(t *testing.T) { Config: testAccRateBasedRuleConfig_basic(wafRuleName), Check: resource.ComposeTestCheckFunc( testAccCheckRateBasedRuleExists(ctx, resourceName, &v), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "waf", regexache.MustCompile(`ratebasedrule/.+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "waf", regexache.MustCompile(`ratebasedrule/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, wafRuleName), resource.TestCheckResourceAttr(resourceName, "predicates.#", "1"), resource.TestCheckResourceAttr(resourceName, names.AttrMetricName, wafRuleName), @@ -281,7 +281,7 @@ func testAccWAFRateBasedRule_tags(t *testing.T) { Config: testAccRateBasedRuleConfig_tags1(ruleName, acctest.CtKey1, acctest.CtValue1), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckRateBasedRuleExists(ctx, resourceName, &rule), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "waf", regexache.MustCompile(`ratebasedrule/.+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "waf", regexache.MustCompile(`ratebasedrule/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, ruleName), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsKey1, acctest.CtValue1), diff --git a/internal/service/waf/regex_match_set.go b/internal/service/waf/regex_match_set.go index 567782034ee..ea29e519e2b 100644 --- a/internal/service/waf/regex_match_set.go +++ b/internal/service/waf/regex_match_set.go @@ -130,7 +130,7 @@ func resourceRegexMatchSetRead(ctx context.Context, d *schema.ResourceData, meta arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "waf", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: "regexmatchset/" + d.Id(), } d.Set(names.AttrARN, arn.String()) diff --git a/internal/service/waf/regex_match_set_test.go b/internal/service/waf/regex_match_set_test.go index 963748ae1c0..cf5549a5adb 100644 --- a/internal/service/waf/regex_match_set_test.go +++ b/internal/service/waf/regex_match_set_test.go @@ -62,7 +62,7 @@ func testAccRegexMatchSet_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckRegexMatchSetExists(ctx, resourceName, &matchSet), testAccCheckRegexPatternSetExists(ctx, "aws_waf_regex_pattern_set.test", &patternSet), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "waf", regexache.MustCompile(`regexmatchset/.+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "waf", regexache.MustCompile(`regexmatchset/.+`)), computeRegexMatchSetTuple(&patternSet, &fieldToMatch, "NONE", &idx), resource.TestCheckResourceAttr(resourceName, names.AttrName, matchSetName), resource.TestCheckResourceAttr(resourceName, "regex_match_tuple.#", "1"), diff --git a/internal/service/waf/regex_pattern_set.go b/internal/service/waf/regex_pattern_set.go index fcede9e747a..fa95ef18ca4 100644 --- a/internal/service/waf/regex_pattern_set.go +++ b/internal/service/waf/regex_pattern_set.go @@ -96,7 +96,7 @@ func resourceRegexPatternSetRead(ctx context.Context, d *schema.ResourceData, me arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "waf", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: "regexpatternset/" + d.Id(), } d.Set(names.AttrARN, arn.String()) diff --git a/internal/service/waf/regex_pattern_set_test.go b/internal/service/waf/regex_pattern_set_test.go index 9db5028a986..0b3ce7a2031 100644 --- a/internal/service/waf/regex_pattern_set_test.go +++ b/internal/service/waf/regex_pattern_set_test.go @@ -51,7 +51,7 @@ func testAccRegexPatternSet_basic(t *testing.T) { Config: testAccRegexPatternSetConfig_basic(patternSetName), Check: resource.ComposeTestCheckFunc( testAccCheckRegexPatternSetExists(ctx, resourceName, &v), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "waf", regexache.MustCompile(`regexpatternset/.+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "waf", regexache.MustCompile(`regexpatternset/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, patternSetName), resource.TestCheckResourceAttr(resourceName, "regex_pattern_strings.#", "2"), resource.TestCheckTypeSetElemAttr(resourceName, "regex_pattern_strings.*", "one"), diff --git a/internal/service/waf/rule.go b/internal/service/waf/rule.go index fe47ca0aeb0..692fd70b46c 100644 --- a/internal/service/waf/rule.go +++ b/internal/service/waf/rule.go @@ -149,7 +149,7 @@ func resourceRuleRead(ctx context.Context, d *schema.ResourceData, meta interfac arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "waf", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: "rule/" + d.Id(), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/waf/rule_group.go b/internal/service/waf/rule_group.go index bc03bf1d42c..7988bbca0e0 100644 --- a/internal/service/waf/rule_group.go +++ b/internal/service/waf/rule_group.go @@ -168,7 +168,7 @@ func resourceRuleGroupRead(ctx context.Context, d *schema.ResourceData, meta int arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "waf", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: "rulegroup/" + d.Id(), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/waf/rule_group_test.go b/internal/service/waf/rule_group_test.go index 4cffc1e6e58..fabc0a9e69a 100644 --- a/internal/service/waf/rule_group_test.go +++ b/internal/service/waf/rule_group_test.go @@ -51,7 +51,7 @@ func TestAccWAFRuleGroup_basic(t *testing.T) { names.AttrPriority: "50", names.AttrType: string(awstypes.WafRuleTypeRegular), }), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "waf", regexache.MustCompile(`rulegroup/.+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "waf", regexache.MustCompile(`rulegroup/.+`)), ), }, { diff --git a/internal/service/waf/rule_test.go b/internal/service/waf/rule_test.go index c27568f74c6..70280c42226 100644 --- a/internal/service/waf/rule_test.go +++ b/internal/service/waf/rule_test.go @@ -39,7 +39,7 @@ func TestAccWAFRule_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrName, wafRuleName), resource.TestCheckResourceAttr(resourceName, "predicates.#", "1"), resource.TestCheckResourceAttr(resourceName, names.AttrMetricName, wafRuleName), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "waf", regexache.MustCompile(`rule/.+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "waf", regexache.MustCompile(`rule/.+`)), ), }, { diff --git a/internal/service/waf/size_constraint_set.go b/internal/service/waf/size_constraint_set.go index 6f6a0338a72..129f78c85ac 100644 --- a/internal/service/waf/size_constraint_set.go +++ b/internal/service/waf/size_constraint_set.go @@ -127,7 +127,7 @@ func resourceSizeConstraintSetRead(ctx context.Context, d *schema.ResourceData, arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "waf", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: "sizeconstraintset/" + d.Id(), } d.Set(names.AttrARN, arn.String()) diff --git a/internal/service/waf/size_constraint_set_test.go b/internal/service/waf/size_constraint_set_test.go index a3efa84f765..f053e9463a4 100644 --- a/internal/service/waf/size_constraint_set_test.go +++ b/internal/service/waf/size_constraint_set_test.go @@ -36,7 +36,7 @@ func TestAccWAFSizeConstraintSet_basic(t *testing.T) { Config: testAccSizeConstraintSetConfig_basic(sizeConstraintSet), Check: resource.ComposeTestCheckFunc( testAccCheckSizeConstraintSetExists(ctx, resourceName, &v), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "waf", regexache.MustCompile(`sizeconstraintset/.+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "waf", regexache.MustCompile(`sizeconstraintset/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, sizeConstraintSet), resource.TestCheckResourceAttr(resourceName, "size_constraints.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "size_constraints.*", map[string]string{ diff --git a/internal/service/waf/web_acl.go b/internal/service/waf/web_acl.go index 882637698d6..f178fc71ac5 100644 --- a/internal/service/waf/web_acl.go +++ b/internal/service/waf/web_acl.go @@ -189,7 +189,7 @@ func resourceWebACLCreate(ctx context.Context, d *schema.ResourceData, meta inte arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "waf", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: "webacl/" + d.Id(), }.String() input := &waf.PutLoggingConfigurationInput{ diff --git a/internal/service/waf/web_acl_test.go b/internal/service/waf/web_acl_test.go index f7993bfb193..0a9bbeb6797 100644 --- a/internal/service/waf/web_acl_test.go +++ b/internal/service/waf/web_acl_test.go @@ -42,7 +42,7 @@ func TestAccWAFWebACL_basic(t *testing.T) { resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "0"), resource.TestCheckResourceAttr(resourceName, "rules.#", "0"), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "waf", regexache.MustCompile(`webacl/.+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "waf", regexache.MustCompile(`webacl/.+`)), ), }, { diff --git a/internal/service/waf/xss_match_set.go b/internal/service/waf/xss_match_set.go index 01706e73924..2e332d87ca4 100644 --- a/internal/service/waf/xss_match_set.go +++ b/internal/service/waf/xss_match_set.go @@ -128,7 +128,7 @@ func resourceXSSMatchSetRead(ctx context.Context, d *schema.ResourceData, meta i arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "waf", - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: "xssmatchset/" + d.Id(), } d.Set(names.AttrARN, arn.String()) diff --git a/internal/service/waf/xss_match_set_test.go b/internal/service/waf/xss_match_set_test.go index 86e3382afa3..de19c871b34 100644 --- a/internal/service/waf/xss_match_set_test.go +++ b/internal/service/waf/xss_match_set_test.go @@ -36,7 +36,7 @@ func TestAccWAFXSSMatchSet_basic(t *testing.T) { Config: testAccXSSMatchSetConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckXSSMatchSetExists(ctx, resourceName, &v), - acctest.MatchResourceAttrGlobalARN(resourceName, names.AttrARN, "waf", regexache.MustCompile(`xssmatchset/.+`)), + acctest.MatchResourceAttrGlobalARN(ctx, resourceName, names.AttrARN, "waf", regexache.MustCompile(`xssmatchset/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, "xss_match_tuples.#", "2"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "xss_match_tuples.*", map[string]string{ From 1fc532369487b3e9c802ee9a5a67ad28181abd65 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:24:00 -0500 Subject: [PATCH 175/304] Make 'AWSClient.AccountID' a getter - wafregional. --- internal/service/wafregional/ipset.go | 2 +- internal/service/wafregional/ipset_test.go | 2 +- internal/service/wafregional/rate_based_rule.go | 2 +- internal/service/wafregional/rate_based_rule_test.go | 2 +- internal/service/wafregional/rule.go | 2 +- internal/service/wafregional/rule_group.go | 2 +- internal/service/wafregional/rule_group_test.go | 2 +- internal/service/wafregional/rule_test.go | 2 +- internal/service/wafregional/web_acl.go | 4 ++-- internal/service/wafregional/web_acl_test.go | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/internal/service/wafregional/ipset.go b/internal/service/wafregional/ipset.go index 922cbde5d7c..357436ad667 100644 --- a/internal/service/wafregional/ipset.go +++ b/internal/service/wafregional/ipset.go @@ -108,7 +108,7 @@ func resourceIPSetRead(ctx context.Context, d *schema.ResourceData, meta interfa Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "waf-regional", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: "ipset/" + d.Id(), } d.Set(names.AttrARN, arn.String()) diff --git a/internal/service/wafregional/ipset_test.go b/internal/service/wafregional/ipset_test.go index 2117cd4c124..409d54996fe 100644 --- a/internal/service/wafregional/ipset_test.go +++ b/internal/service/wafregional/ipset_test.go @@ -43,7 +43,7 @@ func TestAccWAFRegionalIPSet_basic(t *testing.T) { names.AttrType: "IPV4", names.AttrValue: "192.0.7.0/24", }), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "waf-regional", regexache.MustCompile("ipset/.+$")), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "waf-regional", regexache.MustCompile("ipset/.+$")), ), }, { diff --git a/internal/service/wafregional/rate_based_rule.go b/internal/service/wafregional/rate_based_rule.go index cd0d2546860..90869df2a2a 100644 --- a/internal/service/wafregional/rate_based_rule.go +++ b/internal/service/wafregional/rate_based_rule.go @@ -160,7 +160,7 @@ func resourceRateBasedRuleRead(ctx context.Context, d *schema.ResourceData, meta Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "waf-regional", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: "ratebasedrule/" + d.Id(), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/wafregional/rate_based_rule_test.go b/internal/service/wafregional/rate_based_rule_test.go index a186f4e5eab..90201ad7488 100644 --- a/internal/service/wafregional/rate_based_rule_test.go +++ b/internal/service/wafregional/rate_based_rule_test.go @@ -35,7 +35,7 @@ func TestAccWAFRegionalRateBasedRule_basic(t *testing.T) { Config: testAccRateBasedRuleConfig_basic(wafRuleName), Check: resource.ComposeTestCheckFunc( testAccCheckRateBasedRuleExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "waf-regional", regexache.MustCompile(`ratebasedrule/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "waf-regional", regexache.MustCompile(`ratebasedrule/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, wafRuleName), resource.TestCheckResourceAttr(resourceName, "predicate.#", "1"), resource.TestCheckResourceAttr(resourceName, names.AttrMetricName, wafRuleName), diff --git a/internal/service/wafregional/rule.go b/internal/service/wafregional/rule.go index c6169f86fa9..cee2e39a977 100644 --- a/internal/service/wafregional/rule.go +++ b/internal/service/wafregional/rule.go @@ -137,7 +137,7 @@ func resourceRuleRead(ctx context.Context, d *schema.ResourceData, meta interfac Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "waf-regional", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: "rule/" + d.Id(), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/wafregional/rule_group.go b/internal/service/wafregional/rule_group.go index 4fa127edb19..d4e69fd9d67 100644 --- a/internal/service/wafregional/rule_group.go +++ b/internal/service/wafregional/rule_group.go @@ -170,7 +170,7 @@ func resourceRuleGroupRead(ctx context.Context, d *schema.ResourceData, meta int Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "waf-regional", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: "rulegroup/" + d.Id(), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/wafregional/rule_group_test.go b/internal/service/wafregional/rule_group_test.go index 299bd854738..178486d78c1 100644 --- a/internal/service/wafregional/rule_group_test.go +++ b/internal/service/wafregional/rule_group_test.go @@ -42,7 +42,7 @@ func TestAccWAFRegionalRuleGroup_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckRuleExists(ctx, "aws_wafregional_rule.test", &rule), testAccCheckRuleGroupExists(ctx, resourceName, &group), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "waf-regional", regexache.MustCompile(`rulegroup/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "waf-regional", regexache.MustCompile(`rulegroup/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, groupName), resource.TestCheckResourceAttr(resourceName, "activated_rule.#", "1"), resource.TestCheckResourceAttr(resourceName, names.AttrMetricName, groupName), diff --git a/internal/service/wafregional/rule_test.go b/internal/service/wafregional/rule_test.go index 247ba4fccec..e500d5a6889 100644 --- a/internal/service/wafregional/rule_test.go +++ b/internal/service/wafregional/rule_test.go @@ -37,7 +37,7 @@ func TestAccWAFRegionalRule_basic(t *testing.T) { Config: testAccRuleConfig_basic(wafRuleName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "waf-regional", regexache.MustCompile(`rule/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "waf-regional", regexache.MustCompile(`rule/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, wafRuleName), resource.TestCheckResourceAttr(resourceName, "predicate.#", "1"), resource.TestCheckResourceAttr(resourceName, names.AttrMetricName, wafRuleName), diff --git a/internal/service/wafregional/web_acl.go b/internal/service/wafregional/web_acl.go index 6b25700fb3a..e62ee1acdd2 100644 --- a/internal/service/wafregional/web_acl.go +++ b/internal/service/wafregional/web_acl.go @@ -193,7 +193,7 @@ func resourceWebACLCreate(ctx context.Context, d *schema.ResourceData, meta inte Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "waf-regional", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: "webacl/" + d.Id(), }.String() @@ -248,7 +248,7 @@ func resourceWebACLRead(ctx context.Context, d *schema.ResourceData, meta interf Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "waf-regional", Region: meta.(*conns.AWSClient).Region, - AccountID: meta.(*conns.AWSClient).AccountID, + AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: "webacl/" + d.Id(), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/wafregional/web_acl_test.go b/internal/service/wafregional/web_acl_test.go index 4f36a192db6..6c1f90aa820 100644 --- a/internal/service/wafregional/web_acl_test.go +++ b/internal/service/wafregional/web_acl_test.go @@ -37,7 +37,7 @@ func TestAccWAFRegionalWebACL_basic(t *testing.T) { Config: testAccWebACLConfig_basic(wafAclName), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "waf-regional", regexache.MustCompile(`webacl/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "waf-regional", regexache.MustCompile(`webacl/.+`)), resource.TestCheckResourceAttr(resourceName, "default_action.#", "1"), resource.TestCheckResourceAttr(resourceName, "default_action.0.type", "ALLOW"), resource.TestCheckResourceAttr(resourceName, names.AttrName, wafAclName), From defc60e812d8c9d20a08addbe44333f97ffc05ef Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:24:01 -0500 Subject: [PATCH 176/304] Make 'AWSClient.AccountID' a getter - wafv2. --- .../service/wafv2/ip_set_data_source_test.go | 2 +- internal/service/wafv2/ip_set_test.go | 20 +-- .../regex_pattern_set_data_source_test.go | 2 +- .../service/wafv2/regex_pattern_set_test.go | 16 +- .../wafv2/rule_group_data_source_test.go | 2 +- internal/service/wafv2/rule_group_test.go | 150 ++++++++--------- .../service/wafv2/web_acl_association_test.go | 2 +- .../service/wafv2/web_acl_data_source_test.go | 2 +- internal/service/wafv2/web_acl_test.go | 154 +++++++++--------- 9 files changed, 175 insertions(+), 175 deletions(-) diff --git a/internal/service/wafv2/ip_set_data_source_test.go b/internal/service/wafv2/ip_set_data_source_test.go index 7a687d65bc8..efb224d88d5 100644 --- a/internal/service/wafv2/ip_set_data_source_test.go +++ b/internal/service/wafv2/ip_set_data_source_test.go @@ -34,7 +34,7 @@ func TestAccWAFV2IPSetDataSource_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrPair(datasourceName, "addresses", resourceName, "addresses"), resource.TestCheckResourceAttrPair(datasourceName, names.AttrARN, resourceName, names.AttrARN), - acctest.MatchResourceAttrRegionalARN(datasourceName, names.AttrARN, "wafv2", regexache.MustCompile(fmt.Sprintf("regional/ipset/%v/.+$", name))), + acctest.MatchResourceAttrRegionalARN(ctx, datasourceName, names.AttrARN, "wafv2", regexache.MustCompile(fmt.Sprintf("regional/ipset/%v/.+$", name))), resource.TestCheckResourceAttrPair(datasourceName, names.AttrDescription, resourceName, names.AttrDescription), resource.TestCheckResourceAttrPair(datasourceName, names.AttrID, resourceName, names.AttrID), resource.TestCheckResourceAttrPair(datasourceName, "ip_address_version", resourceName, "ip_address_version"), diff --git a/internal/service/wafv2/ip_set_test.go b/internal/service/wafv2/ip_set_test.go index 30cac94b0da..d41aa5e19e6 100644 --- a/internal/service/wafv2/ip_set_test.go +++ b/internal/service/wafv2/ip_set_test.go @@ -36,7 +36,7 @@ func TestAccWAFV2IPSet_basic(t *testing.T) { Config: testAccIPSetConfig_basic(ipSetName), Check: resource.ComposeTestCheckFunc( testAccCheckIPSetExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/ipset/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/ipset/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, ipSetName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ipSetName), resource.TestCheckResourceAttr(resourceName, names.AttrScope, string(awstypes.ScopeRegional)), @@ -51,7 +51,7 @@ func TestAccWAFV2IPSet_basic(t *testing.T) { Config: testAccIPSetConfig_update(ipSetName), Check: resource.ComposeTestCheckFunc( testAccCheckIPSetExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/ipset/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/ipset/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, ipSetName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Updated"), resource.TestCheckResourceAttr(resourceName, names.AttrScope, string(awstypes.ScopeRegional)), @@ -109,7 +109,7 @@ func TestAccWAFV2IPSet_ipv6(t *testing.T) { Config: testAccIPSetConfig_v6(ipSetName), Check: resource.ComposeTestCheckFunc( testAccCheckIPSetExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/ipset/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/ipset/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, ipSetName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ipSetName), resource.TestCheckResourceAttr(resourceName, names.AttrScope, string(awstypes.ScopeRegional)), @@ -146,7 +146,7 @@ func TestAccWAFV2IPSet_minimal(t *testing.T) { Config: testAccIPSetConfig_minimal(ipSetName), Check: resource.ComposeTestCheckFunc( testAccCheckIPSetExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/ipset/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/ipset/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, ipSetName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttr(resourceName, names.AttrScope, string(awstypes.ScopeRegional)), @@ -181,7 +181,7 @@ func TestAccWAFV2IPSet_changeNameForceNew(t *testing.T) { Config: testAccIPSetConfig_basic(ipSetName), Check: resource.ComposeTestCheckFunc( testAccCheckIPSetExists(ctx, resourceName, &before), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/ipset/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/ipset/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, ipSetName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ipSetName), resource.TestCheckResourceAttr(resourceName, names.AttrScope, string(awstypes.ScopeRegional)), @@ -193,7 +193,7 @@ func TestAccWAFV2IPSet_changeNameForceNew(t *testing.T) { Config: testAccIPSetConfig_basic(ipSetNewName), Check: resource.ComposeTestCheckFunc( testAccCheckIPSetExists(ctx, resourceName, &after), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/ipset/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/ipset/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, ipSetNewName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ipSetNewName), resource.TestCheckResourceAttr(resourceName, names.AttrScope, string(awstypes.ScopeRegional)), @@ -244,7 +244,7 @@ func TestAccWAFV2IPSet_tags(t *testing.T) { Config: testAccIPSetConfig_oneTag(ipSetName, "Tag1", "Value1"), Check: resource.ComposeTestCheckFunc( testAccCheckIPSetExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/ipset/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/ipset/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), resource.TestCheckResourceAttr(resourceName, "tags.Tag1", "Value1"), ), @@ -259,7 +259,7 @@ func TestAccWAFV2IPSet_tags(t *testing.T) { Config: testAccIPSetConfig_twoTags(ipSetName, "Tag1", "Value1Updated", "Tag2", "Value2"), Check: resource.ComposeTestCheckFunc( testAccCheckIPSetExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/ipset/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/ipset/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "2"), resource.TestCheckResourceAttr(resourceName, "tags.Tag1", "Value1Updated"), resource.TestCheckResourceAttr(resourceName, "tags.Tag2", "Value2"), @@ -269,7 +269,7 @@ func TestAccWAFV2IPSet_tags(t *testing.T) { Config: testAccIPSetConfig_oneTag(ipSetName, "Tag2", "Value2"), Check: resource.ComposeTestCheckFunc( testAccCheckIPSetExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/ipset/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/ipset/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), resource.TestCheckResourceAttr(resourceName, "tags.Tag2", "Value2"), ), @@ -294,7 +294,7 @@ func TestAccWAFV2IPSet_large(t *testing.T) { Config: testAccIPSetConfig_large(ipSetName), Check: resource.ComposeTestCheckFunc( testAccCheckIPSetExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/ipset/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/ipset/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, ipSetName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ipSetName), resource.TestCheckResourceAttr(resourceName, names.AttrScope, string(awstypes.ScopeRegional)), diff --git a/internal/service/wafv2/regex_pattern_set_data_source_test.go b/internal/service/wafv2/regex_pattern_set_data_source_test.go index d11832b5dfb..8fc1e7f08f0 100644 --- a/internal/service/wafv2/regex_pattern_set_data_source_test.go +++ b/internal/service/wafv2/regex_pattern_set_data_source_test.go @@ -33,7 +33,7 @@ func TestAccWAFV2RegexPatternSetDataSource_basic(t *testing.T) { Config: testAccRegexPatternSetDataSourceConfig_name(name), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrPair(datasourceName, names.AttrARN, resourceName, names.AttrARN), - acctest.MatchResourceAttrRegionalARN(datasourceName, names.AttrARN, "wafv2", regexache.MustCompile(fmt.Sprintf("regional/regexpatternset/%v/.+$", name))), + acctest.MatchResourceAttrRegionalARN(ctx, datasourceName, names.AttrARN, "wafv2", regexache.MustCompile(fmt.Sprintf("regional/regexpatternset/%v/.+$", name))), resource.TestCheckResourceAttrPair(datasourceName, names.AttrDescription, resourceName, names.AttrDescription), resource.TestCheckResourceAttrPair(datasourceName, names.AttrID, resourceName, names.AttrID), resource.TestCheckResourceAttrPair(datasourceName, names.AttrName, resourceName, names.AttrName), diff --git a/internal/service/wafv2/regex_pattern_set_test.go b/internal/service/wafv2/regex_pattern_set_test.go index 87e7460842a..aeed5af2160 100644 --- a/internal/service/wafv2/regex_pattern_set_test.go +++ b/internal/service/wafv2/regex_pattern_set_test.go @@ -36,7 +36,7 @@ func TestAccWAFV2RegexPatternSet_basic(t *testing.T) { Config: testAccRegexPatternSetConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckRegexPatternSetExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/regexpatternset/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/regexpatternset/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, rName), resource.TestCheckResourceAttr(resourceName, names.AttrScope, string(awstypes.ScopeRegional)), @@ -54,7 +54,7 @@ func TestAccWAFV2RegexPatternSet_basic(t *testing.T) { Config: testAccRegexPatternSetConfig_update(rName), Check: resource.ComposeTestCheckFunc( testAccCheckRegexPatternSetExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/regexpatternset/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/regexpatternset/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Updated"), resource.TestCheckResourceAttr(resourceName, names.AttrScope, string(awstypes.ScopeRegional)), @@ -121,7 +121,7 @@ func TestAccWAFV2RegexPatternSet_minimal(t *testing.T) { Config: testAccRegexPatternSetConfig_minimal(rName), Check: resource.ComposeTestCheckFunc( testAccCheckRegexPatternSetExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/regexpatternset/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/regexpatternset/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttr(resourceName, names.AttrScope, string(awstypes.ScopeRegional)), @@ -149,7 +149,7 @@ func TestAccWAFV2RegexPatternSet_changeNameForceNew(t *testing.T) { Config: testAccRegexPatternSetConfig_basic(rName), Check: resource.ComposeTestCheckFunc( testAccCheckRegexPatternSetExists(ctx, resourceName, &before), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/regexpatternset/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/regexpatternset/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, rName), resource.TestCheckResourceAttr(resourceName, names.AttrScope, string(awstypes.ScopeRegional)), @@ -160,7 +160,7 @@ func TestAccWAFV2RegexPatternSet_changeNameForceNew(t *testing.T) { Config: testAccRegexPatternSetConfig_basic(rNewName), Check: resource.ComposeTestCheckFunc( testAccCheckRegexPatternSetExists(ctx, resourceName, &after), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/regexpatternset/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/regexpatternset/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, rNewName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, rNewName), resource.TestCheckResourceAttr(resourceName, names.AttrScope, string(awstypes.ScopeRegional)), @@ -187,7 +187,7 @@ func TestAccWAFV2RegexPatternSet_tags(t *testing.T) { Config: testAccRegexPatternSetConfig_oneTag(rName, "Tag1", "Value1"), Check: resource.ComposeTestCheckFunc( testAccCheckRegexPatternSetExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/regexpatternset/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/regexpatternset/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), resource.TestCheckResourceAttr(resourceName, "tags.Tag1", "Value1"), ), @@ -202,7 +202,7 @@ func TestAccWAFV2RegexPatternSet_tags(t *testing.T) { Config: testAccRegexPatternSetConfig_twoTags(rName, "Tag1", "Value1Updated", "Tag2", "Value2"), Check: resource.ComposeTestCheckFunc( testAccCheckRegexPatternSetExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/regexpatternset/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/regexpatternset/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "2"), resource.TestCheckResourceAttr(resourceName, "tags.Tag1", "Value1Updated"), resource.TestCheckResourceAttr(resourceName, "tags.Tag2", "Value2"), @@ -212,7 +212,7 @@ func TestAccWAFV2RegexPatternSet_tags(t *testing.T) { Config: testAccRegexPatternSetConfig_oneTag(rName, "Tag2", "Value2"), Check: resource.ComposeTestCheckFunc( testAccCheckRegexPatternSetExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/regexpatternset/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/regexpatternset/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), resource.TestCheckResourceAttr(resourceName, "tags.Tag2", "Value2"), ), diff --git a/internal/service/wafv2/rule_group_data_source_test.go b/internal/service/wafv2/rule_group_data_source_test.go index 1181ef31ca3..29175d3b238 100644 --- a/internal/service/wafv2/rule_group_data_source_test.go +++ b/internal/service/wafv2/rule_group_data_source_test.go @@ -33,7 +33,7 @@ func TestAccWAFV2RuleGroupDataSource_basic(t *testing.T) { Config: testAccRuleGroupDataSourceConfig_name(name), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrPair(datasourceName, names.AttrARN, resourceName, names.AttrARN), - acctest.MatchResourceAttrRegionalARN(datasourceName, names.AttrARN, "wafv2", regexache.MustCompile(fmt.Sprintf("regional/rulegroup/%v/.+$", name))), + acctest.MatchResourceAttrRegionalARN(ctx, datasourceName, names.AttrARN, "wafv2", regexache.MustCompile(fmt.Sprintf("regional/rulegroup/%v/.+$", name))), resource.TestCheckResourceAttrPair(datasourceName, names.AttrDescription, resourceName, names.AttrDescription), resource.TestCheckResourceAttrPair(datasourceName, names.AttrID, resourceName, names.AttrID), resource.TestCheckResourceAttrPair(datasourceName, names.AttrName, resourceName, names.AttrName), diff --git a/internal/service/wafv2/rule_group_test.go b/internal/service/wafv2/rule_group_test.go index e7c5e95914c..e2479e7ca87 100644 --- a/internal/service/wafv2/rule_group_test.go +++ b/internal/service/wafv2/rule_group_test.go @@ -39,7 +39,7 @@ func TestAccWAFV2RuleGroup_basic(t *testing.T) { Config: testAccRuleGroupConfig_basic(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, "capacity", "2"), resource.TestCheckResourceAttr(resourceName, names.AttrName, ruleGroupName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ruleGroupName), @@ -136,7 +136,7 @@ func TestAccWAFV2RuleGroup_updateRule(t *testing.T) { Config: testAccRuleGroupConfig_basic(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, "capacity", "2"), resource.TestCheckResourceAttr(resourceName, names.AttrName, ruleGroupName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ruleGroupName), @@ -153,7 +153,7 @@ func TestAccWAFV2RuleGroup_updateRule(t *testing.T) { Config: testAccRuleGroupConfig_basicUpdate(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, "capacity", "50"), resource.TestCheckResourceAttr(resourceName, names.AttrName, ruleGroupName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Updated"), @@ -206,7 +206,7 @@ func TestAccWAFV2RuleGroup_updateRuleProperties(t *testing.T) { Config: testAccRuleGroupConfig_basicUpdate(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, "capacity", "50"), resource.TestCheckResourceAttr(resourceName, names.AttrName, ruleGroupName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Updated"), @@ -240,7 +240,7 @@ func TestAccWAFV2RuleGroup_updateRuleProperties(t *testing.T) { Config: testAccRuleGroupConfig_updateMultiples(ruleGroupName, "rule-1", ruleName2, 1, 2), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, "capacity", "50"), resource.TestCheckResourceAttr(resourceName, names.AttrName, ruleGroupName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Updated"), @@ -304,7 +304,7 @@ func TestAccWAFV2RuleGroup_updateRuleProperties(t *testing.T) { Config: testAccRuleGroupConfig_updateMultiples(ruleGroupName, "rule-1", "updated", 5, 10), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, "capacity", "50"), resource.TestCheckResourceAttr(resourceName, names.AttrName, ruleGroupName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Updated"), @@ -389,7 +389,7 @@ func TestAccWAFV2RuleGroup_byteMatchStatement(t *testing.T) { Config: testAccRuleGroupConfig_byteMatchStatement(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -412,7 +412,7 @@ func TestAccWAFV2RuleGroup_byteMatchStatement(t *testing.T) { Config: testAccRuleGroupConfig_byteMatchStatementUpdate(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -453,7 +453,7 @@ func TestAccWAFV2RuleGroup_ByteMatchStatement_fieldToMatch(t *testing.T) { Config: testAccRuleGroupConfig_byteMatchStatementFieldToMatchAllQueryArguments(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -478,7 +478,7 @@ func TestAccWAFV2RuleGroup_ByteMatchStatement_fieldToMatch(t *testing.T) { Config: testAccRuleGroupConfig_byteMatchStatementFieldToMatchBody(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -503,7 +503,7 @@ func TestAccWAFV2RuleGroup_ByteMatchStatement_fieldToMatch(t *testing.T) { Config: testAccRuleGroupConfig_byteMatchStatementFieldToMatchCookies(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -533,7 +533,7 @@ func TestAccWAFV2RuleGroup_ByteMatchStatement_fieldToMatch(t *testing.T) { Config: testAccRuleGroupConfig_byteMatchStatementFieldToMatchJSONBody(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -554,7 +554,7 @@ func TestAccWAFV2RuleGroup_ByteMatchStatement_fieldToMatch(t *testing.T) { Config: testAccRuleGroupConfig_byteMatchStatementFieldToMatchHeaderOrder(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -580,7 +580,7 @@ func TestAccWAFV2RuleGroup_ByteMatchStatement_fieldToMatch(t *testing.T) { Config: testAccRuleGroupConfig_byteMatchStatementFieldToMatchHeadersMatchPatternAll(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -611,7 +611,7 @@ func TestAccWAFV2RuleGroup_ByteMatchStatement_fieldToMatch(t *testing.T) { Config: testAccRuleGroupConfig_byteMatchStatementFieldToMatchHeadersMatchPatternIncludedHeaders(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -644,7 +644,7 @@ func TestAccWAFV2RuleGroup_ByteMatchStatement_fieldToMatch(t *testing.T) { Config: testAccRuleGroupConfig_byteMatchStatementFieldToMatchHeadersMatchPatternExcludedHeaders(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -681,7 +681,7 @@ func TestAccWAFV2RuleGroup_ByteMatchStatement_fieldToMatch(t *testing.T) { Config: testAccRuleGroupConfig_byteMatchStatementFieldToMatchMethod(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -706,7 +706,7 @@ func TestAccWAFV2RuleGroup_ByteMatchStatement_fieldToMatch(t *testing.T) { Config: testAccRuleGroupConfig_byteMatchStatementFieldToMatchQueryString(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -731,7 +731,7 @@ func TestAccWAFV2RuleGroup_ByteMatchStatement_fieldToMatch(t *testing.T) { Config: testAccRuleGroupConfig_byteMatchStatementFieldToMatchSingleHeader(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -757,7 +757,7 @@ func TestAccWAFV2RuleGroup_ByteMatchStatement_fieldToMatch(t *testing.T) { Config: testAccRuleGroupConfig_byteMatchStatementFieldToMatchSingleQueryArgument(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -783,7 +783,7 @@ func TestAccWAFV2RuleGroup_ByteMatchStatement_fieldToMatch(t *testing.T) { Config: testAccRuleGroupConfig_byteMatchStatementFieldToMatchURIPath(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -831,7 +831,7 @@ func TestAccWAFV2RuleGroup_changeNameForceNew(t *testing.T) { Config: testAccRuleGroupConfig_basic(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &before), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, "capacity", "2"), resource.TestCheckResourceAttr(resourceName, names.AttrName, ruleGroupName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ruleGroupName), @@ -847,7 +847,7 @@ func TestAccWAFV2RuleGroup_changeNameForceNew(t *testing.T) { Config: testAccRuleGroupConfig_basic(ruleGroupNewName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &after), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, "capacity", "2"), resource.TestCheckResourceAttr(resourceName, names.AttrName, ruleGroupNewName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ruleGroupNewName), @@ -879,7 +879,7 @@ func TestAccWAFV2RuleGroup_changeCapacityForceNew(t *testing.T) { Config: testAccRuleGroupConfig_basic(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &before), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, "capacity", "2"), resource.TestCheckResourceAttr(resourceName, names.AttrName, ruleGroupName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ruleGroupName), @@ -895,7 +895,7 @@ func TestAccWAFV2RuleGroup_changeCapacityForceNew(t *testing.T) { Config: testAccRuleGroupConfig_updateCapacity(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &after), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, "capacity", "3"), resource.TestCheckResourceAttr(resourceName, names.AttrName, ruleGroupName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ruleGroupName), @@ -927,7 +927,7 @@ func TestAccWAFV2RuleGroup_changeMetricNameForceNew(t *testing.T) { Config: testAccRuleGroupConfig_basic(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &before), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, "capacity", "2"), resource.TestCheckResourceAttr(resourceName, names.AttrName, ruleGroupName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ruleGroupName), @@ -943,7 +943,7 @@ func TestAccWAFV2RuleGroup_changeMetricNameForceNew(t *testing.T) { Config: testAccRuleGroupConfig_updateMetricName(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &after), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, "capacity", "2"), resource.TestCheckResourceAttr(resourceName, names.AttrName, ruleGroupName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ruleGroupName), @@ -999,7 +999,7 @@ func TestAccWAFV2RuleGroup_RuleLabels(t *testing.T) { Config: testAccRuleGroupConfig_labels(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "rule_label.#": "2", @@ -1012,7 +1012,7 @@ func TestAccWAFV2RuleGroup_RuleLabels(t *testing.T) { Config: testAccRuleGroupConfig_noLabels(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "rule_label.#": "0", @@ -1045,7 +1045,7 @@ func TestAccWAFV2RuleGroup_geoMatchStatement(t *testing.T) { Config: testAccRuleGroupConfig_geoMatchStatement(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -1061,7 +1061,7 @@ func TestAccWAFV2RuleGroup_geoMatchStatement(t *testing.T) { Config: testAccRuleGroupConfig_geoMatchStatementUpdate(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -1100,7 +1100,7 @@ func TestAccWAFV2RuleGroup_GeoMatchStatement_forwardedIP(t *testing.T) { Config: testAccRuleGroupConfig_geoMatchStatementForwardedIP(ruleGroupName, "MATCH", "X-Forwarded-For"), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -1118,7 +1118,7 @@ func TestAccWAFV2RuleGroup_GeoMatchStatement_forwardedIP(t *testing.T) { Config: testAccRuleGroupConfig_geoMatchStatementForwardedIP(ruleGroupName, "NO_MATCH", "Updated"), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -1158,7 +1158,7 @@ func TestAccWAFV2RuleGroup_LabelMatchStatement(t *testing.T) { Config: testAccRuleGroupConfig_labelMatchStatement(ruleGroupName, "LABEL", "Hashicorp:Test:Label1"), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -1172,7 +1172,7 @@ func TestAccWAFV2RuleGroup_LabelMatchStatement(t *testing.T) { Config: testAccRuleGroupConfig_labelMatchStatement(ruleGroupName, "NAMESPACE", "awswaf:managed:aws:bot-control:"), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -1208,7 +1208,7 @@ func TestAccWAFV2RuleGroup_ipSetReferenceStatement(t *testing.T) { Config: testAccRuleGroupConfig_ipsetReferenceStatement(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -1246,7 +1246,7 @@ func TestAccWAFV2RuleGroup_IPSetReferenceStatement_ipsetForwardedIP(t *testing.T Config: testAccRuleGroupConfig_ipsetReferenceStatementIPSetForwardedIP(ruleGroupName, "MATCH", "X-Forwarded-For", "FIRST"), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -1267,7 +1267,7 @@ func TestAccWAFV2RuleGroup_IPSetReferenceStatement_ipsetForwardedIP(t *testing.T Config: testAccRuleGroupConfig_ipsetReferenceStatementIPSetForwardedIP(ruleGroupName, "NO_MATCH", "X-Forwarded-For", "LAST"), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -1288,7 +1288,7 @@ func TestAccWAFV2RuleGroup_IPSetReferenceStatement_ipsetForwardedIP(t *testing.T Config: testAccRuleGroupConfig_ipsetReferenceStatementIPSetForwardedIP(ruleGroupName, "MATCH", "Updated", "ANY"), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -1309,7 +1309,7 @@ func TestAccWAFV2RuleGroup_IPSetReferenceStatement_ipsetForwardedIP(t *testing.T Config: testAccRuleGroupConfig_ipsetReferenceStatement(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -1347,7 +1347,7 @@ func TestAccWAFV2RuleGroup_logicalRuleStatements(t *testing.T) { Config: testAccRuleGroupConfig_logicalStatementAnd(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -1362,7 +1362,7 @@ func TestAccWAFV2RuleGroup_logicalRuleStatements(t *testing.T) { Config: testAccRuleGroupConfig_logicalStatementNotAnd(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -1379,7 +1379,7 @@ func TestAccWAFV2RuleGroup_logicalRuleStatements(t *testing.T) { Config: testAccRuleGroupConfig_logicalStatementOrNotAnd(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -1421,7 +1421,7 @@ func TestAccWAFV2RuleGroup_minimal(t *testing.T) { Config: testAccRuleGroupConfig_minimal(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, "capacity", "2"), resource.TestCheckResourceAttr(resourceName, names.AttrName, ruleGroupName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -1453,7 +1453,7 @@ func TestAccWAFV2RuleGroup_regexMatchStatement(t *testing.T) { Config: testAccRuleGroupConfig_regexMatchStatement(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -1490,7 +1490,7 @@ func TestAccWAFV2RuleGroup_regexPatternSetReferenceStatement(t *testing.T) { Config: testAccRuleGroupConfig_regexPatternSetReferenceStatement(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -1529,7 +1529,7 @@ func TestAccWAFV2RuleGroup_ruleAction(t *testing.T) { Config: testAccRuleGroupConfig_actionAllow(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, "capacity", "2"), resource.TestCheckResourceAttr(resourceName, names.AttrName, ruleGroupName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -1551,7 +1551,7 @@ func TestAccWAFV2RuleGroup_ruleAction(t *testing.T) { Config: testAccRuleGroupConfig_actionBlock(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, "capacity", "2"), resource.TestCheckResourceAttr(resourceName, names.AttrName, ruleGroupName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -1573,7 +1573,7 @@ func TestAccWAFV2RuleGroup_ruleAction(t *testing.T) { Config: testAccRuleGroupConfig_actionCount(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, "capacity", "2"), resource.TestCheckResourceAttr(resourceName, names.AttrName, ruleGroupName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -1617,7 +1617,7 @@ func TestAccWAFV2RuleGroup_RuleAction_customRequestHandling(t *testing.T) { Config: testAccRuleGroupConfig_actionAllowCustomRequestHandling(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, "capacity", "2"), resource.TestCheckResourceAttr(resourceName, names.AttrName, ruleGroupName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -1644,7 +1644,7 @@ func TestAccWAFV2RuleGroup_RuleAction_customRequestHandling(t *testing.T) { Config: testAccRuleGroupConfig_actionCountCustomRequestHandling(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, "capacity", "2"), resource.TestCheckResourceAttr(resourceName, names.AttrName, ruleGroupName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -1693,7 +1693,7 @@ func TestAccWAFV2RuleGroup_RuleAction_customResponse(t *testing.T) { Config: testAccRuleGroupConfig_actionBlockCustomResponse(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, "capacity", "2"), resource.TestCheckResourceAttr(resourceName, names.AttrName, ruleGroupName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -1721,7 +1721,7 @@ func TestAccWAFV2RuleGroup_RuleAction_customResponse(t *testing.T) { Config: testAccRuleGroupConfig_actionBlockCustomResponseBody(ruleGroupName, "test_body_1"), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, "capacity", "2"), resource.TestCheckResourceAttr(resourceName, names.AttrName, ruleGroupName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -1755,7 +1755,7 @@ func TestAccWAFV2RuleGroup_RuleAction_customResponse(t *testing.T) { Config: testAccRuleGroupConfig_actionBlockCustomResponseBody(ruleGroupName, "test_body_2"), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, "capacity", "2"), resource.TestCheckResourceAttr(resourceName, names.AttrName, ruleGroupName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), @@ -1812,7 +1812,7 @@ func TestAccWAFV2RuleGroup_sizeConstraintStatement(t *testing.T) { Config: testAccRuleGroupConfig_sizeConstraintStatement(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -1829,7 +1829,7 @@ func TestAccWAFV2RuleGroup_sizeConstraintStatement(t *testing.T) { Config: testAccRuleGroupConfig_sizeConstraintStatementUpdate(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -1868,7 +1868,7 @@ func TestAccWAFV2RuleGroup_sqliMatchStatement(t *testing.T) { Config: testAccRuleGroupConfig_sqliMatchStatement(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -1891,7 +1891,7 @@ func TestAccWAFV2RuleGroup_sqliMatchStatement(t *testing.T) { Config: testAccRuleGroupConfig_sqliMatchStatementUpdate(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -1987,7 +1987,7 @@ func TestAccWAFV2RuleGroup_xssMatchStatement(t *testing.T) { Config: testAccRuleGroupConfig_xssMatchStatement(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -2006,7 +2006,7 @@ func TestAccWAFV2RuleGroup_xssMatchStatement(t *testing.T) { Config: testAccRuleGroupConfig_xssMatchStatementUpdate(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -2047,7 +2047,7 @@ func TestAccWAFV2RuleGroup_rateBasedStatement(t *testing.T) { Config: testAccRuleGroupConfig_rateBasedStatement(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -2064,7 +2064,7 @@ func TestAccWAFV2RuleGroup_rateBasedStatement(t *testing.T) { Config: testAccRuleGroupConfig_rateBasedStatement_forwardedIPConfig(ruleGroupName, "MATCH", "X-Forwarded-For"), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -2084,7 +2084,7 @@ func TestAccWAFV2RuleGroup_rateBasedStatement(t *testing.T) { Config: testAccRuleGroupConfig_rateBasedStatement_forwardedIPConfig(ruleGroupName, "NO_MATCH", "Updated"), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -2104,7 +2104,7 @@ func TestAccWAFV2RuleGroup_rateBasedStatement(t *testing.T) { Config: testAccRuleGroupConfig_rateBasedStatement_customKeysBasic(ruleGroupName, "cookie", "testcookie"), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -2132,7 +2132,7 @@ func TestAccWAFV2RuleGroup_rateBasedStatement(t *testing.T) { Config: testAccRuleGroupConfig_rateBasedStatement_customKeysForwardedIP(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -2160,7 +2160,7 @@ func TestAccWAFV2RuleGroup_rateBasedStatement(t *testing.T) { Config: testAccRuleGroupConfig_rateBasedStatement_customKeysHTTPMethod(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -2187,7 +2187,7 @@ func TestAccWAFV2RuleGroup_rateBasedStatement(t *testing.T) { Config: testAccRuleGroupConfig_rateBasedStatement_customKeysBasic(ruleGroupName, names.AttrHeader, "x-forwrded-for"), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -2215,7 +2215,7 @@ func TestAccWAFV2RuleGroup_rateBasedStatement(t *testing.T) { Config: testAccRuleGroupConfig_rateBasedStatement_customKeysIP(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -2243,7 +2243,7 @@ func TestAccWAFV2RuleGroup_rateBasedStatement(t *testing.T) { Config: testAccRuleGroupConfig_rateBasedStatement_customKeysBasic(ruleGroupName, "query_argument", names.AttrKey), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -2271,7 +2271,7 @@ func TestAccWAFV2RuleGroup_rateBasedStatement(t *testing.T) { Config: testAccRuleGroupConfig_rateBasedStatement_customKeysMinimal(ruleGroupName, "query_string"), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -2299,7 +2299,7 @@ func TestAccWAFV2RuleGroup_rateBasedStatement(t *testing.T) { Config: testAccRuleGroupConfig_rateBasedStatement_customKeysMinimal(ruleGroupName, "uri_path"), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -2327,7 +2327,7 @@ func TestAccWAFV2RuleGroup_rateBasedStatement(t *testing.T) { Config: testAccRuleGroupConfig_rateBasedStatement_customKeysMaxKeys(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -2345,7 +2345,7 @@ func TestAccWAFV2RuleGroup_rateBasedStatement(t *testing.T) { Config: testAccRuleGroupConfig_rateBasedStatement_update(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ "statement.#": "1", @@ -2389,7 +2389,7 @@ func TestAccWAFV2RuleGroup_RateBased_maxNested(t *testing.T) { Config: testAccRuleGroupConfig_multipleNestedRateBasedStatements(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, ruleGroupName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -2434,7 +2434,7 @@ func TestAccWAFV2RuleGroup_Operators_maxNested(t *testing.T) { Config: testAccRuleGroupConfig_multipleNestedOperatorStatements(ruleGroupName), Check: resource.ComposeTestCheckFunc( testAccCheckRuleGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/rulegroup/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, ruleGroupName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ diff --git a/internal/service/wafv2/web_acl_association_test.go b/internal/service/wafv2/web_acl_association_test.go index 2baaaf7d0be..30e9f95c7df 100644 --- a/internal/service/wafv2/web_acl_association_test.go +++ b/internal/service/wafv2/web_acl_association_test.go @@ -39,7 +39,7 @@ func TestAccWAFV2WebACLAssociation_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( testAccCheckWebACLAssociationExists(ctx, resourceName), acctest.MatchResourceAttrRegionalARNNoAccount(resourceName, names.AttrResourceARN, "apigateway", regexache.MustCompile(fmt.Sprintf("/restapis/.*/stages/%s", rName))), - acctest.MatchResourceAttrRegionalARN(resourceName, "web_acl_arn", "wafv2", regexache.MustCompile(fmt.Sprintf("regional/webacl/%s/.*", rName))), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "web_acl_arn", "wafv2", regexache.MustCompile(fmt.Sprintf("regional/webacl/%s/.*", rName))), ), }, { diff --git a/internal/service/wafv2/web_acl_data_source_test.go b/internal/service/wafv2/web_acl_data_source_test.go index 3f57f80612b..4a957073b1a 100644 --- a/internal/service/wafv2/web_acl_data_source_test.go +++ b/internal/service/wafv2/web_acl_data_source_test.go @@ -33,7 +33,7 @@ func TestAccWAFV2WebACLDataSource_basic(t *testing.T) { Config: testAccWebACLDataSourceConfig_name(name), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrPair(datasourceName, names.AttrARN, resourceName, names.AttrARN), - acctest.MatchResourceAttrRegionalARN(datasourceName, names.AttrARN, "wafv2", regexache.MustCompile(fmt.Sprintf("regional/webacl/%v/.+$", name))), + acctest.MatchResourceAttrRegionalARN(ctx, datasourceName, names.AttrARN, "wafv2", regexache.MustCompile(fmt.Sprintf("regional/webacl/%v/.+$", name))), resource.TestCheckResourceAttrPair(datasourceName, names.AttrDescription, resourceName, names.AttrDescription), resource.TestCheckResourceAttrPair(datasourceName, names.AttrID, resourceName, names.AttrID), resource.TestCheckResourceAttrPair(datasourceName, names.AttrName, resourceName, names.AttrName), diff --git a/internal/service/wafv2/web_acl_test.go b/internal/service/wafv2/web_acl_test.go index c18acb82613..a6f1f9f9f7f 100644 --- a/internal/service/wafv2/web_acl_test.go +++ b/internal/service/wafv2/web_acl_test.go @@ -51,7 +51,7 @@ func TestAccWAFV2WebACL_basic(t *testing.T) { Config: testAccWebACLConfig_basic(webACLName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, "application_integration_url", ""), resource.TestCheckResourceAttr(resourceName, "association_config.#", "0"), resource.TestCheckResourceAttr(resourceName, "captcha_config.#", "0"), @@ -99,7 +99,7 @@ func TestAccWAFV2WebACL_Update_rule(t *testing.T) { Config: testAccWebACLConfig_basicRule(webACLName), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Updated"), resource.TestCheckResourceAttr(resourceName, names.AttrScope, string(awstypes.ScopeRegional)), @@ -157,7 +157,7 @@ func TestAccWAFV2WebACL_Update_rule(t *testing.T) { Config: testAccWebACLConfig_updateRuleNamePriorityMetric(webACLName, ruleName1, ruleName2, 10, 5), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Updated"), resource.TestCheckResourceAttr(resourceName, names.AttrScope, string(awstypes.ScopeRegional)), @@ -243,7 +243,7 @@ func TestAccWAFV2WebACL_Update_ruleProperties(t *testing.T) { Config: testAccWebACLConfig_updateRuleNamePriorityMetric(webACLName, ruleName1, ruleName2, 5, 10), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Updated"), resource.TestCheckResourceAttr(resourceName, names.AttrScope, string(awstypes.ScopeRegional)), @@ -304,7 +304,7 @@ func TestAccWAFV2WebACL_Update_ruleProperties(t *testing.T) { Config: testAccWebACLConfig_updateRuleNamePriorityMetric(webACLName, ruleName1, ruleName2, 10, 5), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Updated"), resource.TestCheckResourceAttr(resourceName, names.AttrScope, string(awstypes.ScopeRegional)), @@ -365,7 +365,7 @@ func TestAccWAFV2WebACL_Update_ruleProperties(t *testing.T) { Config: testAccWebACLConfig_updateRuleNamePriorityMetric(webACLName, ruleName1, "updated", 10, 5), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, "Updated"), resource.TestCheckResourceAttr(resourceName, names.AttrScope, string(awstypes.ScopeRegional)), @@ -450,7 +450,7 @@ func TestAccWAFV2WebACL_Update_nameForceNew(t *testing.T) { Config: testAccWebACLConfig_basic(webACLName), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &before), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "0"), @@ -468,7 +468,7 @@ func TestAccWAFV2WebACL_Update_nameForceNew(t *testing.T) { Config: testAccWebACLConfig_basic(ruleGroupNewName), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &after), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, ruleGroupNewName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ruleGroupNewName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "0"), @@ -526,7 +526,7 @@ func TestAccWAFV2WebACL_ManagedRuleGroup_basic(t *testing.T) { Config: testAccWebACLConfig_managedRuleGroupStatement(webACLName), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, "application_integration_url", ""), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), @@ -549,7 +549,7 @@ func TestAccWAFV2WebACL_ManagedRuleGroup_basic(t *testing.T) { Config: testAccWebACLConfig_managedRuleGroupStatementUpdate(webACLName), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -577,7 +577,7 @@ func TestAccWAFV2WebACL_ManagedRuleGroup_basic(t *testing.T) { Config: testAccWebACLConfig_managedRuleGroupStatementRuleActionOverrides(webACLName), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -617,7 +617,7 @@ func TestAccWAFV2WebACL_ManagedRuleGroup_basic(t *testing.T) { Config: testAccWebACLConfig_managedRuleGroupStatementVersionVersion10(webACLName), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -663,7 +663,7 @@ func TestAccWAFV2WebACL_ManagedRuleGroup_ManagedRuleGroupConfig(t *testing.T) { Config: testAccWebACLConfig_managedRuleGroupStatementManagedRuleGroupConfig(webACLName), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -688,7 +688,7 @@ func TestAccWAFV2WebACL_ManagedRuleGroup_ManagedRuleGroupConfig(t *testing.T) { Config: testAccWebACLConfig_managedRuleGroupStatementManagedRuleGroupConfigUpdate(webACLName), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -737,7 +737,7 @@ func TestAccWAFV2WebACL_ManagedRuleGroup_ManagedRuleGroupConfig_ACFPRuleSet(t *t Config: testAccWebACLConfig_managedRuleGroupStatementManagedRuleGroupConfig_acfpRuleSet(webACLName), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestMatchResourceAttr(resourceName, "application_integration_url", regexache.MustCompile(`https:\/\/.*\.sdk\.awswaf\.com.*`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), @@ -781,7 +781,7 @@ func TestAccWAFV2WebACL_ManagedRuleGroup_ManagedRuleGroupConfig_ACFPRuleSet(t *t Config: testAccWebACLConfig_managedRuleGroupStatementManagedRuleGroupConfig_acfpRuleSetUpdate(webACLName), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -845,7 +845,7 @@ func TestAccWAFV2WebACL_ManagedRuleGroup_ManagedRuleGroupConfig_ATPRuleSet(t *te Config: testAccWebACLConfig_managedRuleGroupStatementManagedRuleGroupConfig_atpRuleSet(webACLName), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestMatchResourceAttr(resourceName, "application_integration_url", regexache.MustCompile(`https:\/\/.*\.sdk\.awswaf\.com.*`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), @@ -878,7 +878,7 @@ func TestAccWAFV2WebACL_ManagedRuleGroup_ManagedRuleGroupConfig_ATPRuleSet(t *te Config: testAccWebACLConfig_managedRuleGroupStatementManagedRuleGroupConfig_atpRuleSetUpdate(webACLName), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -933,7 +933,7 @@ func TestAccWAFV2WebACL_ManagedRuleGroup_ManagedRuleGroupConfig_BotControl(t *te Config: testAccWebACLConfig_managedRuleGroupStatementManagedRuleGroupConfig_botControl(webACLName), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestMatchResourceAttr(resourceName, "application_integration_url", regexache.MustCompile(`https:\/\/.*\.sdk\.awswaf\.com.*`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), @@ -972,7 +972,7 @@ func TestAccWAFV2WebACL_ManagedRuleGroup_specifyVersion(t *testing.T) { Config: testAccWebACLConfig_managedRuleGroupStatementVersionVersion10(webACLName), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -995,7 +995,7 @@ func TestAccWAFV2WebACL_ManagedRuleGroup_specifyVersion(t *testing.T) { Config: testAccWebACLConfig_managedRuleGroupStatement(webACLName), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -1040,7 +1040,7 @@ func TestAccWAFV2WebACL_minimal(t *testing.T) { Config: testAccWebACLConfig_minimal(webACLName), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, ""), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "0"), @@ -1074,7 +1074,7 @@ func TestAccWAFV2WebACL_RateBased_basic(t *testing.T) { Config: testAccWebACLConfig_rateBasedStatement(webACLName), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -1097,7 +1097,7 @@ func TestAccWAFV2WebACL_RateBased_basic(t *testing.T) { Config: testAccWebACLConfig_rateBasedStatementUpdate(webACLName), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -1147,7 +1147,7 @@ func TestAccWAFV2WebACL_ByteMatchStatement_basic(t *testing.T) { Config: testAccWebACLConfig_byteMatchStatement(webACLName, string(awstypes.PositionalConstraintContainsWord), acctest.CtValue1), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -1167,7 +1167,7 @@ func TestAccWAFV2WebACL_ByteMatchStatement_basic(t *testing.T) { Config: testAccWebACLConfig_byteMatchStatement(webACLName, string(awstypes.PositionalConstraintExactly), acctest.CtValue2), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -1210,7 +1210,7 @@ func TestAccWAFV2WebACL_ByteMatchStatement_ja3fingerprint(t *testing.T) { Config: testAccWebACLConfig_byteMatchStatementJA3Fingerprint(webACLName, string(awstypes.FallbackBehaviorMatch)), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -1223,7 +1223,7 @@ func TestAccWAFV2WebACL_ByteMatchStatement_ja3fingerprint(t *testing.T) { Config: testAccWebACLConfig_byteMatchStatementJA3Fingerprint(webACLName, string(awstypes.FallbackBehaviorNoMatch)), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -1259,7 +1259,7 @@ func TestAccWAFV2WebACL_ByteMatchStatement_jsonBody(t *testing.T) { Config: testAccWebACLConfig_byteMatchStatementJSONBody(webACLName, string(awstypes.JsonMatchScopeValue), string(awstypes.FallbackBehaviorMatch), string(awstypes.OversizeHandlingNoMatch), `included_paths = ["/dogs/0/name", "/dogs/1/name"]`), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -1279,7 +1279,7 @@ func TestAccWAFV2WebACL_ByteMatchStatement_jsonBody(t *testing.T) { Config: testAccWebACLConfig_byteMatchStatementJSONBody(webACLName, string(awstypes.JsonMatchScopeAll), string(awstypes.FallbackBehaviorNoMatch), string(awstypes.OversizeHandlingContinue), "all {}"), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -1320,7 +1320,7 @@ func TestAccWAFV2WebACL_ByteMatchStatement_body(t *testing.T) { Config: testAccWebACLConfig_byteMatchStatementBody(webACLName, string(awstypes.OversizeHandlingNoMatch)), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -1333,7 +1333,7 @@ func TestAccWAFV2WebACL_ByteMatchStatement_body(t *testing.T) { Config: testAccWebACLConfig_byteMatchStatementBody(webACLName, string(awstypes.OversizeHandlingContinue)), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -1369,7 +1369,7 @@ func TestAccWAFV2WebACL_ByteMatchStatement_headerOrder(t *testing.T) { Config: testAccWebACLConfig_byteMatchStatementHeaderOrder(webACLName, string(awstypes.OversizeHandlingMatch)), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -1382,7 +1382,7 @@ func TestAccWAFV2WebACL_ByteMatchStatement_headerOrder(t *testing.T) { Config: testAccWebACLConfig_byteMatchStatementHeaderOrder(webACLName, string(awstypes.OversizeHandlingNoMatch)), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -1420,7 +1420,7 @@ func TestAccWAFV2WebACL_GeoMatch_basic(t *testing.T) { Config: testAccWebACLConfig_geoMatchStatement(webACLName, countryCode), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, "default_action.#", "1"), resource.TestCheckResourceAttr(resourceName, "default_action.0.allow.#", "1"), @@ -1454,7 +1454,7 @@ func TestAccWAFV2WebACL_GeoMatch_basic(t *testing.T) { Config: testAccWebACLConfig_geoMatchStatement(webACLName, countryCodes), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, "default_action.#", "1"), resource.TestCheckResourceAttr(resourceName, "default_action.0.allow.#", "1"), @@ -1512,7 +1512,7 @@ func TestAccWAFV2WebACL_GeoMatch_forwardedIP(t *testing.T) { Config: testAccWebACLConfig_geoMatchStatementForwardedIP(webACLName, "MATCH", "X-Forwarded-For"), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -1534,7 +1534,7 @@ func TestAccWAFV2WebACL_GeoMatch_forwardedIP(t *testing.T) { Config: testAccWebACLConfig_geoMatchStatementForwardedIP(webACLName, "NO_MATCH", "Updated"), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -1579,7 +1579,7 @@ func TestAccWAFV2WebACL_LabelMatchStatement(t *testing.T) { Config: testAccWebACLConfig_labelMatchStatement(webACLName, "LABEL", "Hashicorp:Test:Label1"), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -1594,7 +1594,7 @@ func TestAccWAFV2WebACL_LabelMatchStatement(t *testing.T) { Config: testAccWebACLConfig_labelMatchStatement(webACLName, "NAMESPACE", "awswaf:managed:aws:bot-control:"), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -1632,7 +1632,7 @@ func TestAccWAFV2WebACL_RuleLabels(t *testing.T) { Config: testAccWebACLConfig_ruleLabels(webACLName), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -1646,7 +1646,7 @@ func TestAccWAFV2WebACL_RuleLabels(t *testing.T) { Config: testAccWebACLConfig_noRuleLabels(webACLName), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -1681,7 +1681,7 @@ func TestAccWAFV2WebACL_IPSetReference_basic(t *testing.T) { Config: testAccWebACLConfig_ipsetReference(webACLName), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -1729,7 +1729,7 @@ func TestAccWAFV2WebACL_IPSetReference_forwardedIP(t *testing.T) { Config: testAccWebACLConfig_ipsetReferenceForwardedIP(webACLName, "MATCH", "X-Forwarded-For", "FIRST"), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -1751,7 +1751,7 @@ func TestAccWAFV2WebACL_IPSetReference_forwardedIP(t *testing.T) { Config: testAccWebACLConfig_ipsetReferenceForwardedIP(webACLName, "NO_MATCH", "X-Forwarded-For", "LAST"), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -1773,7 +1773,7 @@ func TestAccWAFV2WebACL_IPSetReference_forwardedIP(t *testing.T) { Config: testAccWebACLConfig_ipsetReferenceForwardedIP(webACLName, "MATCH", "Updated", "ANY"), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -1795,7 +1795,7 @@ func TestAccWAFV2WebACL_IPSetReference_forwardedIP(t *testing.T) { Config: testAccWebACLConfig_ipsetReference(webACLName), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -1835,7 +1835,7 @@ func TestAccWAFV2WebACL_RateBased_customKeys(t *testing.T) { Config: testAccWebACLConfig_rateBasedStatement_customKeysBasic(webACLName, "cookie", "testcookie"), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -1864,7 +1864,7 @@ func TestAccWAFV2WebACL_RateBased_customKeys(t *testing.T) { Config: testAccWebACLConfig_rateBasedStatement_customKeysForwardedIP(webACLName), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -1893,7 +1893,7 @@ func TestAccWAFV2WebACL_RateBased_customKeys(t *testing.T) { Config: testAccWebACLConfig_rateBasedStatement_customKeysHTTPMethod(webACLName), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -1921,7 +1921,7 @@ func TestAccWAFV2WebACL_RateBased_customKeys(t *testing.T) { Config: testAccWebACLConfig_rateBasedStatement_customKeysBasic(webACLName, names.AttrHeader, "x-forwrded-for"), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -1950,7 +1950,7 @@ func TestAccWAFV2WebACL_RateBased_customKeys(t *testing.T) { Config: testAccWebACLConfig_rateBasedStatement_customKeysIP(webACLName), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -1979,7 +1979,7 @@ func TestAccWAFV2WebACL_RateBased_customKeys(t *testing.T) { Config: testAccWebACLConfig_rateBasedStatement_customKeysBasic(webACLName, "query_argument", names.AttrKey), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -2008,7 +2008,7 @@ func TestAccWAFV2WebACL_RateBased_customKeys(t *testing.T) { Config: testAccWebACLConfig_rateBasedStatement_customKeysMinimal(webACLName, "query_string"), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -2037,7 +2037,7 @@ func TestAccWAFV2WebACL_RateBased_customKeys(t *testing.T) { Config: testAccWebACLConfig_rateBasedStatement_customKeysMinimal(webACLName, "uri_path"), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -2066,7 +2066,7 @@ func TestAccWAFV2WebACL_RateBased_customKeys(t *testing.T) { Config: testAccWebACLConfig_rateBasedStatement_customKeysMaxKeys(webACLName), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -2108,7 +2108,7 @@ func TestAccWAFV2WebACL_RateBased_forwardedIP(t *testing.T) { Config: testAccWebACLConfig_rateBasedStatementForwardedIP(webACLName, "MATCH", "X-Forwarded-For"), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -2133,7 +2133,7 @@ func TestAccWAFV2WebACL_RateBased_forwardedIP(t *testing.T) { Config: testAccWebACLConfig_rateBasedStatementForwardedIP(webACLName, "NO_MATCH", "Updated"), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -2181,7 +2181,7 @@ func TestAccWAFV2WebACL_RuleGroupReference_basic(t *testing.T) { Config: testAccWebACLConfig_ruleGroupReferenceStatement(webACLName), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -2202,7 +2202,7 @@ func TestAccWAFV2WebACL_RuleGroupReference_basic(t *testing.T) { Config: testAccWebACLConfig_ruleGroupReferenceStatementUpdate(webACLName), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -2448,7 +2448,7 @@ func TestAccWAFV2WebACL_Custom_requestHandling(t *testing.T) { Config: testAccWebACLConfig_customRequestHandlingAllow(webACLName, "x-hdr1", "x-hdr2"), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, "default_action.#", "1"), resource.TestCheckResourceAttr(resourceName, "default_action.0.allow.#", "1"), @@ -2488,7 +2488,7 @@ func TestAccWAFV2WebACL_Custom_requestHandling(t *testing.T) { Config: testAccWebACLConfig_customRequestHandlingCount(webACLName, "x-hdr1", "x-hdr2"), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, "default_action.#", "1"), resource.TestCheckResourceAttr(resourceName, "default_action.0.allow.#", "1"), @@ -2521,7 +2521,7 @@ func TestAccWAFV2WebACL_Custom_requestHandling(t *testing.T) { Config: testAccWebACLConfig_customRequestHandlingCaptcha(webACLName, "x-hdr1", "x-hdr2"), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, "default_action.#", "1"), resource.TestCheckResourceAttr(resourceName, "default_action.0.allow.#", "1"), @@ -2559,7 +2559,7 @@ func TestAccWAFV2WebACL_Custom_requestHandling(t *testing.T) { Config: testAccWebACLConfig_customRequestHandlingChallenge(webACLName), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, "default_action.#", "1"), resource.TestCheckResourceAttr(resourceName, "default_action.0.allow.#", "1"), @@ -2603,7 +2603,7 @@ func TestAccWAFV2WebACL_Custom_response(t *testing.T) { Config: testAccWebACLConfig_customResponse(webACLName, 401, 403, "x-hdr1"), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, "default_action.#", "1"), resource.TestCheckResourceAttr(resourceName, "default_action.0.allow.#", "0"), @@ -2635,7 +2635,7 @@ func TestAccWAFV2WebACL_Custom_response(t *testing.T) { Config: testAccWebACLConfig_customResponse(webACLName, 404, 429, "x-hdr2"), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, "default_action.#", "1"), resource.TestCheckResourceAttr(resourceName, "default_action.0.allow.#", "0"), @@ -2667,7 +2667,7 @@ func TestAccWAFV2WebACL_Custom_response(t *testing.T) { Config: testAccWebACLConfig_customResponseBody(webACLName, 404, 429), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, "custom_response_body.#", "1"), resource.TestCheckResourceAttr(resourceName, "custom_response_body.0.key", "test_body"), @@ -2772,7 +2772,7 @@ func TestAccWAFV2WebACL_RateBased_maxNested(t *testing.T) { Config: testAccWebACLConfig_multipleNestedRateBasedStatements(webACLName), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -2819,7 +2819,7 @@ func TestAccWAFV2WebACL_Operators_maxNested(t *testing.T) { Config: testAccWebACLConfig_multipleNestedOperatorStatements(webACLName), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ @@ -2867,7 +2867,7 @@ func TestAccWAFV2WebACL_tokenDomains(t *testing.T) { Config: testAccWebACLConfig_tokenDomains(webACLName, domain1, domain2), Check: resource.ComposeTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, names.AttrDescription, webACLName), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "0"), @@ -2914,7 +2914,7 @@ func TestAccWAFV2WebACL_associationConfigCloudFront(t *testing.T) { Config: testAccWebACLConfig_associationConfigCloudFront(webACLName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`global/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`global/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, "association_config.#", "1"), resource.TestCheckResourceAttr(resourceName, "association_config.0.request_body.#", "1"), resource.TestCheckResourceAttr(resourceName, "association_config.0.request_body.0.cloudfront.#", "1"), @@ -2959,7 +2959,7 @@ func TestAccWAFV2WebACL_associationConfigRegional(t *testing.T) { Config: testAccWebACLConfig_associationConfigRegional(webACLName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, "association_config.#", "1"), resource.TestCheckResourceAttr(resourceName, "association_config.0.request_body.#", "1"), resource.TestCheckResourceAttr(resourceName, "association_config.0.request_body.0.api_gateway.#", "1"), @@ -3011,7 +3011,7 @@ func TestAccWAFV2WebACL_CloudFrontScope(t *testing.T) { Config: testAccWebACLConfig_CloudFrontScope(webACLName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`global/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`global/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, names.AttrName, webACLName), resource.TestCheckResourceAttr(resourceName, names.AttrScope, string(awstypes.ScopeCloudfront)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), @@ -3063,7 +3063,7 @@ func TestAccWAFV2WebACL_ruleJSON(t *testing.T) { Config: testAccWebACLConfig_jsonRule(webACLName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttrSet(resourceName, "rule_json"), ), }, @@ -3078,7 +3078,7 @@ func TestAccWAFV2WebACL_ruleJSON(t *testing.T) { Config: testAccWebACLConfig_jsonRuleUpdate(webACLName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttrSet(resourceName, "rule_json"), ), }, @@ -3102,7 +3102,7 @@ func TestAccWAFV2WebACL_ruleJSONToRule(t *testing.T) { Config: testAccWebACLConfig_jsonRule(webACLName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "0"), resource.TestCheckResourceAttrSet(resourceName, "rule_json"), ), @@ -3111,7 +3111,7 @@ func TestAccWAFV2WebACL_ruleJSONToRule(t *testing.T) { Config: testAccWebACLConfig_jsonRuleEquivalent(webACLName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckWebACLExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "wafv2", regexache.MustCompile(`regional/webacl/.+$`)), resource.TestCheckResourceAttr(resourceName, acctest.CtRulePound, "1"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "rule.*", map[string]string{ names.AttrName: "rule-1", From 92e1b83a246881425581f03fd5260e55a7854d11 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:24:01 -0500 Subject: [PATCH 177/304] Make 'AWSClient.AccountID' a getter - xray. --- internal/service/xray/group_test.go | 4 ++-- internal/service/xray/sampling_rule_test.go | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/service/xray/group_test.go b/internal/service/xray/group_test.go index 2f6c4fde288..ade4033259f 100644 --- a/internal/service/xray/group_test.go +++ b/internal/service/xray/group_test.go @@ -36,7 +36,7 @@ func TestAccXRayGroup_basic(t *testing.T) { Config: testAccGroupConfig_basic(rName, "responsetime > 5"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "xray", regexache.MustCompile(`group/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "xray", regexache.MustCompile(`group/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrGroupName, rName), resource.TestCheckResourceAttr(resourceName, "filter_expression", "responsetime > 5"), resource.TestCheckResourceAttr(resourceName, "insights_configuration.#", "1"), // Computed. @@ -51,7 +51,7 @@ func TestAccXRayGroup_basic(t *testing.T) { Config: testAccGroupConfig_basic(rName, "responsetime > 10"), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckGroupExists(ctx, resourceName, &v), - acctest.MatchResourceAttrRegionalARN(resourceName, names.AttrARN, "xray", regexache.MustCompile(`group/.+`)), + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "xray", regexache.MustCompile(`group/.+`)), resource.TestCheckResourceAttr(resourceName, names.AttrGroupName, rName), resource.TestCheckResourceAttr(resourceName, "filter_expression", "responsetime > 10"), resource.TestCheckResourceAttr(resourceName, "insights_configuration.#", "1"), diff --git a/internal/service/xray/sampling_rule_test.go b/internal/service/xray/sampling_rule_test.go index 4e4943cae94..f096064a9f6 100644 --- a/internal/service/xray/sampling_rule_test.go +++ b/internal/service/xray/sampling_rule_test.go @@ -36,7 +36,7 @@ func TestAccXRaySamplingRule_basic(t *testing.T) { Config: testAccSamplingRuleConfig_basic(rName), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSamplingRuleExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "xray", fmt.Sprintf("sampling-rule/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "xray", fmt.Sprintf("sampling-rule/%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrPriority, "5"), resource.TestCheckResourceAttr(resourceName, names.AttrVersion, "1"), resource.TestCheckResourceAttr(resourceName, "reservoir_size", "10"), @@ -78,7 +78,7 @@ func TestAccXRaySamplingRule_update(t *testing.T) { Config: testAccSamplingRuleConfig_update(rName, sdkacctest.RandIntRange(0, 9999), sdkacctest.RandIntRange(0, 2147483647)), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSamplingRuleExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "xray", fmt.Sprintf("sampling-rule/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "xray", fmt.Sprintf("sampling-rule/%s", rName)), resource.TestCheckResourceAttrSet(resourceName, names.AttrPriority), resource.TestCheckResourceAttrSet(resourceName, "reservoir_size"), resource.TestCheckResourceAttr(resourceName, names.AttrVersion, "1"), @@ -96,7 +96,7 @@ func TestAccXRaySamplingRule_update(t *testing.T) { Config: testAccSamplingRuleConfig_update(rName, updatedPriority, updatedReservoirSize), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckSamplingRuleExists(ctx, resourceName, &v), - acctest.CheckResourceAttrRegionalARN(resourceName, names.AttrARN, "xray", fmt.Sprintf("sampling-rule/%s", rName)), + acctest.CheckResourceAttrRegionalARN(ctx, resourceName, names.AttrARN, "xray", fmt.Sprintf("sampling-rule/%s", rName)), resource.TestCheckResourceAttr(resourceName, names.AttrPriority, strconv.Itoa(updatedPriority)), resource.TestCheckResourceAttr(resourceName, "reservoir_size", strconv.Itoa(updatedReservoirSize)), resource.TestCheckResourceAttr(resourceName, names.AttrVersion, "1"), From 29d505077f3f00d2843e17df58c3e3734d9a2105 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:35:44 -0500 Subject: [PATCH 178/304] Make 'AWSClient.Region' a getter. --- internal/acctest/acctest.go | 4 ++-- internal/conns/awsclient.go | 21 +++++++++++++-------- internal/conns/awsclient_test.go | 12 ++++++------ internal/conns/config.go | 2 +- internal/provider/provider_acc_test.go | 2 +- internal/provider/provider_config_test.go | 11 ++++++----- 6 files changed, 29 insertions(+), 23 deletions(-) diff --git a/internal/acctest/acctest.go b/internal/acctest/acctest.go index a0b08015ce8..d115d944cd8 100644 --- a/internal/acctest/acctest.go +++ b/internal/acctest/acctest.go @@ -1569,7 +1569,7 @@ provider %[1]q { `, providerName, os.Getenv(envvar.AlternateAccessKeyId), os.Getenv(envvar.AlternateProfile), AlternateRegion(), os.Getenv(envvar.AlternateSecretAccessKey)) } -func RegionProviderFunc(region string, providers *[]*schema.Provider) ProviderFunc { +func RegionProviderFunc(ctx context.Context, region string, providers *[]*schema.Provider) ProviderFunc { return func() *schema.Provider { if region == "" { log.Println("[DEBUG] No region given") @@ -1595,7 +1595,7 @@ func RegionProviderFunc(region string, providers *[]*schema.Provider) ProviderFu continue } - clientRegion := client.Region + clientRegion := client.Region(ctx) log.Printf("[DEBUG] Checking AWS provider region %q against %q", clientRegion, region) if clientRegion == region { log.Printf("[DEBUG] Found AWS provider with region: %s", region) diff --git a/internal/conns/awsclient.go b/internal/conns/awsclient.go index c11623b6dd1..d84b29d9972 100644 --- a/internal/conns/awsclient.go +++ b/internal/conns/awsclient.go @@ -26,7 +26,6 @@ import ( ) type AWSClient struct { - Region string ServicePackages map[string]ServicePackage accountID string @@ -40,6 +39,7 @@ type AWSClient struct { lock sync.Mutex logger baselogging.Logger partition endpoints.Partition + region string session *session_sdkv1.Session s3ExpressClient *s3.Client s3UsePathStyle bool // From provider configuration. @@ -86,6 +86,11 @@ func (c *AWSClient) Partition(context.Context) string { return c.partition.ID() } +// Region returns the ID of the configured AWS Region. +func (c *AWSClient) Region(context.Context) string { + return c.region +} + // PartitionHostname returns a hostname with the provider domain suffix for the partition // e.g. PREFIX.amazonaws.com // The prefix should not contain a trailing period. @@ -98,7 +103,7 @@ func (c *AWSClient) RegionalARN(ctx context.Context, service, resource string) s return arn.ARN{ Partition: c.Partition(ctx), Service: service, - Region: c.Region, + Region: c.Region(ctx), AccountID: c.AccountID(ctx), Resource: resource, }.String() @@ -109,7 +114,7 @@ func (c *AWSClient) RegionalARNNoAccount(ctx context.Context, service, resource return arn.ARN{ Partition: c.Partition(ctx), Service: service, - Region: c.Region, + Region: c.Region(ctx), Resource: resource, }.String() } @@ -118,7 +123,7 @@ func (c *AWSClient) RegionalARNNoAccount(ctx context.Context, service, resource // e.g. PREFIX.us-west-2.amazonaws.com // The prefix should not contain a trailing period. func (c *AWSClient) RegionalHostname(ctx context.Context, prefix string) string { - return fmt.Sprintf("%s.%s.%s", prefix, c.Region, c.DNSSuffix(ctx)) + return fmt.Sprintf("%s.%s.%s", prefix, c.Region(ctx), c.DNSSuffix(ctx)) } // S3ExpressClient returns an AWS SDK for Go v2 S3 API client suitable for use with S3 Express (directory buckets). @@ -239,8 +244,8 @@ func (c *AWSClient) ReverseDNSPrefix(ctx context.Context) string { } // EC2RegionalPrivateDNSSuffix returns the EC2 private DNS suffix for the configured AWS Region. -func (c *AWSClient) EC2RegionalPrivateDNSSuffix(context.Context) string { - region := c.Region +func (c *AWSClient) EC2RegionalPrivateDNSSuffix(ctx context.Context) string { + region := c.Region(ctx) if region == endpoints.UsEast1RegionID { return "ec2.internal" } @@ -249,8 +254,8 @@ func (c *AWSClient) EC2RegionalPrivateDNSSuffix(context.Context) string { } // EC2RegionalPublicDNSSuffix returns the EC2 public DNS suffix for the configured AWS Region. -func (c *AWSClient) EC2RegionalPublicDNSSuffix(context.Context) string { - region := c.Region +func (c *AWSClient) EC2RegionalPublicDNSSuffix(ctx context.Context) string { + region := c.Region(ctx) if region == endpoints.UsEast1RegionID { return "compute-1" } diff --git a/internal/conns/awsclient_test.go b/internal/conns/awsclient_test.go index ed6bfe7a968..fbadf5b6dca 100644 --- a/internal/conns/awsclient_test.go +++ b/internal/conns/awsclient_test.go @@ -70,7 +70,7 @@ func TestAWSClientRegionalHostname(t *testing.T) { // nosemgrep:ci.aws-in-func-n Name: "AWS Commercial", AWSClient: &AWSClient{ partition: standardPartition, - Region: "us-west-2", //lintignore:AWSAT003 + region: "us-west-2", //lintignore:AWSAT003 }, Prefix: "test", Expected: "test.us-west-2.amazonaws.com", //lintignore:AWSAT003 @@ -79,7 +79,7 @@ func TestAWSClientRegionalHostname(t *testing.T) { // nosemgrep:ci.aws-in-func-n Name: "AWS China", AWSClient: &AWSClient{ partition: chinaPartition, - Region: "cn-northwest-1", //lintignore:AWSAT003 + region: "cn-northwest-1", //lintignore:AWSAT003 }, Prefix: "test", Expected: "test.cn-northwest-1.amazonaws.com.cn", //lintignore:AWSAT003 @@ -113,7 +113,7 @@ func TestAWSClientEC2PrivateDNSNameForIP(t *testing.T) { // nosemgrep:ci.aws-in- Name: "us-west-2", AWSClient: &AWSClient{ partition: standardPartition, - Region: "us-west-2", //lintignore:AWSAT003 + region: "us-west-2", //lintignore:AWSAT003 }, IP: "10.20.30.40", Expected: "ip-10-20-30-40.us-west-2.compute.internal", //lintignore:AWSAT003 @@ -122,7 +122,7 @@ func TestAWSClientEC2PrivateDNSNameForIP(t *testing.T) { // nosemgrep:ci.aws-in- Name: "us-east-1", AWSClient: &AWSClient{ partition: standardPartition, - Region: "us-east-1", //lintignore:AWSAT003 + region: "us-east-1", //lintignore:AWSAT003 }, IP: "10.20.30.40", Expected: "ip-10-20-30-40.ec2.internal", @@ -156,7 +156,7 @@ func TestAWSClientEC2PublicDNSNameForIP(t *testing.T) { // nosemgrep:ci.aws-in-f Name: "us-west-2", AWSClient: &AWSClient{ partition: standardPartition, - Region: "us-west-2", //lintignore:AWSAT003 + region: "us-west-2", //lintignore:AWSAT003 }, IP: "10.20.30.40", Expected: "ec2-10-20-30-40.us-west-2.compute.amazonaws.com", //lintignore:AWSAT003 @@ -165,7 +165,7 @@ func TestAWSClientEC2PublicDNSNameForIP(t *testing.T) { // nosemgrep:ci.aws-in-f Name: "us-east-1", AWSClient: &AWSClient{ partition: standardPartition, - Region: "us-east-1", //lintignore:AWSAT003 + region: "us-east-1", //lintignore:AWSAT003 }, IP: "10.20.30.40", Expected: "ec2-10-20-30-40.compute-1.amazonaws.com", diff --git a/internal/conns/config.go b/internal/conns/config.go index 9abb8b7c12d..771456c71f7 100644 --- a/internal/conns/config.go +++ b/internal/conns/config.go @@ -210,7 +210,7 @@ func (c *Config) ConfigureProvider(ctx context.Context, client *AWSClient) (*AWS client.accountID = accountID client.defaultTagsConfig = c.DefaultTagsConfig client.ignoreTagsConfig = c.IgnoreTagsConfig - client.Region = c.Region + client.region = c.Region client.SetHTTPClient(ctx, session.Config.HTTPClient) // Must be called while client.Session is nil. client.session = session diff --git a/internal/provider/provider_acc_test.go b/internal/provider/provider_acc_test.go index 928ce52a417..481c724ff05 100644 --- a/internal/provider/provider_acc_test.go +++ b/internal/provider/provider_acc_test.go @@ -719,7 +719,7 @@ func testAccCheckRegion(ctx context.Context, t *testing.T, p **schema.Provider, return fmt.Errorf("provider not initialized") } - if got := (*p).Meta().(*conns.AWSClient).Region; got != expectedRegion { + if got := (*p).Meta().(*conns.AWSClient).Region(ctx); got != expectedRegion { return fmt.Errorf("expected Region (%s), got: %s", expectedRegion, got) } diff --git a/internal/provider/provider_config_test.go b/internal/provider/provider_config_test.go index e1d4ed25489..3295d7e5db0 100644 --- a/internal/provider/provider_config_test.go +++ b/internal/provider/provider_config_test.go @@ -28,6 +28,7 @@ import ( // * https://github.com/aws/aws-sdk-go-v2/issues/2363: leading whitespace // * https://github.com/aws/aws-sdk-go-v2/issues/2369: trailing `#` in, e.g. SSO Start URLs func TestSharedConfigFileParsing(t *testing.T) { //nolint:paralleltest + ctx := context.TODO() testcases := map[string]struct { Config map[string]any SharedConfigurationFile string @@ -40,7 +41,7 @@ region = us-west-2 `, //lintignore:AWSAT003 Check: func(t *testing.T, meta *conns.AWSClient) { //lintignore:AWSAT003 - if a, e := meta.Region, "us-west-2"; a != e { + if a, e := meta.Region(ctx), "us-west-2"; a != e { t.Errorf("expected region %q, got %q", e, a) } }, @@ -53,7 +54,7 @@ region = us-west-2 `, //lintignore:AWSAT003 Check: func(t *testing.T, meta *conns.AWSClient) { //lintignore:AWSAT003 - if a, e := meta.Region, "us-west-2"; a != e { + if a, e := meta.Region(ctx), "us-west-2"; a != e { t.Errorf("expected region %q, got %q", e, a) } }, @@ -67,7 +68,7 @@ region = us-west-2 `, //lintignore:AWSAT003 Check: func(t *testing.T, meta *conns.AWSClient) { //lintignore:AWSAT003 - if a, e := meta.Region, "us-west-2"; a != e { + if a, e := meta.Region(ctx), "us-west-2"; a != e { t.Errorf("expected region %q, got %q", e, a) } }, @@ -87,7 +88,7 @@ region = us-west-2 `, //lintignore:AWSAT003 Check: func(t *testing.T, meta *conns.AWSClient) { //lintignore:AWSAT003 - if a, e := meta.Region, "us-east-1"; a != e { + if a, e := meta.Region(ctx), "us-east-1"; a != e { t.Errorf("expected region %q, got %q", e, a) } }, @@ -106,7 +107,7 @@ region = us-east-1 `, //lintignore:AWSAT003 Check: func(t *testing.T, meta *conns.AWSClient) { //lintignore:AWSAT003 - if a, e := meta.Region, "us-east-1"; a != e { + if a, e := meta.Region(ctx), "us-east-1"; a != e { t.Errorf("expected region %q, got %q", e, a) } }, From 274592e426f8b3187b42ba0815df01e24d650f26 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:07 -0500 Subject: [PATCH 179/304] Make 'AWSClient.Region' a getter - amp. --- internal/service/amp/workspaces_data_source.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/amp/workspaces_data_source.go b/internal/service/amp/workspaces_data_source.go index 79a7299a28e..8a6c936c2fe 100644 --- a/internal/service/amp/workspaces_data_source.go +++ b/internal/service/amp/workspaces_data_source.go @@ -63,7 +63,7 @@ func dataSourceWorkspacesRead(ctx context.Context, d *schema.ResourceData, meta workspaceIDs = append(workspaceIDs, aws.ToString(w.WorkspaceId)) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set("aliases", aliases) d.Set(names.AttrARNs, arns) d.Set("workspace_ids", workspaceIDs) From e35d30fddfaf6c18ebb4cf60b056dc2f9436ff1a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:07 -0500 Subject: [PATCH 180/304] Make 'AWSClient.Region' a getter - apigateway. --- internal/service/apigateway/client_certificate.go | 2 +- internal/service/apigateway/deployment.go | 2 +- internal/service/apigateway/usage_plan.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/service/apigateway/client_certificate.go b/internal/service/apigateway/client_certificate.go index 0fb8cd2b7c6..63cdfa58e1c 100644 --- a/internal/service/apigateway/client_certificate.go +++ b/internal/service/apigateway/client_certificate.go @@ -109,7 +109,7 @@ func resourceClientCertificateRead(ctx context.Context, d *schema.ResourceData, arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "apigateway", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Resource: fmt.Sprintf("/clientcertificates/%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/apigateway/deployment.go b/internal/service/apigateway/deployment.go index 51c1e0c1aff..f20e12e0c01 100644 --- a/internal/service/apigateway/deployment.go +++ b/internal/service/apigateway/deployment.go @@ -178,7 +178,7 @@ func resourceDeploymentRead(ctx context.Context, d *schema.ResourceData, meta in executionARN := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "execute-api", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("%s/%s", restAPIID, stageName), }.String() diff --git a/internal/service/apigateway/usage_plan.go b/internal/service/apigateway/usage_plan.go index 0d3772bb44d..3084f5353ae 100644 --- a/internal/service/apigateway/usage_plan.go +++ b/internal/service/apigateway/usage_plan.go @@ -240,7 +240,7 @@ func resourceUsagePlanRead(ctx context.Context, d *schema.ResourceData, meta int arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "apigateway", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Resource: fmt.Sprintf("/usageplans/%s", d.Id()), }.String() d.Set(names.AttrARN, arn) From da0b3b727f9cbe55b537f08fe73dd800041cc6ac Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:07 -0500 Subject: [PATCH 181/304] Make 'AWSClient.Region' a getter - apigatewayv2. --- internal/service/apigatewayv2/apis_data_source.go | 2 +- internal/service/apigatewayv2/domain_name.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/apigatewayv2/apis_data_source.go b/internal/service/apigatewayv2/apis_data_source.go index 321732c11c1..36f75e79011 100644 --- a/internal/service/apigatewayv2/apis_data_source.go +++ b/internal/service/apigatewayv2/apis_data_source.go @@ -74,7 +74,7 @@ func dataSourceAPIsRead(ctx context.Context, d *schema.ResourceData, meta interf ids = append(ids, api.ApiId) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) if err := d.Set(names.AttrIDs, flex.FlattenStringSet(ids)); err != nil { return sdkdiag.AppendErrorf(diags, "setting ids: %s", err) diff --git a/internal/service/apigatewayv2/domain_name.go b/internal/service/apigatewayv2/domain_name.go index c4e1c2e70c3..a6c389e0a82 100644 --- a/internal/service/apigatewayv2/domain_name.go +++ b/internal/service/apigatewayv2/domain_name.go @@ -175,7 +175,7 @@ func resourceDomainNameRead(ctx context.Context, d *schema.ResourceData, meta in arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "apigateway", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Resource: "/domainnames/" + d.Id(), }.String() d.Set(names.AttrARN, arn) From 93c36756613b4f767f3c6178cd8bf52a184883e5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:07 -0500 Subject: [PATCH 182/304] Make 'AWSClient.Region' a getter - appconfig. --- internal/service/appconfig/application.go | 2 +- internal/service/appconfig/configuration_profile.go | 2 +- internal/service/appconfig/configuration_profile_data_source.go | 2 +- internal/service/appconfig/deployment.go | 2 +- internal/service/appconfig/deployment_strategy.go | 2 +- internal/service/appconfig/hosted_configuration_version.go | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/appconfig/application.go b/internal/service/appconfig/application.go index 377b47645da..691e008a8ee 100644 --- a/internal/service/appconfig/application.go +++ b/internal/service/appconfig/application.go @@ -113,7 +113,7 @@ func resourceApplicationRead(ctx context.Context, d *schema.ResourceData, meta i arn := arn.ARN{ AccountID: meta.(*conns.AWSClient).AccountID(ctx), Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Resource: fmt.Sprintf("application/%s", aws.ToString(output.Id)), Service: "appconfig", }.String() diff --git a/internal/service/appconfig/configuration_profile.go b/internal/service/appconfig/configuration_profile.go index c2ce63c9708..2797a8bcd10 100644 --- a/internal/service/appconfig/configuration_profile.go +++ b/internal/service/appconfig/configuration_profile.go @@ -214,7 +214,7 @@ func resourceConfigurationProfileRead(ctx context.Context, d *schema.ResourceDat arn := arn.ARN{ AccountID: meta.(*conns.AWSClient).AccountID(ctx), Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Resource: fmt.Sprintf("application/%s/configurationprofile/%s", appID, confProfID), Service: "appconfig", }.String() diff --git a/internal/service/appconfig/configuration_profile_data_source.go b/internal/service/appconfig/configuration_profile_data_source.go index 18f1e341f1b..8cd8f20cdcb 100644 --- a/internal/service/appconfig/configuration_profile_data_source.go +++ b/internal/service/appconfig/configuration_profile_data_source.go @@ -110,7 +110,7 @@ func dataSourceConfigurationProfileRead(ctx context.Context, d *schema.ResourceD arn := arn.ARN{ AccountID: meta.(*conns.AWSClient).AccountID(ctx), Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Resource: fmt.Sprintf("application/%s/configurationprofile/%s", appId, profileId), Service: "appconfig", }.String() diff --git a/internal/service/appconfig/deployment.go b/internal/service/appconfig/deployment.go index ba9da434da5..8e2a51dac9a 100644 --- a/internal/service/appconfig/deployment.go +++ b/internal/service/appconfig/deployment.go @@ -183,7 +183,7 @@ func resourceDeploymentRead(ctx context.Context, d *schema.ResourceData, meta in arn := arn.ARN{ AccountID: meta.(*conns.AWSClient).AccountID(ctx), Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Resource: fmt.Sprintf("application/%s/environment/%s/deployment/%d", aws.ToString(output.ApplicationId), aws.ToString(output.EnvironmentId), output.DeploymentNumber), Service: "appconfig", }.String() diff --git a/internal/service/appconfig/deployment_strategy.go b/internal/service/appconfig/deployment_strategy.go index 3e321a95da3..b3c72d1ebba 100644 --- a/internal/service/appconfig/deployment_strategy.go +++ b/internal/service/appconfig/deployment_strategy.go @@ -154,7 +154,7 @@ func resourceDeploymentStrategyRead(ctx context.Context, d *schema.ResourceData, arn := arn.ARN{ AccountID: meta.(*conns.AWSClient).AccountID(ctx), Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Resource: fmt.Sprintf("deploymentstrategy/%s", d.Id()), Service: "appconfig", }.String() diff --git a/internal/service/appconfig/hosted_configuration_version.go b/internal/service/appconfig/hosted_configuration_version.go index a53e5fa5828..73711eb3f42 100644 --- a/internal/service/appconfig/hosted_configuration_version.go +++ b/internal/service/appconfig/hosted_configuration_version.go @@ -148,7 +148,7 @@ func resourceHostedConfigurationVersionRead(ctx context.Context, d *schema.Resou arn := arn.ARN{ AccountID: meta.(*conns.AWSClient).AccountID(ctx), Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Resource: fmt.Sprintf("application/%s/configurationprofile/%s/hostedconfigurationversion/%d", appID, confProfID, versionNumber), Service: "appconfig", }.String() From af7ddc708bb4ad850c2b355cd4cc075f98c0603d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:08 -0500 Subject: [PATCH 183/304] Make 'AWSClient.Region' a getter - applicationinsights. --- internal/service/applicationinsights/application.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/applicationinsights/application.go b/internal/service/applicationinsights/application.go index ade20e114dc..d1301353692 100644 --- a/internal/service/applicationinsights/application.go +++ b/internal/service/applicationinsights/application.go @@ -142,7 +142,7 @@ func resourceApplicationRead(ctx context.Context, d *schema.ResourceData, meta i arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "applicationinsights", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: "application/resource-group/" + rgName, }.String() From 5c9069fa17ac2acb81f286045a03174a36799bbc Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:08 -0500 Subject: [PATCH 184/304] Make 'AWSClient.Region' a getter - apprunner. --- internal/service/apprunner/hosted_zone_id_data_source.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/apprunner/hosted_zone_id_data_source.go b/internal/service/apprunner/hosted_zone_id_data_source.go index 20e65370764..5232acaa217 100644 --- a/internal/service/apprunner/hosted_zone_id_data_source.go +++ b/internal/service/apprunner/hosted_zone_id_data_source.go @@ -64,7 +64,7 @@ func (d *hostedZoneIDDataSource) Read(ctx context.Context, request datasource.Re var region string if data.Region.IsNull() { - region = d.Meta().Region + region = d.Meta().Region(ctx) } else { region = data.Region.ValueString() } From 9bc601faec61833fa89281334723aeab44da7c96 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:08 -0500 Subject: [PATCH 185/304] Make 'AWSClient.Region' a getter - appsync. --- internal/service/appsync/datasource.go | 4 ++-- internal/service/appsync/graphql_api.go | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/appsync/datasource.go b/internal/service/appsync/datasource.go index b520af2976f..1d92ae5c93a 100644 --- a/internal/service/appsync/datasource.go +++ b/internal/service/appsync/datasource.go @@ -284,7 +284,7 @@ func resourceDataSource() *schema.Resource { func resourceDataSourceCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).AppSyncClient(ctx) - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) apiID := d.Get("api_id").(string) name := d.Get(names.AttrName).(string) @@ -397,7 +397,7 @@ func resourceDataSourceRead(ctx context.Context, d *schema.ResourceData, meta in func resourceDataSourceUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).AppSyncClient(ctx) - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) apiID, name, err := dataSourceParseResourceID(d.Id()) if err != nil { diff --git a/internal/service/appsync/graphql_api.go b/internal/service/appsync/graphql_api.go index fa6b51f329d..4fe10975da4 100644 --- a/internal/service/appsync/graphql_api.go +++ b/internal/service/appsync/graphql_api.go @@ -337,7 +337,7 @@ func resourceGraphQLAPICreate(ctx context.Context, d *schema.ResourceData, meta } if v, ok := d.GetOk("additional_authentication_provider"); ok { - input.AdditionalAuthenticationProviders = expandAdditionalAuthenticationProviders(v.([]interface{}), meta.(*conns.AWSClient).Region) + input.AdditionalAuthenticationProviders = expandAdditionalAuthenticationProviders(v.([]interface{}), meta.(*conns.AWSClient).Region(ctx)) } if v, ok := d.GetOk("api_type"); ok { @@ -377,7 +377,7 @@ func resourceGraphQLAPICreate(ctx context.Context, d *schema.ResourceData, meta } if v, ok := d.GetOk("user_pool_config"); ok { - input.UserPoolConfig = expandUserPoolConfig(v.([]interface{}), meta.(*conns.AWSClient).Region) + input.UserPoolConfig = expandUserPoolConfig(v.([]interface{}), meta.(*conns.AWSClient).Region(ctx)) } if v, ok := d.GetOk("xray_enabled"); ok { @@ -468,7 +468,7 @@ func resourceGraphQLAPIUpdate(ctx context.Context, d *schema.ResourceData, meta } if v, ok := d.GetOk("additional_authentication_provider"); ok { - input.AdditionalAuthenticationProviders = expandAdditionalAuthenticationProviders(v.([]interface{}), meta.(*conns.AWSClient).Region) + input.AdditionalAuthenticationProviders = expandAdditionalAuthenticationProviders(v.([]interface{}), meta.(*conns.AWSClient).Region(ctx)) } if v, ok := d.GetOk("enhanced_metrics_config"); ok { @@ -504,7 +504,7 @@ func resourceGraphQLAPIUpdate(ctx context.Context, d *schema.ResourceData, meta } if v, ok := d.GetOk("user_pool_config"); ok { - input.UserPoolConfig = expandUserPoolConfig(v.([]interface{}), meta.(*conns.AWSClient).Region) + input.UserPoolConfig = expandUserPoolConfig(v.([]interface{}), meta.(*conns.AWSClient).Region(ctx)) } if v, ok := d.GetOk("xray_enabled"); ok { From f36b9bd405ca2f0a30b0ac0ff699b2e0dfbf0bb2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:08 -0500 Subject: [PATCH 186/304] Make 'AWSClient.Region' a getter - athena. --- internal/service/athena/data_catalog.go | 2 +- internal/service/athena/workgroup.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/athena/data_catalog.go b/internal/service/athena/data_catalog.go index 78b2c532efa..d54c5d1d3a6 100644 --- a/internal/service/athena/data_catalog.go +++ b/internal/service/athena/data_catalog.go @@ -128,7 +128,7 @@ func resourceDataCatalogRead(ctx context.Context, d *schema.ResourceData, meta i arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Service: "athena", AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("datacatalog/%s", d.Id()), diff --git a/internal/service/athena/workgroup.go b/internal/service/athena/workgroup.go index 05cec0c7ad7..7a417943ab7 100644 --- a/internal/service/athena/workgroup.go +++ b/internal/service/athena/workgroup.go @@ -241,7 +241,7 @@ func resourceWorkGroupRead(ctx context.Context, d *schema.ResourceData, meta int arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Service: "athena", AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("workgroup/%s", d.Id()), From 4bdab2e30eb9464fe43abe2574013ed850c00be5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:08 -0500 Subject: [PATCH 187/304] Make 'AWSClient.Region' a getter - auditmanager. --- internal/service/auditmanager/account_registration.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/auditmanager/account_registration.go b/internal/service/auditmanager/account_registration.go index bb17e323cf2..f43e59dda7f 100644 --- a/internal/service/auditmanager/account_registration.go +++ b/internal/service/auditmanager/account_registration.go @@ -58,7 +58,7 @@ func (r *resourceAccountRegistration) Schema(ctx context.Context, req resource.S func (r *resourceAccountRegistration) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) { conn := r.Meta().AuditManagerClient(ctx) // Registration is applied per region, so use this as the ID - id := r.Meta().Region + id := r.Meta().Region(ctx) var plan resourceAccountRegistrationData resp.Diagnostics.Append(req.Plan.Get(ctx, &plan)...) From cbe3c58d5cad3b05a469fb1ed4b8da731fc5f904 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:08 -0500 Subject: [PATCH 188/304] Make 'AWSClient.Region' a getter - autoscaling. --- internal/service/autoscaling/groups_data_source.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/autoscaling/groups_data_source.go b/internal/service/autoscaling/groups_data_source.go index bb435feb5c7..2e987d42093 100644 --- a/internal/service/autoscaling/groups_data_source.go +++ b/internal/service/autoscaling/groups_data_source.go @@ -113,7 +113,7 @@ func dataSourceGroupsRead(ctx context.Context, d *schema.ResourceData, meta inte slices.Sort(arns) slices.Sort(nms) - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrARNs, arns) d.Set(names.AttrNames, nms) From 8208e9ff8e7d694389e2bd286347b8f44c2cfde2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:08 -0500 Subject: [PATCH 189/304] Make 'AWSClient.Region' a getter - backup. --- internal/service/backup/region_settings.go | 2 +- internal/service/backup/vault_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/backup/region_settings.go b/internal/service/backup/region_settings.go index 181fb63eae7..acc556b082d 100644 --- a/internal/service/backup/region_settings.go +++ b/internal/service/backup/region_settings.go @@ -65,7 +65,7 @@ func resourceRegionSettingsUpdate(ctx context.Context, d *schema.ResourceData, m } if d.IsNewResource() { - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) } return append(diags, resourceRegionSettingsRead(ctx, d, meta)...) diff --git a/internal/service/backup/vault_test.go b/internal/service/backup/vault_test.go index adf0d6f7528..0ee8906635f 100644 --- a/internal/service/backup/vault_test.go +++ b/internal/service/backup/vault_test.go @@ -239,7 +239,7 @@ func testAccCheckRunDynamoDBTableBackupJob(ctx context.Context, rName string) re resourceARN := arn.ARN{ Partition: client.Partition(ctx), Service: "dynamodb", - Region: client.Region, + Region: client.Region(ctx), AccountID: client.AccountID(ctx), Resource: fmt.Sprintf("table/%s", rName), }.String() From 16f816b7d76bb18ad639e2ee6051a3c5d18b090e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:09 -0500 Subject: [PATCH 190/304] Make 'AWSClient.Region' a getter - bedrock. --- internal/service/bedrock/custom_models_data_source.go | 2 +- internal/service/bedrock/foundation_models_data_source.go | 2 +- .../service/bedrock/model_invocation_logging_configuration.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/service/bedrock/custom_models_data_source.go b/internal/service/bedrock/custom_models_data_source.go index fde2ccb18c2..090072bd19f 100644 --- a/internal/service/bedrock/custom_models_data_source.go +++ b/internal/service/bedrock/custom_models_data_source.go @@ -72,7 +72,7 @@ func (d *customModelsDataSource) Read(ctx context.Context, request datasource.Re return } - data.ID = types.StringValue(d.Meta().Region) + data.ID = types.StringValue(d.Meta().Region(ctx)) response.Diagnostics.Append(response.State.Set(ctx, &data)...) } diff --git a/internal/service/bedrock/foundation_models_data_source.go b/internal/service/bedrock/foundation_models_data_source.go index f18606b0641..d70e78aae39 100644 --- a/internal/service/bedrock/foundation_models_data_source.go +++ b/internal/service/bedrock/foundation_models_data_source.go @@ -88,7 +88,7 @@ func (d *foundationModelsDataSource) Read(ctx context.Context, request datasourc return } - data.ID = types.StringValue(d.Meta().Region) + data.ID = types.StringValue(d.Meta().Region(ctx)) response.Diagnostics.Append(response.State.Set(ctx, &data)...) } diff --git a/internal/service/bedrock/model_invocation_logging_configuration.go b/internal/service/bedrock/model_invocation_logging_configuration.go index 45e485fbc17..869fb251617 100644 --- a/internal/service/bedrock/model_invocation_logging_configuration.go +++ b/internal/service/bedrock/model_invocation_logging_configuration.go @@ -118,7 +118,7 @@ func (r *resourceModelInvocationLoggingConfiguration) Create(ctx context.Context } // Set values for unknowns. - data.ID = types.StringValue(r.Meta().Region) + data.ID = types.StringValue(r.Meta().Region(ctx)) response.Diagnostics.Append(response.State.Set(ctx, &data)...) } From 586ed6b4d52824749dbf1b9e15dc75844e7982d9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:09 -0500 Subject: [PATCH 191/304] Make 'AWSClient.Region' a getter - chime. --- internal/service/chime/voice_connector.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/chime/voice_connector.go b/internal/service/chime/voice_connector.go index a19b2c8626d..fd2f8dd9c80 100644 --- a/internal/service/chime/voice_connector.go +++ b/internal/service/chime/voice_connector.go @@ -76,7 +76,7 @@ func ResourceVoiceConnector() *schema.Resource { func resourceVoiceConnectorDefaultRegion(ctx context.Context, diff *schema.ResourceDiff, meta interface{}) error { if v, ok := diff.Get("aws_region").(string); !ok || v == "" { - if err := diff.SetNew("aws_region", meta.(*conns.AWSClient).Region); err != nil { + if err := diff.SetNew("aws_region", meta.(*conns.AWSClient).Region(ctx)); err != nil { return err } } From 3104b79b04561d863fc40f3f8c5ceaa6bf37f4c2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:10 -0500 Subject: [PATCH 192/304] Make 'AWSClient.Region' a getter - cloudformation. --- internal/service/cloudformation/export_data_source.go | 2 +- internal/service/cloudformation/stack_instances.go | 4 ++-- internal/service/cloudformation/stack_set_instance.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/cloudformation/export_data_source.go b/internal/service/cloudformation/export_data_source.go index 3577c9fc76a..d98811396a9 100644 --- a/internal/service/cloudformation/export_data_source.go +++ b/internal/service/cloudformation/export_data_source.go @@ -68,7 +68,7 @@ func dataSourceExportRead(ctx context.Context, d *schema.ResourceData, meta inte return sdkdiag.AppendFromErr(diags, tfresource.NewEmptyResultError(name)) } - d.SetId(fmt.Sprintf("cloudformation-exports-%s-%s", meta.(*conns.AWSClient).Region, name)) + d.SetId(fmt.Sprintf("cloudformation-exports-%s-%s", meta.(*conns.AWSClient).Region(ctx), name)) return diags } diff --git a/internal/service/cloudformation/stack_instances.go b/internal/service/cloudformation/stack_instances.go index e81a1f89f33..ce2f32e6995 100644 --- a/internal/service/cloudformation/stack_instances.go +++ b/internal/service/cloudformation/stack_instances.go @@ -260,7 +260,7 @@ func resourceStackInstancesCreate(ctx context.Context, d *schema.ResourceData, m } if v, ok := d.GetOk(AttrRegions); !ok || v.(*schema.Set).Len() == 0 { - input.Regions = []string{meta.(*conns.AWSClient).Region} + input.Regions = []string{meta.(*conns.AWSClient).Region(ctx)} } if v, ok := d.GetOk(AttrAccounts); ok && v.(*schema.Set).Len() > 0 { @@ -697,7 +697,7 @@ func findStackInstancesByNameCallAs(ctx context.Context, meta interface{}, stack } if len(output.Regions) == 0 && len(regions) == 0 { - output.Regions = []string{meta.(*conns.AWSClient).Region} + output.Regions = []string{meta.(*conns.AWSClient).Region(ctx)} } if deployedByOU { diff --git a/internal/service/cloudformation/stack_set_instance.go b/internal/service/cloudformation/stack_set_instance.go index b2af46fc77f..b282ac8386d 100644 --- a/internal/service/cloudformation/stack_set_instance.go +++ b/internal/service/cloudformation/stack_set_instance.go @@ -230,7 +230,7 @@ func resourceStackSetInstanceCreate(ctx context.Context, d *schema.ResourceData, var diags diag.Diagnostics conn := meta.(*conns.AWSClient).CloudFormationClient(ctx) - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) if v, ok := d.GetOk(names.AttrRegion); ok { region = v.(string) } From 267053f9c0f1810c6d969f1452977e761904d721 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:10 -0500 Subject: [PATCH 193/304] Make 'AWSClient.Region' a getter - cloudfront. --- .../cloudfront/log_delivery_canonical_user_id_data_source.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/cloudfront/log_delivery_canonical_user_id_data_source.go b/internal/service/cloudfront/log_delivery_canonical_user_id_data_source.go index a4c00fe3c93..1071a9db138 100644 --- a/internal/service/cloudfront/log_delivery_canonical_user_id_data_source.go +++ b/internal/service/cloudfront/log_delivery_canonical_user_id_data_source.go @@ -39,7 +39,7 @@ func dataSourceLogDeliveryCanonicalUserIDRead(ctx context.Context, d *schema.Res var diags diag.Diagnostics canonicalUserID := defaultLogDeliveryCanonicalUserID - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) if v, ok := d.GetOk(names.AttrRegion); ok { region = v.(string) } From 35cc2f46e1d70cce045693c861f1023575956f32 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:10 -0500 Subject: [PATCH 194/304] Make 'AWSClient.Region' a getter - cloudtrail. --- internal/service/cloudtrail/service_account_data_source.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/cloudtrail/service_account_data_source.go b/internal/service/cloudtrail/service_account_data_source.go index 703aaeb99db..1a1b4dbb8ec 100644 --- a/internal/service/cloudtrail/service_account_data_source.go +++ b/internal/service/cloudtrail/service_account_data_source.go @@ -74,7 +74,7 @@ func dataSourceServiceAccount() *schema.Resource { func dataSourceServiceAccountRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) if v, ok := d.GetOk(names.AttrRegion); ok { region = v.(string) } From dfa61d0a89a4291d4370ee25de367f127b2c87a2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:11 -0500 Subject: [PATCH 195/304] Make 'AWSClient.Region' a getter - codepipeline. --- internal/service/codepipeline/custom_action_type.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/codepipeline/custom_action_type.go b/internal/service/codepipeline/custom_action_type.go index 208941f5ad8..57c2a8e5dc2 100644 --- a/internal/service/codepipeline/custom_action_type.go +++ b/internal/service/codepipeline/custom_action_type.go @@ -249,7 +249,7 @@ func resourceCustomActionTypeRead(ctx context.Context, d *schema.ResourceData, m arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "codepipeline", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("actiontype:%s/%s/%s/%s", types.ActionOwnerCustom, category, provider, version), }.String() From 434ba4b4fc3f5f61049b6af2f5c2ea5705cf2255 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:12 -0500 Subject: [PATCH 196/304] Make 'AWSClient.Region' a getter - cognitoidentity. --- internal/service/cognitoidentity/pool.go | 2 +- internal/service/cognitoidentity/pool_data_source.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/cognitoidentity/pool.go b/internal/service/cognitoidentity/pool.go index 3dfe7615587..7786904c418 100644 --- a/internal/service/cognitoidentity/pool.go +++ b/internal/service/cognitoidentity/pool.go @@ -187,7 +187,7 @@ func resourcePoolRead(ctx context.Context, d *schema.ResourceData, meta interfac arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Service: "cognito-identity", AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("identitypool/%s", d.Id()), diff --git a/internal/service/cognitoidentity/pool_data_source.go b/internal/service/cognitoidentity/pool_data_source.go index 576f92c7773..a2ef847a974 100644 --- a/internal/service/cognitoidentity/pool_data_source.go +++ b/internal/service/cognitoidentity/pool_data_source.go @@ -113,7 +113,7 @@ func dataSourcePoolRead(ctx context.Context, d *schema.ResourceData, meta interf arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Service: "cognito-identity", AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("identitypool/%s", d.Id()), From 17bd8660bc0a0aeb23333d5cb694928b192085d7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:12 -0500 Subject: [PATCH 197/304] Make 'AWSClient.Region' a getter - cognitoidp. --- internal/service/cognitoidp/user_pools_data_source.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/cognitoidp/user_pools_data_source.go b/internal/service/cognitoidp/user_pools_data_source.go index b8597386d88..9765d9d8346 100644 --- a/internal/service/cognitoidp/user_pools_data_source.go +++ b/internal/service/cognitoidp/user_pools_data_source.go @@ -59,7 +59,7 @@ func dataSourceUserPoolsRead(ctx context.Context, d *schema.ResourceData, meta i arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "cognito-idp", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: "userpool/" + userPoolID, }.String() From bfce9437eab55b6401cc4cf8d9cee2bbbc6a6767 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:12 -0500 Subject: [PATCH 198/304] Make 'AWSClient.Region' a getter - connect. --- internal/service/connect/bot_association.go | 2 +- internal/service/connect/bot_association_data_source.go | 4 ++-- .../connect/lambda_function_association_data_source.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/connect/bot_association.go b/internal/service/connect/bot_association.go index c76d4278447..f0d7037d847 100644 --- a/internal/service/connect/bot_association.go +++ b/internal/service/connect/bot_association.go @@ -80,7 +80,7 @@ func resourceBotAssociationCreate(ctx context.Context, d *schema.ResourceData, m if v, ok := d.GetOk("lex_bot"); ok && len(v.([]interface{})) > 0 && v.([]interface{})[0] != nil { input.LexBot = expandLexBot(v.([]interface{})[0].(map[string]interface{})) if input.LexBot.LexRegion == nil { - input.LexBot.LexRegion = aws.String(meta.(*conns.AWSClient).Region) + input.LexBot.LexRegion = aws.String(meta.(*conns.AWSClient).Region(ctx)) } } diff --git a/internal/service/connect/bot_association_data_source.go b/internal/service/connect/bot_association_data_source.go index e666e722623..98f749867b3 100644 --- a/internal/service/connect/bot_association_data_source.go +++ b/internal/service/connect/bot_association_data_source.go @@ -60,7 +60,7 @@ func dataSourceBotAssociationRead(ctx context.Context, d *schema.ResourceData, m name = aws.ToString(lexBot.Name) region = aws.ToString(lexBot.LexRegion) if region == "" { - region = meta.(*conns.AWSClient).Region + region = meta.(*conns.AWSClient).Region(ctx) } } @@ -71,7 +71,7 @@ func dataSourceBotAssociationRead(ctx context.Context, d *schema.ResourceData, m return sdkdiag.AppendErrorf(diags, "reading Connect Bot Association (%s): %s", id, err) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrInstanceID, instanceID) if err := d.Set("lex_bot", flattenLexBot(lexBot)); err != nil { return sdkdiag.AppendErrorf(diags, "setting lex_bot: %s", err) diff --git a/internal/service/connect/lambda_function_association_data_source.go b/internal/service/connect/lambda_function_association_data_source.go index 1c87e97fef5..5634059b6c5 100644 --- a/internal/service/connect/lambda_function_association_data_source.go +++ b/internal/service/connect/lambda_function_association_data_source.go @@ -45,7 +45,7 @@ func dataSourceLambdaFunctionAssociationRead(ctx context.Context, d *schema.Reso return sdkdiag.AppendErrorf(diags, "reading Connect Lambda Function Association: %s", err) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrFunctionARN, functionARN) d.Set(names.AttrInstanceID, instanceID) From 8ef39b9c33a5fab599f282b596417e48e86dbf9d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:13 -0500 Subject: [PATCH 199/304] Make 'AWSClient.Region' a getter - cur. --- internal/service/cur/report_definition.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/cur/report_definition.go b/internal/service/cur/report_definition.go index 5e6a8e53267..ba5a6a765db 100644 --- a/internal/service/cur/report_definition.go +++ b/internal/service/cur/report_definition.go @@ -194,7 +194,7 @@ func resourceReportDefinitionRead(ctx context.Context, d *schema.ResourceData, m arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.CUR, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: "definition/" + reportName, }.String() From fc94acd22c141119895965a250ce78f398d4a602 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:13 -0500 Subject: [PATCH 200/304] Make 'AWSClient.Region' a getter - datasync. --- internal/service/datasync/agent.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/datasync/agent.go b/internal/service/datasync/agent.go index af2ccfb28b8..b22b0799b2c 100644 --- a/internal/service/datasync/agent.go +++ b/internal/service/datasync/agent.go @@ -116,7 +116,7 @@ func resourceAgentCreate(ctx context.Context, d *schema.ResourceData, meta inter }, Timeout: time.Second * 10, } - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) var requestURL string if v, ok := d.GetOk("private_link_endpoint"); ok { From bc76c50cc41869b996d1977bbd9df788de235f7a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:13 -0500 Subject: [PATCH 201/304] Make 'AWSClient.Region' a getter - deploy. --- internal/service/deploy/app.go | 2 +- internal/service/deploy/deployment_config.go | 2 +- internal/service/deploy/deployment_group.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/service/deploy/app.go b/internal/service/deploy/app.go index 7b642a7dd94..b0e4b8fa6e6 100644 --- a/internal/service/deploy/app.go +++ b/internal/service/deploy/app.go @@ -156,7 +156,7 @@ func resourceAppRead(ctx context.Context, d *schema.ResourceData, meta interface arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "codedeploy", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("application:%s", appName), }.String() diff --git a/internal/service/deploy/deployment_config.go b/internal/service/deploy/deployment_config.go index a9cf962726d..9858c164d4b 100644 --- a/internal/service/deploy/deployment_config.go +++ b/internal/service/deploy/deployment_config.go @@ -223,7 +223,7 @@ func resourceDeploymentConfigRead(ctx context.Context, d *schema.ResourceData, m arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "codedeploy", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: "deploymentconfig:" + deploymentConfigName, }.String() diff --git a/internal/service/deploy/deployment_group.go b/internal/service/deploy/deployment_group.go index 288eb47513c..0c9f04438c0 100644 --- a/internal/service/deploy/deployment_group.go +++ b/internal/service/deploy/deployment_group.go @@ -576,7 +576,7 @@ func resourceDeploymentGroupRead(ctx context.Context, d *schema.ResourceData, me arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "codedeploy", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("deploymentgroup:%s/%s", appName, groupName), }.String() From 251df1b3c43ef0a5ea0b930f364cf58003afd99f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:14 -0500 Subject: [PATCH 202/304] Make 'AWSClient.Region' a getter - devopsguru. --- internal/service/devopsguru/event_sources_config.go | 2 +- internal/service/devopsguru/service_integration.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/devopsguru/event_sources_config.go b/internal/service/devopsguru/event_sources_config.go index 8b65ef664bd..e459d608b71 100644 --- a/internal/service/devopsguru/event_sources_config.go +++ b/internal/service/devopsguru/event_sources_config.go @@ -86,7 +86,7 @@ func (r *resourceEventSourcesConfig) Create(ctx context.Context, req resource.Cr if resp.Diagnostics.HasError() { return } - plan.ID = types.StringValue(r.Meta().Region) + plan.ID = types.StringValue(r.Meta().Region(ctx)) in := &devopsguru.UpdateEventSourcesConfigInput{} resp.Diagnostics.Append(flex.Expand(ctx, &plan, in)...) diff --git a/internal/service/devopsguru/service_integration.go b/internal/service/devopsguru/service_integration.go index b2f38926f89..0fb4711a346 100644 --- a/internal/service/devopsguru/service_integration.go +++ b/internal/service/devopsguru/service_integration.go @@ -141,7 +141,7 @@ func (r *resourceServiceIntegration) Create(ctx context.Context, req resource.Cr if resp.Diagnostics.HasError() { return } - plan.ID = types.StringValue(r.Meta().Region) + plan.ID = types.StringValue(r.Meta().Region(ctx)) integration := &awstypes.UpdateServiceIntegrationConfig{} resp.Diagnostics.Append(flex.Expand(ctx, plan, integration)...) From 3b1b3fc0ee8b86901cd723c6c8964e139008936e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:14 -0500 Subject: [PATCH 203/304] Make 'AWSClient.Region' a getter - directconnect. --- .../service/directconnect/hosted_private_virtual_interface.go | 2 +- .../hosted_private_virtual_interface_accepter.go | 4 ++-- .../service/directconnect/hosted_public_virtual_interface.go | 2 +- .../directconnect/hosted_public_virtual_interface_accepter.go | 4 ++-- .../service/directconnect/hosted_transit_virtual_interface.go | 2 +- .../hosted_transit_virtual_interface_accepter.go | 4 ++-- internal/service/directconnect/locations_data_source.go | 2 +- internal/service/directconnect/private_virtual_interface.go | 2 +- internal/service/directconnect/public_virtual_interface.go | 2 +- internal/service/directconnect/transit_virtual_interface.go | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/directconnect/hosted_private_virtual_interface.go b/internal/service/directconnect/hosted_private_virtual_interface.go index f42b8227ca8..aa09aa678d1 100644 --- a/internal/service/directconnect/hosted_private_virtual_interface.go +++ b/internal/service/directconnect/hosted_private_virtual_interface.go @@ -188,7 +188,7 @@ func resourceHostedPrivateVirtualInterfaceRead(ctx context.Context, d *schema.Re d.Set("amazon_side_asn", flex.Int64ToStringValue(vif.AmazonSideAsn)) arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Service: "directconnect", AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("dxvif/%s", d.Id()), diff --git a/internal/service/directconnect/hosted_private_virtual_interface_accepter.go b/internal/service/directconnect/hosted_private_virtual_interface_accepter.go index 0a916098a6d..4a849493009 100644 --- a/internal/service/directconnect/hosted_private_virtual_interface_accepter.go +++ b/internal/service/directconnect/hosted_private_virtual_interface_accepter.go @@ -98,7 +98,7 @@ func resourceHostedPrivateVirtualInterfaceAccepterCreate(ctx context.Context, d d.SetId(vifID) arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Service: "directconnect", AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("dxvif/%s", d.Id()), @@ -171,7 +171,7 @@ func resourceHostedPrivateVirtualInterfaceAccepterImport(ctx context.Context, d arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Service: "directconnect", AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("dxvif/%s", d.Id()), diff --git a/internal/service/directconnect/hosted_public_virtual_interface.go b/internal/service/directconnect/hosted_public_virtual_interface.go index 60731577931..64e24e99691 100644 --- a/internal/service/directconnect/hosted_public_virtual_interface.go +++ b/internal/service/directconnect/hosted_public_virtual_interface.go @@ -185,7 +185,7 @@ func resourceHostedPublicVirtualInterfaceRead(ctx context.Context, d *schema.Res d.Set("amazon_side_asn", strconv.FormatInt(aws.ToInt64(vif.AmazonSideAsn), 10)) arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Service: "directconnect", AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("dxvif/%s", d.Id()), diff --git a/internal/service/directconnect/hosted_public_virtual_interface_accepter.go b/internal/service/directconnect/hosted_public_virtual_interface_accepter.go index 8ec9cf4a1c4..ff4ce47b46d 100644 --- a/internal/service/directconnect/hosted_public_virtual_interface_accepter.go +++ b/internal/service/directconnect/hosted_public_virtual_interface_accepter.go @@ -78,7 +78,7 @@ func resourceHostedPublicVirtualInterfaceAccepterCreate(ctx context.Context, d * d.SetId(vifID) arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Service: "directconnect", AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("dxvif/%s", d.Id()), @@ -149,7 +149,7 @@ func resourceHostedPublicVirtualInterfaceAccepterImport(ctx context.Context, d * arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Service: "directconnect", AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("dxvif/%s", d.Id()), diff --git a/internal/service/directconnect/hosted_transit_virtual_interface.go b/internal/service/directconnect/hosted_transit_virtual_interface.go index c05de044175..e73b83d1565 100644 --- a/internal/service/directconnect/hosted_transit_virtual_interface.go +++ b/internal/service/directconnect/hosted_transit_virtual_interface.go @@ -184,7 +184,7 @@ func resourceHostedTransitVirtualInterfaceRead(ctx context.Context, d *schema.Re d.Set("amazon_side_asn", flex.Int64ToStringValue(vif.AmazonSideAsn)) arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Service: "directconnect", AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("dxvif/%s", d.Id()), diff --git a/internal/service/directconnect/hosted_transit_virtual_interface_accepter.go b/internal/service/directconnect/hosted_transit_virtual_interface_accepter.go index d72f626d6af..ed198b0251b 100644 --- a/internal/service/directconnect/hosted_transit_virtual_interface_accepter.go +++ b/internal/service/directconnect/hosted_transit_virtual_interface_accepter.go @@ -84,7 +84,7 @@ func resourceHostedTransitVirtualInterfaceAccepterCreate(ctx context.Context, d d.SetId(vifID) arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Service: "directconnect", AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("dxvif/%s", d.Id()), @@ -156,7 +156,7 @@ func resourceHostedTransitVirtualInterfaceAccepterImport(ctx context.Context, d arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Service: "directconnect", AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("dxvif/%s", d.Id()), diff --git a/internal/service/directconnect/locations_data_source.go b/internal/service/directconnect/locations_data_source.go index 123baa2fd3b..8da49d9151f 100644 --- a/internal/service/directconnect/locations_data_source.go +++ b/internal/service/directconnect/locations_data_source.go @@ -42,7 +42,7 @@ func dataSourceLocationsRead(ctx context.Context, d *schema.ResourceData, meta i return sdkdiag.AppendErrorf(diags, "reading Direct Connect Locations: %s", err) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set("location_codes", tfslices.ApplyToAll(locations, func(v awstypes.Location) string { return aws.ToString(v.LocationCode) })) diff --git a/internal/service/directconnect/private_virtual_interface.go b/internal/service/directconnect/private_virtual_interface.go index f6d5a051850..7ce3797911e 100644 --- a/internal/service/directconnect/private_virtual_interface.go +++ b/internal/service/directconnect/private_virtual_interface.go @@ -210,7 +210,7 @@ func resourcePrivateVirtualInterfaceRead(ctx context.Context, d *schema.Resource d.Set("amazon_side_asn", strconv.FormatInt(aws.ToInt64(vif.AmazonSideAsn), 10)) arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Service: "directconnect", AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("dxvif/%s", d.Id()), diff --git a/internal/service/directconnect/public_virtual_interface.go b/internal/service/directconnect/public_virtual_interface.go index 396c22b5b0c..d8257bb99ab 100644 --- a/internal/service/directconnect/public_virtual_interface.go +++ b/internal/service/directconnect/public_virtual_interface.go @@ -188,7 +188,7 @@ func resourcePublicVirtualInterfaceRead(ctx context.Context, d *schema.ResourceD d.Set("amazon_side_asn", strconv.FormatInt(aws.ToInt64(vif.AmazonSideAsn), 10)) arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Service: "directconnect", AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("dxvif/%s", d.Id()), diff --git a/internal/service/directconnect/transit_virtual_interface.go b/internal/service/directconnect/transit_virtual_interface.go index ef361ca46fa..71c23f7e587 100644 --- a/internal/service/directconnect/transit_virtual_interface.go +++ b/internal/service/directconnect/transit_virtual_interface.go @@ -196,7 +196,7 @@ func resourceTransitVirtualInterfaceRead(ctx context.Context, d *schema.Resource d.Set("amazon_side_asn", strconv.FormatInt(aws.ToInt64(vif.AmazonSideAsn), 10)) arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Service: "directconnect", AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("dxvif/%s", d.Id()), From 24c987bd570d47ccfaa9ea6ea205d76e81647a20 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:14 -0500 Subject: [PATCH 204/304] Make 'AWSClient.Region' a getter - dms. --- internal/service/dms/event_subscription.go | 2 +- internal/service/dms/replication_subnet_group.go | 2 +- internal/service/dms/replication_subnet_group_data_source.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/service/dms/event_subscription.go b/internal/service/dms/event_subscription.go index 22bb6153722..1d8c2f6ead0 100644 --- a/internal/service/dms/event_subscription.go +++ b/internal/service/dms/event_subscription.go @@ -148,7 +148,7 @@ func resourceEventSubscriptionRead(ctx context.Context, d *schema.ResourceData, arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "dms", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("es:%s", d.Id()), }.String() diff --git a/internal/service/dms/replication_subnet_group.go b/internal/service/dms/replication_subnet_group.go index add559c6309..8eebcde9674 100644 --- a/internal/service/dms/replication_subnet_group.go +++ b/internal/service/dms/replication_subnet_group.go @@ -117,7 +117,7 @@ func resourceReplicationSubnetGroupRead(ctx context.Context, d *schema.ResourceD arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "dms", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("subgrp:%s", d.Id()), }.String() diff --git a/internal/service/dms/replication_subnet_group_data_source.go b/internal/service/dms/replication_subnet_group_data_source.go index 8db4b4548a9..b219cfa8915 100644 --- a/internal/service/dms/replication_subnet_group_data_source.go +++ b/internal/service/dms/replication_subnet_group_data_source.go @@ -71,7 +71,7 @@ func dataSourceReplicationSubnetGroupRead(ctx context.Context, d *schema.Resourc arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "dms", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("subgrp:%s", d.Id()), }.String() From ee3587ee2ed5e27eae2f094d43b7bcf7f831e9ad Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:14 -0500 Subject: [PATCH 205/304] Make 'AWSClient.Region' a getter - docdb. --- internal/service/docdb/cluster_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/docdb/cluster_test.go b/internal/service/docdb/cluster_test.go index 06f402718eb..fb54bd12b4b 100644 --- a/internal/service/docdb/cluster_test.go +++ b/internal/service/docdb/cluster_test.go @@ -790,8 +790,8 @@ func TestAccDocDBCluster_GlobalClusterIdentifier_PrimarySecondaryClusters(t *tes { Config: testAccClusterConfig_globalIdentifierPrimarySecondary(rNameGlobal, rNamePrimary, rNameSecondary), Check: resource.ComposeTestCheckFunc( - testAccCheckClusterExistsProvider(ctx, resourceNamePrimary, &primaryDbCluster, acctest.RegionProviderFunc(acctest.Region(), &providers)), - testAccCheckClusterExistsProvider(ctx, resourceNameSecondary, &secondaryDbCluster, acctest.RegionProviderFunc(acctest.AlternateRegion(), &providers)), + testAccCheckClusterExistsProvider(ctx, resourceNamePrimary, &primaryDbCluster, acctest.RegionProviderFunc(ctx, acctest.Region(), &providers)), + testAccCheckClusterExistsProvider(ctx, resourceNameSecondary, &secondaryDbCluster, acctest.RegionProviderFunc(ctx, acctest.AlternateRegion(), &providers)), ), }, }, From cf3271c86cb6c06605516b70c7f2eaa3ff9d6cf3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:14 -0500 Subject: [PATCH 206/304] Make 'AWSClient.Region' a getter - dynamodb. --- internal/service/dynamodb/table.go | 8 ++++---- internal/service/dynamodb/table_replica.go | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/internal/service/dynamodb/table.go b/internal/service/dynamodb/table.go index ba455942330..4caac0fd7c7 100644 --- a/internal/service/dynamodb/table.go +++ b/internal/service/dynamodb/table.go @@ -810,7 +810,7 @@ func resourceTableCreate(ctx context.Context, d *schema.ResourceData, meta inter } if d.Get("point_in_time_recovery.0.enabled").(bool) { - if err := updatePITR(ctx, conn, d.Id(), true, meta.(*conns.AWSClient).Region, d.Timeout(schema.TimeoutCreate)); err != nil { + if err := updatePITR(ctx, conn, d.Id(), true, meta.(*conns.AWSClient).Region(ctx), d.Timeout(schema.TimeoutCreate)); err != nil { return create.AppendDiagError(diags, names.DynamoDB, create.ErrActionCreating, resNameTable, d.Id(), fmt.Errorf("enabling point in time recovery: %w", err)) } } @@ -1174,7 +1174,7 @@ func resourceTableUpdate(ctx context.Context, d *schema.ResourceData, meta inter } var input = &awstypes.UpdateReplicationGroupMemberAction{ KMSMasterKeyId: sseSpecification.KMSMasterKeyId, - RegionName: aws.String(meta.(*conns.AWSClient).Region), + RegionName: aws.String(meta.(*conns.AWSClient).Region(ctx)), } var update = awstypes.ReplicationGroupUpdate{Update: input} replicaInputs = append(replicaInputs, update) @@ -1250,7 +1250,7 @@ func resourceTableUpdate(ctx context.Context, d *schema.ResourceData, meta inter } if d.HasChange("point_in_time_recovery") { - if err := updatePITR(ctx, conn, d.Id(), d.Get("point_in_time_recovery.0.enabled").(bool), meta.(*conns.AWSClient).Region, d.Timeout(schema.TimeoutUpdate)); err != nil { + if err := updatePITR(ctx, conn, d.Id(), d.Get("point_in_time_recovery.0.enabled").(bool), meta.(*conns.AWSClient).Region(ctx), d.Timeout(schema.TimeoutUpdate)); err != nil { return create.AppendDiagError(diags, names.DynamoDB, create.ErrActionUpdating, resNameTable, d.Id(), err) } } @@ -2021,7 +2021,7 @@ func clearSSEDefaultKey(ctx context.Context, client *conns.AWSClient, sseList [] sse := sseList[0].(map[string]interface{}) - dk, err := kms.FindDefaultKeyARNForService(ctx, client.KMSClient(ctx), "dynamodb", client.Region) + dk, err := kms.FindDefaultKeyARNForService(ctx, client.KMSClient(ctx), "dynamodb", client.Region(ctx)) if err != nil { return sseList } diff --git a/internal/service/dynamodb/table_replica.go b/internal/service/dynamodb/table_replica.go index f3002481867..2b77a1af8ca 100644 --- a/internal/service/dynamodb/table_replica.go +++ b/internal/service/dynamodb/table_replica.go @@ -102,7 +102,7 @@ func resourceTableReplicaCreate(ctx context.Context, d *schema.ResourceData, met var diags diag.Diagnostics conn := meta.(*conns.AWSClient).DynamoDBClient(ctx) - replicaRegion := meta.(*conns.AWSClient).Region + replicaRegion := meta.(*conns.AWSClient).Region(ctx) mainRegion, err := regionFromARN(d.Get("global_table_arn").(string)) if err != nil { @@ -168,7 +168,7 @@ func resourceTableReplicaCreate(ctx context.Context, d *schema.ResourceData, met return create.AppendDiagError(diags, names.DynamoDB, create.ErrActionCreating, resNameTableReplica, d.Get("global_table_arn").(string), err) } - if _, err := waitReplicaActive(ctx, conn, tableName, meta.(*conns.AWSClient).Region, d.Timeout(schema.TimeoutCreate), optFn); err != nil { + if _, err := waitReplicaActive(ctx, conn, tableName, meta.(*conns.AWSClient).Region(ctx), d.Timeout(schema.TimeoutCreate), optFn); err != nil { return create.AppendDiagError(diags, names.DynamoDB, create.ErrActionWaitingForCreation, resNameTableReplica, d.Get("global_table_arn").(string), err) } @@ -198,7 +198,7 @@ func resourceTableReplicaRead(ctx context.Context, d *schema.ResourceData, meta diags diag.Diagnostics conn := meta.(*conns.AWSClient).DynamoDBClient(ctx) - replicaRegion := meta.(*conns.AWSClient).Region + replicaRegion := meta.(*conns.AWSClient).Region(ctx) tableName, mainRegion, err := tableReplicaParseResourceID(d.Id()) if err != nil { @@ -331,7 +331,7 @@ func resourceTableReplicaUpdate(ctx context.Context, d *schema.ResourceData, met return create.AppendDiagError(diags, names.DynamoDB, create.ErrActionUpdating, resNameTableReplica, d.Id(), err) } - replicaRegion := meta.(*conns.AWSClient).Region + replicaRegion := meta.(*conns.AWSClient).Region(ctx) if mainRegion == replicaRegion { return create.AppendDiagError(diags, names.DynamoDB, create.ErrActionUpdating, resNameTableReplica, d.Id(), errors.New("replica cannot be in same region as main table")) @@ -422,7 +422,7 @@ func resourceTableReplicaDelete(ctx context.Context, d *schema.ResourceData, met return create.AppendDiagError(diags, names.DynamoDB, create.ErrActionDeleting, resNameTableReplica, d.Id(), err) } - replicaRegion := meta.(*conns.AWSClient).Region + replicaRegion := meta.(*conns.AWSClient).Region(ctx) // now main table region. optFn := func(o *dynamodb.Options) { From 24db7335a0253c0aeb862eff90b61a1938d32852 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:15 -0500 Subject: [PATCH 207/304] Make 'AWSClient.Region' a getter - ec2. --- internal/service/ec2/ebs_default_kms_key_data_source.go | 2 +- internal/service/ec2/ebs_encryption_by_default_data_source.go | 2 +- internal/service/ec2/ebs_snapshot.go | 2 +- internal/service/ec2/ebs_snapshot_block_public_access.go | 2 +- internal/service/ec2/ebs_snapshot_data_source.go | 2 +- internal/service/ec2/ebs_snapshot_ids_data_source.go | 2 +- internal/service/ec2/ebs_snapshot_import.go | 2 +- internal/service/ec2/ebs_volume.go | 2 +- internal/service/ec2/ebs_volume_data_source.go | 2 +- internal/service/ec2/ebs_volumes_data_source.go | 2 +- internal/service/ec2/ec2_ami.go | 2 +- internal/service/ec2/ec2_ami_data_source.go | 2 +- internal/service/ec2/ec2_availability_zones_data_source.go | 2 +- internal/service/ec2/ec2_eips_data_source.go | 2 +- internal/service/ec2/ec2_fleet.go | 2 +- internal/service/ec2/ec2_host.go | 2 +- internal/service/ec2/ec2_host_data_source.go | 2 +- internal/service/ec2/ec2_image_block_public_access.go | 2 +- internal/service/ec2/ec2_instance.go | 2 +- internal/service/ec2/ec2_instance_data_source.go | 2 +- internal/service/ec2/ec2_instance_test.go | 2 +- .../service/ec2/ec2_instance_type_offerings_data_source.go | 2 +- internal/service/ec2/ec2_instance_types_data_source.go | 2 +- internal/service/ec2/ec2_instances_data_source.go | 2 +- internal/service/ec2/ec2_key_pair.go | 2 +- internal/service/ec2/ec2_key_pair_data_source.go | 2 +- internal/service/ec2/ec2_launch_template.go | 2 +- internal/service/ec2/ec2_launch_template_data_source.go | 2 +- internal/service/ec2/ec2_placement_group.go | 2 +- internal/service/ec2/ec2_public_ipv4_pools_data_source.go | 2 +- internal/service/ec2/ec2_serial_console_access.go | 2 +- internal/service/ec2/ec2_serial_console_access_data_source.go | 2 +- internal/service/ec2/ec2_spot_price_data_source.go | 2 +- internal/service/ec2/ipam_.go | 4 ++-- internal/service/ec2/ipam_pool_cidr_allocation_test.go | 2 +- internal/service/ec2/ipam_pools_data_source.go | 2 +- internal/service/ec2/ipam_resource_discovery.go | 4 ++-- internal/service/ec2/outposts_coip_pools_data_source.go | 2 +- .../ec2/outposts_local_gateway_route_tables_data_source.go | 2 +- ...osts_local_gateway_virtual_interface_groups_data_source.go | 2 +- internal/service/ec2/outposts_local_gateways_data_source.go | 2 +- internal/service/ec2/transitgateway_attachment_data_source.go | 2 +- .../service/ec2/transitgateway_attachments_data_source.go | 2 +- internal/service/ec2/transitgateway_connect_peer.go | 2 +- .../service/ec2/transitgateway_connect_peer_data_source.go | 2 +- .../ec2/transitgateway_peering_attachment_data_source.go | 2 +- .../ec2/transitgateway_peering_attachments_data_source.go | 2 +- internal/service/ec2/transitgateway_policy_table.go | 2 +- internal/service/ec2/transitgateway_route_table.go | 2 +- .../transitgateway_route_table_associations_data_source.go | 2 +- .../service/ec2/transitgateway_route_table_data_source.go | 2 +- .../transitgateway_route_table_propagations_data_source.go | 2 +- .../service/ec2/transitgateway_route_tables_data_source.go | 2 +- .../service/ec2/transitgateway_vpc_attachments_data_source.go | 2 +- internal/service/ec2/vpc_.go | 2 +- internal/service/ec2/vpc_data_source.go | 2 +- internal/service/ec2/vpc_dhcp_options.go | 2 +- internal/service/ec2/vpc_dhcp_options_data_source.go | 2 +- internal/service/ec2/vpc_endpoint.go | 2 +- internal/service/ec2/vpc_endpoint_data_source.go | 2 +- internal/service/ec2/vpc_endpoint_service.go | 2 +- internal/service/ec2/vpc_endpoint_service_data_source.go | 4 ++-- internal/service/ec2/vpc_flow_log.go | 2 +- internal/service/ec2/vpc_internet_gateway.go | 2 +- internal/service/ec2/vpc_internet_gateway_data_source.go | 2 +- internal/service/ec2/vpc_managed_prefix_lists_data_source.go | 2 +- internal/service/ec2/vpc_nat_gateways_data_source.go | 2 +- internal/service/ec2/vpc_network_acl.go | 2 +- internal/service/ec2/vpc_network_acls_data_source.go | 2 +- internal/service/ec2/vpc_network_interface.go | 2 +- internal/service/ec2/vpc_network_interface_data_source.go | 2 +- internal/service/ec2/vpc_network_interfaces_data_source.go | 2 +- internal/service/ec2/vpc_peering_connection_accepter_test.go | 2 +- internal/service/ec2/vpc_peering_connection_options_test.go | 4 ++-- internal/service/ec2/vpc_peering_connections_data_source.go | 2 +- internal/service/ec2/vpc_route_table.go | 2 +- internal/service/ec2/vpc_route_table_data_source.go | 2 +- internal/service/ec2/vpc_route_tables_data_source.go | 2 +- internal/service/ec2/vpc_security_group.go | 2 +- internal/service/ec2/vpc_security_group_data_source.go | 2 +- internal/service/ec2/vpc_security_group_rules_data_source.go | 2 +- internal/service/ec2/vpc_security_groups_data_source.go | 4 ++-- internal/service/ec2/vpc_subnets_data_source.go | 2 +- internal/service/ec2/vpc_traffic_mirror_filter.go | 2 +- internal/service/ec2/vpc_traffic_mirror_filter_rule.go | 2 +- internal/service/ec2/vpc_traffic_mirror_session.go | 2 +- internal/service/ec2/vpc_traffic_mirror_target.go | 2 +- internal/service/ec2/vpc_vpcs_data_source.go | 2 +- internal/service/ec2/vpnclient_endpoint.go | 2 +- internal/service/ec2/vpnclient_endpoint_data_source.go | 2 +- internal/service/ec2/vpnsite_connection.go | 2 +- internal/service/ec2/vpnsite_customer_gateway.go | 2 +- internal/service/ec2/vpnsite_customer_gateway_data_source.go | 2 +- internal/service/ec2/vpnsite_gateway.go | 2 +- internal/service/ec2/vpnsite_gateway_data_source.go | 2 +- internal/service/ec2/wavelength_carrier_gateway.go | 2 +- 96 files changed, 101 insertions(+), 101 deletions(-) diff --git a/internal/service/ec2/ebs_default_kms_key_data_source.go b/internal/service/ec2/ebs_default_kms_key_data_source.go index 56d47e7eecf..5cd88937e82 100644 --- a/internal/service/ec2/ebs_default_kms_key_data_source.go +++ b/internal/service/ec2/ebs_default_kms_key_data_source.go @@ -40,7 +40,7 @@ func dataSourceEBSDefaultKMSKeyRead(ctx context.Context, d *schema.ResourceData, return sdkdiag.AppendErrorf(diags, "reading EBS default KMS key: %s", err) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set("key_arn", res.KmsKeyId) return diags diff --git a/internal/service/ec2/ebs_encryption_by_default_data_source.go b/internal/service/ec2/ebs_encryption_by_default_data_source.go index caf80bebdc7..b74c6b9df62 100644 --- a/internal/service/ec2/ebs_encryption_by_default_data_source.go +++ b/internal/service/ec2/ebs_encryption_by_default_data_source.go @@ -41,7 +41,7 @@ func dataSourceEBSEncryptionByDefaultRead(ctx context.Context, d *schema.Resourc return sdkdiag.AppendErrorf(diags, "reading default EBS encryption toggle: %s", err) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrEnabled, res.EbsEncryptionByDefault) return diags diff --git a/internal/service/ec2/ebs_snapshot.go b/internal/service/ec2/ebs_snapshot.go index e12e5e6a7e8..22ea44a4304 100644 --- a/internal/service/ec2/ebs_snapshot.go +++ b/internal/service/ec2/ebs_snapshot.go @@ -192,7 +192,7 @@ func resourceEBSSnapshotRead(ctx context.Context, d *schema.ResourceData, meta i arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Resource: fmt.Sprintf("snapshot/%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/ec2/ebs_snapshot_block_public_access.go b/internal/service/ec2/ebs_snapshot_block_public_access.go index 23342a0e00b..5beefaa3d27 100644 --- a/internal/service/ec2/ebs_snapshot_block_public_access.go +++ b/internal/service/ec2/ebs_snapshot_block_public_access.go @@ -54,7 +54,7 @@ func resourceEBSSnapshotBlockPublicAccessPut(ctx context.Context, d *schema.Reso } if d.IsNewResource() { - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) } return append(diags, resourceEBSSnapshotBlockPublicAccessRead(ctx, d, meta)...) diff --git a/internal/service/ec2/ebs_snapshot_data_source.go b/internal/service/ec2/ebs_snapshot_data_source.go index 0e337fb5478..b07e0123995 100644 --- a/internal/service/ec2/ebs_snapshot_data_source.go +++ b/internal/service/ec2/ebs_snapshot_data_source.go @@ -167,7 +167,7 @@ func dataSourceEBSSnapshotRead(ctx context.Context, d *schema.ResourceData, meta arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Resource: fmt.Sprintf("snapshot/%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/ec2/ebs_snapshot_ids_data_source.go b/internal/service/ec2/ebs_snapshot_ids_data_source.go index 9764bf0ed53..1505e32d508 100644 --- a/internal/service/ec2/ebs_snapshot_ids_data_source.go +++ b/internal/service/ec2/ebs_snapshot_ids_data_source.go @@ -85,7 +85,7 @@ func dataSourceEBSSnapshotIDsRead(ctx context.Context, d *schema.ResourceData, m snapshotIDs = append(snapshotIDs, aws.ToString(v.SnapshotId)) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrIDs, snapshotIDs) return diags diff --git a/internal/service/ec2/ebs_snapshot_import.go b/internal/service/ec2/ebs_snapshot_import.go index 5cbc327490d..cbfda621bee 100644 --- a/internal/service/ec2/ebs_snapshot_import.go +++ b/internal/service/ec2/ebs_snapshot_import.go @@ -289,7 +289,7 @@ func resourceEBSSnapshotImportRead(ctx context.Context, d *schema.ResourceData, arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Resource: fmt.Sprintf("snapshot/%s", d.Id()), }.String() d.Set(names.AttrARN, arn) diff --git a/internal/service/ec2/ebs_volume.go b/internal/service/ec2/ebs_volume.go index fcc822a2b5d..c1c0ba05f5e 100644 --- a/internal/service/ec2/ebs_volume.go +++ b/internal/service/ec2/ebs_volume.go @@ -206,7 +206,7 @@ func resourceEBSVolumeRead(ctx context.Context, d *schema.ResourceData, meta int arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("volume/%s", d.Id()), } diff --git a/internal/service/ec2/ebs_volume_data_source.go b/internal/service/ec2/ebs_volume_data_source.go index 9b4334111b3..850610202a0 100644 --- a/internal/service/ec2/ebs_volume_data_source.go +++ b/internal/service/ec2/ebs_volume_data_source.go @@ -137,7 +137,7 @@ func dataSourceEBSVolumeRead(ctx context.Context, d *schema.ResourceData, meta i arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("volume/%s", d.Id()), } diff --git a/internal/service/ec2/ebs_volumes_data_source.go b/internal/service/ec2/ebs_volumes_data_source.go index 1d9b4037561..2ce0ef9b8fa 100644 --- a/internal/service/ec2/ebs_volumes_data_source.go +++ b/internal/service/ec2/ebs_volumes_data_source.go @@ -68,7 +68,7 @@ func dataSourceEBSVolumesRead(ctx context.Context, d *schema.ResourceData, meta volumeIDs = append(volumeIDs, aws.ToString(v.VolumeId)) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrIDs, volumeIDs) return diags diff --git a/internal/service/ec2/ec2_ami.go b/internal/service/ec2/ec2_ami.go index b91a38c73a5..6a3f5c569ad 100644 --- a/internal/service/ec2/ec2_ami.go +++ b/internal/service/ec2/ec2_ami.go @@ -423,7 +423,7 @@ func resourceAMIRead(ctx context.Context, d *schema.ResourceData, meta interface d.Set("architecture", image.Architecture) imageArn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Resource: fmt.Sprintf("image/%s", d.Id()), Service: names.EC2, }.String() diff --git a/internal/service/ec2/ec2_ami_data_source.go b/internal/service/ec2/ec2_ami_data_source.go index fbeec15d1ef..1146e5c7d7a 100644 --- a/internal/service/ec2/ec2_ami_data_source.go +++ b/internal/service/ec2/ec2_ami_data_source.go @@ -297,7 +297,7 @@ func dataSourceAMIRead(ctx context.Context, d *schema.ResourceData, meta interfa d.Set("architecture", image.Architecture) imageArn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Service: names.EC2, Resource: fmt.Sprintf("image/%s", d.Id()), }.String() diff --git a/internal/service/ec2/ec2_availability_zones_data_source.go b/internal/service/ec2/ec2_availability_zones_data_source.go index bc9f3749a0c..311e55300a1 100644 --- a/internal/service/ec2/ec2_availability_zones_data_source.go +++ b/internal/service/ec2/ec2_availability_zones_data_source.go @@ -139,7 +139,7 @@ func dataSourceAvailabilityZonesRead(ctx context.Context, d *schema.ResourceData zoneIds = append(zoneIds, zoneID) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) if err := d.Set("group_names", groupNames); err != nil { return sdkdiag.AppendErrorf(diags, "setting group_names: %s", err) diff --git a/internal/service/ec2/ec2_eips_data_source.go b/internal/service/ec2/ec2_eips_data_source.go index e1c2e1ce5cb..d2d462ae28c 100644 --- a/internal/service/ec2/ec2_eips_data_source.go +++ b/internal/service/ec2/ec2_eips_data_source.go @@ -82,7 +82,7 @@ func dataSourceEIPsRead(ctx context.Context, d *schema.ResourceData, meta interf } } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set("allocation_ids", allocationIDs) d.Set("public_ips", publicIPs) diff --git a/internal/service/ec2/ec2_fleet.go b/internal/service/ec2/ec2_fleet.go index 7bb8f015bd4..966127e7221 100644 --- a/internal/service/ec2/ec2_fleet.go +++ b/internal/service/ec2/ec2_fleet.go @@ -809,7 +809,7 @@ func resourceFleetRead(ctx context.Context, d *schema.ResourceData, meta interfa arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("fleet/%s", d.Id()), }.String() diff --git a/internal/service/ec2/ec2_host.go b/internal/service/ec2/ec2_host.go index 400101e1f95..469b4146679 100644 --- a/internal/service/ec2/ec2_host.go +++ b/internal/service/ec2/ec2_host.go @@ -165,7 +165,7 @@ func resourceHostRead(ctx context.Context, d *schema.ResourceData, meta interfac arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: aws.ToString(host.OwnerId), Resource: fmt.Sprintf("dedicated-host/%s", d.Id()), }.String() diff --git a/internal/service/ec2/ec2_host_data_source.go b/internal/service/ec2/ec2_host_data_source.go index 67a677a5c37..f170cb5b975 100644 --- a/internal/service/ec2/ec2_host_data_source.go +++ b/internal/service/ec2/ec2_host_data_source.go @@ -118,7 +118,7 @@ func dataSourceHostRead(ctx context.Context, d *schema.ResourceData, meta interf arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: aws.ToString(host.OwnerId), Resource: fmt.Sprintf("dedicated-host/%s", d.Id()), }.String() diff --git a/internal/service/ec2/ec2_image_block_public_access.go b/internal/service/ec2/ec2_image_block_public_access.go index 53b71c31459..fc5483c98d8 100644 --- a/internal/service/ec2/ec2_image_block_public_access.go +++ b/internal/service/ec2/ec2_image_block_public_access.go @@ -70,7 +70,7 @@ func resourceImageBlockPublicAccessPut(ctx context.Context, d *schema.ResourceDa } if d.IsNewResource() { - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) } if err := waitImageBlockPublicAccessState(ctx, conn, state, d.Timeout(schema.TimeoutUpdate)); err != nil { diff --git a/internal/service/ec2/ec2_instance.go b/internal/service/ec2/ec2_instance.go index 98fb9f0e08a..847636a2502 100644 --- a/internal/service/ec2/ec2_instance.go +++ b/internal/service/ec2/ec2_instance.go @@ -1362,7 +1362,7 @@ func resourceInstanceRead(ctx context.Context, d *schema.ResourceData, meta inte arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Service: names.EC2, AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("instance/%s", d.Id()), diff --git a/internal/service/ec2/ec2_instance_data_source.go b/internal/service/ec2/ec2_instance_data_source.go index 452009d72c4..8e8f42f4ef8 100644 --- a/internal/service/ec2/ec2_instance_data_source.go +++ b/internal/service/ec2/ec2_instance_data_source.go @@ -453,7 +453,7 @@ func dataSourceInstanceRead(ctx context.Context, d *schema.ResourceData, meta in // ARN arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Service: names.EC2, AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("instance/%s", d.Id()), diff --git a/internal/service/ec2/ec2_instance_test.go b/internal/service/ec2/ec2_instance_test.go index e3603f77eb4..03dd3da5420 100644 --- a/internal/service/ec2/ec2_instance_test.go +++ b/internal/service/ec2/ec2_instance_test.go @@ -5808,7 +5808,7 @@ func testAccPreCheckHasDefaultVPCDefaultSubnets(ctx context.Context, t *testing. client := acctest.Provider.Meta().(*conns.AWSClient) if !(hasDefaultVPC(ctx, t) && defaultSubnetCount(ctx, t) > 0) { - t.Skipf("skipping tests; %s does not have a default VPC with default subnets", client.Region) + t.Skipf("skipping tests; %s does not have a default VPC with default subnets", client.Region(ctx)) } } diff --git a/internal/service/ec2/ec2_instance_type_offerings_data_source.go b/internal/service/ec2/ec2_instance_type_offerings_data_source.go index 4ba5a469112..9d6563a274e 100644 --- a/internal/service/ec2/ec2_instance_type_offerings_data_source.go +++ b/internal/service/ec2/ec2_instance_type_offerings_data_source.go @@ -83,7 +83,7 @@ func dataSourceInstanceTypeOfferingsRead(ctx context.Context, d *schema.Resource locationTypes = append(locationTypes, string(instanceTypeOffering.LocationType)) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set("instance_types", instanceTypes) d.Set("locations", locations) d.Set("location_types", locationTypes) diff --git a/internal/service/ec2/ec2_instance_types_data_source.go b/internal/service/ec2/ec2_instance_types_data_source.go index 44586c540bd..99329f23b02 100644 --- a/internal/service/ec2/ec2_instance_types_data_source.go +++ b/internal/service/ec2/ec2_instance_types_data_source.go @@ -57,7 +57,7 @@ func dataSourceInstanceTypesRead(ctx context.Context, d *schema.ResourceData, me instanceTypes = append(instanceTypes, string(instanceType.InstanceType)) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set("instance_types", instanceTypes) return diags diff --git a/internal/service/ec2/ec2_instances_data_source.go b/internal/service/ec2/ec2_instances_data_source.go index e125c0da085..2b49ca71797 100644 --- a/internal/service/ec2/ec2_instances_data_source.go +++ b/internal/service/ec2/ec2_instances_data_source.go @@ -115,7 +115,7 @@ func dataSourceInstancesRead(ctx context.Context, d *schema.ResourceData, meta i } } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrIDs, instanceIDs) d.Set("ipv6_addresses", ipv6Addresses) d.Set("private_ips", privateIPs) diff --git a/internal/service/ec2/ec2_key_pair.go b/internal/service/ec2/ec2_key_pair.go index 5d8b7d77ef8..06ce5d0a687 100644 --- a/internal/service/ec2/ec2_key_pair.go +++ b/internal/service/ec2/ec2_key_pair.go @@ -140,7 +140,7 @@ func resourceKeyPairRead(ctx context.Context, d *schema.ResourceData, meta inter arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: "key-pair/" + d.Id(), }.String() diff --git a/internal/service/ec2/ec2_key_pair_data_source.go b/internal/service/ec2/ec2_key_pair_data_source.go index 42f3f9246ab..99db1b8badd 100644 --- a/internal/service/ec2/ec2_key_pair_data_source.go +++ b/internal/service/ec2/ec2_key_pair_data_source.go @@ -103,7 +103,7 @@ func dataSourceKeyPairRead(ctx context.Context, d *schema.ResourceData, meta int arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "ec2", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: "key-pair/" + keyName, }.String() diff --git a/internal/service/ec2/ec2_launch_template.go b/internal/service/ec2/ec2_launch_template.go index 031fba2f32c..4600a5434c7 100644 --- a/internal/service/ec2/ec2_launch_template.go +++ b/internal/service/ec2/ec2_launch_template.go @@ -1054,7 +1054,7 @@ func resourceLaunchTemplateRead(ctx context.Context, d *schema.ResourceData, met arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("launch-template/%s", d.Id()), }.String() diff --git a/internal/service/ec2/ec2_launch_template_data_source.go b/internal/service/ec2/ec2_launch_template_data_source.go index 317b7b67c1e..8f4c710d5bc 100644 --- a/internal/service/ec2/ec2_launch_template_data_source.go +++ b/internal/service/ec2/ec2_launch_template_data_source.go @@ -833,7 +833,7 @@ func dataSourceLaunchTemplateRead(ctx context.Context, d *schema.ResourceData, m arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("launch-template/%s", d.Id()), }.String() diff --git a/internal/service/ec2/ec2_placement_group.go b/internal/service/ec2/ec2_placement_group.go index aecd139b771..4dc785db688 100644 --- a/internal/service/ec2/ec2_placement_group.go +++ b/internal/service/ec2/ec2_placement_group.go @@ -141,7 +141,7 @@ func resourcePlacementGroupRead(ctx context.Context, d *schema.ResourceData, met arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("placement-group/%s", d.Id()), }.String() diff --git a/internal/service/ec2/ec2_public_ipv4_pools_data_source.go b/internal/service/ec2/ec2_public_ipv4_pools_data_source.go index 3b844b8f506..77bb5608281 100644 --- a/internal/service/ec2/ec2_public_ipv4_pools_data_source.go +++ b/internal/service/ec2/ec2_public_ipv4_pools_data_source.go @@ -63,7 +63,7 @@ func dataSourcePublicIPv4PoolsRead(ctx context.Context, d *schema.ResourceData, poolIDs = append(poolIDs, aws.ToString(v.PoolId)) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set("pool_ids", poolIDs) return diags diff --git a/internal/service/ec2/ec2_serial_console_access.go b/internal/service/ec2/ec2_serial_console_access.go index 7256c559494..63580ddd128 100644 --- a/internal/service/ec2/ec2_serial_console_access.go +++ b/internal/service/ec2/ec2_serial_console_access.go @@ -46,7 +46,7 @@ func resourceSerialConsoleAccessCreate(ctx context.Context, d *schema.ResourceDa return sdkdiag.AppendErrorf(diags, "setting EC2 Serial Console Access (%t): %s", enabled, err) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) return append(diags, resourceSerialConsoleAccessRead(ctx, d, meta)...) } diff --git a/internal/service/ec2/ec2_serial_console_access_data_source.go b/internal/service/ec2/ec2_serial_console_access_data_source.go index 13124b64379..9fce6ac7ab9 100644 --- a/internal/service/ec2/ec2_serial_console_access_data_source.go +++ b/internal/service/ec2/ec2_serial_console_access_data_source.go @@ -43,7 +43,7 @@ func dataSourceSerialConsoleAccessRead(ctx context.Context, d *schema.ResourceDa return sdkdiag.AppendErrorf(diags, "reading EC2 Serial Console Access: %s", err) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrEnabled, output.SerialConsoleAccessEnabled) return diags diff --git a/internal/service/ec2/ec2_spot_price_data_source.go b/internal/service/ec2/ec2_spot_price_data_source.go index 96301e43db2..ef5646709bd 100644 --- a/internal/service/ec2/ec2_spot_price_data_source.go +++ b/internal/service/ec2/ec2_spot_price_data_source.go @@ -81,7 +81,7 @@ func dataSourceSpotPriceRead(ctx context.Context, d *schema.ResourceData, meta i d.Set("spot_price", resultSpotPrice.SpotPrice) d.Set("spot_price_timestamp", (*resultSpotPrice.Timestamp).Format(time.RFC3339)) - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) return diags } diff --git a/internal/service/ec2/ipam_.go b/internal/service/ec2/ipam_.go index 5f1afabeab4..5f95606389e 100644 --- a/internal/service/ec2/ipam_.go +++ b/internal/service/ec2/ipam_.go @@ -109,9 +109,9 @@ func resourceIPAM() *schema.Resource { CustomizeDiff: customdiff.Sequence( verify.SetTagsDiff, - func(_ context.Context, diff *schema.ResourceDiff, meta interface{}) error { + func(ctx context.Context, diff *schema.ResourceDiff, meta interface{}) error { if diff.Id() == "" { // Create. - currentRegion := meta.(*conns.AWSClient).Region + currentRegion := meta.(*conns.AWSClient).Region(ctx) for _, v := range diff.Get("operating_regions").(*schema.Set).List() { if v.(map[string]interface{})["region_name"].(string) == currentRegion { diff --git a/internal/service/ec2/ipam_pool_cidr_allocation_test.go b/internal/service/ec2/ipam_pool_cidr_allocation_test.go index 2cd4e403be5..41bbaae7cda 100644 --- a/internal/service/ec2/ipam_pool_cidr_allocation_test.go +++ b/internal/service/ec2/ipam_pool_cidr_allocation_test.go @@ -244,7 +244,7 @@ func TestAccIPAMPoolCIDRAllocation_differentRegion(t *testing.T) { { Config: testAccIPAMPoolCIDRAllocationConfig_differentRegion(cidr), Check: resource.ComposeTestCheckFunc( - testAccCheckIPAMPoolCIDRAllocationExistsWithProvider(ctx, resourceName, &allocation, acctest.RegionProviderFunc(acctest.AlternateRegion(), &providers)), + testAccCheckIPAMPoolCIDRAllocationExistsWithProvider(ctx, resourceName, &allocation, acctest.RegionProviderFunc(ctx, acctest.AlternateRegion(), &providers)), resource.TestCheckResourceAttr(resourceName, "cidr", cidr), resource.TestMatchResourceAttr(resourceName, names.AttrID, regexache.MustCompile(`^ipam-pool-alloc-[0-9a-f]+_ipam-pool(-[0-9a-f]+)$`)), resource.TestMatchResourceAttr(resourceName, "ipam_pool_allocation_id", regexache.MustCompile(`^ipam-pool-alloc-[0-9a-f]+$`)), diff --git a/internal/service/ec2/ipam_pools_data_source.go b/internal/service/ec2/ipam_pools_data_source.go index be12ea5864d..52edd30e3dc 100644 --- a/internal/service/ec2/ipam_pools_data_source.go +++ b/internal/service/ec2/ipam_pools_data_source.go @@ -124,7 +124,7 @@ func dataSourceIPAMPoolsRead(ctx context.Context, d *schema.ResourceData, meta i return sdkdiag.AppendErrorf(diags, "reading IPAM Pools: %s", err) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set("ipam_pools", flattenIPAMPools(ctx, pools, ignoreTagsConfig)) return diags diff --git a/internal/service/ec2/ipam_resource_discovery.go b/internal/service/ec2/ipam_resource_discovery.go index 14e773c13ef..8459323dd18 100644 --- a/internal/service/ec2/ipam_resource_discovery.go +++ b/internal/service/ec2/ipam_resource_discovery.go @@ -86,9 +86,9 @@ func resourceIPAMResourceDiscovery() *schema.Resource { CustomizeDiff: customdiff.Sequence( verify.SetTagsDiff, // user must define authn region within `operating_regions {}` - func(_ context.Context, diff *schema.ResourceDiff, meta interface{}) error { + func(ctx context.Context, diff *schema.ResourceDiff, meta interface{}) error { if diff.Id() == "" { // Create. - currentRegion := meta.(*conns.AWSClient).Region + currentRegion := meta.(*conns.AWSClient).Region(ctx) for _, v := range diff.Get("operating_regions").(*schema.Set).List() { if v.(map[string]interface{})["region_name"].(string) == currentRegion { diff --git a/internal/service/ec2/outposts_coip_pools_data_source.go b/internal/service/ec2/outposts_coip_pools_data_source.go index 3239831b646..06cc734e884 100644 --- a/internal/service/ec2/outposts_coip_pools_data_source.go +++ b/internal/service/ec2/outposts_coip_pools_data_source.go @@ -64,7 +64,7 @@ func dataSourceCoIPPoolsRead(ctx context.Context, d *schema.ResourceData, meta i return sdkdiag.AppendErrorf(diags, "reading EC2 COIP Pools: %s", err) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set("pool_ids", tfslices.ApplyToAll(output, func(v awstypes.CoipPool) string { return aws.ToString(v.PoolId) })) diff --git a/internal/service/ec2/outposts_local_gateway_route_tables_data_source.go b/internal/service/ec2/outposts_local_gateway_route_tables_data_source.go index 1f9687143de..49ec79d6fbf 100644 --- a/internal/service/ec2/outposts_local_gateway_route_tables_data_source.go +++ b/internal/service/ec2/outposts_local_gateway_route_tables_data_source.go @@ -64,7 +64,7 @@ func dataSourceLocalGatewayRouteTablesRead(ctx context.Context, d *schema.Resour return sdkdiag.AppendErrorf(diags, "reading EC2 Local Gateway Route Tables: %s", err) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrIDs, tfslices.ApplyToAll(output, func(v awstypes.LocalGatewayRouteTable) string { return aws.ToString(v.LocalGatewayRouteTableId) })) diff --git a/internal/service/ec2/outposts_local_gateway_virtual_interface_groups_data_source.go b/internal/service/ec2/outposts_local_gateway_virtual_interface_groups_data_source.go index 2de038f2f7a..034e054c09b 100644 --- a/internal/service/ec2/outposts_local_gateway_virtual_interface_groups_data_source.go +++ b/internal/service/ec2/outposts_local_gateway_virtual_interface_groups_data_source.go @@ -74,7 +74,7 @@ func dataSourceLocalGatewayVirtualInterfaceGroupsRead(ctx context.Context, d *sc interfaceIDs = append(interfaceIDs, v.LocalGatewayVirtualInterfaceIds...) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrIDs, groupIDs) d.Set("local_gateway_virtual_interface_ids", interfaceIDs) diff --git a/internal/service/ec2/outposts_local_gateways_data_source.go b/internal/service/ec2/outposts_local_gateways_data_source.go index 179d4d40fed..b08bbd163fb 100644 --- a/internal/service/ec2/outposts_local_gateways_data_source.go +++ b/internal/service/ec2/outposts_local_gateways_data_source.go @@ -64,7 +64,7 @@ func dataSourceLocalGatewaysRead(ctx context.Context, d *schema.ResourceData, me return sdkdiag.AppendErrorf(diags, "reading EC2 Local Gateways: %s", err) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrIDs, tfslices.ApplyToAll(output, func(v awstypes.LocalGateway) string { return aws.ToString(v.LocalGatewayId) })) diff --git a/internal/service/ec2/transitgateway_attachment_data_source.go b/internal/service/ec2/transitgateway_attachment_data_source.go index b506172a259..da19a94d578 100644 --- a/internal/service/ec2/transitgateway_attachment_data_source.go +++ b/internal/service/ec2/transitgateway_attachment_data_source.go @@ -106,7 +106,7 @@ func dataSourceTransitGatewayAttachmentRead(ctx context.Context, d *schema.Resou arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: resourceOwnerID, Resource: fmt.Sprintf("transit-gateway-attachment/%s", d.Id()), }.String() diff --git a/internal/service/ec2/transitgateway_attachments_data_source.go b/internal/service/ec2/transitgateway_attachments_data_source.go index c5326b1d9ea..bd282859588 100644 --- a/internal/service/ec2/transitgateway_attachments_data_source.go +++ b/internal/service/ec2/transitgateway_attachments_data_source.go @@ -66,7 +66,7 @@ func dataSourceTransitGatewayAttachmentsRead(ctx context.Context, d *schema.Reso attachmentIDs = append(attachmentIDs, aws.ToString(v.TransitGatewayAttachmentId)) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrIDs, attachmentIDs) return diags diff --git a/internal/service/ec2/transitgateway_connect_peer.go b/internal/service/ec2/transitgateway_connect_peer.go index b1f3852c10a..35d31ffdd9e 100644 --- a/internal/service/ec2/transitgateway_connect_peer.go +++ b/internal/service/ec2/transitgateway_connect_peer.go @@ -180,7 +180,7 @@ func resourceTransitGatewayConnectPeerRead(ctx context.Context, d *schema.Resour arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("transit-gateway-connect-peer/%s", d.Id()), }.String() diff --git a/internal/service/ec2/transitgateway_connect_peer_data_source.go b/internal/service/ec2/transitgateway_connect_peer_data_source.go index 50522bac348..3ac1238b72e 100644 --- a/internal/service/ec2/transitgateway_connect_peer_data_source.go +++ b/internal/service/ec2/transitgateway_connect_peer_data_source.go @@ -105,7 +105,7 @@ func dataSourceTransitGatewayConnectPeerRead(ctx context.Context, d *schema.Reso arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("transit-gateway-connect-peer/%s", d.Id()), }.String() diff --git a/internal/service/ec2/transitgateway_peering_attachment_data_source.go b/internal/service/ec2/transitgateway_peering_attachment_data_source.go index 72045042247..8ae366ce768 100644 --- a/internal/service/ec2/transitgateway_peering_attachment_data_source.go +++ b/internal/service/ec2/transitgateway_peering_attachment_data_source.go @@ -97,7 +97,7 @@ func dataSourceTransitGatewayPeeringAttachmentRead(ctx context.Context, d *schem local := transitGatewayPeeringAttachment.RequesterTgwInfo peer := transitGatewayPeeringAttachment.AccepterTgwInfo - if aws.ToString(transitGatewayPeeringAttachment.AccepterTgwInfo.OwnerId) == meta.(*conns.AWSClient).AccountID(ctx) && aws.ToString(transitGatewayPeeringAttachment.AccepterTgwInfo.Region) == meta.(*conns.AWSClient).Region { + if aws.ToString(transitGatewayPeeringAttachment.AccepterTgwInfo.OwnerId) == meta.(*conns.AWSClient).AccountID(ctx) && aws.ToString(transitGatewayPeeringAttachment.AccepterTgwInfo.Region) == meta.(*conns.AWSClient).Region(ctx) { local = transitGatewayPeeringAttachment.AccepterTgwInfo peer = transitGatewayPeeringAttachment.RequesterTgwInfo } diff --git a/internal/service/ec2/transitgateway_peering_attachments_data_source.go b/internal/service/ec2/transitgateway_peering_attachments_data_source.go index 6570826aa31..637bc4390b2 100644 --- a/internal/service/ec2/transitgateway_peering_attachments_data_source.go +++ b/internal/service/ec2/transitgateway_peering_attachments_data_source.go @@ -59,7 +59,7 @@ func dataSourceTransitGatewayPeeringAttachmentsRead(ctx context.Context, d *sche return sdkdiag.AppendErrorf(diags, "reading EC2 Transit Gateway Peering Attachments: %s", err) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrIDs, tfslices.ApplyToAll(output, func(v awstypes.TransitGatewayPeeringAttachment) string { return aws.ToString(v.TransitGatewayAttachmentId) })) diff --git a/internal/service/ec2/transitgateway_policy_table.go b/internal/service/ec2/transitgateway_policy_table.go index 6d3d8c1b1e4..faedfadce96 100644 --- a/internal/service/ec2/transitgateway_policy_table.go +++ b/internal/service/ec2/transitgateway_policy_table.go @@ -106,7 +106,7 @@ func resourceTransitGatewayPolicyTableRead(ctx context.Context, d *schema.Resour arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("transit-gateway-policy-table/%s", d.Id()), }.String() diff --git a/internal/service/ec2/transitgateway_route_table.go b/internal/service/ec2/transitgateway_route_table.go index b726fb145b3..b019bdb8444 100644 --- a/internal/service/ec2/transitgateway_route_table.go +++ b/internal/service/ec2/transitgateway_route_table.go @@ -109,7 +109,7 @@ func resourceTransitGatewayRouteTableRead(ctx context.Context, d *schema.Resourc arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("transit-gateway-route-table/%s", d.Id()), }.String() diff --git a/internal/service/ec2/transitgateway_route_table_associations_data_source.go b/internal/service/ec2/transitgateway_route_table_associations_data_source.go index cc723cfb7e3..fb557c10e24 100644 --- a/internal/service/ec2/transitgateway_route_table_associations_data_source.go +++ b/internal/service/ec2/transitgateway_route_table_associations_data_source.go @@ -72,7 +72,7 @@ func dataSourceTransitGatewayRouteTableAssociationsRead(ctx context.Context, d * routeTableAssociationIDs = append(routeTableAssociationIDs, aws.ToString(v.TransitGatewayAttachmentId)) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrIDs, routeTableAssociationIDs) return diags diff --git a/internal/service/ec2/transitgateway_route_table_data_source.go b/internal/service/ec2/transitgateway_route_table_data_source.go index f0a959dc3a5..a11e9606461 100644 --- a/internal/service/ec2/transitgateway_route_table_data_source.go +++ b/internal/service/ec2/transitgateway_route_table_data_source.go @@ -88,7 +88,7 @@ func dataSourceTransitGatewayRouteTableRead(ctx context.Context, d *schema.Resou arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("transit-gateway-route-table/%s", d.Id()), }.String() diff --git a/internal/service/ec2/transitgateway_route_table_propagations_data_source.go b/internal/service/ec2/transitgateway_route_table_propagations_data_source.go index b56127b05f4..1be9dfc802b 100644 --- a/internal/service/ec2/transitgateway_route_table_propagations_data_source.go +++ b/internal/service/ec2/transitgateway_route_table_propagations_data_source.go @@ -72,7 +72,7 @@ func dataSourceTransitGatewayRouteTablePropagationsRead(ctx context.Context, d * routeTablePropagationIDs = append(routeTablePropagationIDs, aws.ToString(v.TransitGatewayAttachmentId)) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrIDs, routeTablePropagationIDs) return diags diff --git a/internal/service/ec2/transitgateway_route_tables_data_source.go b/internal/service/ec2/transitgateway_route_tables_data_source.go index c650b6c0d04..18fd8cab90b 100644 --- a/internal/service/ec2/transitgateway_route_tables_data_source.go +++ b/internal/service/ec2/transitgateway_route_tables_data_source.go @@ -68,7 +68,7 @@ func dataSourceTransitGatewayRouteTablesRead(ctx context.Context, d *schema.Reso routeTableIDs = append(routeTableIDs, aws.ToString(v.TransitGatewayRouteTableId)) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrIDs, routeTableIDs) return diags diff --git a/internal/service/ec2/transitgateway_vpc_attachments_data_source.go b/internal/service/ec2/transitgateway_vpc_attachments_data_source.go index e73237fe579..52a7241d694 100644 --- a/internal/service/ec2/transitgateway_vpc_attachments_data_source.go +++ b/internal/service/ec2/transitgateway_vpc_attachments_data_source.go @@ -63,7 +63,7 @@ func dataSourceTransitGatewayVPCAttachmentsRead(ctx context.Context, d *schema.R attachmentIDs = append(attachmentIDs, aws.ToString(v.TransitGatewayAttachmentId)) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrIDs, attachmentIDs) return diags diff --git a/internal/service/ec2/vpc_.go b/internal/service/ec2/vpc_.go index f1779d7bd21..ed2d1247c57 100644 --- a/internal/service/ec2/vpc_.go +++ b/internal/service/ec2/vpc_.go @@ -290,7 +290,7 @@ func resourceVPCRead(ctx context.Context, d *schema.ResourceData, meta interface arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: ownerID, Resource: fmt.Sprintf("vpc/%s", d.Id()), }.String() diff --git a/internal/service/ec2/vpc_data_source.go b/internal/service/ec2/vpc_data_source.go index 929586bf454..624b508aafc 100644 --- a/internal/service/ec2/vpc_data_source.go +++ b/internal/service/ec2/vpc_data_source.go @@ -169,7 +169,7 @@ func dataSourceVPCRead(ctx context.Context, d *schema.ResourceData, meta interfa arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: aws.ToString(ownerID), Resource: "vpc/" + d.Id(), }.String() diff --git a/internal/service/ec2/vpc_dhcp_options.go b/internal/service/ec2/vpc_dhcp_options.go index ffe2642be97..0921aacf029 100644 --- a/internal/service/ec2/vpc_dhcp_options.go +++ b/internal/service/ec2/vpc_dhcp_options.go @@ -156,7 +156,7 @@ func resourceVPCDHCPOptionsRead(ctx context.Context, d *schema.ResourceData, met arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: ownerID, Resource: fmt.Sprintf("dhcp-options/%s", d.Id()), }.String() diff --git a/internal/service/ec2/vpc_dhcp_options_data_source.go b/internal/service/ec2/vpc_dhcp_options_data_source.go index 8f174c6a2eb..1483e11c34d 100644 --- a/internal/service/ec2/vpc_dhcp_options_data_source.go +++ b/internal/service/ec2/vpc_dhcp_options_data_source.go @@ -107,7 +107,7 @@ func dataSourceVPCDHCPOptionsRead(ctx context.Context, d *schema.ResourceData, m arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: ownerID, Resource: fmt.Sprintf("dhcp-options/%s", d.Id()), }.String() diff --git a/internal/service/ec2/vpc_endpoint.go b/internal/service/ec2/vpc_endpoint.go index 59ff63618c5..6aaaf145efe 100644 --- a/internal/service/ec2/vpc_endpoint.go +++ b/internal/service/ec2/vpc_endpoint.go @@ -333,7 +333,7 @@ func resourceVPCEndpointRead(ctx context.Context, d *schema.ResourceData, meta i arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: aws.ToString(vpce.OwnerId), Resource: fmt.Sprintf("vpc-endpoint/%s", d.Id()), }.String() diff --git a/internal/service/ec2/vpc_endpoint_data_source.go b/internal/service/ec2/vpc_endpoint_data_source.go index 673dabb0579..0de695c279c 100644 --- a/internal/service/ec2/vpc_endpoint_data_source.go +++ b/internal/service/ec2/vpc_endpoint_data_source.go @@ -188,7 +188,7 @@ func dataSourceVPCEndpointRead(ctx context.Context, d *schema.ResourceData, meta arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: aws.ToString(vpce.OwnerId), Resource: fmt.Sprintf("vpc-endpoint/%s", d.Id()), }.String() diff --git a/internal/service/ec2/vpc_endpoint_service.go b/internal/service/ec2/vpc_endpoint_service.go index af47ba1f03a..b24e5902300 100644 --- a/internal/service/ec2/vpc_endpoint_service.go +++ b/internal/service/ec2/vpc_endpoint_service.go @@ -225,7 +225,7 @@ func resourceVPCEndpointServiceRead(ctx context.Context, d *schema.ResourceData, arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("vpc-endpoint-service/%s", d.Id()), }.String() diff --git a/internal/service/ec2/vpc_endpoint_service_data_source.go b/internal/service/ec2/vpc_endpoint_service_data_source.go index 37fcaa83d04..8ace3f8de45 100644 --- a/internal/service/ec2/vpc_endpoint_service_data_source.go +++ b/internal/service/ec2/vpc_endpoint_service_data_source.go @@ -122,7 +122,7 @@ func dataSourceVPCEndpointServiceRead(ctx context.Context, d *schema.ResourceDat if v, ok := d.GetOk(names.AttrServiceName); ok { serviceName = v.(string) } else if v, ok := d.GetOk("service"); ok { - serviceName = fmt.Sprintf("com.amazonaws.%s.%s", meta.(*conns.AWSClient).Region, v.(string)) + serviceName = fmt.Sprintf("com.amazonaws.%s.%s", meta.(*conns.AWSClient).Region(ctx), v.(string)) } if serviceName != "" { @@ -181,7 +181,7 @@ func dataSourceVPCEndpointServiceRead(ctx context.Context, d *schema.ResourceDat arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("vpc-endpoint-service/%s", serviceID), }.String() diff --git a/internal/service/ec2/vpc_flow_log.go b/internal/service/ec2/vpc_flow_log.go index 497fceedc0e..86bf6b6cd6a 100644 --- a/internal/service/ec2/vpc_flow_log.go +++ b/internal/service/ec2/vpc_flow_log.go @@ -284,7 +284,7 @@ func resourceLogFlowRead(ctx context.Context, d *schema.ResourceData, meta inter arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("vpc-flow-log/%s", d.Id()), }.String() diff --git a/internal/service/ec2/vpc_internet_gateway.go b/internal/service/ec2/vpc_internet_gateway.go index 9530b8c1af3..e1f5fd7e822 100644 --- a/internal/service/ec2/vpc_internet_gateway.go +++ b/internal/service/ec2/vpc_internet_gateway.go @@ -116,7 +116,7 @@ func resourceInternetGatewayRead(ctx context.Context, d *schema.ResourceData, me arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: ownerID, Resource: fmt.Sprintf("internet-gateway/%s", d.Id()), }.String() diff --git a/internal/service/ec2/vpc_internet_gateway_data_source.go b/internal/service/ec2/vpc_internet_gateway_data_source.go index 23ffe75d169..60ccc0b5ded 100644 --- a/internal/service/ec2/vpc_internet_gateway_data_source.go +++ b/internal/service/ec2/vpc_internet_gateway_data_source.go @@ -102,7 +102,7 @@ func dataSourceInternetGatewayRead(ctx context.Context, d *schema.ResourceData, arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: ownerID, Resource: fmt.Sprintf("internet-gateway/%s", d.Id()), }.String() diff --git a/internal/service/ec2/vpc_managed_prefix_lists_data_source.go b/internal/service/ec2/vpc_managed_prefix_lists_data_source.go index 17bf480291c..4f49541bb5b 100644 --- a/internal/service/ec2/vpc_managed_prefix_lists_data_source.go +++ b/internal/service/ec2/vpc_managed_prefix_lists_data_source.go @@ -65,7 +65,7 @@ func dataSourceManagedPrefixListsRead(ctx context.Context, d *schema.ResourceDat prefixListIDs = append(prefixListIDs, aws.ToString(v.PrefixListId)) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrIDs, prefixListIDs) return diags diff --git a/internal/service/ec2/vpc_nat_gateways_data_source.go b/internal/service/ec2/vpc_nat_gateways_data_source.go index 10d6a3da972..3227fdc0641 100644 --- a/internal/service/ec2/vpc_nat_gateways_data_source.go +++ b/internal/service/ec2/vpc_nat_gateways_data_source.go @@ -83,7 +83,7 @@ func dataSourceNATGatewaysRead(ctx context.Context, d *schema.ResourceData, meta natGatewayIDs = append(natGatewayIDs, aws.ToString(v.NatGatewayId)) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrIDs, natGatewayIDs) return diags diff --git a/internal/service/ec2/vpc_network_acl.go b/internal/service/ec2/vpc_network_acl.go index 699160142b7..9f6d3ca0588 100644 --- a/internal/service/ec2/vpc_network_acl.go +++ b/internal/service/ec2/vpc_network_acl.go @@ -216,7 +216,7 @@ func resourceNetworkACLRead(ctx context.Context, d *schema.ResourceData, meta in arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: ownerID, Resource: fmt.Sprintf("network-acl/%s", d.Id()), }.String() diff --git a/internal/service/ec2/vpc_network_acls_data_source.go b/internal/service/ec2/vpc_network_acls_data_source.go index 1135e2b6b61..3d4691cbb71 100644 --- a/internal/service/ec2/vpc_network_acls_data_source.go +++ b/internal/service/ec2/vpc_network_acls_data_source.go @@ -80,7 +80,7 @@ func dataSourceNetworkACLsRead(ctx context.Context, d *schema.ResourceData, meta naclIDs = append(naclIDs, aws.ToString(v.NetworkAclId)) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrIDs, naclIDs) return diags diff --git a/internal/service/ec2/vpc_network_interface.go b/internal/service/ec2/vpc_network_interface.go index 1a832a3c7be..75d60b515cd 100644 --- a/internal/service/ec2/vpc_network_interface.go +++ b/internal/service/ec2/vpc_network_interface.go @@ -513,7 +513,7 @@ func resourceNetworkInterfaceRead(ctx context.Context, d *schema.ResourceData, m arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "ec2", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: ownerID, Resource: "network-interface/" + d.Id(), }.String() diff --git a/internal/service/ec2/vpc_network_interface_data_source.go b/internal/service/ec2/vpc_network_interface_data_source.go index c8d1fdcaee1..e3f6856efb7 100644 --- a/internal/service/ec2/vpc_network_interface_data_source.go +++ b/internal/service/ec2/vpc_network_interface_data_source.go @@ -191,7 +191,7 @@ func dataSourceNetworkInterfaceRead(ctx context.Context, d *schema.ResourceData, arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "ec2", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: ownerID, Resource: "network-interface/" + d.Id(), }.String() diff --git a/internal/service/ec2/vpc_network_interfaces_data_source.go b/internal/service/ec2/vpc_network_interfaces_data_source.go index c5e70609641..5bfb48026ba 100644 --- a/internal/service/ec2/vpc_network_interfaces_data_source.go +++ b/internal/service/ec2/vpc_network_interfaces_data_source.go @@ -68,7 +68,7 @@ func dataSourceNetworkInterfacesRead(ctx context.Context, d *schema.ResourceData networkInterfaceIDs = append(networkInterfaceIDs, aws.ToString(v.NetworkInterfaceId)) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrIDs, networkInterfaceIDs) return diags diff --git a/internal/service/ec2/vpc_peering_connection_accepter_test.go b/internal/service/ec2/vpc_peering_connection_accepter_test.go index cfdf8f7d389..6bb8e8a2e62 100644 --- a/internal/service/ec2/vpc_peering_connection_accepter_test.go +++ b/internal/service/ec2/vpc_peering_connection_accepter_test.go @@ -93,7 +93,7 @@ func TestAccVPCPeeringConnectionAccepter_differentRegionSameAccount(t *testing.T Config: testAccVPCPeeringConnectionAccepterConfig_differentRegionSameAccount(rName), Check: resource.ComposeTestCheckFunc( testAccCheckVPCPeeringConnectionExists(ctx, resourceNameConnection, &vMain), - testAccCheckVPCPeeringConnectionExistsWithProvider(ctx, resourceNameAccepter, &vPeer, acctest.RegionProviderFunc(acctest.AlternateRegion(), &providers)), + testAccCheckVPCPeeringConnectionExistsWithProvider(ctx, resourceNameAccepter, &vPeer, acctest.RegionProviderFunc(ctx, acctest.AlternateRegion(), &providers)), resource.TestCheckResourceAttrPair(resourceNameConnection, names.AttrVPCID, resourceNameMainVpc, names.AttrID), resource.TestCheckResourceAttrPair(resourceNameConnection, "peer_vpc_id", resourceNamePeerVpc, names.AttrID), resource.TestCheckResourceAttrPair(resourceNameConnection, "peer_owner_id", resourceNamePeerVpc, names.AttrOwnerID), diff --git a/internal/service/ec2/vpc_peering_connection_options_test.go b/internal/service/ec2/vpc_peering_connection_options_test.go index 0613eb42837..428c5f68905 100644 --- a/internal/service/ec2/vpc_peering_connection_options_test.go +++ b/internal/service/ec2/vpc_peering_connection_options_test.go @@ -131,7 +131,7 @@ func TestAccVPCPeeringConnectionOptions_differentRegionSameAccount(t *testing.T) &awstypes.VpcPeeringConnectionOptionsDescription{ AllowDnsResolutionFromRemoteVpc: aws.Bool(true), }, - acctest.RegionProviderFunc(acctest.AlternateRegion(), &providers), + acctest.RegionProviderFunc(ctx, acctest.AlternateRegion(), &providers), ), ), }, @@ -168,7 +168,7 @@ func TestAccVPCPeeringConnectionOptions_differentRegionSameAccount(t *testing.T) &awstypes.VpcPeeringConnectionOptionsDescription{ AllowDnsResolutionFromRemoteVpc: aws.Bool(false), }, - acctest.RegionProviderFunc(acctest.AlternateRegion(), &providers), + acctest.RegionProviderFunc(ctx, acctest.AlternateRegion(), &providers), ), ), }, diff --git a/internal/service/ec2/vpc_peering_connections_data_source.go b/internal/service/ec2/vpc_peering_connections_data_source.go index 4268a62b416..570522195cc 100644 --- a/internal/service/ec2/vpc_peering_connections_data_source.go +++ b/internal/service/ec2/vpc_peering_connections_data_source.go @@ -66,7 +66,7 @@ func dataSourceVPCPeeringConnectionsRead(ctx context.Context, d *schema.Resource vpcPeeringConnectionIDs = append(vpcPeeringConnectionIDs, aws.ToString(v.VpcPeeringConnectionId)) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrIDs, vpcPeeringConnectionIDs) return diags diff --git a/internal/service/ec2/vpc_route_table.go b/internal/service/ec2/vpc_route_table.go index 891535c7572..33c0bd06eae 100644 --- a/internal/service/ec2/vpc_route_table.go +++ b/internal/service/ec2/vpc_route_table.go @@ -236,7 +236,7 @@ func resourceRouteTableRead(ctx context.Context, d *schema.ResourceData, meta in arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: ownerID, Resource: fmt.Sprintf("route-table/%s", d.Id()), }.String() diff --git a/internal/service/ec2/vpc_route_table_data_source.go b/internal/service/ec2/vpc_route_table_data_source.go index 532a8cdbd0a..809bfcc8382 100644 --- a/internal/service/ec2/vpc_route_table_data_source.go +++ b/internal/service/ec2/vpc_route_table_data_source.go @@ -236,7 +236,7 @@ func dataSourceRouteTableRead(ctx context.Context, d *schema.ResourceData, meta arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: ownerID, Resource: fmt.Sprintf("route-table/%s", d.Id()), }.String() diff --git a/internal/service/ec2/vpc_route_tables_data_source.go b/internal/service/ec2/vpc_route_tables_data_source.go index 1642bfe23d3..8b055c79d96 100644 --- a/internal/service/ec2/vpc_route_tables_data_source.go +++ b/internal/service/ec2/vpc_route_tables_data_source.go @@ -80,7 +80,7 @@ func dataSourceRouteTablesRead(ctx context.Context, d *schema.ResourceData, meta routeTableIDs = append(routeTableIDs, aws.ToString(v.RouteTableId)) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrIDs, routeTableIDs) return diags diff --git a/internal/service/ec2/vpc_security_group.go b/internal/service/ec2/vpc_security_group.go index 90c20748955..82b8dae6e72 100644 --- a/internal/service/ec2/vpc_security_group.go +++ b/internal/service/ec2/vpc_security_group.go @@ -299,7 +299,7 @@ func resourceSecurityGroupRead(ctx context.Context, d *schema.ResourceData, meta arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: ownerID, Resource: fmt.Sprintf("security-group/%s", d.Id()), } diff --git a/internal/service/ec2/vpc_security_group_data_source.go b/internal/service/ec2/vpc_security_group_data_source.go index ff68375475c..e2259dced55 100644 --- a/internal/service/ec2/vpc_security_group_data_source.go +++ b/internal/service/ec2/vpc_security_group_data_source.go @@ -103,7 +103,7 @@ func dataSourceSecurityGroupRead(ctx context.Context, d *schema.ResourceData, me arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: *sg.OwnerId, Resource: fmt.Sprintf("security-group/%s", *sg.GroupId), }.String() diff --git a/internal/service/ec2/vpc_security_group_rules_data_source.go b/internal/service/ec2/vpc_security_group_rules_data_source.go index 1b0fa0e049a..a61543de1b3 100644 --- a/internal/service/ec2/vpc_security_group_rules_data_source.go +++ b/internal/service/ec2/vpc_security_group_rules_data_source.go @@ -76,7 +76,7 @@ func (d *securityGroupRulesDataSource) Read(ctx context.Context, request datasou return } - data.ID = types.StringValue(d.Meta().Region) + data.ID = types.StringValue(d.Meta().Region(ctx)) data.IDs = flex.FlattenFrameworkStringValueList(ctx, tfslices.ApplyToAll(output, func(v awstypes.SecurityGroupRule) string { return aws.ToString(v.SecurityGroupRuleId) })) diff --git a/internal/service/ec2/vpc_security_groups_data_source.go b/internal/service/ec2/vpc_security_groups_data_source.go index 630d8e1486f..b2c977440a0 100644 --- a/internal/service/ec2/vpc_security_groups_data_source.go +++ b/internal/service/ec2/vpc_security_groups_data_source.go @@ -81,7 +81,7 @@ func dataSourceSecurityGroupsRead(ctx context.Context, d *schema.ResourceData, m arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: aws.ToString(v.OwnerId), Resource: fmt.Sprintf("security-group/%s", aws.ToString(v.GroupId)), }.String() @@ -90,7 +90,7 @@ func dataSourceSecurityGroupsRead(ctx context.Context, d *schema.ResourceData, m vpcIDs = append(vpcIDs, aws.ToString(v.VpcId)) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrARNs, arns) d.Set(names.AttrIDs, securityGroupIDs) d.Set("vpc_ids", vpcIDs) diff --git a/internal/service/ec2/vpc_subnets_data_source.go b/internal/service/ec2/vpc_subnets_data_source.go index 677f55817f6..f06d1cadc7c 100644 --- a/internal/service/ec2/vpc_subnets_data_source.go +++ b/internal/service/ec2/vpc_subnets_data_source.go @@ -71,7 +71,7 @@ func dataSourceSubnetsRead(ctx context.Context, d *schema.ResourceData, meta int subnetIDs = append(subnetIDs, aws.ToString(v.SubnetId)) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrIDs, subnetIDs) return diags diff --git a/internal/service/ec2/vpc_traffic_mirror_filter.go b/internal/service/ec2/vpc_traffic_mirror_filter.go index 41af526b5c9..7e288eac176 100644 --- a/internal/service/ec2/vpc_traffic_mirror_filter.go +++ b/internal/service/ec2/vpc_traffic_mirror_filter.go @@ -125,7 +125,7 @@ func resourceTrafficMirrorFilterRead(ctx context.Context, d *schema.ResourceData arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "ec2", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: "traffic-mirror-filter/" + d.Id(), }.String() diff --git a/internal/service/ec2/vpc_traffic_mirror_filter_rule.go b/internal/service/ec2/vpc_traffic_mirror_filter_rule.go index 18e5f15734b..18a42b940e2 100644 --- a/internal/service/ec2/vpc_traffic_mirror_filter_rule.go +++ b/internal/service/ec2/vpc_traffic_mirror_filter_rule.go @@ -182,7 +182,7 @@ func resourceTrafficMirrorFilterRuleRead(ctx context.Context, d *schema.Resource arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "ec2", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: "traffic-mirror-filter-rule/" + d.Id(), }.String() diff --git a/internal/service/ec2/vpc_traffic_mirror_session.go b/internal/service/ec2/vpc_traffic_mirror_session.go index f995419645e..fc993051573 100644 --- a/internal/service/ec2/vpc_traffic_mirror_session.go +++ b/internal/service/ec2/vpc_traffic_mirror_session.go @@ -147,7 +147,7 @@ func resourceTrafficMirrorSessionRead(ctx context.Context, d *schema.ResourceDat arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "ec2", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: ownerID, Resource: "traffic-mirror-session/" + d.Id(), }.String() diff --git a/internal/service/ec2/vpc_traffic_mirror_target.go b/internal/service/ec2/vpc_traffic_mirror_target.go index 2989dffa531..e1235e0fc99 100644 --- a/internal/service/ec2/vpc_traffic_mirror_target.go +++ b/internal/service/ec2/vpc_traffic_mirror_target.go @@ -147,7 +147,7 @@ func resourceTrafficMirrorTargetRead(ctx context.Context, d *schema.ResourceData arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: ownerID, Resource: fmt.Sprintf("traffic-mirror-target/%s", d.Id()), }.String() diff --git a/internal/service/ec2/vpc_vpcs_data_source.go b/internal/service/ec2/vpc_vpcs_data_source.go index 0066c7f6811..55c9ffe82f2 100644 --- a/internal/service/ec2/vpc_vpcs_data_source.go +++ b/internal/service/ec2/vpc_vpcs_data_source.go @@ -71,7 +71,7 @@ func dataSourceVPCsRead(ctx context.Context, d *schema.ResourceData, meta interf vpcIDs = append(vpcIDs, aws.ToString(v.VpcId)) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrIDs, vpcIDs) return diags diff --git a/internal/service/ec2/vpnclient_endpoint.go b/internal/service/ec2/vpnclient_endpoint.go index 43d5677a10c..3acf64032a8 100644 --- a/internal/service/ec2/vpnclient_endpoint.go +++ b/internal/service/ec2/vpnclient_endpoint.go @@ -315,7 +315,7 @@ func resourceClientVPNEndpointRead(ctx context.Context, d *schema.ResourceData, arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("client-vpn-endpoint/%s", d.Id()), }.String() diff --git a/internal/service/ec2/vpnclient_endpoint_data_source.go b/internal/service/ec2/vpnclient_endpoint_data_source.go index f96e2538557..b2ed8cbb50c 100644 --- a/internal/service/ec2/vpnclient_endpoint_data_source.go +++ b/internal/service/ec2/vpnclient_endpoint_data_source.go @@ -214,7 +214,7 @@ func dataSourceClientVPNEndpointRead(ctx context.Context, d *schema.ResourceData arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("client-vpn-endpoint/%s", d.Id()), }.String() diff --git a/internal/service/ec2/vpnsite_connection.go b/internal/service/ec2/vpnsite_connection.go index 4e85b346c0a..9ac28c50ef7 100644 --- a/internal/service/ec2/vpnsite_connection.go +++ b/internal/service/ec2/vpnsite_connection.go @@ -732,7 +732,7 @@ func resourceVPNConnectionRead(ctx context.Context, d *schema.ResourceData, meta arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("vpn-connection/%s", d.Id()), }.String() diff --git a/internal/service/ec2/vpnsite_customer_gateway.go b/internal/service/ec2/vpnsite_customer_gateway.go index e4ab9439869..8e4b51742ef 100644 --- a/internal/service/ec2/vpnsite_customer_gateway.go +++ b/internal/service/ec2/vpnsite_customer_gateway.go @@ -166,7 +166,7 @@ func resourceCustomerGatewayRead(ctx context.Context, d *schema.ResourceData, me arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("customer-gateway/%s", d.Id()), }.String() diff --git a/internal/service/ec2/vpnsite_customer_gateway_data_source.go b/internal/service/ec2/vpnsite_customer_gateway_data_source.go index 4a51dbefeaa..b5f4976924f 100644 --- a/internal/service/ec2/vpnsite_customer_gateway_data_source.go +++ b/internal/service/ec2/vpnsite_customer_gateway_data_source.go @@ -97,7 +97,7 @@ func dataSourceCustomerGatewayRead(ctx context.Context, d *schema.ResourceData, arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("customer-gateway/%s", d.Id()), }.String() diff --git a/internal/service/ec2/vpnsite_gateway.go b/internal/service/ec2/vpnsite_gateway.go index 0698446f2a2..5dc9ee08e03 100644 --- a/internal/service/ec2/vpnsite_gateway.go +++ b/internal/service/ec2/vpnsite_gateway.go @@ -128,7 +128,7 @@ func resourceVPNGatewayRead(ctx context.Context, d *schema.ResourceData, meta in arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("vpn-gateway/%s", d.Id()), }.String() diff --git a/internal/service/ec2/vpnsite_gateway_data_source.go b/internal/service/ec2/vpnsite_gateway_data_source.go index 7bfd1dc5200..4f8e19f0521 100644 --- a/internal/service/ec2/vpnsite_gateway_data_source.go +++ b/internal/service/ec2/vpnsite_gateway_data_source.go @@ -123,7 +123,7 @@ func dataSourceVPNGatewayRead(ctx context.Context, d *schema.ResourceData, meta arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("vpn-gateway/%s", d.Id()), }.String() diff --git a/internal/service/ec2/wavelength_carrier_gateway.go b/internal/service/ec2/wavelength_carrier_gateway.go index 86c32185725..008f1896a2c 100644 --- a/internal/service/ec2/wavelength_carrier_gateway.go +++ b/internal/service/ec2/wavelength_carrier_gateway.go @@ -105,7 +105,7 @@ func resourceCarrierGatewayRead(ctx context.Context, d *schema.ResourceData, met arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.EC2, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: ownerID, Resource: fmt.Sprintf("carrier-gateway/%s", d.Id()), }.String() From 8bec6ab2ee411fd65c670052941b2228697151f5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:15 -0500 Subject: [PATCH 208/304] Make 'AWSClient.Region' a getter - ecr. --- internal/service/ecr/authorization_token_data_source.go | 2 +- internal/service/ecr/repositories_data_source.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/ecr/authorization_token_data_source.go b/internal/service/ecr/authorization_token_data_source.go index 5ebebfe0910..4c67fafbb70 100644 --- a/internal/service/ecr/authorization_token_data_source.go +++ b/internal/service/ecr/authorization_token_data_source.go @@ -79,7 +79,7 @@ func dataSourceAuthorizationTokenRead(ctx context.Context, d *schema.ResourceDat } userName := basicAuthorization[0] password := basicAuthorization[1] - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set("authorization_token", authorizationToken) d.Set("proxy_endpoint", proxyEndpoint) d.Set("expires_at", expiresAt) diff --git a/internal/service/ecr/repositories_data_source.go b/internal/service/ecr/repositories_data_source.go index 616bf8615f0..f4ab1b96e25 100644 --- a/internal/service/ecr/repositories_data_source.go +++ b/internal/service/ecr/repositories_data_source.go @@ -63,7 +63,7 @@ func (d *repositoriesDataSource) Read(ctx context.Context, req datasource.ReadRe return } - data.ID = fwflex.StringValueToFramework(ctx, d.Meta().Region) + data.ID = fwflex.StringValueToFramework(ctx, d.Meta().Region(ctx)) data.Names.SetValue = fwflex.FlattenFrameworkStringValueSet(ctx, tfslices.ApplyToAll(output, func(v awstypes.Repository) string { return aws.ToString(v.RepositoryName) })) From e9327956fd25432fd2c9a54d85d6c8c1f5c23c11 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:15 -0500 Subject: [PATCH 209/304] Make 'AWSClient.Region' a getter - ecrpublic. --- internal/service/ecrpublic/authorization_token_data_source.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/ecrpublic/authorization_token_data_source.go b/internal/service/ecrpublic/authorization_token_data_source.go index 9d7b802cf1b..4c195e658e7 100644 --- a/internal/service/ecrpublic/authorization_token_data_source.go +++ b/internal/service/ecrpublic/authorization_token_data_source.go @@ -73,7 +73,7 @@ func dataSourceAuthorizationTokenRead(ctx context.Context, d *schema.ResourceDat userName := basicAuthorization[0] password := basicAuthorization[1] - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set("authorization_token", authorizationToken) d.Set("expires_at", expiresAt) d.Set(names.AttrUserName, userName) From dbe862a124f7db05d7c123da64f192b6f8c4427c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:15 -0500 Subject: [PATCH 210/304] Make 'AWSClient.Region' a getter - ecs. --- internal/service/ecs/account_setting_default.go | 2 +- internal/service/ecs/capacity_provider.go | 2 +- internal/service/ecs/cluster.go | 2 +- internal/service/ecs/service.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/ecs/account_setting_default.go b/internal/service/ecs/account_setting_default.go index aec510de905..4a605dd8e69 100644 --- a/internal/service/ecs/account_setting_default.go +++ b/internal/service/ecs/account_setting_default.go @@ -140,7 +140,7 @@ func resourceAccountSettingDefaultImport(ctx context.Context, d *schema.Resource d.Set(names.AttrName, d.Id()) d.SetId(arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Service: names.ECSEndpointID, Resource: "cluster/" + d.Id(), diff --git a/internal/service/ecs/capacity_provider.go b/internal/service/ecs/capacity_provider.go index 5326965d2ab..afa2d0613eb 100644 --- a/internal/service/ecs/capacity_provider.go +++ b/internal/service/ecs/capacity_provider.go @@ -257,7 +257,7 @@ func resourceCapacityProviderImport(ctx context.Context, d *schema.ResourceData, d.Set(names.AttrName, d.Id()) d.SetId(arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Service: "ecs", Resource: "capacity-provider/" + d.Id(), diff --git a/internal/service/ecs/cluster.go b/internal/service/ecs/cluster.go index 29258041a38..738ee4f6b1b 100644 --- a/internal/service/ecs/cluster.go +++ b/internal/service/ecs/cluster.go @@ -333,7 +333,7 @@ func resourceClusterImport(ctx context.Context, d *schema.ResourceData, meta int d.Set(names.AttrName, d.Id()) d.SetId(arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Service: "ecs", Resource: "cluster/" + d.Id(), diff --git a/internal/service/ecs/service.go b/internal/service/ecs/service.go index 511980c4920..d2475c357dc 100644 --- a/internal/service/ecs/service.go +++ b/internal/service/ecs/service.go @@ -1692,7 +1692,7 @@ func resourceServiceImport(ctx context.Context, d *schema.ResourceData, meta int d.SetId(name) clusterArn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Service: "ecs", AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("cluster/%s", cluster), From 76feb6cdf821148120e0421a4b3b24dd8d0d01ec Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:15 -0500 Subject: [PATCH 211/304] Make 'AWSClient.Region' a getter - efs. --- internal/service/efs/access_point.go | 2 +- internal/service/efs/access_point_data_source.go | 2 +- internal/service/efs/mount_target.go | 2 +- internal/service/efs/mount_target_data_source.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/efs/access_point.go b/internal/service/efs/access_point.go index 85b28bcc664..9cbaeac9ccf 100644 --- a/internal/service/efs/access_point.go +++ b/internal/service/efs/access_point.go @@ -189,7 +189,7 @@ func resourceAccessPointRead(ctx context.Context, d *schema.ResourceData, meta i fsARN := arn.ARN{ AccountID: meta.(*conns.AWSClient).AccountID(ctx), Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Resource: "file-system/" + fsID, Service: "elasticfilesystem", }.String() diff --git a/internal/service/efs/access_point_data_source.go b/internal/service/efs/access_point_data_source.go index 405c2fbb4a1..8585a8b593e 100644 --- a/internal/service/efs/access_point_data_source.go +++ b/internal/service/efs/access_point_data_source.go @@ -119,7 +119,7 @@ func dataSourceAccessPointRead(ctx context.Context, d *schema.ResourceData, meta fsARN := arn.ARN{ AccountID: meta.(*conns.AWSClient).AccountID(ctx), Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Resource: "file-system/" + fsID, Service: "elasticfilesystem", }.String() diff --git a/internal/service/efs/mount_target.go b/internal/service/efs/mount_target.go index 50d80940dd2..3c79c0d42df 100644 --- a/internal/service/efs/mount_target.go +++ b/internal/service/efs/mount_target.go @@ -170,7 +170,7 @@ func resourceMountTargetRead(ctx context.Context, d *schema.ResourceData, meta i fsARN := arn.ARN{ AccountID: meta.(*conns.AWSClient).AccountID(ctx), Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Resource: "file-system/" + fsID, Service: "elasticfilesystem", }.String() diff --git a/internal/service/efs/mount_target_data_source.go b/internal/service/efs/mount_target_data_source.go index 44ec84cef5b..2bec050c3ca 100644 --- a/internal/service/efs/mount_target_data_source.go +++ b/internal/service/efs/mount_target_data_source.go @@ -113,7 +113,7 @@ func dataSourceMountTargetRead(ctx context.Context, d *schema.ResourceData, meta fsARN := arn.ARN{ AccountID: meta.(*conns.AWSClient).AccountID(ctx), Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Resource: "file-system/" + fsID, Service: "elasticfilesystem", }.String() From 00a7a3e23501b9d2e44e5c1872d5271e91cbdfc1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:15 -0500 Subject: [PATCH 212/304] Make 'AWSClient.Region' a getter - eks. --- internal/service/eks/clusters_data_source.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/eks/clusters_data_source.go b/internal/service/eks/clusters_data_source.go index 3a4a54fd27d..215ff675dd5 100644 --- a/internal/service/eks/clusters_data_source.go +++ b/internal/service/eks/clusters_data_source.go @@ -46,7 +46,7 @@ func dataSourceClustersRead(ctx context.Context, d *schema.ResourceData, meta in clusters = append(clusters, page.Clusters...) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrNames, clusters) return diags From 1277255eedae795631c490b796eb8e5611ab2567 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:15 -0500 Subject: [PATCH 213/304] Make 'AWSClient.Region' a getter - elasticache. --- internal/service/elasticache/replication_group.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/elasticache/replication_group.go b/internal/service/elasticache/replication_group.go index 67fa1dd92a4..10cbf9d4903 100644 --- a/internal/service/elasticache/replication_group.go +++ b/internal/service/elasticache/replication_group.go @@ -1027,7 +1027,7 @@ func resourceReplicationGroupDelete(ctx context.Context, d *schema.ResourceData, v, hasGlobalReplicationGroupID := d.GetOk("global_replication_group_id") if hasGlobalReplicationGroupID { - if err := disassociateReplicationGroup(ctx, conn, v.(string), d.Id(), meta.(*conns.AWSClient).Region, d.Timeout(schema.TimeoutDelete)); err != nil { + if err := disassociateReplicationGroup(ctx, conn, v.(string), d.Id(), meta.(*conns.AWSClient).Region(ctx), d.Timeout(schema.TimeoutDelete)); err != nil { return sdkdiag.AppendFromErr(diags, err) } } From f3aac8639d9c38fe92ae2a75e2d2f3b72cf380c3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:15 -0500 Subject: [PATCH 214/304] Make 'AWSClient.Region' a getter - elasticbeanstalk. --- internal/service/elasticbeanstalk/hosted_zone_data_source.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/elasticbeanstalk/hosted_zone_data_source.go b/internal/service/elasticbeanstalk/hosted_zone_data_source.go index 52954f75f7c..a3c8915e36c 100644 --- a/internal/service/elasticbeanstalk/hosted_zone_data_source.go +++ b/internal/service/elasticbeanstalk/hosted_zone_data_source.go @@ -60,7 +60,7 @@ func dataSourceHostedZone() *schema.Resource { func dataSourceHostedZoneRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) if v, ok := d.GetOk(names.AttrRegion); ok { region = v.(string) } From 4861cf1c0c3db052d7a8e9a3a947b60e55471795 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:15 -0500 Subject: [PATCH 215/304] Make 'AWSClient.Region' a getter - elasticsearch. --- internal/service/elasticsearch/domain_policy_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/elasticsearch/domain_policy_test.go b/internal/service/elasticsearch/domain_policy_test.go index 949a367178b..e54cb5e0685 100644 --- a/internal/service/elasticsearch/domain_policy_test.go +++ b/internal/service/elasticsearch/domain_policy_test.go @@ -63,7 +63,7 @@ func TestAccElasticsearchDomainPolicy_basic(t *testing.T) { resource.TestCheckResourceAttr("aws_elasticsearch_domain.example", "elasticsearch_version", "2.3"), func(s *terraform.State) error { awsClient := acctest.Provider.Meta().(*conns.AWSClient) - expectedArn, err := buildDomainARN(name, awsClient.Partition(ctx), awsClient.AccountID(ctx), awsClient.Region) + expectedArn, err := buildDomainARN(name, awsClient.Partition(ctx), awsClient.AccountID(ctx), awsClient.Region(ctx)) if err != nil { return err } From aea8cabd9fa7237d88d0c1bb013d9399dd3879c7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:15 -0500 Subject: [PATCH 216/304] Make 'AWSClient.Region' a getter - elb. --- internal/service/elb/hosted_zone_id_data_source.go | 2 +- internal/service/elb/load_balancer.go | 2 +- internal/service/elb/load_balancer_data_source.go | 2 +- internal/service/elb/service_account_data_source.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/elb/hosted_zone_id_data_source.go b/internal/service/elb/hosted_zone_id_data_source.go index 18ddd43b57a..ccfa64fd69f 100644 --- a/internal/service/elb/hosted_zone_id_data_source.go +++ b/internal/service/elb/hosted_zone_id_data_source.go @@ -68,7 +68,7 @@ func dataSourceHostedZoneID() *schema.Resource { func dataSourceHostedZoneIDRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) if v, ok := d.GetOk(names.AttrRegion); ok { region = v.(string) } diff --git a/internal/service/elb/load_balancer.go b/internal/service/elb/load_balancer.go index 704a1b54fa8..fe84c36dd4a 100644 --- a/internal/service/elb/load_balancer.go +++ b/internal/service/elb/load_balancer.go @@ -342,7 +342,7 @@ func resourceLoadBalancerRead(ctx context.Context, d *schema.ResourceData, meta arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Service: "elasticloadbalancing", AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: "loadbalancer/" + d.Id(), diff --git a/internal/service/elb/load_balancer_data_source.go b/internal/service/elb/load_balancer_data_source.go index 81e54e9f6ba..870ce643e29 100644 --- a/internal/service/elb/load_balancer_data_source.go +++ b/internal/service/elb/load_balancer_data_source.go @@ -230,7 +230,7 @@ func dataSourceLoadBalancerRead(ctx context.Context, d *schema.ResourceData, met arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Service: "elasticloadbalancing", AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("loadbalancer/%s", d.Id()), diff --git a/internal/service/elb/service_account_data_source.go b/internal/service/elb/service_account_data_source.go index 950095235ed..7c545aa722c 100644 --- a/internal/service/elb/service_account_data_source.go +++ b/internal/service/elb/service_account_data_source.go @@ -67,7 +67,7 @@ func dataSourceServiceAccount() *schema.Resource { func dataSourceServiceAccountRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) if v, ok := d.GetOk(names.AttrRegion); ok { region = v.(string) } From 1eb1cd4f87e08720d4daf2848fe081672cc7a345 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:16 -0500 Subject: [PATCH 217/304] Make 'AWSClient.Region' a getter - elbv2. --- internal/service/elbv2/hosted_zone_id_data_source.go | 2 +- internal/service/elbv2/load_balancers_data_source.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/elbv2/hosted_zone_id_data_source.go b/internal/service/elbv2/hosted_zone_id_data_source.go index 96b375db7d3..51b51c14d31 100644 --- a/internal/service/elbv2/hosted_zone_id_data_source.go +++ b/internal/service/elbv2/hosted_zone_id_data_source.go @@ -117,7 +117,7 @@ func dataSourceHostedZoneID() *schema.Resource { func dataSourceHostedZoneIDRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) if v, ok := d.GetOk(names.AttrRegion); ok { region = v.(string) } diff --git a/internal/service/elbv2/load_balancers_data_source.go b/internal/service/elbv2/load_balancers_data_source.go index b3c4e6c22d8..e842b84a227 100644 --- a/internal/service/elbv2/load_balancers_data_source.go +++ b/internal/service/elbv2/load_balancers_data_source.go @@ -80,7 +80,7 @@ func dataSourceLoadBalancersRead(ctx context.Context, d *schema.ResourceData, me loadBalancerARNs = append(loadBalancerARNs, aws.ToString(lb.LoadBalancerArn)) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrARNs, loadBalancerARNs) return diags From 7c2da117263235a09920047a1e7b0f0cd8d295cc Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:16 -0500 Subject: [PATCH 218/304] Make 'AWSClient.Region' a getter - finspace. --- internal/service/finspace/kx_dataview.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/finspace/kx_dataview.go b/internal/service/finspace/kx_dataview.go index 7e0cb066042..83d6ba0c8ea 100644 --- a/internal/service/finspace/kx_dataview.go +++ b/internal/service/finspace/kx_dataview.go @@ -250,7 +250,7 @@ func resourceKxDataviewRead(ctx context.Context, d *schema.ResourceData, meta in // Ref: https://docs.aws.amazon.com/service-authorization/latest/reference/list_amazonfinspace.html#amazonfinspace-resources-for-iam-policies dataviewARN := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Service: names.FinSpace, AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("kxEnvironment/%s/kxDatabase/%s/kxDataview/%s", aws.ToString(out.EnvironmentId), aws.ToString(out.DatabaseName), aws.ToString(out.DataviewName)), From ceeb2d4ae29a9e239bc45592fe1224ae9eff0264 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:17 -0500 Subject: [PATCH 219/304] Make 'AWSClient.Region' a getter - fsx. --- .../service/fsx/ontap_storage_virtual_machines_data_source.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/fsx/ontap_storage_virtual_machines_data_source.go b/internal/service/fsx/ontap_storage_virtual_machines_data_source.go index 9951b0351fa..d4a10a1c0e1 100644 --- a/internal/service/fsx/ontap_storage_virtual_machines_data_source.go +++ b/internal/service/fsx/ontap_storage_virtual_machines_data_source.go @@ -53,7 +53,7 @@ func dataSourceONTAPStorageVirtualMachinesRead(ctx context.Context, d *schema.Re return sdkdiag.AppendErrorf(diags, "reading FSx ONTAP Storage Virtual Machines: %s", err) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrIDs, tfslices.ApplyToAll(svms, func(svm awstypes.StorageVirtualMachine) string { return aws.ToString(svm.StorageVirtualMachineId) })) From 5ac73dc3617dbb0a8245e55d72946d94a5c6472f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:17 -0500 Subject: [PATCH 220/304] Make 'AWSClient.Region' a getter - globalaccelerator. --- .../service/globalaccelerator/custom_routing_endpoint_group.go | 2 +- internal/service/globalaccelerator/endpoint_group.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/globalaccelerator/custom_routing_endpoint_group.go b/internal/service/globalaccelerator/custom_routing_endpoint_group.go index 4acc5ce95ec..350f94906c2 100644 --- a/internal/service/globalaccelerator/custom_routing_endpoint_group.go +++ b/internal/service/globalaccelerator/custom_routing_endpoint_group.go @@ -111,7 +111,7 @@ func resourceCustomRoutingEndpointGroupCreate(ctx context.Context, d *schema.Res input := &globalaccelerator.CreateCustomRoutingEndpointGroupInput{ DestinationConfigurations: expandCustomRoutingDestinationConfigurations(d.Get("destination_configuration").(*schema.Set).List()), - EndpointGroupRegion: aws.String(meta.(*conns.AWSClient).Region), + EndpointGroupRegion: aws.String(meta.(*conns.AWSClient).Region(ctx)), IdempotencyToken: aws.String(id.UniqueId()), ListenerArn: aws.String(d.Get("listener_arn").(string)), } diff --git a/internal/service/globalaccelerator/endpoint_group.go b/internal/service/globalaccelerator/endpoint_group.go index 8fc97f32bb8..b1e18e2ccea 100644 --- a/internal/service/globalaccelerator/endpoint_group.go +++ b/internal/service/globalaccelerator/endpoint_group.go @@ -154,7 +154,7 @@ func resourceEndpointGroupCreate(ctx context.Context, d *schema.ResourceData, me conn := meta.(*conns.AWSClient).GlobalAcceleratorClient(ctx) input := &globalaccelerator.CreateEndpointGroupInput{ - EndpointGroupRegion: aws.String(meta.(*conns.AWSClient).Region), + EndpointGroupRegion: aws.String(meta.(*conns.AWSClient).Region(ctx)), IdempotencyToken: aws.String(id.UniqueId()), ListenerArn: aws.String(d.Get("listener_arn").(string)), } From bec2f7a1056aed555471695112838e277c87e3af Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:17 -0500 Subject: [PATCH 221/304] Make 'AWSClient.Region' a getter - glue. --- internal/service/glue/catalog_database.go | 2 +- internal/service/glue/catalog_table.go | 2 +- internal/service/glue/catalog_table_data_source.go | 2 +- internal/service/glue/connection.go | 2 +- internal/service/glue/connection_data_source.go | 2 +- internal/service/glue/crawler.go | 2 +- internal/service/glue/data_quality_ruleset.go | 2 +- internal/service/glue/dev_endpoint.go | 2 +- internal/service/glue/job.go | 2 +- internal/service/glue/ml_transform.go | 2 +- internal/service/glue/resource_policy.go | 2 +- internal/service/glue/script_data_source.go | 2 +- internal/service/glue/trigger.go | 2 +- internal/service/glue/user_defined_function.go | 2 +- internal/service/glue/workflow.go | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/internal/service/glue/catalog_database.go b/internal/service/glue/catalog_database.go index 5a8c7ad7a40..f3618a7bafd 100644 --- a/internal/service/glue/catalog_database.go +++ b/internal/service/glue/catalog_database.go @@ -275,7 +275,7 @@ func resourceCatalogDatabaseRead(ctx context.Context, d *schema.ResourceData, me databaseArn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "glue", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("database/%s", aws.ToString(database.Name)), }.String() diff --git a/internal/service/glue/catalog_table.go b/internal/service/glue/catalog_table.go index e71da935f04..c831feada01 100644 --- a/internal/service/glue/catalog_table.go +++ b/internal/service/glue/catalog_table.go @@ -453,7 +453,7 @@ func resourceCatalogTableRead(ctx context.Context, d *schema.ResourceData, meta tableArn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "glue", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("table/%s/%s", dbName, aws.ToString(table.Name)), }.String() diff --git a/internal/service/glue/catalog_table_data_source.go b/internal/service/glue/catalog_table_data_source.go index e0aeee85bd7..800acb4129d 100644 --- a/internal/service/glue/catalog_table_data_source.go +++ b/internal/service/glue/catalog_table_data_source.go @@ -369,7 +369,7 @@ func dataSourceCatalogTableRead(ctx context.Context, d *schema.ResourceData, met tableArn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "glue", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("table/%s/%s", dbName, aws.ToString(table.Name)), }.String() diff --git a/internal/service/glue/connection.go b/internal/service/glue/connection.go index fe1bc663231..7a1239d827b 100644 --- a/internal/service/glue/connection.go +++ b/internal/service/glue/connection.go @@ -166,7 +166,7 @@ func resourceConnectionRead(ctx context.Context, d *schema.ResourceData, meta in connectionArn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "glue", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("connection/%s", connectionName), }.String() diff --git a/internal/service/glue/connection_data_source.go b/internal/service/glue/connection_data_source.go index b192fe5bba0..f0681d689cb 100644 --- a/internal/service/glue/connection_data_source.go +++ b/internal/service/glue/connection_data_source.go @@ -117,7 +117,7 @@ func dataSourceConnectionRead(ctx context.Context, d *schema.ResourceData, meta connectionArn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "glue", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("connection/%s", connectionName), }.String() diff --git a/internal/service/glue/crawler.go b/internal/service/glue/crawler.go index d37b89d9e57..79c7fd97438 100644 --- a/internal/service/glue/crawler.go +++ b/internal/service/glue/crawler.go @@ -500,7 +500,7 @@ func resourceCrawlerRead(ctx context.Context, d *schema.ResourceData, meta inter crawlerARN := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "glue", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("crawler/%s", d.Id()), }.String() diff --git a/internal/service/glue/data_quality_ruleset.go b/internal/service/glue/data_quality_ruleset.go index c162b91f316..f827b03f2a9 100644 --- a/internal/service/glue/data_quality_ruleset.go +++ b/internal/service/glue/data_quality_ruleset.go @@ -155,7 +155,7 @@ func resourceDataQualityRulesetRead(ctx context.Context, d *schema.ResourceData, dataQualityRulesetArn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "glue", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("dataQualityRuleset/%s", aws.ToString(dataQualityRuleset.Name)), }.String() diff --git a/internal/service/glue/dev_endpoint.go b/internal/service/glue/dev_endpoint.go index 0ea96012994..c433e38f2d4 100644 --- a/internal/service/glue/dev_endpoint.go +++ b/internal/service/glue/dev_endpoint.go @@ -292,7 +292,7 @@ func resourceDevEndpointRead(ctx context.Context, d *schema.ResourceData, meta i endpointARN := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "glue", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("devEndpoint/%s", d.Id()), }.String() diff --git a/internal/service/glue/job.go b/internal/service/glue/job.go index 4c0b89c4098..906a4c69ceb 100644 --- a/internal/service/glue/job.go +++ b/internal/service/glue/job.go @@ -303,7 +303,7 @@ func resourceJobRead(ctx context.Context, d *schema.ResourceData, meta interface jobARN := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "glue", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("job/%s", d.Id()), }.String() diff --git a/internal/service/glue/ml_transform.go b/internal/service/glue/ml_transform.go index 55839c4272e..2f737b26839 100644 --- a/internal/service/glue/ml_transform.go +++ b/internal/service/glue/ml_transform.go @@ -271,7 +271,7 @@ func resourceMLTransformRead(ctx context.Context, d *schema.ResourceData, meta i mlTransformArn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "glue", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("mlTransform/%s", d.Id()), }.String() diff --git a/internal/service/glue/resource_policy.go b/internal/service/glue/resource_policy.go index db00570c7a5..e2914348a70 100644 --- a/internal/service/glue/resource_policy.go +++ b/internal/service/glue/resource_policy.go @@ -78,7 +78,7 @@ func resourceResourcePolicyPut(condition awstypes.ExistCondition) func(context.C if err != nil { return sdkdiag.AppendErrorf(diags, "putting policy request: %s", err) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) return append(diags, resourceResourcePolicyRead(ctx, d, meta)...) } diff --git a/internal/service/glue/script_data_source.go b/internal/service/glue/script_data_source.go index 5b159392f48..3e15d744c7b 100644 --- a/internal/service/glue/script_data_source.go +++ b/internal/service/glue/script_data_source.go @@ -128,7 +128,7 @@ func dataSourceScriptRead(ctx context.Context, d *schema.ResourceData, meta inte return sdkdiag.AppendErrorf(diags, "script not created") } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set("python_script", output.PythonScript) d.Set("scala_code", output.ScalaCode) diff --git a/internal/service/glue/trigger.go b/internal/service/glue/trigger.go index a312a3f05f4..12e81ab1029 100644 --- a/internal/service/glue/trigger.go +++ b/internal/service/glue/trigger.go @@ -339,7 +339,7 @@ func resourceTriggerRead(ctx context.Context, d *schema.ResourceData, meta inter triggerARN := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "glue", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("trigger/%s", d.Id()), }.String() diff --git a/internal/service/glue/user_defined_function.go b/internal/service/glue/user_defined_function.go index 9e3ccd2cb79..48e662ba893 100644 --- a/internal/service/glue/user_defined_function.go +++ b/internal/service/glue/user_defined_function.go @@ -175,7 +175,7 @@ func resourceUserDefinedFunctionRead(ctx context.Context, d *schema.ResourceData udfArn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "glue", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("userDefinedFunction/%s/%s", dbName, aws.ToString(udf.FunctionName)), }.String() diff --git a/internal/service/glue/workflow.go b/internal/service/glue/workflow.go index 8c1ccc49f19..b6bc0e2fdaa 100644 --- a/internal/service/glue/workflow.go +++ b/internal/service/glue/workflow.go @@ -129,7 +129,7 @@ func resourceWorkflowRead(ctx context.Context, d *schema.ResourceData, meta inte workFlowArn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "glue", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("workflow/%s", d.Id()), }.String() From 71e11d23ad400899597fdda952da921613ef7e25 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:17 -0500 Subject: [PATCH 222/304] Make 'AWSClient.Region' a getter - grafana. --- internal/service/grafana/workspace.go | 2 +- internal/service/grafana/workspace_data_source.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/grafana/workspace.go b/internal/service/grafana/workspace.go index 5f03e2a0d0c..33ac3edd49f 100644 --- a/internal/service/grafana/workspace.go +++ b/internal/service/grafana/workspace.go @@ -287,7 +287,7 @@ func resourceWorkspaceRead(ctx context.Context, d *schema.ResourceData, meta int workspaceARN := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "grafana", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("/workspaces/%s", d.Id()), }.String() diff --git a/internal/service/grafana/workspace_data_source.go b/internal/service/grafana/workspace_data_source.go index 53347694653..e490d4dc064 100644 --- a/internal/service/grafana/workspace_data_source.go +++ b/internal/service/grafana/workspace_data_source.go @@ -126,7 +126,7 @@ func dataSourceWorkspaceRead(ctx context.Context, d *schema.ResourceData, meta i workspaceARN := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "grafana", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("/workspaces/%s", d.Id()), }.String() From 3e9ce69ef53cdd044f662a355223049eb91c3a4e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:17 -0500 Subject: [PATCH 223/304] Make 'AWSClient.Region' a getter - guardduty. --- internal/service/guardduty/detector.go | 2 +- internal/service/guardduty/filter.go | 2 +- internal/service/guardduty/ipset.go | 2 +- internal/service/guardduty/threatintelset.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/guardduty/detector.go b/internal/service/guardduty/detector.go index 1b3765c264a..13de94061ca 100644 --- a/internal/service/guardduty/detector.go +++ b/internal/service/guardduty/detector.go @@ -192,7 +192,7 @@ func resourceDetectorRead(ctx context.Context, d *schema.ResourceData, meta inte d.Set(names.AttrAccountID, meta.(*conns.AWSClient).AccountID(ctx)) arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Service: "guardduty", AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("detector/%s", d.Id()), diff --git a/internal/service/guardduty/filter.go b/internal/service/guardduty/filter.go index ed29396c860..8c741358b61 100644 --- a/internal/service/guardduty/filter.go +++ b/internal/service/guardduty/filter.go @@ -204,7 +204,7 @@ func resourceFilterRead(ctx context.Context, d *schema.ResourceData, meta interf arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Service: "guardduty", AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("detector/%s/filter/%s", detectorID, name), diff --git a/internal/service/guardduty/ipset.go b/internal/service/guardduty/ipset.go index 3e4706ebabc..36a42562a4f 100644 --- a/internal/service/guardduty/ipset.go +++ b/internal/service/guardduty/ipset.go @@ -137,7 +137,7 @@ func resourceIPSetRead(ctx context.Context, d *schema.ResourceData, meta interfa arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Service: "guardduty", AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("detector/%s/ipset/%s", detectorId, ipSetId), diff --git a/internal/service/guardduty/threatintelset.go b/internal/service/guardduty/threatintelset.go index 1a3564c7fc8..b36b3c5d9a6 100644 --- a/internal/service/guardduty/threatintelset.go +++ b/internal/service/guardduty/threatintelset.go @@ -137,7 +137,7 @@ func resourceThreatIntelSetRead(ctx context.Context, d *schema.ResourceData, met arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Service: "guardduty", AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("detector/%s/threatintelset/%s", detectorId, threatIntelSetId), From 222e22e0a120ba7d4fb024b88114a29bf065ba7d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:18 -0500 Subject: [PATCH 224/304] Make 'AWSClient.Region' a getter - iam. --- internal/service/iam/access_key.go | 2 +- internal/service/iam/roles_data_source.go | 2 +- internal/service/iam/users_data_source.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/service/iam/access_key.go b/internal/service/iam/access_key.go index a4bee31c83f..7e14e554c90 100644 --- a/internal/service/iam/access_key.go +++ b/internal/service/iam/access_key.go @@ -131,7 +131,7 @@ func resourceAccessKeyCreate(ctx context.Context, d *schema.ResourceData, meta i return sdkdiag.AppendErrorf(diags, "CreateAccessKey response did not contain a Secret Access Key as expected") } - sesSMTPPasswordV4, err := sesSMTPPasswordFromSecretKeySigV4(createResp.AccessKey.SecretAccessKey, meta.(*conns.AWSClient).Region) + sesSMTPPasswordV4, err := sesSMTPPasswordFromSecretKeySigV4(createResp.AccessKey.SecretAccessKey, meta.(*conns.AWSClient).Region(ctx)) if err != nil { return sdkdiag.AppendErrorf(diags, "getting SES SigV4 SMTP Password from Secret Access Key: %s", err) } diff --git a/internal/service/iam/roles_data_source.go b/internal/service/iam/roles_data_source.go index 37231e72244..8b230ae78ba 100644 --- a/internal/service/iam/roles_data_source.go +++ b/internal/service/iam/roles_data_source.go @@ -80,7 +80,7 @@ func dataSourceRolesRead(ctx context.Context, d *schema.ResourceData, meta inter } } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) var arns, nms []string diff --git a/internal/service/iam/users_data_source.go b/internal/service/iam/users_data_source.go index 2159b42a9fd..1fe0b19489f 100644 --- a/internal/service/iam/users_data_source.go +++ b/internal/service/iam/users_data_source.go @@ -56,7 +56,7 @@ func dataSourceUsersRead(ctx context.Context, d *schema.ResourceData, meta inter return sdkdiag.AppendErrorf(diags, "reading IAM users: %s", err) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) var arns, nms []string From 8af7f9d0c46fc2213e018e9ef3cf1842056a8e38 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:18 -0500 Subject: [PATCH 225/304] Make 'AWSClient.Region' a getter - imagebuilder. --- internal/service/imagebuilder/components_data_source.go | 2 +- internal/service/imagebuilder/container_recipes_data_source.go | 2 +- .../imagebuilder/distribution_configurations_data_source.go | 2 +- internal/service/imagebuilder/image_pipelines_data_source.go | 2 +- internal/service/imagebuilder/image_recipes_data_source.go | 2 +- .../imagebuilder/infrastructure_configurations_data_source.go | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/imagebuilder/components_data_source.go b/internal/service/imagebuilder/components_data_source.go index 8febf29b95e..13f9b661b73 100644 --- a/internal/service/imagebuilder/components_data_source.go +++ b/internal/service/imagebuilder/components_data_source.go @@ -65,7 +65,7 @@ func dataSourceComponentsRead(ctx context.Context, d *schema.ResourceData, meta return sdkdiag.AppendErrorf(diags, "reading Image Builder Components: %s", err) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrARNs, tfslices.ApplyToAll(components, func(v awstypes.ComponentVersion) string { return aws.ToString(v.Arn) })) diff --git a/internal/service/imagebuilder/container_recipes_data_source.go b/internal/service/imagebuilder/container_recipes_data_source.go index d4c73deba61..200fa6263ca 100644 --- a/internal/service/imagebuilder/container_recipes_data_source.go +++ b/internal/service/imagebuilder/container_recipes_data_source.go @@ -65,7 +65,7 @@ func dataSourceContainerRecipesRead(ctx context.Context, d *schema.ResourceData, return sdkdiag.AppendErrorf(diags, "reading Image Builder Container Recipes: %s", err) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrARNs, tfslices.ApplyToAll(containerRecipes, func(v awstypes.ContainerRecipeSummary) string { return aws.ToString(v.Arn) })) diff --git a/internal/service/imagebuilder/distribution_configurations_data_source.go b/internal/service/imagebuilder/distribution_configurations_data_source.go index fee149ac428..09423f6ce6d 100644 --- a/internal/service/imagebuilder/distribution_configurations_data_source.go +++ b/internal/service/imagebuilder/distribution_configurations_data_source.go @@ -55,7 +55,7 @@ func dataSourceDistributionConfigurationsRead(ctx context.Context, d *schema.Res return sdkdiag.AppendErrorf(diags, "reading Image Builder Distribution Configurations: %s", err) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrARNs, tfslices.ApplyToAll(distributionConfigurations, func(v awstypes.DistributionConfigurationSummary) string { return aws.ToString(v.Arn) })) diff --git a/internal/service/imagebuilder/image_pipelines_data_source.go b/internal/service/imagebuilder/image_pipelines_data_source.go index bdc5a263104..f4916fc6b0b 100644 --- a/internal/service/imagebuilder/image_pipelines_data_source.go +++ b/internal/service/imagebuilder/image_pipelines_data_source.go @@ -55,7 +55,7 @@ func dataSourceImagePipelinesRead(ctx context.Context, d *schema.ResourceData, m return sdkdiag.AppendErrorf(diags, "reading Image Builder Image Pipelines: %s", err) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrARNs, tfslices.ApplyToAll(imagePipelines, func(v awstypes.ImagePipeline) string { return aws.ToString(v.Arn) })) diff --git a/internal/service/imagebuilder/image_recipes_data_source.go b/internal/service/imagebuilder/image_recipes_data_source.go index 7e12d6fa4d5..aa2516d72be 100644 --- a/internal/service/imagebuilder/image_recipes_data_source.go +++ b/internal/service/imagebuilder/image_recipes_data_source.go @@ -65,7 +65,7 @@ func dataSourceImageRecipesRead(ctx context.Context, d *schema.ResourceData, met return sdkdiag.AppendErrorf(diags, "reading Image Builder Image Recipes: %s", err) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrARNs, tfslices.ApplyToAll(imageRecipes, func(v awstypes.ImageRecipeSummary) string { return aws.ToString(v.Arn) })) diff --git a/internal/service/imagebuilder/infrastructure_configurations_data_source.go b/internal/service/imagebuilder/infrastructure_configurations_data_source.go index fdccc6f6ff4..1767535afe2 100644 --- a/internal/service/imagebuilder/infrastructure_configurations_data_source.go +++ b/internal/service/imagebuilder/infrastructure_configurations_data_source.go @@ -55,7 +55,7 @@ func dataSourceInfrastructureConfigurationsRead(ctx context.Context, d *schema.R return sdkdiag.AppendErrorf(diags, "reading Image Builder Infrastructure Configurations: %s", err) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrARNs, tfslices.ApplyToAll(infrastructureConfigurations, func(v awstypes.InfrastructureConfigurationSummary) string { return aws.ToString(v.Arn) })) From 21281804d6fdc94a939cb7c43879e2a48c8193b0 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:18 -0500 Subject: [PATCH 226/304] Make 'AWSClient.Region' a getter - inspector. --- internal/service/inspector/rules_packages_data_source.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/inspector/rules_packages_data_source.go b/internal/service/inspector/rules_packages_data_source.go index 90e6b8bda9d..36169f529fa 100644 --- a/internal/service/inspector/rules_packages_data_source.go +++ b/internal/service/inspector/rules_packages_data_source.go @@ -42,7 +42,7 @@ func dataSourceRulesPackagesRead(ctx context.Context, d *schema.ResourceData, me arns := output slices.Sort(arns) - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrARNs, arns) return diags From 2f2cb8a7e29b09705753ad002f453d0fd22df2e3 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:18 -0500 Subject: [PATCH 227/304] Make 'AWSClient.Region' a getter - iot. --- internal/service/iot/event_configurations.go | 2 +- internal/service/iot/indexing_configuration.go | 2 +- internal/service/iot/logging_options.go | 2 +- internal/service/iot/registration_code_data_source.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/iot/event_configurations.go b/internal/service/iot/event_configurations.go index 48cb55eebaf..370ed40c485 100644 --- a/internal/service/iot/event_configurations.go +++ b/internal/service/iot/event_configurations.go @@ -65,7 +65,7 @@ func resourceEventConfigurationsPut(ctx context.Context, d *schema.ResourceData, } if d.IsNewResource() { - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) } return append(diags, resourceEventConfigurationsRead(ctx, d, meta)...) diff --git a/internal/service/iot/indexing_configuration.go b/internal/service/iot/indexing_configuration.go index 349ae0b3eea..a68f8c5a6b8 100644 --- a/internal/service/iot/indexing_configuration.go +++ b/internal/service/iot/indexing_configuration.go @@ -201,7 +201,7 @@ func resourceIndexingConfigurationPut(ctx context.Context, d *schema.ResourceDat } if d.IsNewResource() { - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) } return append(diags, resourceIndexingConfigurationRead(ctx, d, meta)...) diff --git a/internal/service/iot/logging_options.go b/internal/service/iot/logging_options.go index 6995e5e0edd..7592778a0f9 100644 --- a/internal/service/iot/logging_options.go +++ b/internal/service/iot/logging_options.go @@ -74,7 +74,7 @@ func resourceLoggingOptionsPut(ctx context.Context, d *schema.ResourceData, meta } if d.IsNewResource() { - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) } return append(diags, resourceLoggingOptionsRead(ctx, d, meta)...) diff --git a/internal/service/iot/registration_code_data_source.go b/internal/service/iot/registration_code_data_source.go index f51beabbd5d..903b134bf8b 100644 --- a/internal/service/iot/registration_code_data_source.go +++ b/internal/service/iot/registration_code_data_source.go @@ -39,7 +39,7 @@ func dataSourceRegistrationCodeRead(ctx context.Context, d *schema.ResourceData, return sdkdiag.AppendErrorf(diags, "reading IoT Registration Code: %s", err) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set("registration_code", output.RegistrationCode) return diags From d8036c6ed98ab3d4d811b6ea05094c87c8ebeee8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:19 -0500 Subject: [PATCH 228/304] Make 'AWSClient.Region' a getter - kendra. --- internal/service/kendra/data_source.go | 2 +- internal/service/kendra/experience.go | 2 +- internal/service/kendra/experience_data_source.go | 2 +- internal/service/kendra/faq.go | 2 +- internal/service/kendra/faq_data_source.go | 2 +- internal/service/kendra/index.go | 2 +- internal/service/kendra/index_data_source.go | 2 +- internal/service/kendra/query_suggestions_block_list.go | 2 +- .../service/kendra/query_suggestions_block_list_data_source.go | 2 +- internal/service/kendra/thesaurus.go | 2 +- internal/service/kendra/thesaurus_data_source.go | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/internal/service/kendra/data_source.go b/internal/service/kendra/data_source.go index d23b166645d..530ec6367ac 100644 --- a/internal/service/kendra/data_source.go +++ b/internal/service/kendra/data_source.go @@ -691,7 +691,7 @@ func resourceDataSourceRead(ctx context.Context, d *schema.ResourceData, meta in arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "kendra", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("index/%s/data-source/%s", indexId, id), }.String() diff --git a/internal/service/kendra/experience.go b/internal/service/kendra/experience.go index 99701ca0bad..8d226226789 100644 --- a/internal/service/kendra/experience.go +++ b/internal/service/kendra/experience.go @@ -243,7 +243,7 @@ func resourceExperienceRead(ctx context.Context, d *schema.ResourceData, meta in arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Service: "kendra", AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("index/%s/experience/%s", indexId, id), diff --git a/internal/service/kendra/experience_data_source.go b/internal/service/kendra/experience_data_source.go index df511d6fdcb..2084ac4a209 100644 --- a/internal/service/kendra/experience_data_source.go +++ b/internal/service/kendra/experience_data_source.go @@ -158,7 +158,7 @@ func dataSourceExperienceRead(ctx context.Context, d *schema.ResourceData, meta arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "kendra", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("index/%s/experience/%s", indexID, experienceID), }.String() diff --git a/internal/service/kendra/faq.go b/internal/service/kendra/faq.go index 5e36c762546..6c47332df58 100644 --- a/internal/service/kendra/faq.go +++ b/internal/service/kendra/faq.go @@ -238,7 +238,7 @@ func resourceFaqRead(ctx context.Context, d *schema.ResourceData, meta interface arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "kendra", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("index/%s/faq/%s", indexId, id), }.String() diff --git a/internal/service/kendra/faq_data_source.go b/internal/service/kendra/faq_data_source.go index 8d9e8ca1889..5a0d520aadb 100644 --- a/internal/service/kendra/faq_data_source.go +++ b/internal/service/kendra/faq_data_source.go @@ -127,7 +127,7 @@ func dataSourceFaqRead(ctx context.Context, d *schema.ResourceData, meta interfa arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "kendra", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("index/%s/faq/%s", indexId, id), }.String() diff --git a/internal/service/kendra/index.go b/internal/service/kendra/index.go index 970135018a9..7d1f4d5ca26 100644 --- a/internal/service/kendra/index.go +++ b/internal/service/kendra/index.go @@ -487,7 +487,7 @@ func resourceIndexRead(ctx context.Context, d *schema.ResourceData, meta interfa arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "kendra", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("index/%s", d.Id()), }.String() diff --git a/internal/service/kendra/index_data_source.go b/internal/service/kendra/index_data_source.go index be0fdec2000..32e0f0964b2 100644 --- a/internal/service/kendra/index_data_source.go +++ b/internal/service/kendra/index_data_source.go @@ -304,7 +304,7 @@ func dataSourceIndexRead(ctx context.Context, d *schema.ResourceData, meta inter arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "kendra", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("index/%s", id), }.String() diff --git a/internal/service/kendra/query_suggestions_block_list.go b/internal/service/kendra/query_suggestions_block_list.go index 6256f874f81..17b68ff9655 100644 --- a/internal/service/kendra/query_suggestions_block_list.go +++ b/internal/service/kendra/query_suggestions_block_list.go @@ -181,7 +181,7 @@ func resourceQuerySuggestionsBlockListRead(ctx context.Context, d *schema.Resour arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Service: "kendra", AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("index/%s/query-suggestions-block-list/%s", indexId, id), diff --git a/internal/service/kendra/query_suggestions_block_list_data_source.go b/internal/service/kendra/query_suggestions_block_list_data_source.go index eb52b0efc57..3584c92ac2a 100644 --- a/internal/service/kendra/query_suggestions_block_list_data_source.go +++ b/internal/service/kendra/query_suggestions_block_list_data_source.go @@ -120,7 +120,7 @@ func dataSourceQuerySuggestionsBlockListRead(ctx context.Context, d *schema.Reso arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "kendra", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("index/%s/query-suggestions-block-list/%s", indexID, querySuggestionsBlockListID), }.String() diff --git a/internal/service/kendra/thesaurus.go b/internal/service/kendra/thesaurus.go index 386424f7365..2bfb99d078b 100644 --- a/internal/service/kendra/thesaurus.go +++ b/internal/service/kendra/thesaurus.go @@ -182,7 +182,7 @@ func resourceThesaurusRead(ctx context.Context, d *schema.ResourceData, meta int arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Service: "kendra", AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("index/%s/thesaurus/%s", indexId, id), diff --git a/internal/service/kendra/thesaurus_data_source.go b/internal/service/kendra/thesaurus_data_source.go index d6a2ab46a8d..f20cfbd7e8f 100644 --- a/internal/service/kendra/thesaurus_data_source.go +++ b/internal/service/kendra/thesaurus_data_source.go @@ -127,7 +127,7 @@ func dataSourceThesaurusRead(ctx context.Context, d *schema.ResourceData, meta i arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "kendra", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("index/%s/thesaurus/%s", indexID, thesaurusID), }.String() From 1dbd874ba5957308544f5e71546c85013a8a614a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:19 -0500 Subject: [PATCH 229/304] Make 'AWSClient.Region' a getter - kms. --- internal/service/kms/replica_external_key.go | 2 +- internal/service/kms/replica_key.go | 2 +- internal/service/kms/secrets_data_source.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/service/kms/replica_external_key.go b/internal/service/kms/replica_external_key.go index 19f2228ebac..eab2bb1ad22 100644 --- a/internal/service/kms/replica_external_key.go +++ b/internal/service/kms/replica_external_key.go @@ -132,7 +132,7 @@ func resourceReplicaExternalKeyCreate(ctx context.Context, d *schema.ResourceDat input := &kms.ReplicateKeyInput{ KeyId: aws.String(strings.TrimPrefix(primaryKeyARN.Resource, "key/")), - ReplicaRegion: aws.String(meta.(*conns.AWSClient).Region), + ReplicaRegion: aws.String(meta.(*conns.AWSClient).Region(ctx)), Tags: getTagsIn(ctx), } diff --git a/internal/service/kms/replica_key.go b/internal/service/kms/replica_key.go index 6b9f7d5f9e6..03c056de30e 100644 --- a/internal/service/kms/replica_key.go +++ b/internal/service/kms/replica_key.go @@ -121,7 +121,7 @@ func resourceReplicaKeyCreate(ctx context.Context, d *schema.ResourceData, meta input := &kms.ReplicateKeyInput{ KeyId: aws.String(strings.TrimPrefix(primaryKeyARN.Resource, "key/")), - ReplicaRegion: aws.String(meta.(*conns.AWSClient).Region), + ReplicaRegion: aws.String(meta.(*conns.AWSClient).Region(ctx)), Tags: getTagsIn(ctx), } diff --git a/internal/service/kms/secrets_data_source.go b/internal/service/kms/secrets_data_source.go index 3bca71732b1..e9fa5d83089 100644 --- a/internal/service/kms/secrets_data_source.go +++ b/internal/service/kms/secrets_data_source.go @@ -117,7 +117,7 @@ func dataSourceSecretsRead(ctx context.Context, d *schema.ResourceData, meta int plaintext[name] = string(output.Plaintext) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set("plaintext", plaintext) return diags From 4e116046dbf6e59e472512f580efb434bada5fa7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:20 -0500 Subject: [PATCH 230/304] Make 'AWSClient.Region' a getter - lambda. --- internal/service/lambda/function.go | 4 ++-- internal/service/lambda/function_data_source.go | 2 +- internal/service/lambda/functions_data_source.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/lambda/function.go b/internal/service/lambda/function.go index cf1b3489aeb..00edb37949d 100644 --- a/internal/service/lambda/function.go +++ b/internal/service/lambda/function.go @@ -744,7 +744,7 @@ func resourceFunctionRead(ctx context.Context, d *schema.ResourceData, meta inte // in AWS GovCloud (US)) so we cannot just ignore the error as would typically. // Currently this functionality is not enabled in all Regions and returns ambiguous error codes // (e.g. AccessDeniedException), so we cannot just ignore the error as we would typically. - if partition, region := meta.(*conns.AWSClient).Partition(ctx), meta.(*conns.AWSClient).Region; partition == endpoints.AwsPartitionID && signerServiceIsAvailable(region) { + if partition, region := meta.(*conns.AWSClient).Partition(ctx), meta.(*conns.AWSClient).Region(ctx); partition == endpoints.AwsPartitionID && signerServiceIsAvailable(region) { var codeSigningConfigARN string // Code Signing is only supported on zip packaged lambda functions. @@ -1388,7 +1388,7 @@ func invokeARN(ctx context.Context, c *conns.AWSClient, functionOrAliasARN strin return arn.ARN{ Partition: c.Partition(ctx), Service: "apigateway", - Region: c.Region, + Region: c.Region(ctx), AccountID: "lambda", Resource: fmt.Sprintf("path/2015-03-31/functions/%s/invocations", functionOrAliasARN), }.String() diff --git a/internal/service/lambda/function_data_source.go b/internal/service/lambda/function_data_source.go index 5347ebf2f73..166e16b8e25 100644 --- a/internal/service/lambda/function_data_source.go +++ b/internal/service/lambda/function_data_source.go @@ -364,7 +364,7 @@ func dataSourceFunctionRead(ctx context.Context, d *schema.ResourceData, meta in setTagsOut(ctx, output.Tags) // See r/aws_lambda_function. - if partition, region := meta.(*conns.AWSClient).Partition(ctx), meta.(*conns.AWSClient).Region; partition == endpoints.AwsPartitionID && signerServiceIsAvailable(region) { + if partition, region := meta.(*conns.AWSClient).Partition(ctx), meta.(*conns.AWSClient).Region(ctx); partition == endpoints.AwsPartitionID && signerServiceIsAvailable(region) { var codeSigningConfigARN string if function.PackageType == awstypes.PackageTypeZip { diff --git a/internal/service/lambda/functions_data_source.go b/internal/service/lambda/functions_data_source.go index 19b27c073de..6b21dd23d1b 100644 --- a/internal/service/lambda/functions_data_source.go +++ b/internal/service/lambda/functions_data_source.go @@ -56,7 +56,7 @@ func dataSourceFunctionsRead(ctx context.Context, d *schema.ResourceData, meta i } } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set("function_arns", functionARNs) d.Set("function_names", functionNames) From c238d0239fb962d51645e781adcbdd19e64add1e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:20 -0500 Subject: [PATCH 231/304] Make 'AWSClient.Region' a getter - lexmodels. --- internal/service/lexmodels/bot.go | 2 +- internal/service/lexmodels/bot_alias.go | 2 +- internal/service/lexmodels/bot_alias_data_source.go | 2 +- internal/service/lexmodels/bot_data_source.go | 2 +- internal/service/lexmodels/intent.go | 2 +- internal/service/lexmodels/intent_data_source.go | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/service/lexmodels/bot.go b/internal/service/lexmodels/bot.go index 6bc48b1ec1e..ce142dbc7be 100644 --- a/internal/service/lexmodels/bot.go +++ b/internal/service/lexmodels/bot.go @@ -300,7 +300,7 @@ func resourceBotRead(ctx context.Context, d *schema.ResourceData, meta interface arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Service: "lex", AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("bot:%s", d.Id()), diff --git a/internal/service/lexmodels/bot_alias.go b/internal/service/lexmodels/bot_alias.go index 16319ead9d0..d7e53c237ec 100644 --- a/internal/service/lexmodels/bot_alias.go +++ b/internal/service/lexmodels/bot_alias.go @@ -200,7 +200,7 @@ func resourceBotAliasRead(ctx context.Context, d *schema.ResourceData, meta inte arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Service: "lex", AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("bot:%s", d.Id()), diff --git a/internal/service/lexmodels/bot_alias_data_source.go b/internal/service/lexmodels/bot_alias_data_source.go index 51be370cfd4..fbe5f44bb54 100644 --- a/internal/service/lexmodels/bot_alias_data_source.go +++ b/internal/service/lexmodels/bot_alias_data_source.go @@ -80,7 +80,7 @@ func dataSourceBotAliasRead(ctx context.Context, d *schema.ResourceData, meta in arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Service: "lex", AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("bot:%s", d.Id()), diff --git a/internal/service/lexmodels/bot_data_source.go b/internal/service/lexmodels/bot_data_source.go index aea3ebf9e84..4c4fc8f19ce 100644 --- a/internal/service/lexmodels/bot_data_source.go +++ b/internal/service/lexmodels/bot_data_source.go @@ -107,7 +107,7 @@ func dataSourceBotRead(ctx context.Context, d *schema.ResourceData, meta interfa arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Service: "lex", AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("bot:%s", name), diff --git a/internal/service/lexmodels/intent.go b/internal/service/lexmodels/intent.go index 94699e3c271..d8eb38aa266 100644 --- a/internal/service/lexmodels/intent.go +++ b/internal/service/lexmodels/intent.go @@ -370,7 +370,7 @@ func resourceIntentRead(ctx context.Context, d *schema.ResourceData, meta interf arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Service: "lex", AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("intent:%s", d.Id()), diff --git a/internal/service/lexmodels/intent_data_source.go b/internal/service/lexmodels/intent_data_source.go index cd7cb687e82..02e4b8abf16 100644 --- a/internal/service/lexmodels/intent_data_source.go +++ b/internal/service/lexmodels/intent_data_source.go @@ -86,7 +86,7 @@ func dataSourceIntentRead(ctx context.Context, d *schema.ResourceData, meta inte arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Service: "lex", AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("intent:%s", d.Get(names.AttrName).(string)), From 17c4fbc8313eed329ec028dea871fd3e19422b53 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:20 -0500 Subject: [PATCH 232/304] Make 'AWSClient.Region' a getter - licensemanager. --- internal/service/licensemanager/grant.go | 2 +- internal/service/licensemanager/grants_data_source.go | 2 +- .../service/licensemanager/received_licenses_data_source.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/service/licensemanager/grant.go b/internal/service/licensemanager/grant.go index 6b116506573..82bdc6d5641 100644 --- a/internal/service/licensemanager/grant.go +++ b/internal/service/licensemanager/grant.go @@ -105,7 +105,7 @@ func resourceGrantCreate(ctx context.Context, d *schema.ResourceData, meta inter AllowedOperations: flex.ExpandStringyValueSet[awstypes.AllowedOperation](d.Get("allowed_operations").(*schema.Set)), ClientToken: aws.String(id.UniqueId()), GrantName: aws.String(name), - HomeRegion: aws.String(meta.(*conns.AWSClient).Region), + HomeRegion: aws.String(meta.(*conns.AWSClient).Region(ctx)), LicenseArn: aws.String(d.Get("license_arn").(string)), Principals: []string{d.Get(names.AttrPrincipal).(string)}, } diff --git a/internal/service/licensemanager/grants_data_source.go b/internal/service/licensemanager/grants_data_source.go index a11d5f2441e..2fc7a75ee61 100644 --- a/internal/service/licensemanager/grants_data_source.go +++ b/internal/service/licensemanager/grants_data_source.go @@ -52,7 +52,7 @@ func dataSourceDistributedGrantsRead(ctx context.Context, d *schema.ResourceData return sdkdiag.AppendErrorf(diags, "reading License Manager Distributed Grants: %s", err) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrARNs, tfslices.ApplyToAll(grants, func(v awstypes.Grant) string { return aws.ToString(v.GrantArn) })) diff --git a/internal/service/licensemanager/received_licenses_data_source.go b/internal/service/licensemanager/received_licenses_data_source.go index 5f55aa6abf9..b8b0101711e 100644 --- a/internal/service/licensemanager/received_licenses_data_source.go +++ b/internal/service/licensemanager/received_licenses_data_source.go @@ -52,7 +52,7 @@ func dataSourceReceivedLicensesRead(ctx context.Context, d *schema.ResourceData, return sdkdiag.AppendErrorf(diags, "reading License Manager Received Licenses: %s", err) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrARNs, tfslices.ApplyToAll(licenses, func(v awstypes.GrantedLicense) string { return aws.ToString(v.LicenseArn) })) From 14d64171e01613b8ce63eb73c587506418972e33 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:20 -0500 Subject: [PATCH 233/304] Make 'AWSClient.Region' a getter - lightsail. --- internal/service/lightsail/instance.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/lightsail/instance.go b/internal/service/lightsail/instance.go index 461fed6228e..9c5c084062a 100644 --- a/internal/service/lightsail/instance.go +++ b/internal/service/lightsail/instance.go @@ -161,8 +161,8 @@ func ResourceInstance() *schema.Resource { CustomizeDiff: customdiff.All( customdiff.ValidateChange(names.AttrAvailabilityZone, func(ctx context.Context, old, new, meta any) error { // The availability_zone must be in the same region as the provider region - if !strings.HasPrefix(new.(string), meta.(*conns.AWSClient).Region) { - return fmt.Errorf("availability_zone must be within the same region as provider region: %s", meta.(*conns.AWSClient).Region) + if !strings.HasPrefix(new.(string), meta.(*conns.AWSClient).Region(ctx)) { + return fmt.Errorf("availability_zone must be within the same region as provider region: %s", meta.(*conns.AWSClient).Region(ctx)) } return nil }), From ef22db798bc737ff6d8646c5ebcca7a11ff73b83 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:20 -0500 Subject: [PATCH 234/304] Make 'AWSClient.Region' a getter - location. --- internal/service/location/tracker_associations_data_source.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/location/tracker_associations_data_source.go b/internal/service/location/tracker_associations_data_source.go index d1a0ccc8d86..31aafe9bdf6 100644 --- a/internal/service/location/tracker_associations_data_source.go +++ b/internal/service/location/tracker_associations_data_source.go @@ -65,7 +65,7 @@ func dataSourceTrackerAssociationsRead(ctx context.Context, d *schema.ResourceDa arns = append(arns, page.ConsumerArns...) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set("consumer_arns", arns) return diags From 3075c006eca68d0dc7f78389c26e39bdefdd2957 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:20 -0500 Subject: [PATCH 235/304] Make 'AWSClient.Region' a getter - logs. --- internal/service/logs/groups_data_source.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/logs/groups_data_source.go b/internal/service/logs/groups_data_source.go index 0519d67a72f..93863336ce4 100644 --- a/internal/service/logs/groups_data_source.go +++ b/internal/service/logs/groups_data_source.go @@ -64,7 +64,7 @@ func dataSourceGroupsRead(ctx context.Context, d *schema.ResourceData, meta inte output = append(output, page.LogGroups...) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) var arns, logGroupNames []string From 0cd944a6670782e9c8e7aebfd4639fa8f7ef682c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:21 -0500 Subject: [PATCH 236/304] Make 'AWSClient.Region' a getter - macie2. --- internal/service/macie2/classification_export_configuration.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/macie2/classification_export_configuration.go b/internal/service/macie2/classification_export_configuration.go index c846d63a654..1cbec8ca969 100644 --- a/internal/service/macie2/classification_export_configuration.go +++ b/internal/service/macie2/classification_export_configuration.go @@ -139,7 +139,7 @@ func resourceClassificationExportConfigurationRead(ctx context.Context, d *schem return sdkdiag.AppendErrorf(diags, "setting Macie classification export configuration s3_destination: %s", err) } } - d.SetId(fmt.Sprintf("%s:%s:%s", "macie:classification_export_configuration", meta.(*conns.AWSClient).AccountID(ctx), meta.(*conns.AWSClient).Region)) + d.SetId(fmt.Sprintf("%s:%s:%s", "macie:classification_export_configuration", meta.(*conns.AWSClient).AccountID(ctx), meta.(*conns.AWSClient).Region(ctx))) } return diags From 9e07f210b6f68e9c34dd1f5f7b2eb84ac4b0c0ad Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:21 -0500 Subject: [PATCH 237/304] Make 'AWSClient.Region' a getter - meta. --- internal/service/meta/region_data_source.go | 2 +- internal/service/meta/service_data_source.go | 2 +- internal/service/meta/service_principal_data_source.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/service/meta/region_data_source.go b/internal/service/meta/region_data_source.go index 8c37e882fca..edb7ac543b3 100644 --- a/internal/service/meta/region_data_source.go +++ b/internal/service/meta/region_data_source.go @@ -100,7 +100,7 @@ func (d *regionDataSource) Read(ctx context.Context, request datasource.ReadRequ // Default to provider current Region if no other filters matched. if region == nil { - name := d.Meta().Region + name := d.Meta().Region(ctx) matchingRegion, err := findRegionByName(ctx, name) if err != nil { diff --git a/internal/service/meta/service_data_source.go b/internal/service/meta/service_data_source.go index 0e9157cec2e..3d9ad756115 100644 --- a/internal/service/meta/service_data_source.go +++ b/internal/service/meta/service_data_source.go @@ -110,7 +110,7 @@ func (d *serviceDataSource) Read(ctx context.Context, request datasource.ReadReq } if data.Region.IsNull() { - data.Region = fwflex.StringValueToFrameworkLegacy(ctx, d.Meta().Region) + data.Region = fwflex.StringValueToFrameworkLegacy(ctx, d.Meta().Region(ctx)) } if data.ServiceID.IsNull() { diff --git a/internal/service/meta/service_principal_data_source.go b/internal/service/meta/service_principal_data_source.go index 21a22bccd82..206d7b56b9e 100644 --- a/internal/service/meta/service_principal_data_source.go +++ b/internal/service/meta/service_principal_data_source.go @@ -79,7 +79,7 @@ func (d *servicePrincipalDataSource) Read(ctx context.Context, request datasourc // Default to provider current Region if no other filters matched. if region == nil { - name := d.Meta().Region + name := d.Meta().Region(ctx) matchingRegion, err := findRegionByName(ctx, name) if err != nil { From 7e5b04a07cf758a79ebfcf877c0ca3b564674c82 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:22 -0500 Subject: [PATCH 238/304] Make 'AWSClient.Region' a getter - mq. --- .../mq/broker_instance_type_offerings_data_source.go | 2 +- internal/service/mq/broker_test.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/mq/broker_instance_type_offerings_data_source.go b/internal/service/mq/broker_instance_type_offerings_data_source.go index b4c6e291e0a..b8c548432ad 100644 --- a/internal/service/mq/broker_instance_type_offerings_data_source.go +++ b/internal/service/mq/broker_instance_type_offerings_data_source.go @@ -118,7 +118,7 @@ func dataSourceBrokerInstanceTypeOfferingsRead(ctx context.Context, d *schema.Re return sdkdiag.AppendErrorf(diags, "reading MQ Broker Instance Options: %s", err) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) if err := d.Set("broker_instance_options", flattenBrokerInstanceOptions(output)); err != nil { return sdkdiag.AppendErrorf(diags, "setting broker_instance_options: %s", err) diff --git a/internal/service/mq/broker_test.go b/internal/service/mq/broker_test.go index e83f3ca2458..8dac161150f 100644 --- a/internal/service/mq/broker_test.go +++ b/internal/service/mq/broker_test.go @@ -1610,7 +1610,7 @@ func TestAccMQBroker_dataReplicationMode(t *testing.T) { Config: testAccBrokerConfig_dataReplicationMode(rName, testAccBrokerVersionNewer, string(types.DataReplicationModeCrdr)), Check: resource.ComposeTestCheckFunc( testAccCheckBrokerExists(ctx, resourceName, &broker), - testAccCheckBrokerExistsWithProvider(ctx, primaryBrokerResourceName, &brokerAlternate, acctest.RegionProviderFunc(acctest.AlternateRegion(), &providers)), + testAccCheckBrokerExistsWithProvider(ctx, primaryBrokerResourceName, &brokerAlternate, acctest.RegionProviderFunc(ctx, acctest.AlternateRegion(), &providers)), resource.TestCheckResourceAttr(resourceName, "broker_name", rName), resource.TestCheckResourceAttr(resourceName, "deployment_mode", string(types.DeploymentModeActiveStandbyMultiAz)), // data_replication_mode is not returned until after reboot @@ -1634,11 +1634,11 @@ func TestAccMQBroker_dataReplicationMode(t *testing.T) { PreConfig: func() { // In order to delete, replicated brokers must first be unpaired by setting // data replication mode on the primary broker to "NONE". - testAccUnpairBrokerWithProvider(ctx, t, &brokerAlternate, acctest.RegionProviderFunc(acctest.AlternateRegion(), &providers)) + testAccUnpairBrokerWithProvider(ctx, t, &brokerAlternate, acctest.RegionProviderFunc(ctx, acctest.AlternateRegion(), &providers)) // The primary broker must be deleted before replica broker. The direct // dependency in the Terraform configuration would cause this to happen // in the opposite order, so delete the primary out of band instead. - testAccDeleteBrokerWithProvider(ctx, t, &brokerAlternate, acctest.RegionProviderFunc(acctest.AlternateRegion(), &providers)) + testAccDeleteBrokerWithProvider(ctx, t, &brokerAlternate, acctest.RegionProviderFunc(ctx, acctest.AlternateRegion(), &providers)) }, Config: testAccBrokerConfig_dataReplicationMode(rName, testAccBrokerVersionNewer, string(types.DataReplicationModeNone)), PlanOnly: true, From 3736d29ce17b047d2419635bcca7011512c07d4a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:22 -0500 Subject: [PATCH 239/304] Make 'AWSClient.Region' a getter - neptune. --- internal/service/neptune/cluster_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/neptune/cluster_test.go b/internal/service/neptune/cluster_test.go index d0e719edf26..6226738c696 100644 --- a/internal/service/neptune/cluster_test.go +++ b/internal/service/neptune/cluster_test.go @@ -575,8 +575,8 @@ func TestAccNeptuneCluster_GlobalClusterIdentifier_PrimarySecondaryClusters(t *t { Config: testAccClusterConfig_globalIdentifierPrimarySecondary(rNameGlobal, rNamePrimary, rNameSecondary), Check: resource.ComposeTestCheckFunc( - testAccCheckClusterExistsWithProvider(ctx, resourceNamePrimary, &primaryDbCluster, acctest.RegionProviderFunc(acctest.Region(), &providers)), - testAccCheckClusterExistsWithProvider(ctx, resourceNameSecondary, &secondaryDbCluster, acctest.RegionProviderFunc(acctest.AlternateRegion(), &providers)), + testAccCheckClusterExistsWithProvider(ctx, resourceNamePrimary, &primaryDbCluster, acctest.RegionProviderFunc(ctx, acctest.Region(), &providers)), + testAccCheckClusterExistsWithProvider(ctx, resourceNameSecondary, &secondaryDbCluster, acctest.RegionProviderFunc(ctx, acctest.AlternateRegion(), &providers)), ), }, }, From db274ff9a68eb64b146065b63be28b75a0219235 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:22 -0500 Subject: [PATCH 240/304] Make 'AWSClient.Region' a getter - networkmanager. --- internal/service/networkmanager/connections_data_source.go | 2 +- internal/service/networkmanager/core_network.go | 4 ++-- internal/service/networkmanager/devices_data_source.go | 2 +- .../service/networkmanager/global_networks_data_source.go | 2 +- internal/service/networkmanager/links_data_source.go | 2 +- internal/service/networkmanager/sites_data_source.go | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/internal/service/networkmanager/connections_data_source.go b/internal/service/networkmanager/connections_data_source.go index a5c738d7ebe..e1c9621c5eb 100644 --- a/internal/service/networkmanager/connections_data_source.go +++ b/internal/service/networkmanager/connections_data_source.go @@ -73,7 +73,7 @@ func dataSourceConnectionsRead(ctx context.Context, d *schema.ResourceData, meta connectionIDs = append(connectionIDs, aws.ToString(v.ConnectionId)) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrIDs, connectionIDs) return diags diff --git a/internal/service/networkmanager/core_network.go b/internal/service/networkmanager/core_network.go index 9bca521dde1..7ad02b25c04 100644 --- a/internal/service/networkmanager/core_network.go +++ b/internal/service/networkmanager/core_network.go @@ -197,7 +197,7 @@ func resourceCoreNetworkCreate(ctx context.Context, d *schema.ResourceData, meta input.PolicyDocument = aws.String(v.(string)) } else { // if user supplies a region or multiple regions use it in the base policy, otherwise use current region - regions := []interface{}{meta.(*conns.AWSClient).Region} + regions := []interface{}{meta.(*conns.AWSClient).Region(ctx)} if v, ok := d.GetOk("base_policy_region"); ok { regions = []interface{}{v.(string)} } else if v, ok := d.GetOk("base_policy_regions"); ok && v.(*schema.Set).Len() > 0 { @@ -288,7 +288,7 @@ func resourceCoreNetworkUpdate(ctx context.Context, d *schema.ResourceData, meta if d.HasChange("create_base_policy") { if _, ok := d.GetOk("create_base_policy"); ok { // if user supplies a region or multiple regions use it in the base policy, otherwise use current region - regions := []interface{}{meta.(*conns.AWSClient).Region} + regions := []interface{}{meta.(*conns.AWSClient).Region(ctx)} if v, ok := d.GetOk("base_policy_region"); ok { regions = []interface{}{v.(string)} } else if v, ok := d.GetOk("base_policy_regions"); ok && v.(*schema.Set).Len() > 0 { diff --git a/internal/service/networkmanager/devices_data_source.go b/internal/service/networkmanager/devices_data_source.go index 601ee461371..419e0047175 100644 --- a/internal/service/networkmanager/devices_data_source.go +++ b/internal/service/networkmanager/devices_data_source.go @@ -73,7 +73,7 @@ func dataSourceDevicesRead(ctx context.Context, d *schema.ResourceData, meta int deviceIDs = append(deviceIDs, aws.ToString(v.DeviceId)) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrIDs, deviceIDs) return diags diff --git a/internal/service/networkmanager/global_networks_data_source.go b/internal/service/networkmanager/global_networks_data_source.go index 20849ccfb42..6707b7e976e 100644 --- a/internal/service/networkmanager/global_networks_data_source.go +++ b/internal/service/networkmanager/global_networks_data_source.go @@ -57,7 +57,7 @@ func dataSourceGlobalNetworksRead(ctx context.Context, d *schema.ResourceData, m globalNetworkIDs = append(globalNetworkIDs, aws.ToString(v.GlobalNetworkId)) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrIDs, globalNetworkIDs) return diags diff --git a/internal/service/networkmanager/links_data_source.go b/internal/service/networkmanager/links_data_source.go index 8415a1d822e..4db65b2f960 100644 --- a/internal/service/networkmanager/links_data_source.go +++ b/internal/service/networkmanager/links_data_source.go @@ -89,7 +89,7 @@ func dataSourceLinksRead(ctx context.Context, d *schema.ResourceData, meta inter linkIDs = append(linkIDs, aws.ToString(v.LinkId)) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrIDs, linkIDs) return diags diff --git a/internal/service/networkmanager/sites_data_source.go b/internal/service/networkmanager/sites_data_source.go index 80f365b16ec..82f0f62cc29 100644 --- a/internal/service/networkmanager/sites_data_source.go +++ b/internal/service/networkmanager/sites_data_source.go @@ -63,7 +63,7 @@ func dataSourceSitesRead(ctx context.Context, d *schema.ResourceData, meta inter siteIDs = append(siteIDs, aws.ToString(v.SiteId)) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrIDs, siteIDs) return diags From f92305483d34a53f65ad722ec9eb8501c6f5a026 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:22 -0500 Subject: [PATCH 241/304] Make 'AWSClient.Region' a getter - oam. --- internal/service/oam/links_data_source.go | 2 +- internal/service/oam/sinks_data_source.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/oam/links_data_source.go b/internal/service/oam/links_data_source.go index babfb27cee8..1732fbb4a92 100644 --- a/internal/service/oam/links_data_source.go +++ b/internal/service/oam/links_data_source.go @@ -54,7 +54,7 @@ func dataSourceLinksRead(ctx context.Context, d *schema.ResourceData, meta inter } } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrARNs, arns) return nil diff --git a/internal/service/oam/sinks_data_source.go b/internal/service/oam/sinks_data_source.go index 58366b989d1..bf3eb8114a6 100644 --- a/internal/service/oam/sinks_data_source.go +++ b/internal/service/oam/sinks_data_source.go @@ -54,7 +54,7 @@ func dataSourceSinksRead(ctx context.Context, d *schema.ResourceData, meta inter } } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrARNs, arns) return nil From c29b184c98b03eae9a6228e5080dffd50c26ccd2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:22 -0500 Subject: [PATCH 242/304] Make 'AWSClient.Region' a getter - opensearch. --- internal/service/opensearch/domain_policy_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/opensearch/domain_policy_test.go b/internal/service/opensearch/domain_policy_test.go index 4251e5df507..beb72c1b193 100644 --- a/internal/service/opensearch/domain_policy_test.go +++ b/internal/service/opensearch/domain_policy_test.go @@ -63,7 +63,7 @@ func TestAccOpenSearchDomainPolicy_basic(t *testing.T) { testAccCheckDomainExists(ctx, "aws_opensearch_domain.test", &domain), func(s *terraform.State) error { awsClient := acctest.Provider.Meta().(*conns.AWSClient) - expectedArn, err := buildDomainARN(name, awsClient.Partition(ctx), awsClient.AccountID(ctx), awsClient.Region) + expectedArn, err := buildDomainARN(name, awsClient.Partition(ctx), awsClient.AccountID(ctx), awsClient.Region(ctx)) if err != nil { return err } From ac6a4ba2038a187e1a44fa225e2339fb286f301b Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:23 -0500 Subject: [PATCH 243/304] Make 'AWSClient.Region' a getter - outposts. --- internal/service/outposts/outposts_data_source.go | 2 +- internal/service/outposts/sites_data_source.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/outposts/outposts_data_source.go b/internal/service/outposts/outposts_data_source.go index 02e5fbf9ec5..27e02009600 100644 --- a/internal/service/outposts/outposts_data_source.go +++ b/internal/service/outposts/outposts_data_source.go @@ -101,7 +101,7 @@ func dataSourceOutpostsRead(ctx context.Context, d *schema.ResourceData, meta in return sdkdiag.AppendErrorf(diags, "setting ids: %s", err) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) return diags } diff --git a/internal/service/outposts/sites_data_source.go b/internal/service/outposts/sites_data_source.go index 4896b1a3e63..103e5d308a1 100644 --- a/internal/service/outposts/sites_data_source.go +++ b/internal/service/outposts/sites_data_source.go @@ -55,7 +55,7 @@ func dataSourceSitesRead(ctx context.Context, d *schema.ResourceData, meta inter return sdkdiag.AppendErrorf(diags, "setting ids: %s", err) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) return diags } From 164fa80d81ca37be924837ecec5b6e52ff3e6269 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:24 -0500 Subject: [PATCH 244/304] Make 'AWSClient.Region' a getter - rbin. --- internal/service/rbin/rule.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/rbin/rule.go b/internal/service/rbin/rule.go index 980c5f7e33d..82497e5819b 100644 --- a/internal/service/rbin/rule.go +++ b/internal/service/rbin/rule.go @@ -213,7 +213,7 @@ func resourceRuleRead(ctx context.Context, d *schema.ResourceData, meta interfac ruleArn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: rbin.ServiceID, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("rule/%s", aws.ToString(out.Identifier)), }.String() From bdd1ce3fed85aa3e3c1a75fac2bd972cf661ce37 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:24 -0500 Subject: [PATCH 245/304] Make 'AWSClient.Region' a getter - rds. --- internal/service/rds/certificate.go | 2 +- internal/service/rds/cluster_test.go | 16 ++++++++-------- internal/service/rds/clusters_data_source.go | 2 +- .../service/rds/event_categories_data_source.go | 2 +- internal/service/rds/instance.go | 2 +- internal/service/rds/instance_test.go | 12 ++++++------ internal/service/rds/instances_data_source.go | 2 +- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/internal/service/rds/certificate.go b/internal/service/rds/certificate.go index 2b44984e256..db2a57faa74 100644 --- a/internal/service/rds/certificate.go +++ b/internal/service/rds/certificate.go @@ -57,7 +57,7 @@ func resourceCertificatePut(ctx context.Context, d *schema.ResourceData, meta in } if d.IsNewResource() { - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) } return append(diags, resourceCertificateRead(ctx, d, meta)...) diff --git a/internal/service/rds/cluster_test.go b/internal/service/rds/cluster_test.go index 893e6d61db2..cf4ffbe7150 100644 --- a/internal/service/rds/cluster_test.go +++ b/internal/service/rds/cluster_test.go @@ -1319,8 +1319,8 @@ func TestAccRDSCluster_ReplicationSourceIdentifier_kmsKeyID(t *testing.T) { { Config: testAccClusterConfig_replicationSourceIDKMSKeyID(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckClusterExistsWithProvider(ctx, resourceName, &primaryCluster, acctest.RegionProviderFunc(acctest.Region(), &providers)), - testAccCheckClusterExistsWithProvider(ctx, resourceName2, &replicaCluster, acctest.RegionProviderFunc(acctest.AlternateRegion(), &providers)), + testAccCheckClusterExistsWithProvider(ctx, resourceName, &primaryCluster, acctest.RegionProviderFunc(ctx, acctest.Region(), &providers)), + testAccCheckClusterExistsWithProvider(ctx, resourceName2, &replicaCluster, acctest.RegionProviderFunc(ctx, acctest.AlternateRegion(), &providers)), ), }, }, @@ -1702,8 +1702,8 @@ func TestAccRDSCluster_GlobalClusterIdentifier_primarySecondaryClusters(t *testi { Config: testAccClusterConfig_GlobalClusterID_primarySecondaryClusters(rNameGlobal, rNamePrimary, rNameSecondary), Check: resource.ComposeTestCheckFunc( - testAccCheckClusterExistsWithProvider(ctx, resourceNamePrimary, &primaryDbCluster, acctest.RegionProviderFunc(acctest.Region(), &providers)), - testAccCheckClusterExistsWithProvider(ctx, resourceNameSecondary, &secondaryDbCluster, acctest.RegionProviderFunc(acctest.AlternateRegion(), &providers)), + testAccCheckClusterExistsWithProvider(ctx, resourceNamePrimary, &primaryDbCluster, acctest.RegionProviderFunc(ctx, acctest.Region(), &providers)), + testAccCheckClusterExistsWithProvider(ctx, resourceNameSecondary, &secondaryDbCluster, acctest.RegionProviderFunc(ctx, acctest.AlternateRegion(), &providers)), ), }, }, @@ -1737,8 +1737,8 @@ func TestAccRDSCluster_GlobalClusterIdentifier_replicationSourceIdentifier(t *te { Config: testAccClusterConfig_GlobalClusterID_replicationSourceID(rName), Check: resource.ComposeTestCheckFunc( - testAccCheckClusterExistsWithProvider(ctx, resourceNamePrimary, &primaryDbCluster, acctest.RegionProviderFunc(acctest.Region(), &providers)), - testAccCheckClusterExistsWithProvider(ctx, resourceNameSecondary, &secondaryDbCluster, acctest.RegionProviderFunc(acctest.AlternateRegion(), &providers)), + testAccCheckClusterExistsWithProvider(ctx, resourceNamePrimary, &primaryDbCluster, acctest.RegionProviderFunc(ctx, acctest.Region(), &providers)), + testAccCheckClusterExistsWithProvider(ctx, resourceNameSecondary, &secondaryDbCluster, acctest.RegionProviderFunc(ctx, acctest.AlternateRegion(), &providers)), ), }, }, @@ -1775,8 +1775,8 @@ func TestAccRDSCluster_GlobalClusterIdentifier_secondaryClustersWriteForwarding( { Config: testAccClusterConfig_GlobalClusterID_secondaryClustersWriteForwarding(rNameGlobal, rNamePrimary, rNameSecondary), Check: resource.ComposeTestCheckFunc( - testAccCheckClusterExistsWithProvider(ctx, resourceNamePrimary, &primaryDbCluster, acctest.RegionProviderFunc(acctest.Region(), &providers)), - testAccCheckClusterExistsWithProvider(ctx, resourceNameSecondary, &secondaryDbCluster, acctest.RegionProviderFunc(acctest.AlternateRegion(), &providers)), + testAccCheckClusterExistsWithProvider(ctx, resourceNamePrimary, &primaryDbCluster, acctest.RegionProviderFunc(ctx, acctest.Region(), &providers)), + testAccCheckClusterExistsWithProvider(ctx, resourceNameSecondary, &secondaryDbCluster, acctest.RegionProviderFunc(ctx, acctest.AlternateRegion(), &providers)), resource.TestCheckResourceAttr(resourceNameSecondary, "enable_global_write_forwarding", acctest.CtTrue), ), }, diff --git a/internal/service/rds/clusters_data_source.go b/internal/service/rds/clusters_data_source.go index 72ba778b7bb..2b0e3ed7452 100644 --- a/internal/service/rds/clusters_data_source.go +++ b/internal/service/rds/clusters_data_source.go @@ -63,7 +63,7 @@ func dataSourceClustersRead(ctx context.Context, d *schema.ResourceData, meta in clusterIdentifiers = append(clusterIdentifiers, aws.ToString(cluster.DBClusterIdentifier)) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set("cluster_arns", clusterARNs) d.Set("cluster_identifiers", clusterIdentifiers) diff --git a/internal/service/rds/event_categories_data_source.go b/internal/service/rds/event_categories_data_source.go index cbb6bd72afc..838e2a1195b 100644 --- a/internal/service/rds/event_categories_data_source.go +++ b/internal/service/rds/event_categories_data_source.go @@ -56,7 +56,7 @@ func dataSourceEventCategoriesRead(ctx context.Context, d *schema.ResourceData, return sdkdiag.AppendErrorf(diags, "reading RDS Event Categories: %s", err) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set("event_categories", slices.Concat(tfslices.ApplyToAll(output, func(v types.EventCategoriesMap) []string { return v.EventCategories })...)) diff --git a/internal/service/rds/instance.go b/internal/service/rds/instance.go index d220057be80..0e9dab5cae2 100644 --- a/internal/service/rds/instance.go +++ b/internal/service/rds/instance.go @@ -860,7 +860,7 @@ func resourceInstanceCreate(ctx context.Context, d *schema.ResourceData, meta in if err != nil { return sdkdiag.AppendErrorf(diags, "creating RDS DB Instance (read replica) (%s): %s", identifier, err) } - crossRegion = sourceARN.Region != meta.(*conns.AWSClient).Region + crossRegion = sourceARN.Region != meta.(*conns.AWSClient).Region(ctx) } if crossRegion { input.DBParameterGroupName = aws.String(v.(string)) diff --git a/internal/service/rds/instance_test.go b/internal/service/rds/instance_test.go index 6972ad3a1c3..a4ec871f916 100644 --- a/internal/service/rds/instance_test.go +++ b/internal/service/rds/instance_test.go @@ -2266,9 +2266,9 @@ func TestAccRDSInstance_ReplicateSourceDB_CrossRegion_parameterGroupNameEquivale { Config: testAccInstanceConfig_ReplicateSourceDB_CrossRegion_ParameterGroupName_equivalent(rName), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBInstanceExistsWithProvider(ctx, sourceResourceName, &sourceDbInstance, acctest.RegionProviderFunc(acctest.AlternateRegion(), &providers)), + testAccCheckDBInstanceExistsWithProvider(ctx, sourceResourceName, &sourceDbInstance, acctest.RegionProviderFunc(ctx, acctest.AlternateRegion(), &providers)), resource.TestCheckResourceAttr(sourceResourceName, names.AttrParameterGroupName, fmt.Sprintf("%s-source", rName)), - testAccCheckDBInstanceExistsWithProvider(ctx, resourceName, &dbInstance, acctest.RegionProviderFunc(acctest.Region(), &providers)), + testAccCheckDBInstanceExistsWithProvider(ctx, resourceName, &dbInstance, acctest.RegionProviderFunc(ctx, acctest.Region(), &providers)), resource.TestCheckResourceAttrPair(resourceName, "replicate_source_db", sourceResourceName, names.AttrARN), resource.TestCheckResourceAttrPair(resourceName, names.AttrParameterGroupName, "aws_db_parameter_group.test", names.AttrName), testAccCheckInstanceParameterApplyStatusInSync(&dbInstance), @@ -2310,9 +2310,9 @@ func TestAccRDSInstance_ReplicateSourceDB_CrossRegion_parameterGroupNamePostgres { Config: testAccInstanceConfig_ReplicateSourceDB_CrossRegion_ParameterGroupName_postgres(rName), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBInstanceExistsWithProvider(ctx, sourceResourceName, &sourceDbInstance, acctest.RegionProviderFunc(acctest.AlternateRegion(), &providers)), + testAccCheckDBInstanceExistsWithProvider(ctx, sourceResourceName, &sourceDbInstance, acctest.RegionProviderFunc(ctx, acctest.AlternateRegion(), &providers)), resource.TestCheckResourceAttr(sourceResourceName, names.AttrParameterGroupName, fmt.Sprintf("%s-source", rName)), - testAccCheckDBInstanceExistsWithProvider(ctx, resourceName, &dbInstance, acctest.RegionProviderFunc(acctest.Region(), &providers)), + testAccCheckDBInstanceExistsWithProvider(ctx, resourceName, &dbInstance, acctest.RegionProviderFunc(ctx, acctest.Region(), &providers)), resource.TestCheckResourceAttrPair(resourceName, "replicate_source_db", sourceResourceName, names.AttrARN), resource.TestCheckResourceAttrPair(resourceName, names.AttrParameterGroupName, "aws_db_parameter_group.test", names.AttrName), testAccCheckInstanceParameterApplyStatusInSync(&dbInstance), @@ -2355,9 +2355,9 @@ func TestAccRDSInstance_ReplicateSourceDB_CrossRegion_characterSet(t *testing.T) { Config: testAccInstanceConfig_ReplicateSourceDB_CrossRegion_CharacterSet(rName), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckDBInstanceExistsWithProvider(ctx, sourceResourceName, &sourceDbInstance, acctest.RegionProviderFunc(acctest.AlternateRegion(), &providers)), + testAccCheckDBInstanceExistsWithProvider(ctx, sourceResourceName, &sourceDbInstance, acctest.RegionProviderFunc(ctx, acctest.AlternateRegion(), &providers)), resource.TestCheckResourceAttr(sourceResourceName, "character_set_name", "WE8ISO8859P15"), - testAccCheckDBInstanceExistsWithProvider(ctx, resourceName, &dbInstance, acctest.RegionProviderFunc(acctest.Region(), &providers)), + testAccCheckDBInstanceExistsWithProvider(ctx, resourceName, &dbInstance, acctest.RegionProviderFunc(ctx, acctest.Region(), &providers)), resource.TestCheckResourceAttrPair(resourceName, "replicate_source_db", sourceResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "character_set_name", "WE8ISO8859P15"), ), diff --git a/internal/service/rds/instances_data_source.go b/internal/service/rds/instances_data_source.go index 119eb0684bb..e3b0ec75196 100644 --- a/internal/service/rds/instances_data_source.go +++ b/internal/service/rds/instances_data_source.go @@ -72,7 +72,7 @@ func dataSourceInstancesRead(ctx context.Context, d *schema.ResourceData, meta i instanceIdentifiers = append(instanceIdentifiers, aws.ToString(instance.DBInstanceIdentifier)) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set("instance_arns", instanceARNS) d.Set("instance_identifiers", instanceIdentifiers) From 4e7294430b2cefd7ea8ae9a696d5326ce776c681 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:24 -0500 Subject: [PATCH 246/304] Make 'AWSClient.Region' a getter - redshift. --- internal/service/redshift/cluster.go | 2 +- internal/service/redshift/cluster_data_source.go | 2 +- internal/service/redshift/data_shares_data_source.go | 2 +- internal/service/redshift/event_subscription.go | 2 +- internal/service/redshift/hsm_client_certificate.go | 2 +- internal/service/redshift/hsm_configuration.go | 2 +- internal/service/redshift/parameter_group.go | 2 +- internal/service/redshift/service_account_data_source.go | 2 +- internal/service/redshift/snapshot_copy_grant.go | 2 +- internal/service/redshift/snapshot_schedule.go | 2 +- internal/service/redshift/subnet_group.go | 2 +- internal/service/redshift/subnet_group_data_source.go | 2 +- internal/service/redshift/usage_limit.go | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/redshift/cluster.go b/internal/service/redshift/cluster.go index a9f5101fa5c..7bd05191246 100644 --- a/internal/service/redshift/cluster.go +++ b/internal/service/redshift/cluster.go @@ -660,7 +660,7 @@ func resourceClusterRead(ctx context.Context, d *schema.ResourceData, meta inter arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.Redshift, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("cluster:%s", d.Id()), }.String() diff --git a/internal/service/redshift/cluster_data_source.go b/internal/service/redshift/cluster_data_source.go index 4889f13206e..f41b50a8a30 100644 --- a/internal/service/redshift/cluster_data_source.go +++ b/internal/service/redshift/cluster_data_source.go @@ -223,7 +223,7 @@ func dataSourceClusterRead(ctx context.Context, d *schema.ResourceData, meta int arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.Redshift, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("cluster:%s", d.Id()), }.String() diff --git a/internal/service/redshift/data_shares_data_source.go b/internal/service/redshift/data_shares_data_source.go index e1cecf320d1..d6b31312f56 100644 --- a/internal/service/redshift/data_shares_data_source.go +++ b/internal/service/redshift/data_shares_data_source.go @@ -67,7 +67,7 @@ func (d *dataSourceDataShares) Read(ctx context.Context, req datasource.ReadRequ if resp.Diagnostics.HasError() { return } - data.ID = types.StringValue(d.Meta().Region) + data.ID = types.StringValue(d.Meta().Region(ctx)) paginator := redshift.NewDescribeDataSharesPaginator(conn, &redshift.DescribeDataSharesInput{}) diff --git a/internal/service/redshift/event_subscription.go b/internal/service/redshift/event_subscription.go index b8dd04b05b8..c88a5d589d4 100644 --- a/internal/service/redshift/event_subscription.go +++ b/internal/service/redshift/event_subscription.go @@ -172,7 +172,7 @@ func resourceEventSubscriptionRead(ctx context.Context, d *schema.ResourceData, arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.Redshift, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("eventsubscription:%s", d.Id()), }.String() diff --git a/internal/service/redshift/hsm_client_certificate.go b/internal/service/redshift/hsm_client_certificate.go index 32e7bdda4e9..d364e85425b 100644 --- a/internal/service/redshift/hsm_client_certificate.go +++ b/internal/service/redshift/hsm_client_certificate.go @@ -98,7 +98,7 @@ func resourceHSMClientCertificateRead(ctx context.Context, d *schema.ResourceDat arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.Redshift, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("hsmclientcertificate:%s", d.Id()), }.String() diff --git a/internal/service/redshift/hsm_configuration.go b/internal/service/redshift/hsm_configuration.go index 7507fcebb30..bafc0808041 100644 --- a/internal/service/redshift/hsm_configuration.go +++ b/internal/service/redshift/hsm_configuration.go @@ -125,7 +125,7 @@ func resourceHSMConfigurationRead(ctx context.Context, d *schema.ResourceData, m arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.Redshift, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("hsmconfiguration:%s", d.Id()), }.String() diff --git a/internal/service/redshift/parameter_group.go b/internal/service/redshift/parameter_group.go index 36d67d9cb65..0552e455d6d 100644 --- a/internal/service/redshift/parameter_group.go +++ b/internal/service/redshift/parameter_group.go @@ -150,7 +150,7 @@ func resourceParameterGroupRead(ctx context.Context, d *schema.ResourceData, met arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.Redshift, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("parametergroup:%s", d.Id()), }.String() diff --git a/internal/service/redshift/service_account_data_source.go b/internal/service/redshift/service_account_data_source.go index 221b9b2f8e0..a8abb54ce61 100644 --- a/internal/service/redshift/service_account_data_source.go +++ b/internal/service/redshift/service_account_data_source.go @@ -69,7 +69,7 @@ func dataSourceServiceAccount() *schema.Resource { func dataSourceServiceAccountRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) if v, ok := d.GetOk(names.AttrRegion); ok { region = v.(string) } diff --git a/internal/service/redshift/snapshot_copy_grant.go b/internal/service/redshift/snapshot_copy_grant.go index c3f21ff592b..b94a9eb5730 100644 --- a/internal/service/redshift/snapshot_copy_grant.go +++ b/internal/service/redshift/snapshot_copy_grant.go @@ -114,7 +114,7 @@ func resourceSnapshotCopyGrantRead(ctx context.Context, d *schema.ResourceData, arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.Redshift, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("snapshotcopygrant:%s", d.Id()), }.String() diff --git a/internal/service/redshift/snapshot_schedule.go b/internal/service/redshift/snapshot_schedule.go index 58d22eaf25f..4d03689a737 100644 --- a/internal/service/redshift/snapshot_schedule.go +++ b/internal/service/redshift/snapshot_schedule.go @@ -125,7 +125,7 @@ func resourceSnapshotScheduleRead(ctx context.Context, d *schema.ResourceData, m arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.Redshift, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("snapshotschedule:%s", d.Id()), }.String() diff --git a/internal/service/redshift/subnet_group.go b/internal/service/redshift/subnet_group.go index d7ac1ff65bf..d95746d3432 100644 --- a/internal/service/redshift/subnet_group.go +++ b/internal/service/redshift/subnet_group.go @@ -120,7 +120,7 @@ func resourceSubnetGroupRead(ctx context.Context, d *schema.ResourceData, meta i arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.Redshift, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("subnetgroup:%s", d.Id()), }.String() diff --git a/internal/service/redshift/subnet_group_data_source.go b/internal/service/redshift/subnet_group_data_source.go index db85e95f177..83bce521178 100644 --- a/internal/service/redshift/subnet_group_data_source.go +++ b/internal/service/redshift/subnet_group_data_source.go @@ -60,7 +60,7 @@ func dataSourceSubnetGroupRead(ctx context.Context, d *schema.ResourceData, meta arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.Redshift, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("subnetgroup:%s", d.Id()), }.String() diff --git a/internal/service/redshift/usage_limit.go b/internal/service/redshift/usage_limit.go index bc9767635d1..8fb6a135f1c 100644 --- a/internal/service/redshift/usage_limit.go +++ b/internal/service/redshift/usage_limit.go @@ -135,7 +135,7 @@ func resourceUsageLimitRead(ctx context.Context, d *schema.ResourceData, meta in arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: names.Redshift, - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("usagelimit:%s", d.Id()), }.String() From dc6104a8e06b0bd320343fe4a18e96e18e088a36 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:25 -0500 Subject: [PATCH 247/304] Make 'AWSClient.Region' a getter - route53. --- internal/service/route53/vpc_association_authorization.go | 2 +- internal/service/route53/zone.go | 4 ++-- internal/service/route53/zone_association.go | 6 +++--- internal/service/route53/zones_data_source.go | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/internal/service/route53/vpc_association_authorization.go b/internal/service/route53/vpc_association_authorization.go index a05b22faf27..ec132a2ffe0 100644 --- a/internal/service/route53/vpc_association_authorization.go +++ b/internal/service/route53/vpc_association_authorization.go @@ -65,7 +65,7 @@ func resourceVPCAssociationAuthorizationCreate(ctx context.Context, d *schema.Re HostedZoneId: aws.String(d.Get("zone_id").(string)), VPC: &awstypes.VPC{ VPCId: aws.String(d.Get(names.AttrVPCID).(string)), - VPCRegion: awstypes.VPCRegion(meta.(*conns.AWSClient).Region), + VPCRegion: awstypes.VPCRegion(meta.(*conns.AWSClient).Region(ctx)), }, } diff --git a/internal/service/route53/zone.go b/internal/service/route53/zone.go index b7e095ce905..400486c2e41 100644 --- a/internal/service/route53/zone.go +++ b/internal/service/route53/zone.go @@ -139,7 +139,7 @@ func resourceZoneCreate(ctx context.Context, d *schema.ResourceData, meta interf // Private Route53 Hosted Zones can only be created with their first VPC association, // however we need to associate the remaining after creation. - vpcs := expandVPCs(d.Get("vpc").(*schema.Set).List(), meta.(*conns.AWSClient).Region) + vpcs := expandVPCs(d.Get("vpc").(*schema.Set).List(), meta.(*conns.AWSClient).Region(ctx)) if len(vpcs) > 0 { input.VPC = vpcs[0] } @@ -252,7 +252,7 @@ func resourceZoneUpdate(ctx context.Context, d *schema.ResourceData, meta interf } if d.HasChange("vpc") { - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) o, n := d.GetChange("vpc") os, ns := o.(*schema.Set), n.(*schema.Set) diff --git a/internal/service/route53/zone_association.go b/internal/service/route53/zone_association.go index 92234639060..6bf4c1ef12f 100644 --- a/internal/service/route53/zone_association.go +++ b/internal/service/route53/zone_association.go @@ -66,7 +66,7 @@ func resourceZoneAssociationCreate(ctx context.Context, d *schema.ResourceData, var diags diag.Diagnostics conn := meta.(*conns.AWSClient).Route53Client(ctx) - vpcRegion := meta.(*conns.AWSClient).Region + vpcRegion := meta.(*conns.AWSClient).Region(ctx) if v, ok := d.GetOk("vpc_region"); ok { vpcRegion = v.(string) } @@ -116,7 +116,7 @@ func resourceZoneAssociationRead(ctx context.Context, d *schema.ResourceData, me vpcRegion = d.Get("vpc_region").(string) } if vpcRegion == "" { - vpcRegion = meta.(*conns.AWSClient).Region + vpcRegion = meta.(*conns.AWSClient).Region(ctx) } hostedZoneSummary, err := findZoneAssociationByThreePartKey(ctx, conn, zoneID, vpcID, vpcRegion) @@ -153,7 +153,7 @@ func resourceZoneAssociationDelete(ctx context.Context, d *schema.ResourceData, vpcRegion = d.Get("vpc_region").(string) } if vpcRegion == "" { - vpcRegion = meta.(*conns.AWSClient).Region + vpcRegion = meta.(*conns.AWSClient).Region(ctx) } log.Printf("[INFO] Deleting Route53 Zone Association: %s", d.Id()) diff --git a/internal/service/route53/zones_data_source.go b/internal/service/route53/zones_data_source.go index b9dd9a5b367..e351750a3a4 100644 --- a/internal/service/route53/zones_data_source.go +++ b/internal/service/route53/zones_data_source.go @@ -67,7 +67,7 @@ func (d *zonesDataSource) Read(ctx context.Context, request datasource.ReadReque } } - data.ID = types.StringValue(d.Meta().Region) + data.ID = types.StringValue(d.Meta().Region(ctx)) data.ZoneIDs = fwflex.FlattenFrameworkStringValueList(ctx, zoneIDs) response.Diagnostics.Append(response.State.Set(ctx, &data)...) From 3d6e5ce75211cdfd847521258a3567ac16fceec9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:26 -0500 Subject: [PATCH 248/304] Make 'AWSClient.Region' a getter - route53resolver. --- internal/service/route53resolver/dnssec_config.go | 2 +- internal/service/route53resolver/rules_data_source.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/route53resolver/dnssec_config.go b/internal/service/route53resolver/dnssec_config.go index 35ce97be053..e2f7602986e 100644 --- a/internal/service/route53resolver/dnssec_config.go +++ b/internal/service/route53resolver/dnssec_config.go @@ -102,7 +102,7 @@ func resourceDNSSECConfigRead(ctx context.Context, d *schema.ResourceData, meta arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "route53resolver", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: ownerID, Resource: fmt.Sprintf("resolver-dnssec-config/%s", resourceID), }.String() diff --git a/internal/service/route53resolver/rules_data_source.go b/internal/service/route53resolver/rules_data_source.go index 8c318ebf8d3..6a45989e8d0 100644 --- a/internal/service/route53resolver/rules_data_source.go +++ b/internal/service/route53resolver/rules_data_source.go @@ -99,7 +99,7 @@ func dataSourceRulesRead(ctx context.Context, d *schema.ResourceData, meta inter } } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set("resolver_rule_ids", aws.ToStringSlice(ruleIDs)) From 1cfe35100958b3fd95531137c0b2df2e0f2a91dd Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:26 -0500 Subject: [PATCH 249/304] Make 'AWSClient.Region' a getter - rum. --- internal/service/rum/app_monitor.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/rum/app_monitor.go b/internal/service/rum/app_monitor.go index 1b7241af92b..5c03c3a0b01 100644 --- a/internal/service/rum/app_monitor.go +++ b/internal/service/rum/app_monitor.go @@ -211,7 +211,7 @@ func resourceAppMonitorRead(ctx context.Context, d *schema.ResourceData, meta in arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "rum", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: "appmonitor/" + name, }.String() From 1db29267d95b0aa79447664f4b661022b8704fe4 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:26 -0500 Subject: [PATCH 250/304] Make 'AWSClient.Region' a getter - s3. --- internal/service/s3/bucket.go | 2 +- .../bucket_replication_configuration_test.go | 4 +- internal/service/s3/bucket_test.go | 84 +++++++++---------- .../s3/directory_buckets_data_source.go | 2 +- internal/service/s3/sweep.go | 4 +- 5 files changed, 48 insertions(+), 48 deletions(-) diff --git a/internal/service/s3/bucket.go b/internal/service/s3/bucket.go index 21f85025f51..57a98962cc7 100644 --- a/internal/service/s3/bucket.go +++ b/internal/service/s3/bucket.go @@ -712,7 +712,7 @@ func resourceBucketCreate(ctx context.Context, d *schema.ResourceData, meta inte conn := meta.(*conns.AWSClient).S3Client(ctx) bucket := create.Name(d.Get(names.AttrBucket).(string), d.Get(names.AttrBucketPrefix).(string)) - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) if err := validBucketName(bucket, region); err != nil { return sdkdiag.AppendErrorf(diags, "validating S3 Bucket (%s) name: %s", bucket, err) diff --git a/internal/service/s3/bucket_replication_configuration_test.go b/internal/service/s3/bucket_replication_configuration_test.go index f2ea01b5a3d..466d99da741 100644 --- a/internal/service/s3/bucket_replication_configuration_test.go +++ b/internal/service/s3/bucket_replication_configuration_test.go @@ -1113,7 +1113,7 @@ func TestAccS3BucketReplicationConfiguration_migrate_noChange(t *testing.T) { { Config: testAccBucketConfig_replicationV2PrefixAndTags(rName), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckBucketExistsWithProvider(ctx, bucketResourceName, acctest.RegionProviderFunc(region, &providers)), + testAccCheckBucketExistsWithProvider(ctx, bucketResourceName, acctest.RegionProviderFunc(ctx, region, &providers)), resource.TestCheckResourceAttr(bucketResourceName, "replication_configuration.0.rules.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(bucketResourceName, "replication_configuration.0.rules.*", map[string]string{ "filter.#": "1", @@ -1156,7 +1156,7 @@ func TestAccS3BucketReplicationConfiguration_migrate_withChange(t *testing.T) { { Config: testAccBucketConfig_replicationV2PrefixAndTags(rName), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckBucketExistsWithProvider(ctx, bucketResourceName, acctest.RegionProviderFunc(region, &providers)), + testAccCheckBucketExistsWithProvider(ctx, bucketResourceName, acctest.RegionProviderFunc(ctx, region, &providers)), resource.TestCheckResourceAttr(bucketResourceName, "replication_configuration.0.rules.#", "1"), resource.TestCheckTypeSetElemNestedAttrs(bucketResourceName, "replication_configuration.0.rules.*", map[string]string{ "filter.#": "1", diff --git a/internal/service/s3/bucket_test.go b/internal/service/s3/bucket_test.go index f436a82207e..1ba3a415f76 100644 --- a/internal/service/s3/bucket_test.go +++ b/internal/service/s3/bucket_test.go @@ -1152,27 +1152,27 @@ func TestAccS3Bucket_Replication_basic(t *testing.T) { { Config: testAccBucketConfig_replication(bucketName, string(types.StorageClassStandard)), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckBucketExistsWithProvider(ctx, resourceName, acctest.RegionProviderFunc(region, &providers)), + testAccCheckBucketExistsWithProvider(ctx, resourceName, acctest.RegionProviderFunc(ctx, region, &providers)), resource.TestCheckResourceAttr(resourceName, "replication_configuration.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "replication_configuration.0.role", iamRoleResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "replication_configuration.0.rules.#", "1"), - testAccCheckBucketExistsWithProvider(ctx, "aws_s3_bucket.destination", acctest.RegionProviderFunc(alternateRegion, &providers)), + testAccCheckBucketExistsWithProvider(ctx, "aws_s3_bucket.destination", acctest.RegionProviderFunc(ctx, alternateRegion, &providers)), ), }, { Config: testAccBucketConfig_replication(bucketName, string(types.StorageClassGlacier)), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckBucketExistsWithProvider(ctx, resourceName, acctest.RegionProviderFunc(region, &providers)), + testAccCheckBucketExistsWithProvider(ctx, resourceName, acctest.RegionProviderFunc(ctx, region, &providers)), resource.TestCheckResourceAttr(resourceName, "replication_configuration.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "replication_configuration.0.role", iamRoleResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "replication_configuration.0.rules.#", "1"), - testAccCheckBucketExistsWithProvider(ctx, "aws_s3_bucket.destination", acctest.RegionProviderFunc(alternateRegion, &providers)), + testAccCheckBucketExistsWithProvider(ctx, "aws_s3_bucket.destination", acctest.RegionProviderFunc(ctx, alternateRegion, &providers)), ), }, { Config: testAccBucketConfig_replicationSSEKMSEncryptedObjects(bucketName), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckBucketExistsWithProvider(ctx, resourceName, acctest.RegionProviderFunc(region, &providers)), + testAccCheckBucketExistsWithProvider(ctx, resourceName, acctest.RegionProviderFunc(ctx, region, &providers)), resource.TestCheckResourceAttr(resourceName, "replication_configuration.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "replication_configuration.0.role", iamRoleResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "replication_configuration.0.rules.#", "1"), @@ -1204,10 +1204,10 @@ func TestAccS3Bucket_Replication_multipleDestinationsEmptyFilter(t *testing.T) { { Config: testAccBucketConfig_replicationMultipleDestinationsEmptyFilter(bucketName), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckBucketExistsWithProvider(ctx, resourceName, acctest.RegionProviderFunc(region, &providers)), - testAccCheckBucketExistsWithProvider(ctx, "aws_s3_bucket.destination", acctest.RegionProviderFunc(alternateRegion, &providers)), - testAccCheckBucketExistsWithProvider(ctx, "aws_s3_bucket.destination2", acctest.RegionProviderFunc(alternateRegion, &providers)), - testAccCheckBucketExistsWithProvider(ctx, "aws_s3_bucket.destination3", acctest.RegionProviderFunc(alternateRegion, &providers)), + testAccCheckBucketExistsWithProvider(ctx, resourceName, acctest.RegionProviderFunc(ctx, region, &providers)), + testAccCheckBucketExistsWithProvider(ctx, "aws_s3_bucket.destination", acctest.RegionProviderFunc(ctx, alternateRegion, &providers)), + testAccCheckBucketExistsWithProvider(ctx, "aws_s3_bucket.destination2", acctest.RegionProviderFunc(ctx, alternateRegion, &providers)), + testAccCheckBucketExistsWithProvider(ctx, "aws_s3_bucket.destination3", acctest.RegionProviderFunc(ctx, alternateRegion, &providers)), resource.TestCheckResourceAttr(resourceName, "replication_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "replication_configuration.0.rules.#", "3"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "replication_configuration.0.rules.*", map[string]string{ @@ -1275,10 +1275,10 @@ func TestAccS3Bucket_Replication_multipleDestinationsNonEmptyFilter(t *testing.T { Config: testAccBucketConfig_replicationMultipleDestinationsNonEmptyFilter(bucketName), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckBucketExistsWithProvider(ctx, resourceName, acctest.RegionProviderFunc(region, &providers)), - testAccCheckBucketExistsWithProvider(ctx, "aws_s3_bucket.destination", acctest.RegionProviderFunc(alternateRegion, &providers)), - testAccCheckBucketExistsWithProvider(ctx, "aws_s3_bucket.destination2", acctest.RegionProviderFunc(alternateRegion, &providers)), - testAccCheckBucketExistsWithProvider(ctx, "aws_s3_bucket.destination3", acctest.RegionProviderFunc(alternateRegion, &providers)), + testAccCheckBucketExistsWithProvider(ctx, resourceName, acctest.RegionProviderFunc(ctx, region, &providers)), + testAccCheckBucketExistsWithProvider(ctx, "aws_s3_bucket.destination", acctest.RegionProviderFunc(ctx, alternateRegion, &providers)), + testAccCheckBucketExistsWithProvider(ctx, "aws_s3_bucket.destination2", acctest.RegionProviderFunc(ctx, alternateRegion, &providers)), + testAccCheckBucketExistsWithProvider(ctx, "aws_s3_bucket.destination3", acctest.RegionProviderFunc(ctx, alternateRegion, &providers)), resource.TestCheckResourceAttr(resourceName, "replication_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "replication_configuration.0.rules.#", "3"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "replication_configuration.0.rules.*", map[string]string{ @@ -1351,9 +1351,9 @@ func TestAccS3Bucket_Replication_twoDestination(t *testing.T) { { Config: testAccBucketConfig_replicationMultipleDestinationsTwoDestination(bucketName), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckBucketExistsWithProvider(ctx, resourceName, acctest.RegionProviderFunc(region, &providers)), - testAccCheckBucketExistsWithProvider(ctx, "aws_s3_bucket.destination", acctest.RegionProviderFunc(alternateRegion, &providers)), - testAccCheckBucketExistsWithProvider(ctx, "aws_s3_bucket.destination2", acctest.RegionProviderFunc(alternateRegion, &providers)), + testAccCheckBucketExistsWithProvider(ctx, resourceName, acctest.RegionProviderFunc(ctx, region, &providers)), + testAccCheckBucketExistsWithProvider(ctx, "aws_s3_bucket.destination", acctest.RegionProviderFunc(ctx, alternateRegion, &providers)), + testAccCheckBucketExistsWithProvider(ctx, "aws_s3_bucket.destination2", acctest.RegionProviderFunc(ctx, alternateRegion, &providers)), resource.TestCheckResourceAttr(resourceName, "replication_configuration.#", "1"), resource.TestCheckResourceAttr(resourceName, "replication_configuration.0.rules.#", "2"), resource.TestCheckTypeSetElemNestedAttrs(resourceName, "replication_configuration.0.rules.*", map[string]string{ @@ -1413,7 +1413,7 @@ func TestAccS3Bucket_Replication_ruleDestinationAccessControlTranslation(t *test { Config: testAccBucketConfig_replicationAccessControlTranslation(bucketName), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckBucketExistsWithProvider(ctx, resourceName, acctest.RegionProviderFunc(region, &providers)), + testAccCheckBucketExistsWithProvider(ctx, resourceName, acctest.RegionProviderFunc(ctx, region, &providers)), resource.TestCheckResourceAttr(resourceName, "replication_configuration.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "replication_configuration.0.role", iamRoleResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "replication_configuration.0.rules.#", "1"), @@ -1434,7 +1434,7 @@ func TestAccS3Bucket_Replication_ruleDestinationAccessControlTranslation(t *test { Config: testAccBucketConfig_replicationSSEKMSEncryptedObjectsAndAccessControlTranslation(bucketName), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckBucketExistsWithProvider(ctx, resourceName, acctest.RegionProviderFunc(region, &providers)), + testAccCheckBucketExistsWithProvider(ctx, resourceName, acctest.RegionProviderFunc(ctx, region, &providers)), resource.TestCheckResourceAttr(resourceName, "replication_configuration.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "replication_configuration.0.role", iamRoleResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "replication_configuration.0.rules.#", "1"), @@ -1467,7 +1467,7 @@ func TestAccS3Bucket_Replication_ruleDestinationAddAccessControlTranslation(t *t { Config: testAccBucketConfig_replicationRulesDestination(bucketName), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckBucketExistsWithProvider(ctx, resourceName, acctest.RegionProviderFunc(region, &providers)), + testAccCheckBucketExistsWithProvider(ctx, resourceName, acctest.RegionProviderFunc(ctx, region, &providers)), resource.TestCheckResourceAttr(resourceName, "replication_configuration.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "replication_configuration.0.role", iamRoleResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "replication_configuration.0.rules.#", "1"), @@ -1488,7 +1488,7 @@ func TestAccS3Bucket_Replication_ruleDestinationAddAccessControlTranslation(t *t { Config: testAccBucketConfig_replicationAccessControlTranslation(bucketName), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckBucketExistsWithProvider(ctx, resourceName, acctest.RegionProviderFunc(region, &providers)), + testAccCheckBucketExistsWithProvider(ctx, resourceName, acctest.RegionProviderFunc(ctx, region, &providers)), resource.TestCheckResourceAttr(resourceName, "replication_configuration.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "replication_configuration.0.role", iamRoleResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "replication_configuration.0.rules.#", "1"), @@ -1521,8 +1521,8 @@ func TestAccS3Bucket_Replication_withoutStorageClass(t *testing.T) { { Config: testAccBucketConfig_replicationNoStorageClass(bucketName), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckBucketExistsWithProvider(ctx, resourceName, acctest.RegionProviderFunc(region, &providers)), - testAccCheckBucketExistsWithProvider(ctx, "aws_s3_bucket.destination", acctest.RegionProviderFunc(alternateRegion, &providers)), + testAccCheckBucketExistsWithProvider(ctx, resourceName, acctest.RegionProviderFunc(ctx, region, &providers)), + testAccCheckBucketExistsWithProvider(ctx, "aws_s3_bucket.destination", acctest.RegionProviderFunc(ctx, alternateRegion, &providers)), ), }, { @@ -1587,8 +1587,8 @@ func TestAccS3Bucket_Replication_withoutPrefix(t *testing.T) { { Config: testAccBucketConfig_replicationNoPrefix(bucketName), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckBucketExistsWithProvider(ctx, resourceName, acctest.RegionProviderFunc(region, &providers)), - testAccCheckBucketExistsWithProvider(ctx, "aws_s3_bucket.destination", acctest.RegionProviderFunc(alternateRegion, &providers)), + testAccCheckBucketExistsWithProvider(ctx, resourceName, acctest.RegionProviderFunc(ctx, region, &providers)), + testAccCheckBucketExistsWithProvider(ctx, "aws_s3_bucket.destination", acctest.RegionProviderFunc(ctx, alternateRegion, &providers)), ), }, { @@ -1629,21 +1629,21 @@ func TestAccS3Bucket_Replication_schemaV2(t *testing.T) { { Config: testAccBucketConfig_replicationV2DeleteMarkerReplicationDisabled(bucketName), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckBucketExistsWithProvider(ctx, resourceName, acctest.RegionProviderFunc(region, &providers)), + testAccCheckBucketExistsWithProvider(ctx, resourceName, acctest.RegionProviderFunc(ctx, region, &providers)), resource.TestCheckResourceAttr(resourceName, "replication_configuration.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "replication_configuration.0.role", iamRoleResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "replication_configuration.0.rules.#", "1"), - testAccCheckBucketExistsWithProvider(ctx, "aws_s3_bucket.destination", acctest.RegionProviderFunc(alternateRegion, &providers)), + testAccCheckBucketExistsWithProvider(ctx, "aws_s3_bucket.destination", acctest.RegionProviderFunc(ctx, alternateRegion, &providers)), ), }, { Config: testAccBucketConfig_replicationV2NoTags(bucketName), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckBucketExistsWithProvider(ctx, resourceName, acctest.RegionProviderFunc(region, &providers)), + testAccCheckBucketExistsWithProvider(ctx, resourceName, acctest.RegionProviderFunc(ctx, region, &providers)), resource.TestCheckResourceAttr(resourceName, "replication_configuration.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "replication_configuration.0.role", iamRoleResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "replication_configuration.0.rules.#", "1"), - testAccCheckBucketExistsWithProvider(ctx, "aws_s3_bucket.destination", acctest.RegionProviderFunc(alternateRegion, &providers)), + testAccCheckBucketExistsWithProvider(ctx, "aws_s3_bucket.destination", acctest.RegionProviderFunc(ctx, alternateRegion, &providers)), ), }, { @@ -1660,31 +1660,31 @@ func TestAccS3Bucket_Replication_schemaV2(t *testing.T) { { Config: testAccBucketConfig_replicationV2OnlyOneTag(bucketName), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckBucketExistsWithProvider(ctx, resourceName, acctest.RegionProviderFunc(region, &providers)), + testAccCheckBucketExistsWithProvider(ctx, resourceName, acctest.RegionProviderFunc(ctx, region, &providers)), resource.TestCheckResourceAttr(resourceName, "replication_configuration.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "replication_configuration.0.role", iamRoleResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "replication_configuration.0.rules.#", "1"), - testAccCheckBucketExistsWithProvider(ctx, "aws_s3_bucket.destination", acctest.RegionProviderFunc(alternateRegion, &providers)), + testAccCheckBucketExistsWithProvider(ctx, "aws_s3_bucket.destination", acctest.RegionProviderFunc(ctx, alternateRegion, &providers)), ), }, { Config: testAccBucketConfig_replicationV2PrefixAndTags(bucketName), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckBucketExistsWithProvider(ctx, resourceName, acctest.RegionProviderFunc(region, &providers)), + testAccCheckBucketExistsWithProvider(ctx, resourceName, acctest.RegionProviderFunc(ctx, region, &providers)), resource.TestCheckResourceAttr(resourceName, "replication_configuration.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "replication_configuration.0.role", iamRoleResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "replication_configuration.0.rules.#", "1"), - testAccCheckBucketExistsWithProvider(ctx, "aws_s3_bucket.destination", acctest.RegionProviderFunc(alternateRegion, &providers)), + testAccCheckBucketExistsWithProvider(ctx, "aws_s3_bucket.destination", acctest.RegionProviderFunc(ctx, alternateRegion, &providers)), ), }, { Config: testAccBucketConfig_replicationV2MultipleTags(bucketName), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckBucketExistsWithProvider(ctx, resourceName, acctest.RegionProviderFunc(region, &providers)), + testAccCheckBucketExistsWithProvider(ctx, resourceName, acctest.RegionProviderFunc(ctx, region, &providers)), resource.TestCheckResourceAttr(resourceName, "replication_configuration.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "replication_configuration.0.role", iamRoleResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "replication_configuration.0.rules.#", "1"), - testAccCheckBucketExistsWithProvider(ctx, "aws_s3_bucket.destination", acctest.RegionProviderFunc(alternateRegion, &providers)), + testAccCheckBucketExistsWithProvider(ctx, "aws_s3_bucket.destination", acctest.RegionProviderFunc(ctx, alternateRegion, &providers)), ), }, }, @@ -1751,44 +1751,44 @@ func TestAccS3Bucket_Replication_RTC_valid(t *testing.T) { { Config: testAccBucketConfig_replicationV2RTC(bucketName, 15), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckBucketExistsWithProvider(ctx, resourceName, acctest.RegionProviderFunc(region, &providers)), + testAccCheckBucketExistsWithProvider(ctx, resourceName, acctest.RegionProviderFunc(ctx, region, &providers)), resource.TestCheckResourceAttr(resourceName, "replication_configuration.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "replication_configuration.0.role", iamRoleResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "replication_configuration.0.rules.#", "1"), - testAccCheckBucketExistsWithProvider(ctx, "aws_s3_bucket.destination", acctest.RegionProviderFunc(alternateRegion, &providers)), + testAccCheckBucketExistsWithProvider(ctx, "aws_s3_bucket.destination", acctest.RegionProviderFunc(ctx, alternateRegion, &providers)), ), }, { Config: testAccBucketConfig_replicationV2RTCNoMinutes(bucketName), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckBucketExistsWithProvider(ctx, resourceName, acctest.RegionProviderFunc(region, &providers)), + testAccCheckBucketExistsWithProvider(ctx, resourceName, acctest.RegionProviderFunc(ctx, region, &providers)), resource.TestCheckResourceAttr(resourceName, "replication_configuration.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "replication_configuration.0.role", iamRoleResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "replication_configuration.0.rules.#", "1"), - testAccCheckBucketExistsWithProvider(ctx, "aws_s3_bucket.destination", acctest.RegionProviderFunc(alternateRegion, &providers)), + testAccCheckBucketExistsWithProvider(ctx, "aws_s3_bucket.destination", acctest.RegionProviderFunc(ctx, alternateRegion, &providers)), ), }, { Config: testAccBucketConfig_replicationV2RTCNoStatus(bucketName), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckBucketExistsWithProvider(ctx, resourceName, acctest.RegionProviderFunc(region, &providers)), + testAccCheckBucketExistsWithProvider(ctx, resourceName, acctest.RegionProviderFunc(ctx, region, &providers)), resource.TestCheckResourceAttr(resourceName, "replication_configuration.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "replication_configuration.0.role", iamRoleResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "replication_configuration.0.rules.#", "1"), - testAccCheckBucketExistsWithProvider(ctx, "aws_s3_bucket.destination", acctest.RegionProviderFunc(alternateRegion, &providers)), + testAccCheckBucketExistsWithProvider(ctx, "aws_s3_bucket.destination", acctest.RegionProviderFunc(ctx, alternateRegion, &providers)), ), }, { Config: testAccBucketConfig_replicationV2RTCNotConfigured(bucketName), Check: resource.ComposeAggregateTestCheckFunc( - testAccCheckBucketExistsWithProvider(ctx, resourceName, acctest.RegionProviderFunc(region, &providers)), + testAccCheckBucketExistsWithProvider(ctx, resourceName, acctest.RegionProviderFunc(ctx, region, &providers)), resource.TestCheckResourceAttr(resourceName, "replication_configuration.#", "1"), resource.TestCheckResourceAttrPair(resourceName, "replication_configuration.0.role", iamRoleResourceName, names.AttrARN), resource.TestCheckResourceAttr(resourceName, "replication_configuration.0.rules.#", "1"), resource.TestCheckResourceAttr(resourceName, "replication_configuration.0.rules.0.destination.#", "1"), resource.TestCheckResourceAttr(resourceName, "replication_configuration.0.rules.0.destination.0.replication_time.#", "1"), resource.TestCheckResourceAttr(resourceName, "replication_configuration.0.rules.0.destination.0.metrics.#", "1"), - testAccCheckBucketExistsWithProvider(ctx, "aws_s3_bucket.destination", acctest.RegionProviderFunc(alternateRegion, &providers)), + testAccCheckBucketExistsWithProvider(ctx, "aws_s3_bucket.destination", acctest.RegionProviderFunc(ctx, alternateRegion, &providers)), ), }, }, diff --git a/internal/service/s3/directory_buckets_data_source.go b/internal/service/s3/directory_buckets_data_source.go index 645cb587af1..81e83e1b916 100644 --- a/internal/service/s3/directory_buckets_data_source.go +++ b/internal/service/s3/directory_buckets_data_source.go @@ -81,7 +81,7 @@ func (d *directoryBucketsDataSource) Read(ctx context.Context, request datasourc return d.Meta().RegionalARN(ctx, "s3express", fmt.Sprintf("bucket/%s", v)) })) data.Buckets = flex.FlattenFrameworkStringValueList(ctx, buckets) - data.ID = types.StringValue(d.Meta().Region) + data.ID = types.StringValue(d.Meta().Region(ctx)) response.Diagnostics.Append(response.State.Set(ctx, &data)...) } diff --git a/internal/service/s3/sweep.go b/internal/service/s3/sweep.go index 3c0d4579276..1134a70f7e8 100644 --- a/internal/service/s3/sweep.go +++ b/internal/service/s3/sweep.go @@ -56,7 +56,7 @@ func sweepGeneralPurposeBucketObjects(ctx context.Context, client *conns.AWSClie var sweepables []sweep.Sweepable input := s3.ListBucketsInput{ - BucketRegion: aws.String(client.Region), + BucketRegion: aws.String(client.Region(ctx)), } pages := s3.NewListBucketsPaginator(conn, &input) for pages.HasMorePages() { @@ -167,7 +167,7 @@ func sweepBuckets(ctx context.Context, client *conns.AWSClient) ([]sweep.Sweepab r := resourceBucket() input := s3.ListBucketsInput{ - BucketRegion: aws.String(client.Region), + BucketRegion: aws.String(client.Region(ctx)), } pages := s3.NewListBucketsPaginator(conn, &input) for pages.HasMorePages() { From 9860b9f7a75b8112f3d0662d20122ae13b231a4c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:26 -0500 Subject: [PATCH 251/304] Make 'AWSClient.Region' a getter - s3control. --- internal/service/s3control/access_point.go | 2 +- internal/service/s3control/object_lambda_access_point.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/s3control/access_point.go b/internal/service/s3control/access_point.go index 4d37b7aec58..3fc55ce0498 100644 --- a/internal/service/s3control/access_point.go +++ b/internal/service/s3control/access_point.go @@ -275,7 +275,7 @@ func resourceAccessPointRead(ctx context.Context, d *schema.ResourceData, meta i accessPointARN := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "s3", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: accountID, Resource: fmt.Sprintf("accesspoint/%s", aws.ToString(output.Name)), } diff --git a/internal/service/s3control/object_lambda_access_point.go b/internal/service/s3control/object_lambda_access_point.go index 371bb3b35a2..55d69b00184 100644 --- a/internal/service/s3control/object_lambda_access_point.go +++ b/internal/service/s3control/object_lambda_access_point.go @@ -189,7 +189,7 @@ func resourceObjectLambdaAccessPointRead(ctx context.Context, d *schema.Resource arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "s3-object-lambda", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: accountID, Resource: fmt.Sprintf("accesspoint/%s", name), }.String() From b01a3c2c785f8adfd562d5b85106df66df1dea1c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:26 -0500 Subject: [PATCH 252/304] Make 'AWSClient.Region' a getter - sagemaker. --- internal/service/sagemaker/prebuilt_ecr_image_data_source.go | 2 +- internal/service/sagemaker/servicecatalog_portfolio_status.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go index 082b45b9aa0..614394e36e6 100644 --- a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go +++ b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go @@ -842,7 +842,7 @@ func dataSourcePrebuiltECRImage() *schema.Resource { func dataSourcePrebuiltECRImageRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) if v, ok := d.GetOk(names.AttrRegion); ok { region = v.(string) } diff --git a/internal/service/sagemaker/servicecatalog_portfolio_status.go b/internal/service/sagemaker/servicecatalog_portfolio_status.go index 646cc5bb9f2..af1c17f1af5 100644 --- a/internal/service/sagemaker/servicecatalog_portfolio_status.go +++ b/internal/service/sagemaker/servicecatalog_portfolio_status.go @@ -54,7 +54,7 @@ func resourceServicecatalogPortfolioStatusPut(ctx context.Context, d *schema.Res return sdkdiag.AppendErrorf(diags, "setting SageMaker Servicecatalog Portfolio Status: %s", err) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) return append(diags, resourceServicecatalogPortfolioStatusRead(ctx, d, meta)...) } From 7f1495bef189709fe4f698384619a92ab422982d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:27 -0500 Subject: [PATCH 253/304] Make 'AWSClient.Region' a getter - secretsmanager. --- internal/service/secretsmanager/secrets_data_source.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/secretsmanager/secrets_data_source.go b/internal/service/secretsmanager/secrets_data_source.go index 3a9102c56b4..477fc561bed 100644 --- a/internal/service/secretsmanager/secrets_data_source.go +++ b/internal/service/secretsmanager/secrets_data_source.go @@ -63,7 +63,7 @@ func dataSourceSecretsRead(ctx context.Context, d *schema.ResourceData, meta int } } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrARNs, tfslices.ApplyToAll(results, func(v types.SecretListEntry) string { return aws.ToString(v.ARN) })) d.Set(names.AttrNames, tfslices.ApplyToAll(results, func(v types.SecretListEntry) string { return aws.ToString(v.Name) })) From b502f95d363954c3449561c0de282f623bd43c30 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:27 -0500 Subject: [PATCH 254/304] Make 'AWSClient.Region' a getter - securityhub. --- .../securityhub/standards_control_associations_data_source.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/securityhub/standards_control_associations_data_source.go b/internal/service/securityhub/standards_control_associations_data_source.go index 27f342a986a..8db0af53875 100644 --- a/internal/service/securityhub/standards_control_associations_data_source.go +++ b/internal/service/securityhub/standards_control_associations_data_source.go @@ -74,7 +74,7 @@ func (d *standardsControlAssociationsDataSource) Read(ctx context.Context, reque return } - data.ID = types.StringValue(d.Meta().Region) + data.ID = types.StringValue(d.Meta().Region(ctx)) response.Diagnostics.Append(fwflex.Flatten(ctx, out, &data.StandardsControlAssociations)...) response.Diagnostics.Append(response.State.Set(ctx, &data)...) } From 06792bf332dbe6b3293440fe1e08eee7c0c2a2b8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:27 -0500 Subject: [PATCH 255/304] Make 'AWSClient.Region' a getter - securitylake. --- internal/service/securitylake/data_lake.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/securitylake/data_lake.go b/internal/service/securitylake/data_lake.go index 2a36dacdc97..43fdbadef0f 100644 --- a/internal/service/securitylake/data_lake.go +++ b/internal/service/securitylake/data_lake.go @@ -270,7 +270,7 @@ func (r *dataLakeResource) Read(ctx context.Context, request resource.ReadReques // Transparent tagging fails with "ResourceNotFoundException: The request failed because the specified resource doesn't exist." // if the data lake's AWS Region isn't the configured one. - if region := configuration.Region.ValueString(); region != r.Meta().Region { + if region := configuration.Region.ValueString(); region != r.Meta().Region(ctx) { if tags, err := listTags(ctx, conn, data.ID.ValueString(), func(o *securitylake.Options) { o.Region = region }); err == nil { setTagsOut(ctx, Tags(tags)) } From 7c706929eda77862513a006eb5b47b26e89619bf Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:27 -0500 Subject: [PATCH 256/304] Make 'AWSClient.Region' a getter - ses. --- internal/service/ses/active_receipt_rule_set.go | 4 ++-- internal/service/ses/active_receipt_rule_set_data_source.go | 2 +- internal/service/ses/configuration_set.go | 2 +- internal/service/ses/domain_identity.go | 2 +- internal/service/ses/domain_identity_data_source.go | 2 +- internal/service/ses/domain_identity_verification.go | 2 +- internal/service/ses/email_identity.go | 2 +- internal/service/ses/email_identity_data_source.go | 2 +- internal/service/ses/event_destination.go | 2 +- internal/service/ses/receipt_filter.go | 2 +- internal/service/ses/receipt_rule.go | 2 +- internal/service/ses/receipt_rule_set.go | 2 +- internal/service/ses/template.go | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/internal/service/ses/active_receipt_rule_set.go b/internal/service/ses/active_receipt_rule_set.go index 9e151203d47..1a35b0113fb 100644 --- a/internal/service/ses/active_receipt_rule_set.go +++ b/internal/service/ses/active_receipt_rule_set.go @@ -88,7 +88,7 @@ func resourceActiveReceiptRuleSetRead(ctx context.Context, d *schema.ResourceDat arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "ses", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("receipt-rule-set/%s", d.Id()), }.String() @@ -134,7 +134,7 @@ func resourceActiveReceiptRuleSetImport(ctx context.Context, d *schema.ResourceD arnValue := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "ses", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("receipt-rule-set/%s", d.Id()), }.String() diff --git a/internal/service/ses/active_receipt_rule_set_data_source.go b/internal/service/ses/active_receipt_rule_set_data_source.go index 9dc5b7c3cd8..6357d2b48bd 100644 --- a/internal/service/ses/active_receipt_rule_set_data_source.go +++ b/internal/service/ses/active_receipt_rule_set_data_source.go @@ -49,7 +49,7 @@ func dataSourceActiveReceiptRuleSetRead(ctx context.Context, d *schema.ResourceD arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "ses", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("receipt-rule-set/%s", name), }.String() diff --git a/internal/service/ses/configuration_set.go b/internal/service/ses/configuration_set.go index b30934eba63..46c231fea80 100644 --- a/internal/service/ses/configuration_set.go +++ b/internal/service/ses/configuration_set.go @@ -198,7 +198,7 @@ func resourceConfigurationSetRead(ctx context.Context, d *schema.ResourceData, m arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "ses", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("configuration-set/%s", d.Id()), }.String() diff --git a/internal/service/ses/domain_identity.go b/internal/service/ses/domain_identity.go index 4fb2ad63043..491b3d92b44 100644 --- a/internal/service/ses/domain_identity.go +++ b/internal/service/ses/domain_identity.go @@ -89,7 +89,7 @@ func resourceDomainIdentityRead(ctx context.Context, d *schema.ResourceData, met arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "ses", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("identity/%s", d.Id()), }.String() diff --git a/internal/service/ses/domain_identity_data_source.go b/internal/service/ses/domain_identity_data_source.go index 3728ab2ba27..89d4d280ab3 100644 --- a/internal/service/ses/domain_identity_data_source.go +++ b/internal/service/ses/domain_identity_data_source.go @@ -55,7 +55,7 @@ func dataSourceDomainIdentityRead(ctx context.Context, d *schema.ResourceData, m arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "ses", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("identity/%s", domainName), }.String() diff --git a/internal/service/ses/domain_identity_verification.go b/internal/service/ses/domain_identity_verification.go index 3dc5a6eb841..17e05282083 100644 --- a/internal/service/ses/domain_identity_verification.go +++ b/internal/service/ses/domain_identity_verification.go @@ -99,7 +99,7 @@ func resourceDomainIdentityVerificationRead(ctx context.Context, d *schema.Resou arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "ses", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("identity/%s", d.Id()), }.String() diff --git a/internal/service/ses/email_identity.go b/internal/service/ses/email_identity.go index 7362b35f0e5..88771610499 100644 --- a/internal/service/ses/email_identity.go +++ b/internal/service/ses/email_identity.go @@ -89,7 +89,7 @@ func resourceEmailIdentityRead(ctx context.Context, d *schema.ResourceData, meta arn := arn.ARN{ AccountID: meta.(*conns.AWSClient).AccountID(ctx), Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Resource: fmt.Sprintf("identity/%s", d.Id()), Service: "ses", }.String() diff --git a/internal/service/ses/email_identity_data_source.go b/internal/service/ses/email_identity_data_source.go index 2938904e5ee..b04c801ab27 100644 --- a/internal/service/ses/email_identity_data_source.go +++ b/internal/service/ses/email_identity_data_source.go @@ -52,7 +52,7 @@ func dataSourceEmailIdentityRead(ctx context.Context, d *schema.ResourceData, me arn := arn.ARN{ AccountID: meta.(*conns.AWSClient).AccountID(ctx), Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Resource: fmt.Sprintf("identity/%s", email), Service: "ses", }.String() diff --git a/internal/service/ses/event_destination.go b/internal/service/ses/event_destination.go index cd351163f57..26543d8b269 100644 --- a/internal/service/ses/event_destination.go +++ b/internal/service/ses/event_destination.go @@ -211,7 +211,7 @@ func resourceEventDestinationRead(ctx context.Context, d *schema.ResourceData, m arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "ses", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("configuration-set/%s:event-destination/%s", configurationSetName, d.Id()), }.String() diff --git a/internal/service/ses/receipt_filter.go b/internal/service/ses/receipt_filter.go index fc7672657fd..5582003d3f5 100644 --- a/internal/service/ses/receipt_filter.go +++ b/internal/service/ses/receipt_filter.go @@ -115,7 +115,7 @@ func resourceReceiptFilterRead(ctx context.Context, d *schema.ResourceData, meta arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "ses", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("receipt-filter/%s", d.Id()), }.String() diff --git a/internal/service/ses/receipt_rule.go b/internal/service/ses/receipt_rule.go index ff29db9438d..e30585d32f0 100644 --- a/internal/service/ses/receipt_rule.go +++ b/internal/service/ses/receipt_rule.go @@ -338,7 +338,7 @@ func resourceReceiptRuleRead(ctx context.Context, d *schema.ResourceData, meta i arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "ses", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("receipt-rule-set/%s:receipt-rule/%s", ruleSetName, d.Id()), }.String() diff --git a/internal/service/ses/receipt_rule_set.go b/internal/service/ses/receipt_rule_set.go index 3bd1a7ea8b3..d11eba9115e 100644 --- a/internal/service/ses/receipt_rule_set.go +++ b/internal/service/ses/receipt_rule_set.go @@ -89,7 +89,7 @@ func resourceReceiptRuleSetRead(ctx context.Context, d *schema.ResourceData, met arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "ses", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("receipt-rule-set/%s", name), }.String() diff --git a/internal/service/ses/template.go b/internal/service/ses/template.go index 8f0962f275c..ba0bf7c063a 100644 --- a/internal/service/ses/template.go +++ b/internal/service/ses/template.go @@ -118,7 +118,7 @@ func resourceTemplateRead(ctx context.Context, d *schema.ResourceData, meta inte arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "ses", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("template/%s", d.Id()), }.String() From 3b28b5677c90d38933da470f57c1f13746390650 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:27 -0500 Subject: [PATCH 257/304] Make 'AWSClient.Region' a getter - sesv2. --- internal/service/sesv2/contact_list.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/sesv2/contact_list.go b/internal/service/sesv2/contact_list.go index 019002a4b11..719becc6ce8 100644 --- a/internal/service/sesv2/contact_list.go +++ b/internal/service/sesv2/contact_list.go @@ -150,7 +150,7 @@ func resourceContactListRead(ctx context.Context, d *schema.ResourceData, meta i arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "ses", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("contact-list/%s", d.Id()), }.String() From e2b618fadc90fc71494d482a911e6ab18693319f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:28 -0500 Subject: [PATCH 258/304] Make 'AWSClient.Region' a getter - sqs. --- internal/service/sqs/queues_data_source.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/sqs/queues_data_source.go b/internal/service/sqs/queues_data_source.go index e90b9d617a3..81568cba48f 100644 --- a/internal/service/sqs/queues_data_source.go +++ b/internal/service/sqs/queues_data_source.go @@ -55,7 +55,7 @@ func dataSourceQueuesRead(ctx context.Context, d *schema.ResourceData, meta inte queueURLs = append(queueURLs, page.QueueUrls...) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set("queue_urls", queueURLs) return diags From 771be640385daa719c678c8c957ba0c3971fa619 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:28 -0500 Subject: [PATCH 259/304] Make 'AWSClient.Region' a getter - ssm. --- internal/service/ssm/association.go | 2 +- internal/service/ssm/instances_data_source.go | 2 +- internal/service/ssm/maintenance_window_task.go | 2 +- internal/service/ssm/maintenance_windows_data_source.go | 2 +- internal/service/ssm/patch_baseline.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/service/ssm/association.go b/internal/service/ssm/association.go index aede41ecb70..7a5f7acff18 100644 --- a/internal/service/ssm/association.go +++ b/internal/service/ssm/association.go @@ -279,7 +279,7 @@ func resourceAssociationRead(ctx context.Context, d *schema.ResourceData, meta i arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "ssm", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: "association/" + aws.ToString(association.AssociationId), }.String() diff --git a/internal/service/ssm/instances_data_source.go b/internal/service/ssm/instances_data_source.go index 7149a57f96f..be87f3d64dd 100644 --- a/internal/service/ssm/instances_data_source.go +++ b/internal/service/ssm/instances_data_source.go @@ -73,7 +73,7 @@ func dataSourceInstancesRead(ctx context.Context, d *schema.ResourceData, meta i output = append(output, page.InstanceInformationList...) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrIDs, tfslices.ApplyToAll(output, func(v awstypes.InstanceInformation) string { return aws.ToString(v.InstanceId) })) diff --git a/internal/service/ssm/maintenance_window_task.go b/internal/service/ssm/maintenance_window_task.go index 5dd8ebd7de3..a40b3ef5120 100644 --- a/internal/service/ssm/maintenance_window_task.go +++ b/internal/service/ssm/maintenance_window_task.go @@ -399,7 +399,7 @@ func resourceMaintenanceWindowTaskRead(ctx context.Context, d *schema.ResourceDa arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "ssm", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: "windowtask/" + windowTaskID, }.String() diff --git a/internal/service/ssm/maintenance_windows_data_source.go b/internal/service/ssm/maintenance_windows_data_source.go index 4686bd43e10..81605dd3f19 100644 --- a/internal/service/ssm/maintenance_windows_data_source.go +++ b/internal/service/ssm/maintenance_windows_data_source.go @@ -72,7 +72,7 @@ func dataMaintenanceWindowsRead(ctx context.Context, d *schema.ResourceData, met output = append(output, page.WindowIdentities...) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrIDs, tfslices.ApplyToAll(output, func(v awstypes.MaintenanceWindowIdentity) string { return aws.ToString(v.WindowId) })) diff --git a/internal/service/ssm/patch_baseline.go b/internal/service/ssm/patch_baseline.go index eaeb32a85c1..77ebcf1fdc6 100644 --- a/internal/service/ssm/patch_baseline.go +++ b/internal/service/ssm/patch_baseline.go @@ -329,7 +329,7 @@ func resourcePatchBaselineRead(ctx context.Context, d *schema.ResourceData, meta d.Set("approved_patches_enable_non_security", output.ApprovedPatchesEnableNonSecurity) arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Service: "ssm", AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: "patchbaseline/" + strings.TrimPrefix(d.Id(), "/"), From 6cf82d3503b2730f8949da2d38ea75c94e03e360 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:29 -0500 Subject: [PATCH 260/304] Make 'AWSClient.Region' a getter - ssoadmin. --- internal/service/ssoadmin/application_providers_data_source.go | 2 +- internal/service/ssoadmin/instances_data_source.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/ssoadmin/application_providers_data_source.go b/internal/service/ssoadmin/application_providers_data_source.go index 3c9ed351bba..34b4ccea41b 100644 --- a/internal/service/ssoadmin/application_providers_data_source.go +++ b/internal/service/ssoadmin/application_providers_data_source.go @@ -81,7 +81,7 @@ func (d *dataSourceApplicationProviders) Read(ctx context.Context, req datasourc if resp.Diagnostics.HasError() { return } - data.ID = types.StringValue(d.Meta().Region) + data.ID = types.StringValue(d.Meta().Region(ctx)) paginator := ssoadmin.NewListApplicationProvidersPaginator(conn, &ssoadmin.ListApplicationProvidersInput{}) var apiObjects []awstypes.ApplicationProvider diff --git a/internal/service/ssoadmin/instances_data_source.go b/internal/service/ssoadmin/instances_data_source.go index e1eab45335c..50b7588106b 100644 --- a/internal/service/ssoadmin/instances_data_source.go +++ b/internal/service/ssoadmin/instances_data_source.go @@ -53,7 +53,7 @@ func dataSourceInstancesRead(ctx context.Context, d *schema.ResourceData, meta i arns = append(arns, aws.ToString(v.InstanceArn)) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) d.Set(names.AttrARNs, arns) d.Set("identity_store_ids", identityStoreIDs) From 5b2879e3f9d550300dcdb773fdcf136f43d2c9ef Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:29 -0500 Subject: [PATCH 261/304] Make 'AWSClient.Region' a getter - storagegateway. --- internal/service/storagegateway/gateway.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/storagegateway/gateway.go b/internal/service/storagegateway/gateway.go index f3f52957fa9..081490a117b 100644 --- a/internal/service/storagegateway/gateway.go +++ b/internal/service/storagegateway/gateway.go @@ -278,7 +278,7 @@ func resourceGatewayCreate(ctx context.Context, d *schema.ResourceData, meta int var diags diag.Diagnostics conn := meta.(*conns.AWSClient).StorageGatewayClient(ctx) - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) activationKey := d.Get("activation_key").(string) // Perform one time fetch of activation key from gateway IP address. From cacc559d0c71f97c7d6797ae024067e0ed67ca21 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:29 -0500 Subject: [PATCH 262/304] Make 'AWSClient.Region' a getter - synthetics. --- internal/service/synthetics/canary.go | 2 +- internal/service/synthetics/runtime_versions_data_source.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/service/synthetics/canary.go b/internal/service/synthetics/canary.go index 09fe6775d67..e015574319c 100644 --- a/internal/service/synthetics/canary.go +++ b/internal/service/synthetics/canary.go @@ -380,7 +380,7 @@ func resourceCanaryRead(ctx context.Context, d *schema.ResourceData, meta interf canaryArn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "synthetics", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: fmt.Sprintf("canary:%s", aws.ToString(canary.Name)), }.String() diff --git a/internal/service/synthetics/runtime_versions_data_source.go b/internal/service/synthetics/runtime_versions_data_source.go index 3de433a5c74..02ce4afd5aa 100644 --- a/internal/service/synthetics/runtime_versions_data_source.go +++ b/internal/service/synthetics/runtime_versions_data_source.go @@ -83,7 +83,7 @@ func (d *dataSourceRuntimeVersions) Read(ctx context.Context, req datasource.Rea return } - data.ID = flex.StringValueToFramework(ctx, d.Meta().Region) + data.ID = flex.StringValueToFramework(ctx, d.Meta().Region(ctx)) resp.Diagnostics.Append(flex.Flatten(ctx, out, &data.RuntimeVersions)...) resp.Diagnostics.Append(resp.State.Set(ctx, &data)...) } From 45295fdbdcadc3e1168f50d9cbc8275726e7a122 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:30 -0500 Subject: [PATCH 263/304] Make 'AWSClient.Region' a getter - transcribe. --- internal/service/transcribe/language_model.go | 2 +- internal/service/transcribe/medical_vocabulary.go | 2 +- internal/service/transcribe/vocabulary.go | 2 +- internal/service/transcribe/vocabulary_filter.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/service/transcribe/language_model.go b/internal/service/transcribe/language_model.go index b33c31e84d0..eb17d36c886 100644 --- a/internal/service/transcribe/language_model.go +++ b/internal/service/transcribe/language_model.go @@ -169,7 +169,7 @@ func resourceLanguageModelRead(ctx context.Context, d *schema.ResourceData, meta AccountID: meta.(*conns.AWSClient).AccountID(ctx), Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "transcribe", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Resource: fmt.Sprintf("language-model/%s", d.Id()), }.String() diff --git a/internal/service/transcribe/medical_vocabulary.go b/internal/service/transcribe/medical_vocabulary.go index c5ce7ee368f..4052d0ea811 100644 --- a/internal/service/transcribe/medical_vocabulary.go +++ b/internal/service/transcribe/medical_vocabulary.go @@ -129,7 +129,7 @@ func resourceMedicalVocabularyRead(ctx context.Context, d *schema.ResourceData, AccountID: meta.(*conns.AWSClient).AccountID(ctx), Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "transcribe", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Resource: fmt.Sprintf("medical-vocabulary/%s", d.Id()), }.String() diff --git a/internal/service/transcribe/vocabulary.go b/internal/service/transcribe/vocabulary.go index 1b1b9a23b42..ef0086856f8 100644 --- a/internal/service/transcribe/vocabulary.go +++ b/internal/service/transcribe/vocabulary.go @@ -148,7 +148,7 @@ func resourceVocabularyRead(ctx context.Context, d *schema.ResourceData, meta in AccountID: meta.(*conns.AWSClient).AccountID(ctx), Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "transcribe", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Resource: fmt.Sprintf("vocabulary/%s", d.Id()), }.String() diff --git a/internal/service/transcribe/vocabulary_filter.go b/internal/service/transcribe/vocabulary_filter.go index 6c883c314b8..4188608f21b 100644 --- a/internal/service/transcribe/vocabulary_filter.go +++ b/internal/service/transcribe/vocabulary_filter.go @@ -146,7 +146,7 @@ func resourceVocabularyFilterRead(ctx context.Context, d *schema.ResourceData, m AccountID: meta.(*conns.AWSClient).AccountID(ctx), Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "transcribe", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), Resource: fmt.Sprintf("vocabulary-filter/%s", d.Id()), }.String() From 2f2d6995c2fda5233968a6277814645a4e0447ec Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:30 -0500 Subject: [PATCH 264/304] Make 'AWSClient.Region' a getter - wafregional. --- internal/service/wafregional/byte_match_set.go | 6 +++--- internal/service/wafregional/geo_match_set.go | 6 +++--- internal/service/wafregional/ipset.go | 8 ++++---- internal/service/wafregional/rate_based_rule.go | 8 ++++---- internal/service/wafregional/regex_match_set.go | 6 +++--- internal/service/wafregional/regex_pattern_set.go | 6 +++--- internal/service/wafregional/rule.go | 8 ++++---- internal/service/wafregional/rule_group.go | 8 ++++---- internal/service/wafregional/size_constraint_set.go | 6 +++--- .../service/wafregional/sql_injection_match_set.go | 6 +++--- internal/service/wafregional/web_acl.go | 10 +++++----- internal/service/wafregional/xss_match_set.go | 6 +++--- 12 files changed, 42 insertions(+), 42 deletions(-) diff --git a/internal/service/wafregional/byte_match_set.go b/internal/service/wafregional/byte_match_set.go index 2c285ed84bf..2e5681e64e8 100644 --- a/internal/service/wafregional/byte_match_set.go +++ b/internal/service/wafregional/byte_match_set.go @@ -83,7 +83,7 @@ func resourceByteMatchSet() *schema.Resource { func resourceByteMatchSetCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).WAFRegionalClient(ctx) - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) name := d.Get(names.AttrName).(string) output, err := newRetryer(conn, region).RetryWithToken(ctx, func(token *string) (interface{}, error) { @@ -131,7 +131,7 @@ func resourceByteMatchSetRead(ctx context.Context, d *schema.ResourceData, meta func resourceByteMatchSetUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).WAFRegionalClient(ctx) - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) if d.HasChange("byte_match_tuples") { o, n := d.GetChange("byte_match_tuples") @@ -147,7 +147,7 @@ func resourceByteMatchSetUpdate(ctx context.Context, d *schema.ResourceData, met func resourceByteMatchSetDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).WAFRegionalClient(ctx) - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) if oldT := d.Get("byte_match_tuples").(*schema.Set).List(); len(oldT) > 0 { var newT []interface{} diff --git a/internal/service/wafregional/geo_match_set.go b/internal/service/wafregional/geo_match_set.go index 655936aabe0..a7842ad4d38 100644 --- a/internal/service/wafregional/geo_match_set.go +++ b/internal/service/wafregional/geo_match_set.go @@ -62,7 +62,7 @@ func resourceGeoMatchSet() *schema.Resource { func resourceGeoMatchSetCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).WAFRegionalClient(ctx) - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) name := d.Get(names.AttrName).(string) outputRaw, err := newRetryer(conn, region).RetryWithToken(ctx, func(token *string) (interface{}, error) { @@ -110,7 +110,7 @@ func resourceGeoMatchSetRead(ctx context.Context, d *schema.ResourceData, meta i func resourceGeoMatchSetUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).WAFRegionalClient(ctx) - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) if d.HasChange("geo_match_constraint") { o, n := d.GetChange("geo_match_constraint") @@ -126,7 +126,7 @@ func resourceGeoMatchSetUpdate(ctx context.Context, d *schema.ResourceData, meta func resourceGeoMatchSetDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).WAFRegionalClient(ctx) - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) if oldConstraints := d.Get("geo_match_constraint").(*schema.Set).List(); len(oldConstraints) > 0 { var newConstraints []interface{} diff --git a/internal/service/wafregional/ipset.go b/internal/service/wafregional/ipset.go index 357436ad667..a43bd89c82a 100644 --- a/internal/service/wafregional/ipset.go +++ b/internal/service/wafregional/ipset.go @@ -67,7 +67,7 @@ func resourceIPSet() *schema.Resource { func resourceIPSetCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).WAFRegionalClient(ctx) - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) name := d.Get(names.AttrName).(string) output, err := newRetryer(conn, region).RetryWithToken(ctx, func(token *string) (interface{}, error) { @@ -107,7 +107,7 @@ func resourceIPSetRead(ctx context.Context, d *schema.ResourceData, meta interfa arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "waf-regional", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: "ipset/" + d.Id(), } @@ -123,7 +123,7 @@ func resourceIPSetRead(ctx context.Context, d *schema.ResourceData, meta interfa func resourceIPSetUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).WAFRegionalClient(ctx) - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) if d.HasChange("ip_set_descriptor") { o, n := d.GetChange("ip_set_descriptor") @@ -139,7 +139,7 @@ func resourceIPSetUpdate(ctx context.Context, d *schema.ResourceData, meta inter func resourceIPSetDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).WAFRegionalClient(ctx) - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) if oldD := d.Get("ip_set_descriptor").(*schema.Set).List(); len(oldD) > 0 { var newD []interface{} diff --git a/internal/service/wafregional/rate_based_rule.go b/internal/service/wafregional/rate_based_rule.go index 90869df2a2a..457f325d714 100644 --- a/internal/service/wafregional/rate_based_rule.go +++ b/internal/service/wafregional/rate_based_rule.go @@ -97,7 +97,7 @@ func resourceRateBasedRule() *schema.Resource { func resourceRateBasedRuleCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).WAFRegionalClient(ctx) - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) name := d.Get(names.AttrName).(string) outputRaw, err := newRetryer(conn, region).RetryWithToken(ctx, func(token *string) (interface{}, error) { @@ -159,7 +159,7 @@ func resourceRateBasedRuleRead(ctx context.Context, d *schema.ResourceData, meta arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "waf-regional", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: "ratebasedrule/" + d.Id(), }.String() @@ -178,7 +178,7 @@ func resourceRateBasedRuleRead(ctx context.Context, d *schema.ResourceData, meta func resourceRateBasedRuleUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).WAFRegionalClient(ctx) - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) if d.HasChanges("predicate", "rate_limit") { o, n := d.GetChange("predicate") @@ -194,7 +194,7 @@ func resourceRateBasedRuleUpdate(ctx context.Context, d *schema.ResourceData, me func resourceRateBasedRuleDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).WAFRegionalClient(ctx) - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) if oldPredicates := d.Get("predicate").(*schema.Set).List(); len(oldPredicates) > 0 { var newPredicates []interface{} diff --git a/internal/service/wafregional/regex_match_set.go b/internal/service/wafregional/regex_match_set.go index 43381ef64c5..a8806fa9b30 100644 --- a/internal/service/wafregional/regex_match_set.go +++ b/internal/service/wafregional/regex_match_set.go @@ -86,7 +86,7 @@ func resourceRegexMatchSet() *schema.Resource { func resourceRegexMatchSetCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).WAFRegionalClient(ctx) - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) name := d.Get(names.AttrName).(string) outputRaw, err := newRetryer(conn, region).RetryWithToken(ctx, func(token *string) (interface{}, error) { @@ -134,7 +134,7 @@ func resourceRegexMatchSetRead(ctx context.Context, d *schema.ResourceData, meta func resourceRegexMatchSetUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).WAFRegionalClient(ctx) - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) if d.HasChange("regex_match_tuple") { o, n := d.GetChange("regex_match_tuple") @@ -150,7 +150,7 @@ func resourceRegexMatchSetUpdate(ctx context.Context, d *schema.ResourceData, me func resourceRegexMatchSetDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).WAFRegionalClient(ctx) - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) if oldT := d.Get("regex_match_tuple").(*schema.Set).List(); len(oldT) > 0 { var newT []interface{} diff --git a/internal/service/wafregional/regex_pattern_set.go b/internal/service/wafregional/regex_pattern_set.go index 8739cce9a09..08adf651ed0 100644 --- a/internal/service/wafregional/regex_pattern_set.go +++ b/internal/service/wafregional/regex_pattern_set.go @@ -52,7 +52,7 @@ func resourceRegexPatternSet() *schema.Resource { func resourceRegexPatternSetCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).WAFRegionalClient(ctx) - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) name := d.Get(names.AttrName).(string) outputRaw, err := newRetryer(conn, region).RetryWithToken(ctx, func(token *string) (interface{}, error) { @@ -98,7 +98,7 @@ func resourceRegexPatternSetRead(ctx context.Context, d *schema.ResourceData, me func resourceRegexPatternSetUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).WAFRegionalClient(ctx) - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) if d.HasChange("regex_pattern_strings") { o, n := d.GetChange("regex_pattern_strings") @@ -114,7 +114,7 @@ func resourceRegexPatternSetUpdate(ctx context.Context, d *schema.ResourceData, func resourceRegexPatternSetDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).WAFRegionalClient(ctx) - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) if oldPatterns := d.Get("regex_pattern_strings").(*schema.Set).List(); len(oldPatterns) > 0 { var newPatterns []interface{} diff --git a/internal/service/wafregional/rule.go b/internal/service/wafregional/rule.go index cee2e39a977..782fb39b6c6 100644 --- a/internal/service/wafregional/rule.go +++ b/internal/service/wafregional/rule.go @@ -87,7 +87,7 @@ func resourceRule() *schema.Resource { func resourceRuleCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).WAFRegionalClient(ctx) - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) name := d.Get(names.AttrName).(string) outputRaw, err := newRetryer(conn, region).RetryWithToken(ctx, func(token *string) (interface{}, error) { @@ -136,7 +136,7 @@ func resourceRuleRead(ctx context.Context, d *schema.ResourceData, meta interfac arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "waf-regional", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: "rule/" + d.Id(), }.String() @@ -153,7 +153,7 @@ func resourceRuleRead(ctx context.Context, d *schema.ResourceData, meta interfac func resourceRuleUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).WAFRegionalClient(ctx) - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) if d.HasChange("predicate") { o, n := d.GetChange("predicate") @@ -169,7 +169,7 @@ func resourceRuleUpdate(ctx context.Context, d *schema.ResourceData, meta interf func resourceRuleDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).WAFRegionalClient(ctx) - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) if oldPredicates := d.Get("predicate").(*schema.Set).List(); len(oldPredicates) > 0 { var newPredicates []interface{} diff --git a/internal/service/wafregional/rule_group.go b/internal/service/wafregional/rule_group.go index d4e69fd9d67..9a004bcdc18 100644 --- a/internal/service/wafregional/rule_group.go +++ b/internal/service/wafregional/rule_group.go @@ -98,7 +98,7 @@ func resourceRuleGroup() *schema.Resource { func resourceRuleGroupCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).WAFRegionalClient(ctx) - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) name := d.Get(names.AttrName).(string) outputRaw, err := newRetryer(conn, region).RetryWithToken(ctx, func(token *string) (interface{}, error) { @@ -169,7 +169,7 @@ func resourceRuleGroupRead(ctx context.Context, d *schema.ResourceData, meta int arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "waf-regional", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: "rulegroup/" + d.Id(), }.String() @@ -183,7 +183,7 @@ func resourceRuleGroupRead(ctx context.Context, d *schema.ResourceData, meta int func resourceRuleGroupUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).WAFRegionalClient(ctx) - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) if d.HasChange("activated_rule") { o, n := d.GetChange("activated_rule") @@ -199,7 +199,7 @@ func resourceRuleGroupUpdate(ctx context.Context, d *schema.ResourceData, meta i func resourceRuleGroupDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).WAFRegionalClient(ctx) - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) if oldRules := d.Get("activated_rule").(*schema.Set).List(); len(oldRules) > 0 { noRules := []interface{}{} diff --git a/internal/service/wafregional/size_constraint_set.go b/internal/service/wafregional/size_constraint_set.go index c4a40e753be..a99762fd22f 100644 --- a/internal/service/wafregional/size_constraint_set.go +++ b/internal/service/wafregional/size_constraint_set.go @@ -87,7 +87,7 @@ func resourceSizeConstraintSet() *schema.Resource { func resourceSizeConstraintSetCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).WAFRegionalClient(ctx) - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) name := d.Get(names.AttrName).(string) output, err := newRetryer(conn, region).RetryWithToken(ctx, func(token *string) (interface{}, error) { @@ -135,7 +135,7 @@ func resourceSizeConstraintSetRead(ctx context.Context, d *schema.ResourceData, func resourceSizeConstraintSetUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).WAFRegionalClient(ctx) - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) if d.HasChange("size_constraints") { o, n := d.GetChange("size_constraints") @@ -151,7 +151,7 @@ func resourceSizeConstraintSetUpdate(ctx context.Context, d *schema.ResourceData func resourceSizeConstraintSetDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).WAFRegionalClient(ctx) - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) if oldConstraints := d.Get("size_constraints").(*schema.Set).List(); len(oldConstraints) > 0 { noConstraints := []interface{}{} diff --git a/internal/service/wafregional/sql_injection_match_set.go b/internal/service/wafregional/sql_injection_match_set.go index 67c1f26d9aa..0544fe56823 100644 --- a/internal/service/wafregional/sql_injection_match_set.go +++ b/internal/service/wafregional/sql_injection_match_set.go @@ -83,7 +83,7 @@ func resourceSQLInjectionMatchSet() *schema.Resource { func resourceSQLInjectionMatchSetCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).WAFRegionalClient(ctx) - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) name := d.Get(names.AttrName).(string) output, err := newRetryer(conn, region).RetryWithToken(ctx, func(token *string) (interface{}, error) { @@ -131,7 +131,7 @@ func resourceSQLInjectionMatchSetRead(ctx context.Context, d *schema.ResourceDat func resourceSQLInjectionMatchSetUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).WAFRegionalClient(ctx) - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) if d.HasChange("sql_injection_match_tuple") { o, n := d.GetChange("sql_injection_match_tuple") @@ -147,7 +147,7 @@ func resourceSQLInjectionMatchSetUpdate(ctx context.Context, d *schema.ResourceD func resourceSQLInjectionMatchSetDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).WAFRegionalClient(ctx) - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) if oldTuples := d.Get("sql_injection_match_tuple").(*schema.Set).List(); len(oldTuples) > 0 { noTuples := []interface{}{} diff --git a/internal/service/wafregional/web_acl.go b/internal/service/wafregional/web_acl.go index e62ee1acdd2..3db76af7cb2 100644 --- a/internal/service/wafregional/web_acl.go +++ b/internal/service/wafregional/web_acl.go @@ -167,7 +167,7 @@ func resourceWebACL() *schema.Resource { func resourceWebACLCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).WAFRegionalClient(ctx) - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) name := d.Get(names.AttrName).(string) output, err := newRetryer(conn, region).RetryWithToken(ctx, func(token *string) (interface{}, error) { @@ -192,7 +192,7 @@ func resourceWebACLCreate(ctx context.Context, d *schema.ResourceData, meta inte arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "waf-regional", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: "webacl/" + d.Id(), }.String() @@ -247,7 +247,7 @@ func resourceWebACLRead(ctx context.Context, d *schema.ResourceData, meta interf arn := arn.ARN{ Partition: meta.(*conns.AWSClient).Partition(ctx), Service: "waf-regional", - Region: meta.(*conns.AWSClient).Region, + Region: meta.(*conns.AWSClient).Region(ctx), AccountID: meta.(*conns.AWSClient).AccountID(ctx), Resource: "webacl/" + d.Id(), }.String() @@ -286,7 +286,7 @@ func resourceWebACLRead(ctx context.Context, d *schema.ResourceData, meta interf func resourceWebACLUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).WAFRegionalClient(ctx) - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) if d.HasChanges(names.AttrDefaultAction, names.AttrRule) { o, n := d.GetChange(names.AttrRule) @@ -338,7 +338,7 @@ func resourceWebACLUpdate(ctx context.Context, d *schema.ResourceData, meta inte func resourceWebACLDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).WAFRegionalClient(ctx) - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) if rules := d.Get(names.AttrRule).(*schema.Set).List(); len(rules) > 0 { _, err := newRetryer(conn, region).RetryWithToken(ctx, func(token *string) (interface{}, error) { diff --git a/internal/service/wafregional/xss_match_set.go b/internal/service/wafregional/xss_match_set.go index 28c9ec2acab..91b8d581283 100644 --- a/internal/service/wafregional/xss_match_set.go +++ b/internal/service/wafregional/xss_match_set.go @@ -78,7 +78,7 @@ func resourceXSSMatchSet() *schema.Resource { func resourceXSSMatchSetCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).WAFRegionalClient(ctx) - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) name := d.Get(names.AttrName).(string) output, err := newRetryer(conn, region).RetryWithToken(ctx, func(token *string) (interface{}, error) { @@ -132,7 +132,7 @@ func resourceXSSMatchSetRead(ctx context.Context, d *schema.ResourceData, meta i func resourceXSSMatchSetUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).WAFRegionalClient(ctx) - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) if d.HasChange("xss_match_tuple") { o, n := d.GetChange("xss_match_tuple") @@ -148,7 +148,7 @@ func resourceXSSMatchSetUpdate(ctx context.Context, d *schema.ResourceData, meta func resourceXSSMatchSetDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { var diags diag.Diagnostics conn := meta.(*conns.AWSClient).WAFRegionalClient(ctx) - region := meta.(*conns.AWSClient).Region + region := meta.(*conns.AWSClient).Region(ctx) if oldT := d.Get("xss_match_tuple").(*schema.Set).List(); len(oldT) > 0 { var newT []interface{} From 0e76bd2a74c517b967f6247a1e01e440a6fc0db1 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:36:31 -0500 Subject: [PATCH 265/304] Make 'AWSClient.Region' a getter - xray. --- internal/service/xray/encryption_config.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/service/xray/encryption_config.go b/internal/service/xray/encryption_config.go index 9a23a832818..d5081e0dd39 100644 --- a/internal/service/xray/encryption_config.go +++ b/internal/service/xray/encryption_config.go @@ -67,7 +67,7 @@ func resourceEncryptionPutConfig(ctx context.Context, d *schema.ResourceData, me return sdkdiag.AppendErrorf(diags, "creating XRay Encryption Config: %s", err) } - d.SetId(meta.(*conns.AWSClient).Region) + d.SetId(meta.(*conns.AWSClient).Region(ctx)) if _, err := waitEncryptionConfigAvailable(ctx, conn); err != nil { return sdkdiag.AppendErrorf(diags, "waiting for XRay Encryption Config (%s) create: %s", d.Id(), err) From a3524d388ef5c41fa48c2a560c50bf86ff03f5de Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:47:20 -0500 Subject: [PATCH 266/304] 'names.AFSouth1RegionID' -> 'endpoints.AfSouth1RegionID'. --- .../cloudtrail/service_account_data_source.go | 3 ++- .../hosted_zone_data_source.go | 3 ++- .../service/elb/hosted_zone_id_data_source.go | 3 ++- .../elb/service_account_data_source.go | 3 ++- .../elbv2/hosted_zone_id_data_source.go | 5 ++-- internal/service/lambda/function.go | 2 +- .../redshift/service_account_data_source.go | 3 ++- internal/service/s3/hosted_zones.go | 3 ++- .../prebuilt_ecr_image_data_source.go | 27 ++++++++++--------- names/names.go | 1 - 10 files changed, 30 insertions(+), 23 deletions(-) diff --git a/internal/service/cloudtrail/service_account_data_source.go b/internal/service/cloudtrail/service_account_data_source.go index 1a1b4dbb8ec..d3d56980417 100644 --- a/internal/service/cloudtrail/service_account_data_source.go +++ b/internal/service/cloudtrail/service_account_data_source.go @@ -7,6 +7,7 @@ import ( "context" "github.com/aws/aws-sdk-go-v2/aws/arn" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -19,7 +20,7 @@ import ( // See https://docs.aws.amazon.com/govcloud-us/latest/ug-west/verifying-cloudtrail.html var serviceAccountPerRegionMap = map[string]string{ - names.AFSouth1RegionID: "525921808201", + endpoints.AfSouth1RegionID: "525921808201", names.APEast1RegionID: "119688915426", names.APNortheast1RegionID: "216624486486", names.APNortheast2RegionID: "492519147666", diff --git a/internal/service/elasticbeanstalk/hosted_zone_data_source.go b/internal/service/elasticbeanstalk/hosted_zone_data_source.go index a3c8915e36c..90fc586cfc5 100644 --- a/internal/service/elasticbeanstalk/hosted_zone_data_source.go +++ b/internal/service/elasticbeanstalk/hosted_zone_data_source.go @@ -6,6 +6,7 @@ package elasticbeanstalk import ( "context" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -16,7 +17,7 @@ import ( // See https://docs.aws.amazon.com/general/latest/gr/elasticbeanstalk.html var hostedZoneIDs = map[string]string{ - names.AFSouth1RegionID: "Z1EI3BVKMKK4AM", + endpoints.AfSouth1RegionID: "Z1EI3BVKMKK4AM", names.APSoutheast1RegionID: "Z16FZ9L249IFLT", names.APSoutheast2RegionID: "Z2PCDNR3VC2G1N", names.APSoutheast3RegionID: "Z05913172VM7EAZB40TA8", diff --git a/internal/service/elb/hosted_zone_id_data_source.go b/internal/service/elb/hosted_zone_id_data_source.go index ccfa64fd69f..e7cf5c7161b 100644 --- a/internal/service/elb/hosted_zone_id_data_source.go +++ b/internal/service/elb/hosted_zone_id_data_source.go @@ -6,6 +6,7 @@ package elb import ( "context" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -15,7 +16,7 @@ import ( // See https://docs.aws.amazon.com/general/latest/gr/elb.html#elb_region. var hostedZoneIDPerRegionMap = map[string]string{ - names.AFSouth1RegionID: "Z268VQBMOI5EKX", + endpoints.AfSouth1RegionID: "Z268VQBMOI5EKX", names.APEast1RegionID: "Z3DQVH9N71FHZ0", names.APNortheast1RegionID: "Z14GRHDCWA56QT", names.APNortheast2RegionID: "ZWKZPGTI48KDX", diff --git a/internal/service/elb/service_account_data_source.go b/internal/service/elb/service_account_data_source.go index 7c545aa722c..4fc0a3a8947 100644 --- a/internal/service/elb/service_account_data_source.go +++ b/internal/service/elb/service_account_data_source.go @@ -7,6 +7,7 @@ import ( "context" "github.com/aws/aws-sdk-go-v2/aws/arn" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -17,7 +18,7 @@ import ( // See http://docs.aws.amazon.com/elasticloadbalancing/latest/classic/enable-access-logs.html#attach-bucket-policy // See https://docs.aws.amazon.com/elasticloadbalancing/latest/application/load-balancer-access-logs.html#access-logging-bucket-permissions var accountIDPerRegionMap = map[string]string{ - names.AFSouth1RegionID: "098369216593", + endpoints.AfSouth1RegionID: "098369216593", names.APEast1RegionID: "754344448648", names.APNortheast1RegionID: "582318560864", names.APNortheast2RegionID: "600734575887", diff --git a/internal/service/elbv2/hosted_zone_id_data_source.go b/internal/service/elbv2/hosted_zone_id_data_source.go index 51b51c14d31..8b21ea26f8c 100644 --- a/internal/service/elbv2/hosted_zone_id_data_source.go +++ b/internal/service/elbv2/hosted_zone_id_data_source.go @@ -7,6 +7,7 @@ import ( "context" awstypes "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" @@ -19,7 +20,7 @@ import ( // See https://docs.aws.amazon.com/general/latest/gr/elb.html#elb_region var hostedZoneIDPerRegionALBMap = map[string]string{ - names.AFSouth1RegionID: "Z268VQBMOI5EKX", + endpoints.AfSouth1RegionID: "Z268VQBMOI5EKX", names.APEast1RegionID: "Z3DQVH9N71FHZ0", names.APNortheast1RegionID: "Z14GRHDCWA56QT", names.APNortheast2RegionID: "ZWKZPGTI48KDX", @@ -57,7 +58,7 @@ var hostedZoneIDPerRegionALBMap = map[string]string{ // See https://docs.aws.amazon.com/general/latest/gr/elb.html#elb_region var hostedZoneIDPerRegionNLBMap = map[string]string{ - names.AFSouth1RegionID: "Z203XCE67M25HM", + endpoints.AfSouth1RegionID: "Z203XCE67M25HM", names.APEast1RegionID: "Z12Y7K3UBGUAD1", names.APNortheast1RegionID: "Z31USIVHYNEOWT", names.APNortheast2RegionID: "ZIBE1TIR4HY56", diff --git a/internal/service/lambda/function.go b/internal/service/lambda/function.go index 00edb37949d..87e67c90295 100644 --- a/internal/service/lambda/function.go +++ b/internal/service/lambda/function.go @@ -1403,7 +1403,7 @@ func signerServiceIsAvailable(region string) bool { names.USEast2RegionID: {}, names.USWest1RegionID: {}, names.USWest2RegionID: {}, - names.AFSouth1RegionID: {}, + endpoints.AfSouth1RegionID: {}, names.APEast1RegionID: {}, names.APSouth1RegionID: {}, names.APNortheast2RegionID: {}, diff --git a/internal/service/redshift/service_account_data_source.go b/internal/service/redshift/service_account_data_source.go index a8abb54ce61..82cedf78654 100644 --- a/internal/service/redshift/service_account_data_source.go +++ b/internal/service/redshift/service_account_data_source.go @@ -7,6 +7,7 @@ import ( "context" "github.com/aws/aws-sdk-go-v2/aws/arn" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -19,7 +20,7 @@ import ( // See https://docs.amazonaws.cn/en_us/redshift/latest/mgmt/db-auditing.html#db-auditing-bucket-permissions var ServiceAccountPerRegionMap = map[string]string{ - names.AFSouth1RegionID: "365689465814", + endpoints.AfSouth1RegionID: "365689465814", names.APEast1RegionID: "313564881002", names.APNortheast1RegionID: "404641285394", names.APNortheast2RegionID: "760740231472", diff --git a/internal/service/s3/hosted_zones.go b/internal/service/s3/hosted_zones.go index ccb039f2d35..798343c72e0 100644 --- a/internal/service/s3/hosted_zones.go +++ b/internal/service/s3/hosted_zones.go @@ -6,12 +6,13 @@ package s3 import ( "fmt" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/terraform-provider-aws/names" ) // See https://docs.aws.amazon.com/general/latest/gr/s3.html#s3_website_region_endpoints. var hostedZoneIDsMap = map[string]string{ - names.AFSouth1RegionID: "Z83WF9RJE8B12", + endpoints.AfSouth1RegionID: "Z83WF9RJE8B12", names.APEast1RegionID: "ZNB98KWMFR0R6", names.APNortheast1RegionID: "Z2M4EHUR26P7ZW", names.APNortheast2RegionID: "Z3W03O7B5YMIYP", diff --git a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go index 614394e36e6..65a27c73e9f 100644 --- a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go +++ b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go @@ -7,6 +7,7 @@ import ( "context" "fmt" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" @@ -188,7 +189,7 @@ const ( // https://github.com/aws/sagemaker-python-sdk/blob/master/src/sagemaker/image_uri_config/seq2seq.json var prebuiltECRImageIDByRegion_blazing = map[string]string{ - names.AFSouth1RegionID: "455444449433", + endpoints.AfSouth1RegionID: "455444449433", names.APEast1RegionID: "286214385809", names.APNortheast1RegionID: "501404015308", names.APNortheast2RegionID: "306986355934", @@ -228,7 +229,7 @@ var prebuiltECRImageIDByRegion_blazing = map[string]string{ // https://github.com/aws/sagemaker-python-sdk/blob/master/src/sagemaker/image_uri_config/clarify.json var prebuiltECRImageIDByRegion_clarify = map[string]string{ - names.AFSouth1RegionID: "811711786498", + endpoints.AfSouth1RegionID: "811711786498", names.APEast1RegionID: "098760798382", names.APNortheast1RegionID: "377024640650", names.APNortheast2RegionID: "263625296855", @@ -258,7 +259,7 @@ var prebuiltECRImageIDByRegion_clarify = map[string]string{ // https://github.com/aws/sagemaker-python-sdk/blob/master/src/sagemaker/image_uri_config/data-wrangler.json var prebuiltECRImageIDByRegion_dataWrangler = map[string]string{ - names.AFSouth1RegionID: "143210264188", + endpoints.AfSouth1RegionID: "143210264188", names.APEast1RegionID: "707077482487", names.APNortheast1RegionID: "649008135260", names.APNortheast2RegionID: "131546521161", @@ -287,7 +288,7 @@ var prebuiltECRImageIDByRegion_dataWrangler = map[string]string{ // https://github.com/aws/sagemaker-python-sdk/blob/master/src/sagemaker/image_uri_config/debugger.json var prebuiltECRImageIDByRegion_debugger = map[string]string{ - names.AFSouth1RegionID: "314341159256", + endpoints.AfSouth1RegionID: "314341159256", names.APEast1RegionID: "199566480951", names.APNortheast1RegionID: "430734990657", names.APNortheast2RegionID: "578805364391", @@ -322,7 +323,7 @@ var prebuiltECRImageIDByRegion_debugger = map[string]string{ // https://github.com/aws/sagemaker-python-sdk/blob/master/src/sagemaker/image_uri_config/xgboost-neo.json var prebuiltECRImageIDByRegion_inferentiaNeo = map[string]string{ - names.AFSouth1RegionID: "774647643957", + endpoints.AfSouth1RegionID: "774647643957", names.APEast1RegionID: "110948597952", names.APNortheast1RegionID: "941853720454", names.APNortheast2RegionID: "151534178276", @@ -359,7 +360,7 @@ var prebuiltECRImageIDByRegion_inferentiaNeo = map[string]string{ // https://github.com/aws/sagemaker-python-sdk/blob/master/src/sagemaker/image_uri_config/tensorflow.json var prebuiltECRImageIDByRegion_SageMakerCustom = map[string]string{ // nosemgrep:ci.sagemaker-in-var-name - names.AFSouth1RegionID: "313743910680", + endpoints.AfSouth1RegionID: "313743910680", names.APEast1RegionID: "057415533634", names.APNortheast1RegionID: "520713654638", names.APNortheast2RegionID: "520713654638", @@ -409,7 +410,7 @@ var prebuiltECRImageIDByRegion_SageMakerRL = map[string]string{ // nosemgrep:ci. // https://github.com/aws/sagemaker-python-sdk/blob/master/src/sagemaker/image_uri_config/spark.json var prebuiltECRImageIDByRegion_spark = map[string]string{ - names.AFSouth1RegionID: "309385258863", + endpoints.AfSouth1RegionID: "309385258863", names.APEast1RegionID: "732049463269", names.APNortheast1RegionID: "411782140378", names.APNortheast2RegionID: "860869212795", @@ -447,7 +448,7 @@ var prebuiltECRImageIDByRegion_spark = map[string]string{ // https://github.com/aws/sagemaker-python-sdk/blob/master/src/sagemaker/image_uri_config/sagemaker-base-python.json var prebuiltECRImageIDByRegion_SageMakerBasePython = map[string]string{ // nosemgrep:ci.sagemaker-in-var-name - names.AFSouth1RegionID: "559312083959", + endpoints.AfSouth1RegionID: "559312083959", names.APEast1RegionID: "493642496378", names.APNortheast1RegionID: "102112518831", names.APNortheast2RegionID: "806072073708", @@ -487,7 +488,7 @@ var prebuiltECRImageIDByRegion_SageMakerGeospatial = map[string]string{ // nosem // https://github.com/aws/sagemaker-python-sdk/blob/master/src/sagemaker/image_uri_config/forecasting-deepar.json var prebuiltECRImageIDByRegion_deepAR = map[string]string{ - names.AFSouth1RegionID: "455444449433", + endpoints.AfSouth1RegionID: "455444449433", names.APEast1RegionID: "286214385809", names.APNortheast1RegionID: "633353088612", names.APNortheast2RegionID: "204372634319", @@ -532,7 +533,7 @@ var prebuiltECRImageIDByRegion_deepAR = map[string]string{ // https://github.com/aws/sagemaker-python-sdk/blob/master/src/sagemaker/image_uri_config/pca.json var prebuiltECRImageIDByRegion_factorMachines = map[string]string{ - names.AFSouth1RegionID: "455444449433", + endpoints.AfSouth1RegionID: "455444449433", names.APEast1RegionID: "286214385809", names.APNortheast1RegionID: "351501993468", names.APNortheast2RegionID: "835164637446", @@ -597,7 +598,7 @@ var prebuiltECRImageIDByRegion_lda = map[string]string{ // https://github.com/aws/sagemaker-python-sdk/blob/master/src/sagemaker/image_uri_config/sklearn.json var prebuiltECRImageIDByRegion_XGBoost = map[string]string{ - names.AFSouth1RegionID: "510948584623", + endpoints.AfSouth1RegionID: "510948584623", names.APEast1RegionID: "651117190479", names.APNortheast1RegionID: "354813040037", names.APNortheast2RegionID: "366743142698", @@ -649,7 +650,7 @@ var prebuiltECRImageIDByRegion_XGBoost = map[string]string{ // https://github.com/aws/sagemaker-python-sdk/blob/master/src/sagemaker/image_uri_config/huggingface-llm.json var prebuiltECRImageIDByRegion_deepLearning = map[string]string{ - names.AFSouth1RegionID: "626614931356", + endpoints.AfSouth1RegionID: "626614931356", names.APEast1RegionID: "871362719292", names.APNortheast1RegionID: "763104351884", names.APNortheast2RegionID: "763104351884", @@ -689,7 +690,7 @@ var prebuiltECRImageIDByRegion_deepLearning = map[string]string{ // https://github.com/aws/sagemaker-python-sdk/blob/master/src/sagemaker/image_uri_config/model-monitor.json var prebuiltECRImageIDByRegion_modelMonitor = map[string]string{ - names.AFSouth1RegionID: "875698925577", + endpoints.AfSouth1RegionID: "875698925577", names.APEast1RegionID: "001633400207", names.APNortheast1RegionID: "574779866223", names.APNortheast2RegionID: "709848358524", diff --git a/names/names.go b/names/names.go index 8819bf43d20..7d370430725 100644 --- a/names/names.go +++ b/names/names.go @@ -149,7 +149,6 @@ const ( // AWS Standard partition's regions. GlobalRegionID = "aws-global" // AWS Standard global region. - AFSouth1RegionID = "af-south-1" // Africa (Cape Town). APEast1RegionID = "ap-east-1" // Asia Pacific (Hong Kong). APNortheast1RegionID = "ap-northeast-1" // Asia Pacific (Tokyo). APNortheast2RegionID = "ap-northeast-2" // Asia Pacific (Seoul). From 489fcf14aadf8f21eed74d31f49681b47f5e318d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:49:05 -0500 Subject: [PATCH 267/304] 'names.APEast1RegionID' -> 'endpoints.ApEast1RegionID'. --- .../cloudtrail/service_account_data_source.go | 2 +- .../hosted_zone_data_source.go | 2 +- .../service/elb/hosted_zone_id_data_source.go | 2 +- .../elb/service_account_data_source.go | 2 +- .../elbv2/hosted_zone_id_data_source.go | 4 +-- internal/service/lambda/function.go | 2 +- .../redshift/service_account_data_source.go | 2 +- internal/service/s3/hosted_zones.go | 2 +- internal/service/s3/object_test.go | 3 ++- .../prebuilt_ecr_image_data_source.go | 26 +++++++++---------- names/names.go | 1 - 11 files changed, 24 insertions(+), 24 deletions(-) diff --git a/internal/service/cloudtrail/service_account_data_source.go b/internal/service/cloudtrail/service_account_data_source.go index d3d56980417..2b97f441cd4 100644 --- a/internal/service/cloudtrail/service_account_data_source.go +++ b/internal/service/cloudtrail/service_account_data_source.go @@ -21,7 +21,7 @@ import ( var serviceAccountPerRegionMap = map[string]string{ endpoints.AfSouth1RegionID: "525921808201", - names.APEast1RegionID: "119688915426", + endpoints.ApEast1RegionID: "119688915426", names.APNortheast1RegionID: "216624486486", names.APNortheast2RegionID: "492519147666", names.APNortheast3RegionID: "765225791966", diff --git a/internal/service/elasticbeanstalk/hosted_zone_data_source.go b/internal/service/elasticbeanstalk/hosted_zone_data_source.go index 90fc586cfc5..b260046a68f 100644 --- a/internal/service/elasticbeanstalk/hosted_zone_data_source.go +++ b/internal/service/elasticbeanstalk/hosted_zone_data_source.go @@ -21,7 +21,7 @@ var hostedZoneIDs = map[string]string{ names.APSoutheast1RegionID: "Z16FZ9L249IFLT", names.APSoutheast2RegionID: "Z2PCDNR3VC2G1N", names.APSoutheast3RegionID: "Z05913172VM7EAZB40TA8", - names.APEast1RegionID: "ZPWYUBWRU171A", + endpoints.ApEast1RegionID: "ZPWYUBWRU171A", names.APNortheast1RegionID: "Z1R25G3KIG2GBW", names.APNortheast2RegionID: "Z3JE5OI70TWKCP", names.APNortheast3RegionID: "ZNE5GEY1TIAGY", diff --git a/internal/service/elb/hosted_zone_id_data_source.go b/internal/service/elb/hosted_zone_id_data_source.go index e7cf5c7161b..58bc33a12ba 100644 --- a/internal/service/elb/hosted_zone_id_data_source.go +++ b/internal/service/elb/hosted_zone_id_data_source.go @@ -17,7 +17,7 @@ import ( // See https://docs.aws.amazon.com/general/latest/gr/elb.html#elb_region. var hostedZoneIDPerRegionMap = map[string]string{ endpoints.AfSouth1RegionID: "Z268VQBMOI5EKX", - names.APEast1RegionID: "Z3DQVH9N71FHZ0", + endpoints.ApEast1RegionID: "Z3DQVH9N71FHZ0", names.APNortheast1RegionID: "Z14GRHDCWA56QT", names.APNortheast2RegionID: "ZWKZPGTI48KDX", names.APNortheast3RegionID: "Z5LXEXXYW11ES", diff --git a/internal/service/elb/service_account_data_source.go b/internal/service/elb/service_account_data_source.go index 4fc0a3a8947..cfde282810a 100644 --- a/internal/service/elb/service_account_data_source.go +++ b/internal/service/elb/service_account_data_source.go @@ -19,7 +19,7 @@ import ( // See https://docs.aws.amazon.com/elasticloadbalancing/latest/application/load-balancer-access-logs.html#access-logging-bucket-permissions var accountIDPerRegionMap = map[string]string{ endpoints.AfSouth1RegionID: "098369216593", - names.APEast1RegionID: "754344448648", + endpoints.ApEast1RegionID: "754344448648", names.APNortheast1RegionID: "582318560864", names.APNortheast2RegionID: "600734575887", names.APNortheast3RegionID: "383597477331", diff --git a/internal/service/elbv2/hosted_zone_id_data_source.go b/internal/service/elbv2/hosted_zone_id_data_source.go index 8b21ea26f8c..b93632da05e 100644 --- a/internal/service/elbv2/hosted_zone_id_data_source.go +++ b/internal/service/elbv2/hosted_zone_id_data_source.go @@ -21,7 +21,7 @@ import ( // See https://docs.aws.amazon.com/general/latest/gr/elb.html#elb_region var hostedZoneIDPerRegionALBMap = map[string]string{ endpoints.AfSouth1RegionID: "Z268VQBMOI5EKX", - names.APEast1RegionID: "Z3DQVH9N71FHZ0", + endpoints.ApEast1RegionID: "Z3DQVH9N71FHZ0", names.APNortheast1RegionID: "Z14GRHDCWA56QT", names.APNortheast2RegionID: "ZWKZPGTI48KDX", names.APNortheast3RegionID: "Z5LXEXXYW11ES", @@ -59,7 +59,7 @@ var hostedZoneIDPerRegionALBMap = map[string]string{ // See https://docs.aws.amazon.com/general/latest/gr/elb.html#elb_region var hostedZoneIDPerRegionNLBMap = map[string]string{ endpoints.AfSouth1RegionID: "Z203XCE67M25HM", - names.APEast1RegionID: "Z12Y7K3UBGUAD1", + endpoints.ApEast1RegionID: "Z12Y7K3UBGUAD1", names.APNortheast1RegionID: "Z31USIVHYNEOWT", names.APNortheast2RegionID: "ZIBE1TIR4HY56", names.APNortheast3RegionID: "Z1GWIQ4HH19I5X", diff --git a/internal/service/lambda/function.go b/internal/service/lambda/function.go index 87e67c90295..309f1519f9e 100644 --- a/internal/service/lambda/function.go +++ b/internal/service/lambda/function.go @@ -1404,7 +1404,7 @@ func signerServiceIsAvailable(region string) bool { names.USWest1RegionID: {}, names.USWest2RegionID: {}, endpoints.AfSouth1RegionID: {}, - names.APEast1RegionID: {}, + endpoints.ApEast1RegionID: {}, names.APSouth1RegionID: {}, names.APNortheast2RegionID: {}, names.APSoutheast1RegionID: {}, diff --git a/internal/service/redshift/service_account_data_source.go b/internal/service/redshift/service_account_data_source.go index 82cedf78654..3047a9c8b47 100644 --- a/internal/service/redshift/service_account_data_source.go +++ b/internal/service/redshift/service_account_data_source.go @@ -21,7 +21,7 @@ import ( var ServiceAccountPerRegionMap = map[string]string{ endpoints.AfSouth1RegionID: "365689465814", - names.APEast1RegionID: "313564881002", + endpoints.ApEast1RegionID: "313564881002", names.APNortheast1RegionID: "404641285394", names.APNortheast2RegionID: "760740231472", names.APNortheast3RegionID: "090321488786", diff --git a/internal/service/s3/hosted_zones.go b/internal/service/s3/hosted_zones.go index 798343c72e0..3f48442ca98 100644 --- a/internal/service/s3/hosted_zones.go +++ b/internal/service/s3/hosted_zones.go @@ -13,7 +13,7 @@ import ( // See https://docs.aws.amazon.com/general/latest/gr/s3.html#s3_website_region_endpoints. var hostedZoneIDsMap = map[string]string{ endpoints.AfSouth1RegionID: "Z83WF9RJE8B12", - names.APEast1RegionID: "ZNB98KWMFR0R6", + endpoints.ApEast1RegionID: "ZNB98KWMFR0R6", names.APNortheast1RegionID: "Z2M4EHUR26P7ZW", names.APNortheast2RegionID: "Z3W03O7B5YMIYP", names.APNortheast3RegionID: "Z2YQB5RD63NC85", diff --git a/internal/service/s3/object_test.go b/internal/service/s3/object_test.go index 871d9bfc99b..967bc51fbb6 100644 --- a/internal/service/s3/object_test.go +++ b/internal/service/s3/object_test.go @@ -20,6 +20,7 @@ import ( "github.com/aws/aws-sdk-go-v2/service/s3" "github.com/aws/aws-sdk-go-v2/service/s3/types" "github.com/google/go-cmp/cmp" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" @@ -1865,7 +1866,7 @@ func TestAccS3Object_crossRegion(t *testing.T) { func TestAccS3Object_optInRegion(t *testing.T) { ctx := acctest.Context(t) rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) - optInRegion := names.APEast1RegionID // Hong Kong. + optInRegion := endpoints.ApEast1RegionID // Hong Kong. providers := make(map[string]*schema.Provider) resource.ParallelTest(t, resource.TestCase{ diff --git a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go index 65a27c73e9f..dfb7e4a70df 100644 --- a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go +++ b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go @@ -190,7 +190,7 @@ const ( var prebuiltECRImageIDByRegion_blazing = map[string]string{ endpoints.AfSouth1RegionID: "455444449433", - names.APEast1RegionID: "286214385809", + endpoints.ApEast1RegionID: "286214385809", names.APNortheast1RegionID: "501404015308", names.APNortheast2RegionID: "306986355934", names.APNortheast3RegionID: "867004704886", @@ -230,7 +230,7 @@ var prebuiltECRImageIDByRegion_blazing = map[string]string{ var prebuiltECRImageIDByRegion_clarify = map[string]string{ endpoints.AfSouth1RegionID: "811711786498", - names.APEast1RegionID: "098760798382", + endpoints.ApEast1RegionID: "098760798382", names.APNortheast1RegionID: "377024640650", names.APNortheast2RegionID: "263625296855", names.APNortheast3RegionID: "912233562940", @@ -260,7 +260,7 @@ var prebuiltECRImageIDByRegion_clarify = map[string]string{ var prebuiltECRImageIDByRegion_dataWrangler = map[string]string{ endpoints.AfSouth1RegionID: "143210264188", - names.APEast1RegionID: "707077482487", + endpoints.ApEast1RegionID: "707077482487", names.APNortheast1RegionID: "649008135260", names.APNortheast2RegionID: "131546521161", names.APNortheast3RegionID: "913387583493", @@ -289,7 +289,7 @@ var prebuiltECRImageIDByRegion_dataWrangler = map[string]string{ var prebuiltECRImageIDByRegion_debugger = map[string]string{ endpoints.AfSouth1RegionID: "314341159256", - names.APEast1RegionID: "199566480951", + endpoints.ApEast1RegionID: "199566480951", names.APNortheast1RegionID: "430734990657", names.APNortheast2RegionID: "578805364391", names.APNortheast3RegionID: "479947661362", @@ -324,7 +324,7 @@ var prebuiltECRImageIDByRegion_debugger = map[string]string{ var prebuiltECRImageIDByRegion_inferentiaNeo = map[string]string{ endpoints.AfSouth1RegionID: "774647643957", - names.APEast1RegionID: "110948597952", + endpoints.ApEast1RegionID: "110948597952", names.APNortheast1RegionID: "941853720454", names.APNortheast2RegionID: "151534178276", names.APNortheast3RegionID: "925152966179", @@ -361,7 +361,7 @@ var prebuiltECRImageIDByRegion_inferentiaNeo = map[string]string{ var prebuiltECRImageIDByRegion_SageMakerCustom = map[string]string{ // nosemgrep:ci.sagemaker-in-var-name endpoints.AfSouth1RegionID: "313743910680", - names.APEast1RegionID: "057415533634", + endpoints.ApEast1RegionID: "057415533634", names.APNortheast1RegionID: "520713654638", names.APNortheast2RegionID: "520713654638", names.APSouth1RegionID: "520713654638", @@ -411,7 +411,7 @@ var prebuiltECRImageIDByRegion_SageMakerRL = map[string]string{ // nosemgrep:ci. var prebuiltECRImageIDByRegion_spark = map[string]string{ endpoints.AfSouth1RegionID: "309385258863", - names.APEast1RegionID: "732049463269", + endpoints.ApEast1RegionID: "732049463269", names.APNortheast1RegionID: "411782140378", names.APNortheast2RegionID: "860869212795", names.APNortheast3RegionID: "102471314380", @@ -449,7 +449,7 @@ var prebuiltECRImageIDByRegion_spark = map[string]string{ var prebuiltECRImageIDByRegion_SageMakerBasePython = map[string]string{ // nosemgrep:ci.sagemaker-in-var-name endpoints.AfSouth1RegionID: "559312083959", - names.APEast1RegionID: "493642496378", + endpoints.ApEast1RegionID: "493642496378", names.APNortheast1RegionID: "102112518831", names.APNortheast2RegionID: "806072073708", names.APNortheast3RegionID: "792733760839", @@ -489,7 +489,7 @@ var prebuiltECRImageIDByRegion_SageMakerGeospatial = map[string]string{ // nosem var prebuiltECRImageIDByRegion_deepAR = map[string]string{ endpoints.AfSouth1RegionID: "455444449433", - names.APEast1RegionID: "286214385809", + endpoints.ApEast1RegionID: "286214385809", names.APNortheast1RegionID: "633353088612", names.APNortheast2RegionID: "204372634319", names.APNortheast3RegionID: "867004704886", @@ -534,7 +534,7 @@ var prebuiltECRImageIDByRegion_deepAR = map[string]string{ var prebuiltECRImageIDByRegion_factorMachines = map[string]string{ endpoints.AfSouth1RegionID: "455444449433", - names.APEast1RegionID: "286214385809", + endpoints.ApEast1RegionID: "286214385809", names.APNortheast1RegionID: "351501993468", names.APNortheast2RegionID: "835164637446", names.APNortheast3RegionID: "867004704886", @@ -599,7 +599,7 @@ var prebuiltECRImageIDByRegion_lda = map[string]string{ var prebuiltECRImageIDByRegion_XGBoost = map[string]string{ endpoints.AfSouth1RegionID: "510948584623", - names.APEast1RegionID: "651117190479", + endpoints.ApEast1RegionID: "651117190479", names.APNortheast1RegionID: "354813040037", names.APNortheast2RegionID: "366743142698", names.APNortheast3RegionID: "867004704886", @@ -651,7 +651,7 @@ var prebuiltECRImageIDByRegion_XGBoost = map[string]string{ var prebuiltECRImageIDByRegion_deepLearning = map[string]string{ endpoints.AfSouth1RegionID: "626614931356", - names.APEast1RegionID: "871362719292", + endpoints.ApEast1RegionID: "871362719292", names.APNortheast1RegionID: "763104351884", names.APNortheast2RegionID: "763104351884", names.APNortheast3RegionID: "364406365360", @@ -691,7 +691,7 @@ var prebuiltECRImageIDByRegion_deepLearning = map[string]string{ var prebuiltECRImageIDByRegion_modelMonitor = map[string]string{ endpoints.AfSouth1RegionID: "875698925577", - names.APEast1RegionID: "001633400207", + endpoints.ApEast1RegionID: "001633400207", names.APNortheast1RegionID: "574779866223", names.APNortheast2RegionID: "709848358524", names.APNortheast3RegionID: "990339680094", diff --git a/names/names.go b/names/names.go index 7d370430725..e271c13d57c 100644 --- a/names/names.go +++ b/names/names.go @@ -149,7 +149,6 @@ const ( // AWS Standard partition's regions. GlobalRegionID = "aws-global" // AWS Standard global region. - APEast1RegionID = "ap-east-1" // Asia Pacific (Hong Kong). APNortheast1RegionID = "ap-northeast-1" // Asia Pacific (Tokyo). APNortheast2RegionID = "ap-northeast-2" // Asia Pacific (Seoul). APNortheast3RegionID = "ap-northeast-3" // Asia Pacific (Osaka). From dd4294cbd47c7144589fa1090d4ebc227bcdff3e Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:53:00 -0500 Subject: [PATCH 268/304] 'names.APNortheast1RegionID' -> 'endpoints.ApNortheast1RegionID'. --- .../app_authorization_connection_test.go | 5 ++-- .../appfabric/app_authorization_test.go | 9 +++--- internal/service/appfabric/app_bundle_test.go | 7 +++-- .../appfabric/ingestion_destination_test.go | 11 +++---- internal/service/appfabric/ingestion_test.go | 7 +++-- .../apprunner/hosted_zone_id_data_source.go | 23 +++++++------- .../hosted_zone_id_data_source_test.go | 3 +- .../cloudtrail/service_account_data_source.go | 2 +- .../service/dynamodb/global_table_test.go | 3 +- .../hosted_zone_data_source.go | 2 +- .../service/elb/hosted_zone_id_data_source.go | 2 +- .../elb/service_account_data_source.go | 2 +- .../elbv2/hosted_zone_id_data_source.go | 4 +-- internal/service/gamelift/gamelift_test.go | 29 +++++++++--------- internal/service/lambda/function.go | 2 +- .../redshift/service_account_data_source.go | 2 +- internal/service/route53/record_test.go | 3 +- internal/service/s3/hosted_zones.go | 2 +- .../prebuilt_ecr_image_data_source.go | 30 +++++++++---------- names/names.go | 1 - 20 files changed, 79 insertions(+), 70 deletions(-) diff --git a/internal/service/appfabric/app_authorization_connection_test.go b/internal/service/appfabric/app_authorization_connection_test.go index dff658087a7..e15b43cd108 100644 --- a/internal/service/appfabric/app_authorization_connection_test.go +++ b/internal/service/appfabric/app_authorization_connection_test.go @@ -8,6 +8,7 @@ import ( "fmt" "testing" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -30,7 +31,7 @@ func testAccAppAuthorizationConnection_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, names.APNortheast1RegionID, names.EUWest1RegionID) + acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, names.EUWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), @@ -65,7 +66,7 @@ func testAccAppAuthorizationConnection_OAuth2(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, names.APNortheast1RegionID, names.EUWest1RegionID) + acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, names.EUWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), diff --git a/internal/service/appfabric/app_authorization_test.go b/internal/service/appfabric/app_authorization_test.go index 98008caa166..72777b9b6d7 100644 --- a/internal/service/appfabric/app_authorization_test.go +++ b/internal/service/appfabric/app_authorization_test.go @@ -9,6 +9,7 @@ import ( "testing" "github.com/aws/aws-sdk-go-v2/service/appfabric/types" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -28,7 +29,7 @@ func testAccAppAuthorization_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, names.APNortheast1RegionID, names.EUWest1RegionID) + acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, names.EUWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), @@ -68,7 +69,7 @@ func testAccAppAuthorization_disappears(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, names.APNortheast1RegionID, names.EUWest1RegionID) + acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, names.EUWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), @@ -104,7 +105,7 @@ func testAccAppAuthorization_apiKeyUpdate(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, names.APNortheast1RegionID, names.EUWest1RegionID) + acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, names.EUWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), @@ -164,7 +165,7 @@ func testAccAppAuthorization_oath2Update(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, names.APNortheast1RegionID, names.EUWest1RegionID) + acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, names.EUWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), diff --git a/internal/service/appfabric/app_bundle_test.go b/internal/service/appfabric/app_bundle_test.go index 26eb7a6848b..8b78906be15 100644 --- a/internal/service/appfabric/app_bundle_test.go +++ b/internal/service/appfabric/app_bundle_test.go @@ -9,6 +9,7 @@ import ( "testing" awstypes "github.com/aws/aws-sdk-go-v2/service/appfabric/types" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -27,7 +28,7 @@ func testAccAppBundle_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, names.APNortheast1RegionID, names.EUWest1RegionID) + acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, names.EUWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), @@ -59,7 +60,7 @@ func testAccAppBundle_disappears(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, names.APNortheast1RegionID, names.EUWest1RegionID) + acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, names.EUWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), @@ -87,7 +88,7 @@ func testAccAppBundle_cmk(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, names.APNortheast1RegionID, names.EUWest1RegionID) + acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, names.EUWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), diff --git a/internal/service/appfabric/ingestion_destination_test.go b/internal/service/appfabric/ingestion_destination_test.go index 43a8551e422..6124e4a9afd 100644 --- a/internal/service/appfabric/ingestion_destination_test.go +++ b/internal/service/appfabric/ingestion_destination_test.go @@ -9,6 +9,7 @@ import ( "testing" awstypes "github.com/aws/aws-sdk-go-v2/service/appfabric/types" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -31,7 +32,7 @@ func testAccIngestionDestination_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, names.APNortheast1RegionID, names.EUWest1RegionID) + acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, names.EUWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), @@ -80,7 +81,7 @@ func testAccIngestionDestination_disappears(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, names.APNortheast1RegionID, names.EUWest1RegionID) + acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, names.EUWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), @@ -111,7 +112,7 @@ func testAccIngestionDestination_tags(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, names.APNortheast1RegionID, names.EUWest1RegionID) + acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, names.EUWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), @@ -164,7 +165,7 @@ func testAccIngestionDestination_update(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, names.APNortheast1RegionID, names.EUWest1RegionID) + acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, names.EUWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), @@ -218,7 +219,7 @@ func testAccIngestionDestination_firehose(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, names.APNortheast1RegionID, names.EUWest1RegionID) + acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, names.EUWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), diff --git a/internal/service/appfabric/ingestion_test.go b/internal/service/appfabric/ingestion_test.go index ec58dec6e2e..4ba0c6afcff 100644 --- a/internal/service/appfabric/ingestion_test.go +++ b/internal/service/appfabric/ingestion_test.go @@ -9,6 +9,7 @@ import ( "testing" awstypes "github.com/aws/aws-sdk-go-v2/service/appfabric/types" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -31,7 +32,7 @@ func testAccIngestion_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, names.APNortheast1RegionID, names.EUWest1RegionID) + acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, names.EUWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), @@ -69,7 +70,7 @@ func testAccIngestion_disappears(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, names.APNortheast1RegionID, names.EUWest1RegionID) + acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, names.EUWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), @@ -100,7 +101,7 @@ func testAccIngestion_tags(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, names.APNortheast1RegionID, names.EUWest1RegionID) + acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, names.EUWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), diff --git a/internal/service/apprunner/hosted_zone_id_data_source.go b/internal/service/apprunner/hosted_zone_id_data_source.go index 5232acaa217..37d5cacb45f 100644 --- a/internal/service/apprunner/hosted_zone_id_data_source.go +++ b/internal/service/apprunner/hosted_zone_id_data_source.go @@ -7,6 +7,7 @@ import ( "context" "fmt" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/terraform-plugin-framework/datasource" "github.com/hashicorp/terraform-plugin-framework/datasource/schema" "github.com/hashicorp/terraform-plugin-framework/types" @@ -17,17 +18,17 @@ import ( // See https://docs.aws.amazon.com/general/latest/gr/apprunner.html var hostedZoneIDPerRegionMap = map[string]string{ - names.USEast2RegionID: "Z0224347AD7KVHMLOX31", - names.USEast1RegionID: "Z01915732ZBZKC8D32TPT", - names.USWest2RegionID: "Z02243383FTQ64HJ5772Q", - names.APSouth1RegionID: "Z00855883LBHKTIC4ODF2", - names.APSoutheast1RegionID: "Z09819469CZ3KQ8PWMCL", - names.APSoutheast2RegionID: "Z03657752RA8799S0TI5I", - names.APNortheast1RegionID: "Z08491812XW6IPYLR6CCA", - names.EUCentral1RegionID: "Z0334911C2FDI2Q9M4FZ", - names.EUWest1RegionID: "Z087551914Z2PCAU0QHMW", - names.EUWest2RegionID: "Z098228427VC6B3IX76ON", - names.EUWest3RegionID: "Z087117439MBKHYM69QS6", + names.USEast2RegionID: "Z0224347AD7KVHMLOX31", + names.USEast1RegionID: "Z01915732ZBZKC8D32TPT", + names.USWest2RegionID: "Z02243383FTQ64HJ5772Q", + names.APSouth1RegionID: "Z00855883LBHKTIC4ODF2", + names.APSoutheast1RegionID: "Z09819469CZ3KQ8PWMCL", + names.APSoutheast2RegionID: "Z03657752RA8799S0TI5I", + endpoints.ApNortheast1RegionID: "Z08491812XW6IPYLR6CCA", + names.EUCentral1RegionID: "Z0334911C2FDI2Q9M4FZ", + names.EUWest1RegionID: "Z087551914Z2PCAU0QHMW", + names.EUWest2RegionID: "Z098228427VC6B3IX76ON", + names.EUWest3RegionID: "Z087117439MBKHYM69QS6", } // @FrameworkDataSource("aws_apprunner_hosted_zone_id", name="Hosted Zone ID") diff --git a/internal/service/apprunner/hosted_zone_id_data_source_test.go b/internal/service/apprunner/hosted_zone_id_data_source_test.go index 11f03ade065..a6a1db621e7 100644 --- a/internal/service/apprunner/hosted_zone_id_data_source_test.go +++ b/internal/service/apprunner/hosted_zone_id_data_source_test.go @@ -7,6 +7,7 @@ import ( "fmt" "testing" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-aws/internal/acctest" "github.com/hashicorp/terraform-provider-aws/names" @@ -32,7 +33,7 @@ func TestAccAppRunnerHostedZoneIDDataSource_basic(t *testing.T) { ), }, { - Config: testAccHostedZoneIDDataSourceConfig_explicitRegion(names.APNortheast1RegionID), + Config: testAccHostedZoneIDDataSourceConfig_explicitRegion(endpoints.ApNortheast1RegionID), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr(datasourceName, names.AttrID, "Z08491812XW6IPYLR6CCA"), ), diff --git a/internal/service/cloudtrail/service_account_data_source.go b/internal/service/cloudtrail/service_account_data_source.go index 2b97f441cd4..19b235add8a 100644 --- a/internal/service/cloudtrail/service_account_data_source.go +++ b/internal/service/cloudtrail/service_account_data_source.go @@ -22,7 +22,7 @@ import ( var serviceAccountPerRegionMap = map[string]string{ endpoints.AfSouth1RegionID: "525921808201", endpoints.ApEast1RegionID: "119688915426", - names.APNortheast1RegionID: "216624486486", + endpoints.ApNortheast1RegionID: "216624486486", names.APNortheast2RegionID: "492519147666", names.APNortheast3RegionID: "765225791966", names.APSouth1RegionID: "977081816279", diff --git a/internal/service/dynamodb/global_table_test.go b/internal/service/dynamodb/global_table_test.go index 3865da661d3..1d3c3711ae4 100644 --- a/internal/service/dynamodb/global_table_test.go +++ b/internal/service/dynamodb/global_table_test.go @@ -10,6 +10,7 @@ import ( "github.com/YakDriver/regexache" "github.com/aws/aws-sdk-go-v2/service/dynamodb" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -156,7 +157,7 @@ func testAccCheckGlobalTableExists(ctx context.Context, n string) resource.TestC func testAccPreCheckGlobalTable(ctx context.Context, t *testing.T) { // Region availability for Version 2017.11.29: https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/GlobalTables.html supportedRegions := []string{ - names.APNortheast1RegionID, + endpoints.ApNortheast1RegionID, names.APNortheast2RegionID, names.APSoutheast1RegionID, names.APSoutheast2RegionID, diff --git a/internal/service/elasticbeanstalk/hosted_zone_data_source.go b/internal/service/elasticbeanstalk/hosted_zone_data_source.go index b260046a68f..2603253cb31 100644 --- a/internal/service/elasticbeanstalk/hosted_zone_data_source.go +++ b/internal/service/elasticbeanstalk/hosted_zone_data_source.go @@ -22,7 +22,7 @@ var hostedZoneIDs = map[string]string{ names.APSoutheast2RegionID: "Z2PCDNR3VC2G1N", names.APSoutheast3RegionID: "Z05913172VM7EAZB40TA8", endpoints.ApEast1RegionID: "ZPWYUBWRU171A", - names.APNortheast1RegionID: "Z1R25G3KIG2GBW", + endpoints.ApNortheast1RegionID: "Z1R25G3KIG2GBW", names.APNortheast2RegionID: "Z3JE5OI70TWKCP", names.APNortheast3RegionID: "ZNE5GEY1TIAGY", names.APSouth1RegionID: "Z18NTBI3Y7N9TZ", diff --git a/internal/service/elb/hosted_zone_id_data_source.go b/internal/service/elb/hosted_zone_id_data_source.go index 58bc33a12ba..d648c0f99cf 100644 --- a/internal/service/elb/hosted_zone_id_data_source.go +++ b/internal/service/elb/hosted_zone_id_data_source.go @@ -18,7 +18,7 @@ import ( var hostedZoneIDPerRegionMap = map[string]string{ endpoints.AfSouth1RegionID: "Z268VQBMOI5EKX", endpoints.ApEast1RegionID: "Z3DQVH9N71FHZ0", - names.APNortheast1RegionID: "Z14GRHDCWA56QT", + endpoints.ApNortheast1RegionID: "Z14GRHDCWA56QT", names.APNortheast2RegionID: "ZWKZPGTI48KDX", names.APNortheast3RegionID: "Z5LXEXXYW11ES", names.APSouth1RegionID: "ZP97RAFLXTNZK", diff --git a/internal/service/elb/service_account_data_source.go b/internal/service/elb/service_account_data_source.go index cfde282810a..70edb41d674 100644 --- a/internal/service/elb/service_account_data_source.go +++ b/internal/service/elb/service_account_data_source.go @@ -20,7 +20,7 @@ import ( var accountIDPerRegionMap = map[string]string{ endpoints.AfSouth1RegionID: "098369216593", endpoints.ApEast1RegionID: "754344448648", - names.APNortheast1RegionID: "582318560864", + endpoints.ApNortheast1RegionID: "582318560864", names.APNortheast2RegionID: "600734575887", names.APNortheast3RegionID: "383597477331", names.APSouth1RegionID: "718504428378", diff --git a/internal/service/elbv2/hosted_zone_id_data_source.go b/internal/service/elbv2/hosted_zone_id_data_source.go index b93632da05e..a6591b4a62f 100644 --- a/internal/service/elbv2/hosted_zone_id_data_source.go +++ b/internal/service/elbv2/hosted_zone_id_data_source.go @@ -22,7 +22,7 @@ import ( var hostedZoneIDPerRegionALBMap = map[string]string{ endpoints.AfSouth1RegionID: "Z268VQBMOI5EKX", endpoints.ApEast1RegionID: "Z3DQVH9N71FHZ0", - names.APNortheast1RegionID: "Z14GRHDCWA56QT", + endpoints.ApNortheast1RegionID: "Z14GRHDCWA56QT", names.APNortheast2RegionID: "ZWKZPGTI48KDX", names.APNortheast3RegionID: "Z5LXEXXYW11ES", names.APSouth1RegionID: "ZP97RAFLXTNZK", @@ -60,7 +60,7 @@ var hostedZoneIDPerRegionALBMap = map[string]string{ var hostedZoneIDPerRegionNLBMap = map[string]string{ endpoints.AfSouth1RegionID: "Z203XCE67M25HM", endpoints.ApEast1RegionID: "Z12Y7K3UBGUAD1", - names.APNortheast1RegionID: "Z31USIVHYNEOWT", + endpoints.ApNortheast1RegionID: "Z31USIVHYNEOWT", names.APNortheast2RegionID: "ZIBE1TIR4HY56", names.APNortheast3RegionID: "Z1GWIQ4HH19I5X", names.APSouth1RegionID: "ZVDDRBQ08TROA", diff --git a/internal/service/gamelift/gamelift_test.go b/internal/service/gamelift/gamelift_test.go index f8aaee8a4f4..f5604dfb10c 100644 --- a/internal/service/gamelift/gamelift_test.go +++ b/internal/service/gamelift/gamelift_test.go @@ -8,6 +8,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" awstypes "github.com/aws/aws-sdk-go-v2/service/gamelift/types" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-provider-aws/internal/acctest" "github.com/hashicorp/terraform-provider-aws/names" @@ -50,20 +51,20 @@ func testAccSampleGame(region string) (*testAccGame, error) { // Account ID found from CloudTrail event (role ARN) after finishing tutorial in given region func testAccAccountIdByRegion(region string) (string, error) { m := map[string]string{ - names.APNortheast1RegionID: "120069834884", - names.APNortheast2RegionID: "805673136642", - names.APSouth1RegionID: "134975661615", - names.APSoutheast1RegionID: "077577004113", - names.APSoutheast2RegionID: "112188327105", - names.CACentral1RegionID: "800535022691", - names.EUCentral1RegionID: "797584052317", - names.EUWest1RegionID: "319803218673", - names.EUWest2RegionID: "937342764187", - names.SAEast1RegionID: "028872612690", - names.USEast1RegionID: "783764748367", - names.USEast2RegionID: "415729564621", - names.USWest1RegionID: "715879310420", - names.USWest2RegionID: "741061592171", + endpoints.ApNortheast1RegionID: "120069834884", + names.APNortheast2RegionID: "805673136642", + names.APSouth1RegionID: "134975661615", + names.APSoutheast1RegionID: "077577004113", + names.APSoutheast2RegionID: "112188327105", + names.CACentral1RegionID: "800535022691", + names.EUCentral1RegionID: "797584052317", + names.EUWest1RegionID: "319803218673", + names.EUWest2RegionID: "937342764187", + names.SAEast1RegionID: "028872612690", + names.USEast1RegionID: "783764748367", + names.USEast2RegionID: "415729564621", + names.USWest1RegionID: "715879310420", + names.USWest2RegionID: "741061592171", } if accId, ok := m[region]; ok { diff --git a/internal/service/lambda/function.go b/internal/service/lambda/function.go index 309f1519f9e..311868e9f7c 100644 --- a/internal/service/lambda/function.go +++ b/internal/service/lambda/function.go @@ -1409,7 +1409,7 @@ func signerServiceIsAvailable(region string) bool { names.APNortheast2RegionID: {}, names.APSoutheast1RegionID: {}, names.APSoutheast2RegionID: {}, - names.APNortheast1RegionID: {}, + endpoints.ApNortheast1RegionID: {}, names.CACentral1RegionID: {}, names.EUCentral1RegionID: {}, names.EUWest1RegionID: {}, diff --git a/internal/service/redshift/service_account_data_source.go b/internal/service/redshift/service_account_data_source.go index 3047a9c8b47..abb73803639 100644 --- a/internal/service/redshift/service_account_data_source.go +++ b/internal/service/redshift/service_account_data_source.go @@ -22,7 +22,7 @@ import ( var ServiceAccountPerRegionMap = map[string]string{ endpoints.AfSouth1RegionID: "365689465814", endpoints.ApEast1RegionID: "313564881002", - names.APNortheast1RegionID: "404641285394", + endpoints.ApNortheast1RegionID: "404641285394", names.APNortheast2RegionID: "760740231472", names.APNortheast3RegionID: "090321488786", names.APSouth1RegionID: "865932855811", diff --git a/internal/service/route53/record_test.go b/internal/service/route53/record_test.go index 2c7a0d617ef..2024fda9aa0 100644 --- a/internal/service/route53/record_test.go +++ b/internal/service/route53/record_test.go @@ -13,6 +13,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/route53" awstypes "github.com/aws/aws-sdk-go-v2/service/route53/types" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -849,7 +850,7 @@ func TestAccRoute53Record_Latency_basic(t *testing.T) { CheckDestroy: testAccCheckRecordDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccRecordConfig_latencyCNAME(names.USEast1RegionID, names.EUWest1RegionID, names.APNortheast1RegionID), + Config: testAccRecordConfig_latencyCNAME(names.USEast1RegionID, names.EUWest1RegionID, endpoints.ApNortheast1RegionID), Check: resource.ComposeTestCheckFunc( testAccCheckRecordExists(ctx, resourceName, &record1), testAccCheckRecordExists(ctx, "aws_route53_record.second_region", &record2), diff --git a/internal/service/s3/hosted_zones.go b/internal/service/s3/hosted_zones.go index 3f48442ca98..b8a1b68af0c 100644 --- a/internal/service/s3/hosted_zones.go +++ b/internal/service/s3/hosted_zones.go @@ -14,7 +14,7 @@ import ( var hostedZoneIDsMap = map[string]string{ endpoints.AfSouth1RegionID: "Z83WF9RJE8B12", endpoints.ApEast1RegionID: "ZNB98KWMFR0R6", - names.APNortheast1RegionID: "Z2M4EHUR26P7ZW", + endpoints.ApNortheast1RegionID: "Z2M4EHUR26P7ZW", names.APNortheast2RegionID: "Z3W03O7B5YMIYP", names.APNortheast3RegionID: "Z2YQB5RD63NC85", names.APSouth1RegionID: "Z11RGJOFQNVJUP", diff --git a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go index dfb7e4a70df..50c90043dbf 100644 --- a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go +++ b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go @@ -191,7 +191,7 @@ const ( var prebuiltECRImageIDByRegion_blazing = map[string]string{ endpoints.AfSouth1RegionID: "455444449433", endpoints.ApEast1RegionID: "286214385809", - names.APNortheast1RegionID: "501404015308", + endpoints.ApNortheast1RegionID: "501404015308", names.APNortheast2RegionID: "306986355934", names.APNortheast3RegionID: "867004704886", names.APSouth1RegionID: "991648021394", @@ -231,7 +231,7 @@ var prebuiltECRImageIDByRegion_blazing = map[string]string{ var prebuiltECRImageIDByRegion_clarify = map[string]string{ endpoints.AfSouth1RegionID: "811711786498", endpoints.ApEast1RegionID: "098760798382", - names.APNortheast1RegionID: "377024640650", + endpoints.ApNortheast1RegionID: "377024640650", names.APNortheast2RegionID: "263625296855", names.APNortheast3RegionID: "912233562940", names.APSouth1RegionID: "452307495513", @@ -261,7 +261,7 @@ var prebuiltECRImageIDByRegion_clarify = map[string]string{ var prebuiltECRImageIDByRegion_dataWrangler = map[string]string{ endpoints.AfSouth1RegionID: "143210264188", endpoints.ApEast1RegionID: "707077482487", - names.APNortheast1RegionID: "649008135260", + endpoints.ApNortheast1RegionID: "649008135260", names.APNortheast2RegionID: "131546521161", names.APNortheast3RegionID: "913387583493", names.APSouth1RegionID: "089933028263", @@ -290,7 +290,7 @@ var prebuiltECRImageIDByRegion_dataWrangler = map[string]string{ var prebuiltECRImageIDByRegion_debugger = map[string]string{ endpoints.AfSouth1RegionID: "314341159256", endpoints.ApEast1RegionID: "199566480951", - names.APNortheast1RegionID: "430734990657", + endpoints.ApNortheast1RegionID: "430734990657", names.APNortheast2RegionID: "578805364391", names.APNortheast3RegionID: "479947661362", names.APSouth1RegionID: "904829902805", @@ -325,7 +325,7 @@ var prebuiltECRImageIDByRegion_debugger = map[string]string{ var prebuiltECRImageIDByRegion_inferentiaNeo = map[string]string{ endpoints.AfSouth1RegionID: "774647643957", endpoints.ApEast1RegionID: "110948597952", - names.APNortheast1RegionID: "941853720454", + endpoints.ApNortheast1RegionID: "941853720454", names.APNortheast2RegionID: "151534178276", names.APNortheast3RegionID: "925152966179", names.APSouth1RegionID: "763008648453", @@ -362,7 +362,7 @@ var prebuiltECRImageIDByRegion_inferentiaNeo = map[string]string{ var prebuiltECRImageIDByRegion_SageMakerCustom = map[string]string{ // nosemgrep:ci.sagemaker-in-var-name endpoints.AfSouth1RegionID: "313743910680", endpoints.ApEast1RegionID: "057415533634", - names.APNortheast1RegionID: "520713654638", + endpoints.ApNortheast1RegionID: "520713654638", names.APNortheast2RegionID: "520713654638", names.APSouth1RegionID: "520713654638", names.APSoutheast1RegionID: "520713654638", @@ -392,7 +392,7 @@ var prebuiltECRImageIDByRegion_SageMakerCustom = map[string]string{ // nosemgrep // https://github.com/aws/sagemaker-python-sdk/blob/master/src/sagemaker/image_uri_config/vw.json var prebuiltECRImageIDByRegion_SageMakerRL = map[string]string{ // nosemgrep:ci.sagemaker-in-var-name - names.APNortheast1RegionID: "462105765813", + endpoints.ApNortheast1RegionID: "462105765813", names.APNortheast2RegionID: "462105765813", names.APSouth1RegionID: "462105765813", names.APSoutheast1RegionID: "462105765813", @@ -412,7 +412,7 @@ var prebuiltECRImageIDByRegion_SageMakerRL = map[string]string{ // nosemgrep:ci. var prebuiltECRImageIDByRegion_spark = map[string]string{ endpoints.AfSouth1RegionID: "309385258863", endpoints.ApEast1RegionID: "732049463269", - names.APNortheast1RegionID: "411782140378", + endpoints.ApNortheast1RegionID: "411782140378", names.APNortheast2RegionID: "860869212795", names.APNortheast3RegionID: "102471314380", names.APSouth1RegionID: "105495057255", @@ -450,7 +450,7 @@ var prebuiltECRImageIDByRegion_spark = map[string]string{ var prebuiltECRImageIDByRegion_SageMakerBasePython = map[string]string{ // nosemgrep:ci.sagemaker-in-var-name endpoints.AfSouth1RegionID: "559312083959", endpoints.ApEast1RegionID: "493642496378", - names.APNortheast1RegionID: "102112518831", + endpoints.ApNortheast1RegionID: "102112518831", names.APNortheast2RegionID: "806072073708", names.APNortheast3RegionID: "792733760839", names.APSouth1RegionID: "394103062818", @@ -490,7 +490,7 @@ var prebuiltECRImageIDByRegion_SageMakerGeospatial = map[string]string{ // nosem var prebuiltECRImageIDByRegion_deepAR = map[string]string{ endpoints.AfSouth1RegionID: "455444449433", endpoints.ApEast1RegionID: "286214385809", - names.APNortheast1RegionID: "633353088612", + endpoints.ApNortheast1RegionID: "633353088612", names.APNortheast2RegionID: "204372634319", names.APNortheast3RegionID: "867004704886", names.APSouth1RegionID: "991648021394", @@ -535,7 +535,7 @@ var prebuiltECRImageIDByRegion_deepAR = map[string]string{ var prebuiltECRImageIDByRegion_factorMachines = map[string]string{ endpoints.AfSouth1RegionID: "455444449433", endpoints.ApEast1RegionID: "286214385809", - names.APNortheast1RegionID: "351501993468", + endpoints.ApNortheast1RegionID: "351501993468", names.APNortheast2RegionID: "835164637446", names.APNortheast3RegionID: "867004704886", names.APSouth1RegionID: "991648021394", @@ -573,7 +573,7 @@ var prebuiltECRImageIDByRegion_factorMachines = map[string]string{ // https://github.com/aws/sagemaker-python-sdk/blob/master/src/sagemaker/image_uri_config/lda.json var prebuiltECRImageIDByRegion_lda = map[string]string{ - names.APNortheast1RegionID: "258307448986", + endpoints.ApNortheast1RegionID: "258307448986", names.APNortheast2RegionID: "293181348795", names.APSouth1RegionID: "991648021394", names.APSoutheast1RegionID: "475088953585", @@ -600,7 +600,7 @@ var prebuiltECRImageIDByRegion_lda = map[string]string{ var prebuiltECRImageIDByRegion_XGBoost = map[string]string{ endpoints.AfSouth1RegionID: "510948584623", endpoints.ApEast1RegionID: "651117190479", - names.APNortheast1RegionID: "354813040037", + endpoints.ApNortheast1RegionID: "354813040037", names.APNortheast2RegionID: "366743142698", names.APNortheast3RegionID: "867004704886", names.APSouth1RegionID: "720646828776", @@ -652,7 +652,7 @@ var prebuiltECRImageIDByRegion_XGBoost = map[string]string{ var prebuiltECRImageIDByRegion_deepLearning = map[string]string{ endpoints.AfSouth1RegionID: "626614931356", endpoints.ApEast1RegionID: "871362719292", - names.APNortheast1RegionID: "763104351884", + endpoints.ApNortheast1RegionID: "763104351884", names.APNortheast2RegionID: "763104351884", names.APNortheast3RegionID: "364406365360", names.APSouth1RegionID: "763104351884", @@ -692,7 +692,7 @@ var prebuiltECRImageIDByRegion_deepLearning = map[string]string{ var prebuiltECRImageIDByRegion_modelMonitor = map[string]string{ endpoints.AfSouth1RegionID: "875698925577", endpoints.ApEast1RegionID: "001633400207", - names.APNortheast1RegionID: "574779866223", + endpoints.ApNortheast1RegionID: "574779866223", names.APNortheast2RegionID: "709848358524", names.APNortheast3RegionID: "990339680094", names.APSouth1RegionID: "126357580389", diff --git a/names/names.go b/names/names.go index e271c13d57c..5ce172ab0e5 100644 --- a/names/names.go +++ b/names/names.go @@ -149,7 +149,6 @@ const ( // AWS Standard partition's regions. GlobalRegionID = "aws-global" // AWS Standard global region. - APNortheast1RegionID = "ap-northeast-1" // Asia Pacific (Tokyo). APNortheast2RegionID = "ap-northeast-2" // Asia Pacific (Seoul). APNortheast3RegionID = "ap-northeast-3" // Asia Pacific (Osaka). APSouth1RegionID = "ap-south-1" // Asia Pacific (Mumbai). From 5a2dc4ad82e0462eac2b4f02e49163a057dd6728 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:53:56 -0500 Subject: [PATCH 269/304] 'names.APNortheast2RegionID' -> 'endpoints.ApNortheast2RegionID'. --- .../cloudtrail/service_account_data_source.go | 2 +- .../service/dynamodb/global_table_test.go | 2 +- .../hosted_zone_data_source.go | 2 +- .../service/elb/hosted_zone_id_data_source.go | 2 +- .../elb/service_account_data_source.go | 2 +- .../elbv2/hosted_zone_id_data_source.go | 4 +-- internal/service/gamelift/gamelift_test.go | 2 +- internal/service/lambda/function.go | 2 +- .../redshift/service_account_data_source.go | 2 +- internal/service/s3/hosted_zones.go | 2 +- .../prebuilt_ecr_image_data_source.go | 30 +++++++++---------- names/names.go | 1 - 12 files changed, 26 insertions(+), 27 deletions(-) diff --git a/internal/service/cloudtrail/service_account_data_source.go b/internal/service/cloudtrail/service_account_data_source.go index 19b235add8a..ee466400ec6 100644 --- a/internal/service/cloudtrail/service_account_data_source.go +++ b/internal/service/cloudtrail/service_account_data_source.go @@ -23,7 +23,7 @@ var serviceAccountPerRegionMap = map[string]string{ endpoints.AfSouth1RegionID: "525921808201", endpoints.ApEast1RegionID: "119688915426", endpoints.ApNortheast1RegionID: "216624486486", - names.APNortheast2RegionID: "492519147666", + endpoints.ApNortheast2RegionID: "492519147666", names.APNortheast3RegionID: "765225791966", names.APSouth1RegionID: "977081816279", names.APSouth2RegionID: "582488909970", diff --git a/internal/service/dynamodb/global_table_test.go b/internal/service/dynamodb/global_table_test.go index 1d3c3711ae4..6ea9fca158a 100644 --- a/internal/service/dynamodb/global_table_test.go +++ b/internal/service/dynamodb/global_table_test.go @@ -158,7 +158,7 @@ func testAccPreCheckGlobalTable(ctx context.Context, t *testing.T) { // Region availability for Version 2017.11.29: https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/GlobalTables.html supportedRegions := []string{ endpoints.ApNortheast1RegionID, - names.APNortheast2RegionID, + endpoints.ApNortheast2RegionID, names.APSoutheast1RegionID, names.APSoutheast2RegionID, names.EUCentral1RegionID, diff --git a/internal/service/elasticbeanstalk/hosted_zone_data_source.go b/internal/service/elasticbeanstalk/hosted_zone_data_source.go index 2603253cb31..ccade06d124 100644 --- a/internal/service/elasticbeanstalk/hosted_zone_data_source.go +++ b/internal/service/elasticbeanstalk/hosted_zone_data_source.go @@ -23,7 +23,7 @@ var hostedZoneIDs = map[string]string{ names.APSoutheast3RegionID: "Z05913172VM7EAZB40TA8", endpoints.ApEast1RegionID: "ZPWYUBWRU171A", endpoints.ApNortheast1RegionID: "Z1R25G3KIG2GBW", - names.APNortheast2RegionID: "Z3JE5OI70TWKCP", + endpoints.ApNortheast2RegionID: "Z3JE5OI70TWKCP", names.APNortheast3RegionID: "ZNE5GEY1TIAGY", names.APSouth1RegionID: "Z18NTBI3Y7N9TZ", names.CACentral1RegionID: "ZJFCZL7SSZB5I", diff --git a/internal/service/elb/hosted_zone_id_data_source.go b/internal/service/elb/hosted_zone_id_data_source.go index d648c0f99cf..77f9572142b 100644 --- a/internal/service/elb/hosted_zone_id_data_source.go +++ b/internal/service/elb/hosted_zone_id_data_source.go @@ -19,7 +19,7 @@ var hostedZoneIDPerRegionMap = map[string]string{ endpoints.AfSouth1RegionID: "Z268VQBMOI5EKX", endpoints.ApEast1RegionID: "Z3DQVH9N71FHZ0", endpoints.ApNortheast1RegionID: "Z14GRHDCWA56QT", - names.APNortheast2RegionID: "ZWKZPGTI48KDX", + endpoints.ApNortheast2RegionID: "ZWKZPGTI48KDX", names.APNortheast3RegionID: "Z5LXEXXYW11ES", names.APSouth1RegionID: "ZP97RAFLXTNZK", names.APSouth2RegionID: "Z0173938T07WNTVAEPZN", diff --git a/internal/service/elb/service_account_data_source.go b/internal/service/elb/service_account_data_source.go index 70edb41d674..872164c66a6 100644 --- a/internal/service/elb/service_account_data_source.go +++ b/internal/service/elb/service_account_data_source.go @@ -21,7 +21,7 @@ var accountIDPerRegionMap = map[string]string{ endpoints.AfSouth1RegionID: "098369216593", endpoints.ApEast1RegionID: "754344448648", endpoints.ApNortheast1RegionID: "582318560864", - names.APNortheast2RegionID: "600734575887", + endpoints.ApNortheast2RegionID: "600734575887", names.APNortheast3RegionID: "383597477331", names.APSouth1RegionID: "718504428378", names.APSoutheast1RegionID: "114774131450", diff --git a/internal/service/elbv2/hosted_zone_id_data_source.go b/internal/service/elbv2/hosted_zone_id_data_source.go index a6591b4a62f..0c3c5ee9626 100644 --- a/internal/service/elbv2/hosted_zone_id_data_source.go +++ b/internal/service/elbv2/hosted_zone_id_data_source.go @@ -23,7 +23,7 @@ var hostedZoneIDPerRegionALBMap = map[string]string{ endpoints.AfSouth1RegionID: "Z268VQBMOI5EKX", endpoints.ApEast1RegionID: "Z3DQVH9N71FHZ0", endpoints.ApNortheast1RegionID: "Z14GRHDCWA56QT", - names.APNortheast2RegionID: "ZWKZPGTI48KDX", + endpoints.ApNortheast2RegionID: "ZWKZPGTI48KDX", names.APNortheast3RegionID: "Z5LXEXXYW11ES", names.APSouth1RegionID: "ZP97RAFLXTNZK", names.APSouth2RegionID: "Z0173938T07WNTVAEPZN", @@ -61,7 +61,7 @@ var hostedZoneIDPerRegionNLBMap = map[string]string{ endpoints.AfSouth1RegionID: "Z203XCE67M25HM", endpoints.ApEast1RegionID: "Z12Y7K3UBGUAD1", endpoints.ApNortheast1RegionID: "Z31USIVHYNEOWT", - names.APNortheast2RegionID: "ZIBE1TIR4HY56", + endpoints.ApNortheast2RegionID: "ZIBE1TIR4HY56", names.APNortheast3RegionID: "Z1GWIQ4HH19I5X", names.APSouth1RegionID: "ZVDDRBQ08TROA", names.APSouth2RegionID: "Z0711778386UTO08407HT", diff --git a/internal/service/gamelift/gamelift_test.go b/internal/service/gamelift/gamelift_test.go index f5604dfb10c..3cd6d7f30bb 100644 --- a/internal/service/gamelift/gamelift_test.go +++ b/internal/service/gamelift/gamelift_test.go @@ -52,7 +52,7 @@ func testAccSampleGame(region string) (*testAccGame, error) { func testAccAccountIdByRegion(region string) (string, error) { m := map[string]string{ endpoints.ApNortheast1RegionID: "120069834884", - names.APNortheast2RegionID: "805673136642", + endpoints.ApNortheast2RegionID: "805673136642", names.APSouth1RegionID: "134975661615", names.APSoutheast1RegionID: "077577004113", names.APSoutheast2RegionID: "112188327105", diff --git a/internal/service/lambda/function.go b/internal/service/lambda/function.go index 311868e9f7c..0b45ae56d86 100644 --- a/internal/service/lambda/function.go +++ b/internal/service/lambda/function.go @@ -1406,7 +1406,7 @@ func signerServiceIsAvailable(region string) bool { endpoints.AfSouth1RegionID: {}, endpoints.ApEast1RegionID: {}, names.APSouth1RegionID: {}, - names.APNortheast2RegionID: {}, + endpoints.ApNortheast2RegionID: {}, names.APSoutheast1RegionID: {}, names.APSoutheast2RegionID: {}, endpoints.ApNortheast1RegionID: {}, diff --git a/internal/service/redshift/service_account_data_source.go b/internal/service/redshift/service_account_data_source.go index abb73803639..284fa59139e 100644 --- a/internal/service/redshift/service_account_data_source.go +++ b/internal/service/redshift/service_account_data_source.go @@ -23,7 +23,7 @@ var ServiceAccountPerRegionMap = map[string]string{ endpoints.AfSouth1RegionID: "365689465814", endpoints.ApEast1RegionID: "313564881002", endpoints.ApNortheast1RegionID: "404641285394", - names.APNortheast2RegionID: "760740231472", + endpoints.ApNortheast2RegionID: "760740231472", names.APNortheast3RegionID: "090321488786", names.APSouth1RegionID: "865932855811", names.APSoutheast1RegionID: "361669875840", diff --git a/internal/service/s3/hosted_zones.go b/internal/service/s3/hosted_zones.go index b8a1b68af0c..e9569a4112b 100644 --- a/internal/service/s3/hosted_zones.go +++ b/internal/service/s3/hosted_zones.go @@ -15,7 +15,7 @@ var hostedZoneIDsMap = map[string]string{ endpoints.AfSouth1RegionID: "Z83WF9RJE8B12", endpoints.ApEast1RegionID: "ZNB98KWMFR0R6", endpoints.ApNortheast1RegionID: "Z2M4EHUR26P7ZW", - names.APNortheast2RegionID: "Z3W03O7B5YMIYP", + endpoints.ApNortheast2RegionID: "Z3W03O7B5YMIYP", names.APNortheast3RegionID: "Z2YQB5RD63NC85", names.APSouth1RegionID: "Z11RGJOFQNVJUP", names.APSouth2RegionID: "Z02976202B4EZMXIPMXF7", diff --git a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go index 50c90043dbf..cf7d624dd12 100644 --- a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go +++ b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go @@ -192,7 +192,7 @@ var prebuiltECRImageIDByRegion_blazing = map[string]string{ endpoints.AfSouth1RegionID: "455444449433", endpoints.ApEast1RegionID: "286214385809", endpoints.ApNortheast1RegionID: "501404015308", - names.APNortheast2RegionID: "306986355934", + endpoints.ApNortheast2RegionID: "306986355934", names.APNortheast3RegionID: "867004704886", names.APSouth1RegionID: "991648021394", names.APSouth2RegionID: "628508329040", @@ -232,7 +232,7 @@ var prebuiltECRImageIDByRegion_clarify = map[string]string{ endpoints.AfSouth1RegionID: "811711786498", endpoints.ApEast1RegionID: "098760798382", endpoints.ApNortheast1RegionID: "377024640650", - names.APNortheast2RegionID: "263625296855", + endpoints.ApNortheast2RegionID: "263625296855", names.APNortheast3RegionID: "912233562940", names.APSouth1RegionID: "452307495513", names.APSoutheast1RegionID: "834264404009", @@ -262,7 +262,7 @@ var prebuiltECRImageIDByRegion_dataWrangler = map[string]string{ endpoints.AfSouth1RegionID: "143210264188", endpoints.ApEast1RegionID: "707077482487", endpoints.ApNortheast1RegionID: "649008135260", - names.APNortheast2RegionID: "131546521161", + endpoints.ApNortheast2RegionID: "131546521161", names.APNortheast3RegionID: "913387583493", names.APSouth1RegionID: "089933028263", names.APSoutheast1RegionID: "119527597002", @@ -291,7 +291,7 @@ var prebuiltECRImageIDByRegion_debugger = map[string]string{ endpoints.AfSouth1RegionID: "314341159256", endpoints.ApEast1RegionID: "199566480951", endpoints.ApNortheast1RegionID: "430734990657", - names.APNortheast2RegionID: "578805364391", + endpoints.ApNortheast2RegionID: "578805364391", names.APNortheast3RegionID: "479947661362", names.APSouth1RegionID: "904829902805", names.APSoutheast1RegionID: "972752614525", @@ -326,7 +326,7 @@ var prebuiltECRImageIDByRegion_inferentiaNeo = map[string]string{ endpoints.AfSouth1RegionID: "774647643957", endpoints.ApEast1RegionID: "110948597952", endpoints.ApNortheast1RegionID: "941853720454", - names.APNortheast2RegionID: "151534178276", + endpoints.ApNortheast2RegionID: "151534178276", names.APNortheast3RegionID: "925152966179", names.APSouth1RegionID: "763008648453", names.APSoutheast1RegionID: "324986816169", @@ -363,7 +363,7 @@ var prebuiltECRImageIDByRegion_SageMakerCustom = map[string]string{ // nosemgrep endpoints.AfSouth1RegionID: "313743910680", endpoints.ApEast1RegionID: "057415533634", endpoints.ApNortheast1RegionID: "520713654638", - names.APNortheast2RegionID: "520713654638", + endpoints.ApNortheast2RegionID: "520713654638", names.APSouth1RegionID: "520713654638", names.APSoutheast1RegionID: "520713654638", names.APSoutheast2RegionID: "520713654638", @@ -393,7 +393,7 @@ var prebuiltECRImageIDByRegion_SageMakerCustom = map[string]string{ // nosemgrep var prebuiltECRImageIDByRegion_SageMakerRL = map[string]string{ // nosemgrep:ci.sagemaker-in-var-name endpoints.ApNortheast1RegionID: "462105765813", - names.APNortheast2RegionID: "462105765813", + endpoints.ApNortheast2RegionID: "462105765813", names.APSouth1RegionID: "462105765813", names.APSoutheast1RegionID: "462105765813", names.APSoutheast2RegionID: "462105765813", @@ -413,7 +413,7 @@ var prebuiltECRImageIDByRegion_spark = map[string]string{ endpoints.AfSouth1RegionID: "309385258863", endpoints.ApEast1RegionID: "732049463269", endpoints.ApNortheast1RegionID: "411782140378", - names.APNortheast2RegionID: "860869212795", + endpoints.ApNortheast2RegionID: "860869212795", names.APNortheast3RegionID: "102471314380", names.APSouth1RegionID: "105495057255", names.APSouth2RegionID: "873151114052", @@ -451,7 +451,7 @@ var prebuiltECRImageIDByRegion_SageMakerBasePython = map[string]string{ // nosem endpoints.AfSouth1RegionID: "559312083959", endpoints.ApEast1RegionID: "493642496378", endpoints.ApNortheast1RegionID: "102112518831", - names.APNortheast2RegionID: "806072073708", + endpoints.ApNortheast2RegionID: "806072073708", names.APNortheast3RegionID: "792733760839", names.APSouth1RegionID: "394103062818", names.APSoutheast1RegionID: "492261229750", @@ -491,7 +491,7 @@ var prebuiltECRImageIDByRegion_deepAR = map[string]string{ endpoints.AfSouth1RegionID: "455444449433", endpoints.ApEast1RegionID: "286214385809", endpoints.ApNortheast1RegionID: "633353088612", - names.APNortheast2RegionID: "204372634319", + endpoints.ApNortheast2RegionID: "204372634319", names.APNortheast3RegionID: "867004704886", names.APSouth1RegionID: "991648021394", names.APSouth2RegionID: "628508329040", @@ -536,7 +536,7 @@ var prebuiltECRImageIDByRegion_factorMachines = map[string]string{ endpoints.AfSouth1RegionID: "455444449433", endpoints.ApEast1RegionID: "286214385809", endpoints.ApNortheast1RegionID: "351501993468", - names.APNortheast2RegionID: "835164637446", + endpoints.ApNortheast2RegionID: "835164637446", names.APNortheast3RegionID: "867004704886", names.APSouth1RegionID: "991648021394", names.APSouth2RegionID: "628508329040", @@ -574,7 +574,7 @@ var prebuiltECRImageIDByRegion_factorMachines = map[string]string{ var prebuiltECRImageIDByRegion_lda = map[string]string{ endpoints.ApNortheast1RegionID: "258307448986", - names.APNortheast2RegionID: "293181348795", + endpoints.ApNortheast2RegionID: "293181348795", names.APSouth1RegionID: "991648021394", names.APSoutheast1RegionID: "475088953585", names.APSoutheast2RegionID: "297031611018", @@ -601,7 +601,7 @@ var prebuiltECRImageIDByRegion_XGBoost = map[string]string{ endpoints.AfSouth1RegionID: "510948584623", endpoints.ApEast1RegionID: "651117190479", endpoints.ApNortheast1RegionID: "354813040037", - names.APNortheast2RegionID: "366743142698", + endpoints.ApNortheast2RegionID: "366743142698", names.APNortheast3RegionID: "867004704886", names.APSouth1RegionID: "720646828776", names.APSouth2RegionID: "628508329040", @@ -653,7 +653,7 @@ var prebuiltECRImageIDByRegion_deepLearning = map[string]string{ endpoints.AfSouth1RegionID: "626614931356", endpoints.ApEast1RegionID: "871362719292", endpoints.ApNortheast1RegionID: "763104351884", - names.APNortheast2RegionID: "763104351884", + endpoints.ApNortheast2RegionID: "763104351884", names.APNortheast3RegionID: "364406365360", names.APSouth1RegionID: "763104351884", names.APSouth2RegionID: "772153158452", @@ -693,7 +693,7 @@ var prebuiltECRImageIDByRegion_modelMonitor = map[string]string{ endpoints.AfSouth1RegionID: "875698925577", endpoints.ApEast1RegionID: "001633400207", endpoints.ApNortheast1RegionID: "574779866223", - names.APNortheast2RegionID: "709848358524", + endpoints.ApNortheast2RegionID: "709848358524", names.APNortheast3RegionID: "990339680094", names.APSouth1RegionID: "126357580389", names.APSoutheast1RegionID: "245545462676", diff --git a/names/names.go b/names/names.go index 5ce172ab0e5..a141f0946f9 100644 --- a/names/names.go +++ b/names/names.go @@ -149,7 +149,6 @@ const ( // AWS Standard partition's regions. GlobalRegionID = "aws-global" // AWS Standard global region. - APNortheast2RegionID = "ap-northeast-2" // Asia Pacific (Seoul). APNortheast3RegionID = "ap-northeast-3" // Asia Pacific (Osaka). APSouth1RegionID = "ap-south-1" // Asia Pacific (Mumbai). APSouth2RegionID = "ap-south-2" // Asia Pacific (Hyderabad). From 43aa2d634d56af2b3ff18a809317bb46f138ab82 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 14:55:20 -0500 Subject: [PATCH 270/304] 'names.APNortheast3RegionID' -> 'endpoints.ApNortheast3RegionID'. --- .../cloudtrail/service_account_data_source.go | 2 +- .../hosted_zone_data_source.go | 2 +- .../service/elb/hosted_zone_id_data_source.go | 2 +- .../elb/service_account_data_source.go | 2 +- .../elbv2/hosted_zone_id_data_source.go | 4 ++-- .../redshift/service_account_data_source.go | 2 +- internal/service/s3/hosted_zones.go | 2 +- .../prebuilt_ecr_image_data_source.go | 24 +++++++++---------- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/internal/service/cloudtrail/service_account_data_source.go b/internal/service/cloudtrail/service_account_data_source.go index ee466400ec6..28815e3f61a 100644 --- a/internal/service/cloudtrail/service_account_data_source.go +++ b/internal/service/cloudtrail/service_account_data_source.go @@ -24,7 +24,7 @@ var serviceAccountPerRegionMap = map[string]string{ endpoints.ApEast1RegionID: "119688915426", endpoints.ApNortheast1RegionID: "216624486486", endpoints.ApNortheast2RegionID: "492519147666", - names.APNortheast3RegionID: "765225791966", + endpoints.ApNortheast3RegionID: "765225791966", names.APSouth1RegionID: "977081816279", names.APSouth2RegionID: "582488909970", names.APSoutheast1RegionID: "903692715234", diff --git a/internal/service/elasticbeanstalk/hosted_zone_data_source.go b/internal/service/elasticbeanstalk/hosted_zone_data_source.go index ccade06d124..3a9cbcd48b9 100644 --- a/internal/service/elasticbeanstalk/hosted_zone_data_source.go +++ b/internal/service/elasticbeanstalk/hosted_zone_data_source.go @@ -24,7 +24,7 @@ var hostedZoneIDs = map[string]string{ endpoints.ApEast1RegionID: "ZPWYUBWRU171A", endpoints.ApNortheast1RegionID: "Z1R25G3KIG2GBW", endpoints.ApNortheast2RegionID: "Z3JE5OI70TWKCP", - names.APNortheast3RegionID: "ZNE5GEY1TIAGY", + endpoints.ApNortheast3RegionID: "ZNE5GEY1TIAGY", names.APSouth1RegionID: "Z18NTBI3Y7N9TZ", names.CACentral1RegionID: "ZJFCZL7SSZB5I", names.EUCentral1RegionID: "Z1FRNW7UH4DEZJ", diff --git a/internal/service/elb/hosted_zone_id_data_source.go b/internal/service/elb/hosted_zone_id_data_source.go index 77f9572142b..ff73e67c123 100644 --- a/internal/service/elb/hosted_zone_id_data_source.go +++ b/internal/service/elb/hosted_zone_id_data_source.go @@ -20,7 +20,7 @@ var hostedZoneIDPerRegionMap = map[string]string{ endpoints.ApEast1RegionID: "Z3DQVH9N71FHZ0", endpoints.ApNortheast1RegionID: "Z14GRHDCWA56QT", endpoints.ApNortheast2RegionID: "ZWKZPGTI48KDX", - names.APNortheast3RegionID: "Z5LXEXXYW11ES", + endpoints.ApNortheast3RegionID: "Z5LXEXXYW11ES", names.APSouth1RegionID: "ZP97RAFLXTNZK", names.APSouth2RegionID: "Z0173938T07WNTVAEPZN", names.APSoutheast1RegionID: "Z1LMS91P8CMLE5", diff --git a/internal/service/elb/service_account_data_source.go b/internal/service/elb/service_account_data_source.go index 872164c66a6..98bc790c84c 100644 --- a/internal/service/elb/service_account_data_source.go +++ b/internal/service/elb/service_account_data_source.go @@ -22,7 +22,7 @@ var accountIDPerRegionMap = map[string]string{ endpoints.ApEast1RegionID: "754344448648", endpoints.ApNortheast1RegionID: "582318560864", endpoints.ApNortheast2RegionID: "600734575887", - names.APNortheast3RegionID: "383597477331", + endpoints.ApNortheast3RegionID: "383597477331", names.APSouth1RegionID: "718504428378", names.APSoutheast1RegionID: "114774131450", names.APSoutheast2RegionID: "783225319266", diff --git a/internal/service/elbv2/hosted_zone_id_data_source.go b/internal/service/elbv2/hosted_zone_id_data_source.go index 0c3c5ee9626..cb3fdf7ad70 100644 --- a/internal/service/elbv2/hosted_zone_id_data_source.go +++ b/internal/service/elbv2/hosted_zone_id_data_source.go @@ -24,7 +24,7 @@ var hostedZoneIDPerRegionALBMap = map[string]string{ endpoints.ApEast1RegionID: "Z3DQVH9N71FHZ0", endpoints.ApNortheast1RegionID: "Z14GRHDCWA56QT", endpoints.ApNortheast2RegionID: "ZWKZPGTI48KDX", - names.APNortheast3RegionID: "Z5LXEXXYW11ES", + endpoints.ApNortheast3RegionID: "Z5LXEXXYW11ES", names.APSouth1RegionID: "ZP97RAFLXTNZK", names.APSouth2RegionID: "Z0173938T07WNTVAEPZN", names.APSoutheast1RegionID: "Z1LMS91P8CMLE5", @@ -62,7 +62,7 @@ var hostedZoneIDPerRegionNLBMap = map[string]string{ endpoints.ApEast1RegionID: "Z12Y7K3UBGUAD1", endpoints.ApNortheast1RegionID: "Z31USIVHYNEOWT", endpoints.ApNortheast2RegionID: "ZIBE1TIR4HY56", - names.APNortheast3RegionID: "Z1GWIQ4HH19I5X", + endpoints.ApNortheast3RegionID: "Z1GWIQ4HH19I5X", names.APSouth1RegionID: "ZVDDRBQ08TROA", names.APSouth2RegionID: "Z0711778386UTO08407HT", names.APSoutheast1RegionID: "ZKVM4W9LS7TM", diff --git a/internal/service/redshift/service_account_data_source.go b/internal/service/redshift/service_account_data_source.go index 284fa59139e..5654d432907 100644 --- a/internal/service/redshift/service_account_data_source.go +++ b/internal/service/redshift/service_account_data_source.go @@ -24,7 +24,7 @@ var ServiceAccountPerRegionMap = map[string]string{ endpoints.ApEast1RegionID: "313564881002", endpoints.ApNortheast1RegionID: "404641285394", endpoints.ApNortheast2RegionID: "760740231472", - names.APNortheast3RegionID: "090321488786", + endpoints.ApNortheast3RegionID: "090321488786", names.APSouth1RegionID: "865932855811", names.APSoutheast1RegionID: "361669875840", names.APSoutheast2RegionID: "762762565011", diff --git a/internal/service/s3/hosted_zones.go b/internal/service/s3/hosted_zones.go index e9569a4112b..1b181990aa6 100644 --- a/internal/service/s3/hosted_zones.go +++ b/internal/service/s3/hosted_zones.go @@ -16,7 +16,7 @@ var hostedZoneIDsMap = map[string]string{ endpoints.ApEast1RegionID: "ZNB98KWMFR0R6", endpoints.ApNortheast1RegionID: "Z2M4EHUR26P7ZW", endpoints.ApNortheast2RegionID: "Z3W03O7B5YMIYP", - names.APNortheast3RegionID: "Z2YQB5RD63NC85", + endpoints.ApNortheast3RegionID: "Z2YQB5RD63NC85", names.APSouth1RegionID: "Z11RGJOFQNVJUP", names.APSouth2RegionID: "Z02976202B4EZMXIPMXF7", names.APSoutheast1RegionID: "Z3O0J2DXBE1FTB", diff --git a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go index cf7d624dd12..20a99d8e217 100644 --- a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go +++ b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go @@ -193,7 +193,7 @@ var prebuiltECRImageIDByRegion_blazing = map[string]string{ endpoints.ApEast1RegionID: "286214385809", endpoints.ApNortheast1RegionID: "501404015308", endpoints.ApNortheast2RegionID: "306986355934", - names.APNortheast3RegionID: "867004704886", + endpoints.ApNortheast3RegionID: "867004704886", names.APSouth1RegionID: "991648021394", names.APSouth2RegionID: "628508329040", names.APSoutheast1RegionID: "475088953585", @@ -233,7 +233,7 @@ var prebuiltECRImageIDByRegion_clarify = map[string]string{ endpoints.ApEast1RegionID: "098760798382", endpoints.ApNortheast1RegionID: "377024640650", endpoints.ApNortheast2RegionID: "263625296855", - names.APNortheast3RegionID: "912233562940", + endpoints.ApNortheast3RegionID: "912233562940", names.APSouth1RegionID: "452307495513", names.APSoutheast1RegionID: "834264404009", names.APSoutheast2RegionID: "007051062584", @@ -263,7 +263,7 @@ var prebuiltECRImageIDByRegion_dataWrangler = map[string]string{ endpoints.ApEast1RegionID: "707077482487", endpoints.ApNortheast1RegionID: "649008135260", endpoints.ApNortheast2RegionID: "131546521161", - names.APNortheast3RegionID: "913387583493", + endpoints.ApNortheast3RegionID: "913387583493", names.APSouth1RegionID: "089933028263", names.APSoutheast1RegionID: "119527597002", names.APSoutheast2RegionID: "422173101802", @@ -292,7 +292,7 @@ var prebuiltECRImageIDByRegion_debugger = map[string]string{ endpoints.ApEast1RegionID: "199566480951", endpoints.ApNortheast1RegionID: "430734990657", endpoints.ApNortheast2RegionID: "578805364391", - names.APNortheast3RegionID: "479947661362", + endpoints.ApNortheast3RegionID: "479947661362", names.APSouth1RegionID: "904829902805", names.APSoutheast1RegionID: "972752614525", names.APSoutheast2RegionID: "184798709955", @@ -327,7 +327,7 @@ var prebuiltECRImageIDByRegion_inferentiaNeo = map[string]string{ endpoints.ApEast1RegionID: "110948597952", endpoints.ApNortheast1RegionID: "941853720454", endpoints.ApNortheast2RegionID: "151534178276", - names.APNortheast3RegionID: "925152966179", + endpoints.ApNortheast3RegionID: "925152966179", names.APSouth1RegionID: "763008648453", names.APSoutheast1RegionID: "324986816169", names.APSoutheast2RegionID: "355873309152", @@ -414,7 +414,7 @@ var prebuiltECRImageIDByRegion_spark = map[string]string{ endpoints.ApEast1RegionID: "732049463269", endpoints.ApNortheast1RegionID: "411782140378", endpoints.ApNortheast2RegionID: "860869212795", - names.APNortheast3RegionID: "102471314380", + endpoints.ApNortheast3RegionID: "102471314380", names.APSouth1RegionID: "105495057255", names.APSouth2RegionID: "873151114052", names.APSoutheast1RegionID: "759080221371", @@ -452,7 +452,7 @@ var prebuiltECRImageIDByRegion_SageMakerBasePython = map[string]string{ // nosem endpoints.ApEast1RegionID: "493642496378", endpoints.ApNortheast1RegionID: "102112518831", endpoints.ApNortheast2RegionID: "806072073708", - names.APNortheast3RegionID: "792733760839", + endpoints.ApNortheast3RegionID: "792733760839", names.APSouth1RegionID: "394103062818", names.APSoutheast1RegionID: "492261229750", names.APSoutheast2RegionID: "452832661640", @@ -492,7 +492,7 @@ var prebuiltECRImageIDByRegion_deepAR = map[string]string{ endpoints.ApEast1RegionID: "286214385809", endpoints.ApNortheast1RegionID: "633353088612", endpoints.ApNortheast2RegionID: "204372634319", - names.APNortheast3RegionID: "867004704886", + endpoints.ApNortheast3RegionID: "867004704886", names.APSouth1RegionID: "991648021394", names.APSouth2RegionID: "628508329040", names.APSoutheast1RegionID: "475088953585", @@ -537,7 +537,7 @@ var prebuiltECRImageIDByRegion_factorMachines = map[string]string{ endpoints.ApEast1RegionID: "286214385809", endpoints.ApNortheast1RegionID: "351501993468", endpoints.ApNortheast2RegionID: "835164637446", - names.APNortheast3RegionID: "867004704886", + endpoints.ApNortheast3RegionID: "867004704886", names.APSouth1RegionID: "991648021394", names.APSouth2RegionID: "628508329040", names.APSoutheast1RegionID: "475088953585", @@ -602,7 +602,7 @@ var prebuiltECRImageIDByRegion_XGBoost = map[string]string{ endpoints.ApEast1RegionID: "651117190479", endpoints.ApNortheast1RegionID: "354813040037", endpoints.ApNortheast2RegionID: "366743142698", - names.APNortheast3RegionID: "867004704886", + endpoints.ApNortheast3RegionID: "867004704886", names.APSouth1RegionID: "720646828776", names.APSouth2RegionID: "628508329040", names.APSoutheast1RegionID: "121021644041", @@ -654,7 +654,7 @@ var prebuiltECRImageIDByRegion_deepLearning = map[string]string{ endpoints.ApEast1RegionID: "871362719292", endpoints.ApNortheast1RegionID: "763104351884", endpoints.ApNortheast2RegionID: "763104351884", - names.APNortheast3RegionID: "364406365360", + endpoints.ApNortheast3RegionID: "364406365360", names.APSouth1RegionID: "763104351884", names.APSouth2RegionID: "772153158452", names.APSoutheast1RegionID: "763104351884", @@ -694,7 +694,7 @@ var prebuiltECRImageIDByRegion_modelMonitor = map[string]string{ endpoints.ApEast1RegionID: "001633400207", endpoints.ApNortheast1RegionID: "574779866223", endpoints.ApNortheast2RegionID: "709848358524", - names.APNortheast3RegionID: "990339680094", + endpoints.ApNortheast3RegionID: "990339680094", names.APSouth1RegionID: "126357580389", names.APSoutheast1RegionID: "245545462676", names.APSoutheast2RegionID: "563025443158", From 2141a7642d76df535c2acac2fe696126c670f5ae Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 15:02:37 -0500 Subject: [PATCH 271/304] 'names.APSouth1RegionID' -> 'endpoints.ApSouth1RegionID'. --- .../apprunner/hosted_zone_id_data_source.go | 2 +- .../cloudtrail/service_account_data_source.go | 2 +- .../hosted_zone_data_source.go | 2 +- .../service/elb/hosted_zone_id_data_source.go | 2 +- .../elb/service_account_data_source.go | 2 +- .../elbv2/hosted_zone_id_data_source.go | 4 +-- internal/service/gamelift/gamelift_test.go | 2 +- internal/service/lambda/function.go | 2 +- .../pricing/product_data_source_test.go | 5 ++-- .../redshift/service_account_data_source.go | 2 +- internal/service/s3/hosted_zones.go | 2 +- .../prebuilt_ecr_image_data_source.go | 30 +++++++++---------- names/names.go | 2 -- 13 files changed, 29 insertions(+), 30 deletions(-) diff --git a/internal/service/apprunner/hosted_zone_id_data_source.go b/internal/service/apprunner/hosted_zone_id_data_source.go index 37d5cacb45f..787c2b2753b 100644 --- a/internal/service/apprunner/hosted_zone_id_data_source.go +++ b/internal/service/apprunner/hosted_zone_id_data_source.go @@ -21,7 +21,7 @@ var hostedZoneIDPerRegionMap = map[string]string{ names.USEast2RegionID: "Z0224347AD7KVHMLOX31", names.USEast1RegionID: "Z01915732ZBZKC8D32TPT", names.USWest2RegionID: "Z02243383FTQ64HJ5772Q", - names.APSouth1RegionID: "Z00855883LBHKTIC4ODF2", + endpoints.ApSouth1RegionID: "Z00855883LBHKTIC4ODF2", names.APSoutheast1RegionID: "Z09819469CZ3KQ8PWMCL", names.APSoutheast2RegionID: "Z03657752RA8799S0TI5I", endpoints.ApNortheast1RegionID: "Z08491812XW6IPYLR6CCA", diff --git a/internal/service/cloudtrail/service_account_data_source.go b/internal/service/cloudtrail/service_account_data_source.go index 28815e3f61a..d4653841988 100644 --- a/internal/service/cloudtrail/service_account_data_source.go +++ b/internal/service/cloudtrail/service_account_data_source.go @@ -25,7 +25,7 @@ var serviceAccountPerRegionMap = map[string]string{ endpoints.ApNortheast1RegionID: "216624486486", endpoints.ApNortheast2RegionID: "492519147666", endpoints.ApNortheast3RegionID: "765225791966", - names.APSouth1RegionID: "977081816279", + endpoints.ApSouth1RegionID: "977081816279", names.APSouth2RegionID: "582488909970", names.APSoutheast1RegionID: "903692715234", names.APSoutheast2RegionID: "284668455005", diff --git a/internal/service/elasticbeanstalk/hosted_zone_data_source.go b/internal/service/elasticbeanstalk/hosted_zone_data_source.go index 3a9cbcd48b9..03dc0409bdc 100644 --- a/internal/service/elasticbeanstalk/hosted_zone_data_source.go +++ b/internal/service/elasticbeanstalk/hosted_zone_data_source.go @@ -25,7 +25,7 @@ var hostedZoneIDs = map[string]string{ endpoints.ApNortheast1RegionID: "Z1R25G3KIG2GBW", endpoints.ApNortheast2RegionID: "Z3JE5OI70TWKCP", endpoints.ApNortheast3RegionID: "ZNE5GEY1TIAGY", - names.APSouth1RegionID: "Z18NTBI3Y7N9TZ", + endpoints.ApSouth1RegionID: "Z18NTBI3Y7N9TZ", names.CACentral1RegionID: "ZJFCZL7SSZB5I", names.EUCentral1RegionID: "Z1FRNW7UH4DEZJ", names.EUNorth1RegionID: "Z23GO28BZ5AETM", diff --git a/internal/service/elb/hosted_zone_id_data_source.go b/internal/service/elb/hosted_zone_id_data_source.go index ff73e67c123..a02dd728ea0 100644 --- a/internal/service/elb/hosted_zone_id_data_source.go +++ b/internal/service/elb/hosted_zone_id_data_source.go @@ -21,7 +21,7 @@ var hostedZoneIDPerRegionMap = map[string]string{ endpoints.ApNortheast1RegionID: "Z14GRHDCWA56QT", endpoints.ApNortheast2RegionID: "ZWKZPGTI48KDX", endpoints.ApNortheast3RegionID: "Z5LXEXXYW11ES", - names.APSouth1RegionID: "ZP97RAFLXTNZK", + endpoints.ApSouth1RegionID: "ZP97RAFLXTNZK", names.APSouth2RegionID: "Z0173938T07WNTVAEPZN", names.APSoutheast1RegionID: "Z1LMS91P8CMLE5", names.APSoutheast2RegionID: "Z1GM3OXH4ZPM65", diff --git a/internal/service/elb/service_account_data_source.go b/internal/service/elb/service_account_data_source.go index 98bc790c84c..643524b0892 100644 --- a/internal/service/elb/service_account_data_source.go +++ b/internal/service/elb/service_account_data_source.go @@ -23,7 +23,7 @@ var accountIDPerRegionMap = map[string]string{ endpoints.ApNortheast1RegionID: "582318560864", endpoints.ApNortheast2RegionID: "600734575887", endpoints.ApNortheast3RegionID: "383597477331", - names.APSouth1RegionID: "718504428378", + endpoints.ApSouth1RegionID: "718504428378", names.APSoutheast1RegionID: "114774131450", names.APSoutheast2RegionID: "783225319266", names.APSoutheast3RegionID: "589379963580", diff --git a/internal/service/elbv2/hosted_zone_id_data_source.go b/internal/service/elbv2/hosted_zone_id_data_source.go index cb3fdf7ad70..e51f562a881 100644 --- a/internal/service/elbv2/hosted_zone_id_data_source.go +++ b/internal/service/elbv2/hosted_zone_id_data_source.go @@ -25,7 +25,7 @@ var hostedZoneIDPerRegionALBMap = map[string]string{ endpoints.ApNortheast1RegionID: "Z14GRHDCWA56QT", endpoints.ApNortheast2RegionID: "ZWKZPGTI48KDX", endpoints.ApNortheast3RegionID: "Z5LXEXXYW11ES", - names.APSouth1RegionID: "ZP97RAFLXTNZK", + endpoints.ApSouth1RegionID: "ZP97RAFLXTNZK", names.APSouth2RegionID: "Z0173938T07WNTVAEPZN", names.APSoutheast1RegionID: "Z1LMS91P8CMLE5", names.APSoutheast2RegionID: "Z1GM3OXH4ZPM65", @@ -63,7 +63,7 @@ var hostedZoneIDPerRegionNLBMap = map[string]string{ endpoints.ApNortheast1RegionID: "Z31USIVHYNEOWT", endpoints.ApNortheast2RegionID: "ZIBE1TIR4HY56", endpoints.ApNortheast3RegionID: "Z1GWIQ4HH19I5X", - names.APSouth1RegionID: "ZVDDRBQ08TROA", + endpoints.ApSouth1RegionID: "ZVDDRBQ08TROA", names.APSouth2RegionID: "Z0711778386UTO08407HT", names.APSoutheast1RegionID: "ZKVM4W9LS7TM", names.APSoutheast2RegionID: "ZCT6FZBF4DROD", diff --git a/internal/service/gamelift/gamelift_test.go b/internal/service/gamelift/gamelift_test.go index 3cd6d7f30bb..368ad004cf0 100644 --- a/internal/service/gamelift/gamelift_test.go +++ b/internal/service/gamelift/gamelift_test.go @@ -53,7 +53,7 @@ func testAccAccountIdByRegion(region string) (string, error) { m := map[string]string{ endpoints.ApNortheast1RegionID: "120069834884", endpoints.ApNortheast2RegionID: "805673136642", - names.APSouth1RegionID: "134975661615", + endpoints.ApSouth1RegionID: "134975661615", names.APSoutheast1RegionID: "077577004113", names.APSoutheast2RegionID: "112188327105", names.CACentral1RegionID: "800535022691", diff --git a/internal/service/lambda/function.go b/internal/service/lambda/function.go index 0b45ae56d86..353d0706903 100644 --- a/internal/service/lambda/function.go +++ b/internal/service/lambda/function.go @@ -1405,7 +1405,7 @@ func signerServiceIsAvailable(region string) bool { names.USWest2RegionID: {}, endpoints.AfSouth1RegionID: {}, endpoints.ApEast1RegionID: {}, - names.APSouth1RegionID: {}, + endpoints.ApSouth1RegionID: {}, endpoints.ApNortheast2RegionID: {}, names.APSoutheast1RegionID: {}, names.APSoutheast2RegionID: {}, diff --git a/internal/service/pricing/product_data_source_test.go b/internal/service/pricing/product_data_source_test.go index 193cb67686d..568f7e4186b 100644 --- a/internal/service/pricing/product_data_source_test.go +++ b/internal/service/pricing/product_data_source_test.go @@ -6,6 +6,7 @@ package pricing_test import ( "testing" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-aws/internal/acctest" "github.com/hashicorp/terraform-provider-aws/names" @@ -18,7 +19,7 @@ func TestAccPricingProductDataSource_ec2(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, names.APSouth1RegionID) + acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApSouth1RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.PricingServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -40,7 +41,7 @@ func TestAccPricingProductDataSource_redshift(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, names.APSouth1RegionID) + acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApSouth1RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.PricingServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, diff --git a/internal/service/redshift/service_account_data_source.go b/internal/service/redshift/service_account_data_source.go index 5654d432907..ce4cdbdc280 100644 --- a/internal/service/redshift/service_account_data_source.go +++ b/internal/service/redshift/service_account_data_source.go @@ -25,7 +25,7 @@ var ServiceAccountPerRegionMap = map[string]string{ endpoints.ApNortheast1RegionID: "404641285394", endpoints.ApNortheast2RegionID: "760740231472", endpoints.ApNortheast3RegionID: "090321488786", - names.APSouth1RegionID: "865932855811", + endpoints.ApSouth1RegionID: "865932855811", names.APSoutheast1RegionID: "361669875840", names.APSoutheast2RegionID: "762762565011", names.CACentral1RegionID: "907379612154", diff --git a/internal/service/s3/hosted_zones.go b/internal/service/s3/hosted_zones.go index 1b181990aa6..35fbe22ae17 100644 --- a/internal/service/s3/hosted_zones.go +++ b/internal/service/s3/hosted_zones.go @@ -17,7 +17,7 @@ var hostedZoneIDsMap = map[string]string{ endpoints.ApNortheast1RegionID: "Z2M4EHUR26P7ZW", endpoints.ApNortheast2RegionID: "Z3W03O7B5YMIYP", endpoints.ApNortheast3RegionID: "Z2YQB5RD63NC85", - names.APSouth1RegionID: "Z11RGJOFQNVJUP", + endpoints.ApSouth1RegionID: "Z11RGJOFQNVJUP", names.APSouth2RegionID: "Z02976202B4EZMXIPMXF7", names.APSoutheast1RegionID: "Z3O0J2DXBE1FTB", names.APSoutheast2RegionID: "Z1WCIGYICN2BYD", diff --git a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go index 20a99d8e217..0c095478132 100644 --- a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go +++ b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go @@ -194,7 +194,7 @@ var prebuiltECRImageIDByRegion_blazing = map[string]string{ endpoints.ApNortheast1RegionID: "501404015308", endpoints.ApNortheast2RegionID: "306986355934", endpoints.ApNortheast3RegionID: "867004704886", - names.APSouth1RegionID: "991648021394", + endpoints.ApSouth1RegionID: "991648021394", names.APSouth2RegionID: "628508329040", names.APSoutheast1RegionID: "475088953585", names.APSoutheast2RegionID: "544295431143", @@ -234,7 +234,7 @@ var prebuiltECRImageIDByRegion_clarify = map[string]string{ endpoints.ApNortheast1RegionID: "377024640650", endpoints.ApNortheast2RegionID: "263625296855", endpoints.ApNortheast3RegionID: "912233562940", - names.APSouth1RegionID: "452307495513", + endpoints.ApSouth1RegionID: "452307495513", names.APSoutheast1RegionID: "834264404009", names.APSoutheast2RegionID: "007051062584", names.APSoutheast3RegionID: "705930551576", @@ -264,7 +264,7 @@ var prebuiltECRImageIDByRegion_dataWrangler = map[string]string{ endpoints.ApNortheast1RegionID: "649008135260", endpoints.ApNortheast2RegionID: "131546521161", endpoints.ApNortheast3RegionID: "913387583493", - names.APSouth1RegionID: "089933028263", + endpoints.ApSouth1RegionID: "089933028263", names.APSoutheast1RegionID: "119527597002", names.APSoutheast2RegionID: "422173101802", names.CACentral1RegionID: "557239378090", @@ -293,7 +293,7 @@ var prebuiltECRImageIDByRegion_debugger = map[string]string{ endpoints.ApNortheast1RegionID: "430734990657", endpoints.ApNortheast2RegionID: "578805364391", endpoints.ApNortheast3RegionID: "479947661362", - names.APSouth1RegionID: "904829902805", + endpoints.ApSouth1RegionID: "904829902805", names.APSoutheast1RegionID: "972752614525", names.APSoutheast2RegionID: "184798709955", names.CACentral1RegionID: "519511493484", @@ -328,7 +328,7 @@ var prebuiltECRImageIDByRegion_inferentiaNeo = map[string]string{ endpoints.ApNortheast1RegionID: "941853720454", endpoints.ApNortheast2RegionID: "151534178276", endpoints.ApNortheast3RegionID: "925152966179", - names.APSouth1RegionID: "763008648453", + endpoints.ApSouth1RegionID: "763008648453", names.APSoutheast1RegionID: "324986816169", names.APSoutheast2RegionID: "355873309152", names.CACentral1RegionID: "464438896020", @@ -364,7 +364,7 @@ var prebuiltECRImageIDByRegion_SageMakerCustom = map[string]string{ // nosemgrep endpoints.ApEast1RegionID: "057415533634", endpoints.ApNortheast1RegionID: "520713654638", endpoints.ApNortheast2RegionID: "520713654638", - names.APSouth1RegionID: "520713654638", + endpoints.ApSouth1RegionID: "520713654638", names.APSoutheast1RegionID: "520713654638", names.APSoutheast2RegionID: "520713654638", names.CACentral1RegionID: "520713654638", @@ -394,7 +394,7 @@ var prebuiltECRImageIDByRegion_SageMakerCustom = map[string]string{ // nosemgrep var prebuiltECRImageIDByRegion_SageMakerRL = map[string]string{ // nosemgrep:ci.sagemaker-in-var-name endpoints.ApNortheast1RegionID: "462105765813", endpoints.ApNortheast2RegionID: "462105765813", - names.APSouth1RegionID: "462105765813", + endpoints.ApSouth1RegionID: "462105765813", names.APSoutheast1RegionID: "462105765813", names.APSoutheast2RegionID: "462105765813", names.CACentral1RegionID: "462105765813", @@ -415,7 +415,7 @@ var prebuiltECRImageIDByRegion_spark = map[string]string{ endpoints.ApNortheast1RegionID: "411782140378", endpoints.ApNortheast2RegionID: "860869212795", endpoints.ApNortheast3RegionID: "102471314380", - names.APSouth1RegionID: "105495057255", + endpoints.ApSouth1RegionID: "105495057255", names.APSouth2RegionID: "873151114052", names.APSoutheast1RegionID: "759080221371", names.APSoutheast2RegionID: "440695851116", @@ -453,7 +453,7 @@ var prebuiltECRImageIDByRegion_SageMakerBasePython = map[string]string{ // nosem endpoints.ApNortheast1RegionID: "102112518831", endpoints.ApNortheast2RegionID: "806072073708", endpoints.ApNortheast3RegionID: "792733760839", - names.APSouth1RegionID: "394103062818", + endpoints.ApSouth1RegionID: "394103062818", names.APSoutheast1RegionID: "492261229750", names.APSoutheast2RegionID: "452832661640", names.APSoutheast3RegionID: "276181064229", @@ -493,7 +493,7 @@ var prebuiltECRImageIDByRegion_deepAR = map[string]string{ endpoints.ApNortheast1RegionID: "633353088612", endpoints.ApNortheast2RegionID: "204372634319", endpoints.ApNortheast3RegionID: "867004704886", - names.APSouth1RegionID: "991648021394", + endpoints.ApSouth1RegionID: "991648021394", names.APSouth2RegionID: "628508329040", names.APSoutheast1RegionID: "475088953585", names.APSoutheast2RegionID: "514117268639", @@ -538,7 +538,7 @@ var prebuiltECRImageIDByRegion_factorMachines = map[string]string{ endpoints.ApNortheast1RegionID: "351501993468", endpoints.ApNortheast2RegionID: "835164637446", endpoints.ApNortheast3RegionID: "867004704886", - names.APSouth1RegionID: "991648021394", + endpoints.ApSouth1RegionID: "991648021394", names.APSouth2RegionID: "628508329040", names.APSoutheast1RegionID: "475088953585", names.APSoutheast2RegionID: "712309505854", @@ -575,7 +575,7 @@ var prebuiltECRImageIDByRegion_factorMachines = map[string]string{ var prebuiltECRImageIDByRegion_lda = map[string]string{ endpoints.ApNortheast1RegionID: "258307448986", endpoints.ApNortheast2RegionID: "293181348795", - names.APSouth1RegionID: "991648021394", + endpoints.ApSouth1RegionID: "991648021394", names.APSoutheast1RegionID: "475088953585", names.APSoutheast2RegionID: "297031611018", names.CACentral1RegionID: "469771592824", @@ -603,7 +603,7 @@ var prebuiltECRImageIDByRegion_XGBoost = map[string]string{ endpoints.ApNortheast1RegionID: "354813040037", endpoints.ApNortheast2RegionID: "366743142698", endpoints.ApNortheast3RegionID: "867004704886", - names.APSouth1RegionID: "720646828776", + endpoints.ApSouth1RegionID: "720646828776", names.APSouth2RegionID: "628508329040", names.APSoutheast1RegionID: "121021644041", names.APSoutheast2RegionID: "783357654285", @@ -655,7 +655,7 @@ var prebuiltECRImageIDByRegion_deepLearning = map[string]string{ endpoints.ApNortheast1RegionID: "763104351884", endpoints.ApNortheast2RegionID: "763104351884", endpoints.ApNortheast3RegionID: "364406365360", - names.APSouth1RegionID: "763104351884", + endpoints.ApSouth1RegionID: "763104351884", names.APSouth2RegionID: "772153158452", names.APSoutheast1RegionID: "763104351884", names.APSoutheast2RegionID: "763104351884", @@ -695,7 +695,7 @@ var prebuiltECRImageIDByRegion_modelMonitor = map[string]string{ endpoints.ApNortheast1RegionID: "574779866223", endpoints.ApNortheast2RegionID: "709848358524", endpoints.ApNortheast3RegionID: "990339680094", - names.APSouth1RegionID: "126357580389", + endpoints.ApSouth1RegionID: "126357580389", names.APSoutheast1RegionID: "245545462676", names.APSoutheast2RegionID: "563025443158", names.APSoutheast3RegionID: "669540362728", diff --git a/names/names.go b/names/names.go index a141f0946f9..e84ed474edb 100644 --- a/names/names.go +++ b/names/names.go @@ -149,8 +149,6 @@ const ( // AWS Standard partition's regions. GlobalRegionID = "aws-global" // AWS Standard global region. - APNortheast3RegionID = "ap-northeast-3" // Asia Pacific (Osaka). - APSouth1RegionID = "ap-south-1" // Asia Pacific (Mumbai). APSouth2RegionID = "ap-south-2" // Asia Pacific (Hyderabad). APSoutheast1RegionID = "ap-southeast-1" // Asia Pacific (Singapore). APSoutheast2RegionID = "ap-southeast-2" // Asia Pacific (Sydney). From 4a47973839c4064c7901ba32de657915c8235bb9 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 15:12:57 -0500 Subject: [PATCH 272/304] 'names.APSouth2RegionID' -> 'endpoints.ApSouth2RegionID'. --- .../service/acmpca/certificate_authority_test.go | 3 ++- .../cloudtrail/service_account_data_source.go | 2 +- internal/service/elb/hosted_zone_id_data_source.go | 2 +- internal/service/elbv2/hosted_zone_id_data_source.go | 4 ++-- internal/service/s3/hosted_zones.go | 2 +- .../sagemaker/prebuilt_ecr_image_data_source.go | 12 ++++++------ names/names.go | 1 - 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/internal/service/acmpca/certificate_authority_test.go b/internal/service/acmpca/certificate_authority_test.go index 5cac928059b..31e7bd604c2 100644 --- a/internal/service/acmpca/certificate_authority_test.go +++ b/internal/service/acmpca/certificate_authority_test.go @@ -10,6 +10,7 @@ import ( "github.com/YakDriver/regexache" awstypes "github.com/aws/aws-sdk-go-v2/service/acmpca/types" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -183,7 +184,7 @@ func TestAccACMPCACertificateAuthority_keyStorageSecurityStandard(t *testing.T) PreCheck: func() { acctest.PreCheck(ctx, t) // See https://docs.aws.amazon.com/privateca/latest/userguide/data-protection.html#private-keys. - acctest.PreCheckRegion(t, names.APSouth2RegionID, names.APSoutheast3RegionID, names.APSoutheast4RegionID, names.EUCentral2RegionID, names.EUSouth2RegionID, names.MECentral1RegionID) + acctest.PreCheckRegion(t, endpoints.ApSouth2RegionID, names.APSoutheast3RegionID, names.APSoutheast4RegionID, names.EUCentral2RegionID, names.EUSouth2RegionID, names.MECentral1RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.ACMPCAServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, diff --git a/internal/service/cloudtrail/service_account_data_source.go b/internal/service/cloudtrail/service_account_data_source.go index d4653841988..f8eb7721e99 100644 --- a/internal/service/cloudtrail/service_account_data_source.go +++ b/internal/service/cloudtrail/service_account_data_source.go @@ -26,7 +26,7 @@ var serviceAccountPerRegionMap = map[string]string{ endpoints.ApNortheast2RegionID: "492519147666", endpoints.ApNortheast3RegionID: "765225791966", endpoints.ApSouth1RegionID: "977081816279", - names.APSouth2RegionID: "582488909970", + endpoints.ApSouth2RegionID: "582488909970", names.APSoutheast1RegionID: "903692715234", names.APSoutheast2RegionID: "284668455005", names.APSoutheast3RegionID: "069019280451", diff --git a/internal/service/elb/hosted_zone_id_data_source.go b/internal/service/elb/hosted_zone_id_data_source.go index a02dd728ea0..c91cf6bb120 100644 --- a/internal/service/elb/hosted_zone_id_data_source.go +++ b/internal/service/elb/hosted_zone_id_data_source.go @@ -22,7 +22,7 @@ var hostedZoneIDPerRegionMap = map[string]string{ endpoints.ApNortheast2RegionID: "ZWKZPGTI48KDX", endpoints.ApNortheast3RegionID: "Z5LXEXXYW11ES", endpoints.ApSouth1RegionID: "ZP97RAFLXTNZK", - names.APSouth2RegionID: "Z0173938T07WNTVAEPZN", + endpoints.ApSouth2RegionID: "Z0173938T07WNTVAEPZN", names.APSoutheast1RegionID: "Z1LMS91P8CMLE5", names.APSoutheast2RegionID: "Z1GM3OXH4ZPM65", names.APSoutheast3RegionID: "Z08888821HLRG5A9ZRTER", diff --git a/internal/service/elbv2/hosted_zone_id_data_source.go b/internal/service/elbv2/hosted_zone_id_data_source.go index e51f562a881..bb5e905bd75 100644 --- a/internal/service/elbv2/hosted_zone_id_data_source.go +++ b/internal/service/elbv2/hosted_zone_id_data_source.go @@ -26,7 +26,7 @@ var hostedZoneIDPerRegionALBMap = map[string]string{ endpoints.ApNortheast2RegionID: "ZWKZPGTI48KDX", endpoints.ApNortheast3RegionID: "Z5LXEXXYW11ES", endpoints.ApSouth1RegionID: "ZP97RAFLXTNZK", - names.APSouth2RegionID: "Z0173938T07WNTVAEPZN", + endpoints.ApSouth2RegionID: "Z0173938T07WNTVAEPZN", names.APSoutheast1RegionID: "Z1LMS91P8CMLE5", names.APSoutheast2RegionID: "Z1GM3OXH4ZPM65", names.APSoutheast3RegionID: "Z08888821HLRG5A9ZRTER", @@ -64,7 +64,7 @@ var hostedZoneIDPerRegionNLBMap = map[string]string{ endpoints.ApNortheast2RegionID: "ZIBE1TIR4HY56", endpoints.ApNortheast3RegionID: "Z1GWIQ4HH19I5X", endpoints.ApSouth1RegionID: "ZVDDRBQ08TROA", - names.APSouth2RegionID: "Z0711778386UTO08407HT", + endpoints.ApSouth2RegionID: "Z0711778386UTO08407HT", names.APSoutheast1RegionID: "ZKVM4W9LS7TM", names.APSoutheast2RegionID: "ZCT6FZBF4DROD", names.APSoutheast3RegionID: "Z01971771FYVNCOVWJU1G", diff --git a/internal/service/s3/hosted_zones.go b/internal/service/s3/hosted_zones.go index 35fbe22ae17..e506e09b953 100644 --- a/internal/service/s3/hosted_zones.go +++ b/internal/service/s3/hosted_zones.go @@ -18,7 +18,7 @@ var hostedZoneIDsMap = map[string]string{ endpoints.ApNortheast2RegionID: "Z3W03O7B5YMIYP", endpoints.ApNortheast3RegionID: "Z2YQB5RD63NC85", endpoints.ApSouth1RegionID: "Z11RGJOFQNVJUP", - names.APSouth2RegionID: "Z02976202B4EZMXIPMXF7", + endpoints.ApSouth2RegionID: "Z02976202B4EZMXIPMXF7", names.APSoutheast1RegionID: "Z3O0J2DXBE1FTB", names.APSoutheast2RegionID: "Z1WCIGYICN2BYD", names.APSoutheast3RegionID: "Z01846753K324LI26A3VV", diff --git a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go index 0c095478132..3d5a3565c06 100644 --- a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go +++ b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go @@ -195,7 +195,7 @@ var prebuiltECRImageIDByRegion_blazing = map[string]string{ endpoints.ApNortheast2RegionID: "306986355934", endpoints.ApNortheast3RegionID: "867004704886", endpoints.ApSouth1RegionID: "991648021394", - names.APSouth2RegionID: "628508329040", + endpoints.ApSouth2RegionID: "628508329040", names.APSoutheast1RegionID: "475088953585", names.APSoutheast2RegionID: "544295431143", names.APSoutheast3RegionID: "951798379941", @@ -416,7 +416,7 @@ var prebuiltECRImageIDByRegion_spark = map[string]string{ endpoints.ApNortheast2RegionID: "860869212795", endpoints.ApNortheast3RegionID: "102471314380", endpoints.ApSouth1RegionID: "105495057255", - names.APSouth2RegionID: "873151114052", + endpoints.ApSouth2RegionID: "873151114052", names.APSoutheast1RegionID: "759080221371", names.APSoutheast2RegionID: "440695851116", names.APSoutheast3RegionID: "800295151634", @@ -494,7 +494,7 @@ var prebuiltECRImageIDByRegion_deepAR = map[string]string{ endpoints.ApNortheast2RegionID: "204372634319", endpoints.ApNortheast3RegionID: "867004704886", endpoints.ApSouth1RegionID: "991648021394", - names.APSouth2RegionID: "628508329040", + endpoints.ApSouth2RegionID: "628508329040", names.APSoutheast1RegionID: "475088953585", names.APSoutheast2RegionID: "514117268639", names.APSoutheast3RegionID: "951798379941", @@ -539,7 +539,7 @@ var prebuiltECRImageIDByRegion_factorMachines = map[string]string{ endpoints.ApNortheast2RegionID: "835164637446", endpoints.ApNortheast3RegionID: "867004704886", endpoints.ApSouth1RegionID: "991648021394", - names.APSouth2RegionID: "628508329040", + endpoints.ApSouth2RegionID: "628508329040", names.APSoutheast1RegionID: "475088953585", names.APSoutheast2RegionID: "712309505854", names.APSoutheast3RegionID: "951798379941", @@ -604,7 +604,7 @@ var prebuiltECRImageIDByRegion_XGBoost = map[string]string{ endpoints.ApNortheast2RegionID: "366743142698", endpoints.ApNortheast3RegionID: "867004704886", endpoints.ApSouth1RegionID: "720646828776", - names.APSouth2RegionID: "628508329040", + endpoints.ApSouth2RegionID: "628508329040", names.APSoutheast1RegionID: "121021644041", names.APSoutheast2RegionID: "783357654285", names.APSoutheast3RegionID: "951798379941", @@ -656,7 +656,7 @@ var prebuiltECRImageIDByRegion_deepLearning = map[string]string{ endpoints.ApNortheast2RegionID: "763104351884", endpoints.ApNortheast3RegionID: "364406365360", endpoints.ApSouth1RegionID: "763104351884", - names.APSouth2RegionID: "772153158452", + endpoints.ApSouth2RegionID: "772153158452", names.APSoutheast1RegionID: "763104351884", names.APSoutheast2RegionID: "763104351884", names.APSoutheast3RegionID: "907027046896", diff --git a/names/names.go b/names/names.go index e84ed474edb..9aa8fe414b4 100644 --- a/names/names.go +++ b/names/names.go @@ -149,7 +149,6 @@ const ( // AWS Standard partition's regions. GlobalRegionID = "aws-global" // AWS Standard global region. - APSouth2RegionID = "ap-south-2" // Asia Pacific (Hyderabad). APSoutheast1RegionID = "ap-southeast-1" // Asia Pacific (Singapore). APSoutheast2RegionID = "ap-southeast-2" // Asia Pacific (Sydney). APSoutheast3RegionID = "ap-southeast-3" // Asia Pacific (Jakarta). From becc91958918f775477e5e6f216342f8c0fa6262 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 15:13:50 -0500 Subject: [PATCH 273/304] 'names.APSoutheast1RegionID' -> 'endpoints.ApSoutheast1RegionID'. --- .../apprunner/hosted_zone_id_data_source.go | 2 +- internal/service/chatbot/service_package.go | 2 +- .../cloudtrail/service_account_data_source.go | 2 +- .../service/dynamodb/global_table_test.go | 2 +- .../hosted_zone_data_source.go | 2 +- .../service/elb/hosted_zone_id_data_source.go | 2 +- .../elb/service_account_data_source.go | 2 +- .../elbv2/hosted_zone_id_data_source.go | 4 +-- internal/service/gamelift/gamelift_test.go | 2 +- internal/service/lambda/function.go | 2 +- .../redshift/service_account_data_source.go | 2 +- internal/service/s3/hosted_zones.go | 2 +- .../prebuilt_ecr_image_data_source.go | 30 +++++++++---------- names/names.go | 1 - 14 files changed, 28 insertions(+), 29 deletions(-) diff --git a/internal/service/apprunner/hosted_zone_id_data_source.go b/internal/service/apprunner/hosted_zone_id_data_source.go index 787c2b2753b..44af4f37bc9 100644 --- a/internal/service/apprunner/hosted_zone_id_data_source.go +++ b/internal/service/apprunner/hosted_zone_id_data_source.go @@ -22,7 +22,7 @@ var hostedZoneIDPerRegionMap = map[string]string{ names.USEast1RegionID: "Z01915732ZBZKC8D32TPT", names.USWest2RegionID: "Z02243383FTQ64HJ5772Q", endpoints.ApSouth1RegionID: "Z00855883LBHKTIC4ODF2", - names.APSoutheast1RegionID: "Z09819469CZ3KQ8PWMCL", + endpoints.ApSoutheast1RegionID: "Z09819469CZ3KQ8PWMCL", names.APSoutheast2RegionID: "Z03657752RA8799S0TI5I", endpoints.ApNortheast1RegionID: "Z08491812XW6IPYLR6CCA", names.EUCentral1RegionID: "Z0334911C2FDI2Q9M4FZ", diff --git a/internal/service/chatbot/service_package.go b/internal/service/chatbot/service_package.go index 19bec367747..d9d722f2c20 100644 --- a/internal/service/chatbot/service_package.go +++ b/internal/service/chatbot/service_package.go @@ -25,7 +25,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( if config["partition"].(string) == endpoints.AwsPartitionID { // Chatbot endpoint is available only in the 4 regions us-east-2, us-west-2, eu-west-1, and ap-southeast-1. // If the region from the context is one of those four, then use that region. If not default to us-west-2 - if slices.Contains([]string{names.USEast2RegionID, names.USWest2RegionID, names.EUWest1RegionID, names.APSoutheast1RegionID}, cfg.Region) { + if slices.Contains([]string{names.USEast2RegionID, names.USWest2RegionID, names.EUWest1RegionID, endpoints.ApSoutheast1RegionID}, cfg.Region) { o.Region = cfg.Region } else { tflog.Info(ctx, "overriding region", map[string]any{ diff --git a/internal/service/cloudtrail/service_account_data_source.go b/internal/service/cloudtrail/service_account_data_source.go index f8eb7721e99..aeb2aff0bdd 100644 --- a/internal/service/cloudtrail/service_account_data_source.go +++ b/internal/service/cloudtrail/service_account_data_source.go @@ -27,7 +27,7 @@ var serviceAccountPerRegionMap = map[string]string{ endpoints.ApNortheast3RegionID: "765225791966", endpoints.ApSouth1RegionID: "977081816279", endpoints.ApSouth2RegionID: "582488909970", - names.APSoutheast1RegionID: "903692715234", + endpoints.ApSoutheast1RegionID: "903692715234", names.APSoutheast2RegionID: "284668455005", names.APSoutheast3RegionID: "069019280451", names.APSoutheast4RegionID: "187074758985", diff --git a/internal/service/dynamodb/global_table_test.go b/internal/service/dynamodb/global_table_test.go index 6ea9fca158a..d7988ec71dd 100644 --- a/internal/service/dynamodb/global_table_test.go +++ b/internal/service/dynamodb/global_table_test.go @@ -159,7 +159,7 @@ func testAccPreCheckGlobalTable(ctx context.Context, t *testing.T) { supportedRegions := []string{ endpoints.ApNortheast1RegionID, endpoints.ApNortheast2RegionID, - names.APSoutheast1RegionID, + endpoints.ApSoutheast1RegionID, names.APSoutheast2RegionID, names.EUCentral1RegionID, names.EUWest1RegionID, diff --git a/internal/service/elasticbeanstalk/hosted_zone_data_source.go b/internal/service/elasticbeanstalk/hosted_zone_data_source.go index 03dc0409bdc..b819b10d3e1 100644 --- a/internal/service/elasticbeanstalk/hosted_zone_data_source.go +++ b/internal/service/elasticbeanstalk/hosted_zone_data_source.go @@ -18,7 +18,7 @@ import ( var hostedZoneIDs = map[string]string{ endpoints.AfSouth1RegionID: "Z1EI3BVKMKK4AM", - names.APSoutheast1RegionID: "Z16FZ9L249IFLT", + endpoints.ApSoutheast1RegionID: "Z16FZ9L249IFLT", names.APSoutheast2RegionID: "Z2PCDNR3VC2G1N", names.APSoutheast3RegionID: "Z05913172VM7EAZB40TA8", endpoints.ApEast1RegionID: "ZPWYUBWRU171A", diff --git a/internal/service/elb/hosted_zone_id_data_source.go b/internal/service/elb/hosted_zone_id_data_source.go index c91cf6bb120..e376ae98bfe 100644 --- a/internal/service/elb/hosted_zone_id_data_source.go +++ b/internal/service/elb/hosted_zone_id_data_source.go @@ -23,7 +23,7 @@ var hostedZoneIDPerRegionMap = map[string]string{ endpoints.ApNortheast3RegionID: "Z5LXEXXYW11ES", endpoints.ApSouth1RegionID: "ZP97RAFLXTNZK", endpoints.ApSouth2RegionID: "Z0173938T07WNTVAEPZN", - names.APSoutheast1RegionID: "Z1LMS91P8CMLE5", + endpoints.ApSoutheast1RegionID: "Z1LMS91P8CMLE5", names.APSoutheast2RegionID: "Z1GM3OXH4ZPM65", names.APSoutheast3RegionID: "Z08888821HLRG5A9ZRTER", names.APSoutheast4RegionID: "Z09517862IB2WZLPXG76F", diff --git a/internal/service/elb/service_account_data_source.go b/internal/service/elb/service_account_data_source.go index 643524b0892..2674afa46d9 100644 --- a/internal/service/elb/service_account_data_source.go +++ b/internal/service/elb/service_account_data_source.go @@ -24,7 +24,7 @@ var accountIDPerRegionMap = map[string]string{ endpoints.ApNortheast2RegionID: "600734575887", endpoints.ApNortheast3RegionID: "383597477331", endpoints.ApSouth1RegionID: "718504428378", - names.APSoutheast1RegionID: "114774131450", + endpoints.ApSoutheast1RegionID: "114774131450", names.APSoutheast2RegionID: "783225319266", names.APSoutheast3RegionID: "589379963580", names.CACentral1RegionID: "985666609251", diff --git a/internal/service/elbv2/hosted_zone_id_data_source.go b/internal/service/elbv2/hosted_zone_id_data_source.go index bb5e905bd75..6d996fda6ba 100644 --- a/internal/service/elbv2/hosted_zone_id_data_source.go +++ b/internal/service/elbv2/hosted_zone_id_data_source.go @@ -27,7 +27,7 @@ var hostedZoneIDPerRegionALBMap = map[string]string{ endpoints.ApNortheast3RegionID: "Z5LXEXXYW11ES", endpoints.ApSouth1RegionID: "ZP97RAFLXTNZK", endpoints.ApSouth2RegionID: "Z0173938T07WNTVAEPZN", - names.APSoutheast1RegionID: "Z1LMS91P8CMLE5", + endpoints.ApSoutheast1RegionID: "Z1LMS91P8CMLE5", names.APSoutheast2RegionID: "Z1GM3OXH4ZPM65", names.APSoutheast3RegionID: "Z08888821HLRG5A9ZRTER", names.APSoutheast4RegionID: "Z09517862IB2WZLPXG76F", @@ -65,7 +65,7 @@ var hostedZoneIDPerRegionNLBMap = map[string]string{ endpoints.ApNortheast3RegionID: "Z1GWIQ4HH19I5X", endpoints.ApSouth1RegionID: "ZVDDRBQ08TROA", endpoints.ApSouth2RegionID: "Z0711778386UTO08407HT", - names.APSoutheast1RegionID: "ZKVM4W9LS7TM", + endpoints.ApSoutheast1RegionID: "ZKVM4W9LS7TM", names.APSoutheast2RegionID: "ZCT6FZBF4DROD", names.APSoutheast3RegionID: "Z01971771FYVNCOVWJU1G", names.APSoutheast4RegionID: "Z01156963G8MIIL7X90IV", diff --git a/internal/service/gamelift/gamelift_test.go b/internal/service/gamelift/gamelift_test.go index 368ad004cf0..2597283b8b5 100644 --- a/internal/service/gamelift/gamelift_test.go +++ b/internal/service/gamelift/gamelift_test.go @@ -54,7 +54,7 @@ func testAccAccountIdByRegion(region string) (string, error) { endpoints.ApNortheast1RegionID: "120069834884", endpoints.ApNortheast2RegionID: "805673136642", endpoints.ApSouth1RegionID: "134975661615", - names.APSoutheast1RegionID: "077577004113", + endpoints.ApSoutheast1RegionID: "077577004113", names.APSoutheast2RegionID: "112188327105", names.CACentral1RegionID: "800535022691", names.EUCentral1RegionID: "797584052317", diff --git a/internal/service/lambda/function.go b/internal/service/lambda/function.go index 353d0706903..f2d46b3dc32 100644 --- a/internal/service/lambda/function.go +++ b/internal/service/lambda/function.go @@ -1407,7 +1407,7 @@ func signerServiceIsAvailable(region string) bool { endpoints.ApEast1RegionID: {}, endpoints.ApSouth1RegionID: {}, endpoints.ApNortheast2RegionID: {}, - names.APSoutheast1RegionID: {}, + endpoints.ApSoutheast1RegionID: {}, names.APSoutheast2RegionID: {}, endpoints.ApNortheast1RegionID: {}, names.CACentral1RegionID: {}, diff --git a/internal/service/redshift/service_account_data_source.go b/internal/service/redshift/service_account_data_source.go index ce4cdbdc280..2450692b641 100644 --- a/internal/service/redshift/service_account_data_source.go +++ b/internal/service/redshift/service_account_data_source.go @@ -26,7 +26,7 @@ var ServiceAccountPerRegionMap = map[string]string{ endpoints.ApNortheast2RegionID: "760740231472", endpoints.ApNortheast3RegionID: "090321488786", endpoints.ApSouth1RegionID: "865932855811", - names.APSoutheast1RegionID: "361669875840", + endpoints.ApSoutheast1RegionID: "361669875840", names.APSoutheast2RegionID: "762762565011", names.CACentral1RegionID: "907379612154", names.CNNorth1RegionID: "111890595117", diff --git a/internal/service/s3/hosted_zones.go b/internal/service/s3/hosted_zones.go index e506e09b953..5860fa74e2a 100644 --- a/internal/service/s3/hosted_zones.go +++ b/internal/service/s3/hosted_zones.go @@ -19,7 +19,7 @@ var hostedZoneIDsMap = map[string]string{ endpoints.ApNortheast3RegionID: "Z2YQB5RD63NC85", endpoints.ApSouth1RegionID: "Z11RGJOFQNVJUP", endpoints.ApSouth2RegionID: "Z02976202B4EZMXIPMXF7", - names.APSoutheast1RegionID: "Z3O0J2DXBE1FTB", + endpoints.ApSoutheast1RegionID: "Z3O0J2DXBE1FTB", names.APSoutheast2RegionID: "Z1WCIGYICN2BYD", names.APSoutheast3RegionID: "Z01846753K324LI26A3VV", names.APSoutheast4RegionID: "Z0312387243XT5FE14WFO", diff --git a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go index 3d5a3565c06..e3ba7206b92 100644 --- a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go +++ b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go @@ -196,7 +196,7 @@ var prebuiltECRImageIDByRegion_blazing = map[string]string{ endpoints.ApNortheast3RegionID: "867004704886", endpoints.ApSouth1RegionID: "991648021394", endpoints.ApSouth2RegionID: "628508329040", - names.APSoutheast1RegionID: "475088953585", + endpoints.ApSoutheast1RegionID: "475088953585", names.APSoutheast2RegionID: "544295431143", names.APSoutheast3RegionID: "951798379941", names.APSoutheast4RegionID: "106583098589", @@ -235,7 +235,7 @@ var prebuiltECRImageIDByRegion_clarify = map[string]string{ endpoints.ApNortheast2RegionID: "263625296855", endpoints.ApNortheast3RegionID: "912233562940", endpoints.ApSouth1RegionID: "452307495513", - names.APSoutheast1RegionID: "834264404009", + endpoints.ApSoutheast1RegionID: "834264404009", names.APSoutheast2RegionID: "007051062584", names.APSoutheast3RegionID: "705930551576", names.CACentral1RegionID: "675030665977", @@ -265,7 +265,7 @@ var prebuiltECRImageIDByRegion_dataWrangler = map[string]string{ endpoints.ApNortheast2RegionID: "131546521161", endpoints.ApNortheast3RegionID: "913387583493", endpoints.ApSouth1RegionID: "089933028263", - names.APSoutheast1RegionID: "119527597002", + endpoints.ApSoutheast1RegionID: "119527597002", names.APSoutheast2RegionID: "422173101802", names.CACentral1RegionID: "557239378090", names.CNNorth1RegionID: "245909111842", @@ -294,7 +294,7 @@ var prebuiltECRImageIDByRegion_debugger = map[string]string{ endpoints.ApNortheast2RegionID: "578805364391", endpoints.ApNortheast3RegionID: "479947661362", endpoints.ApSouth1RegionID: "904829902805", - names.APSoutheast1RegionID: "972752614525", + endpoints.ApSoutheast1RegionID: "972752614525", names.APSoutheast2RegionID: "184798709955", names.CACentral1RegionID: "519511493484", names.CNNorth1RegionID: "618459771430", @@ -329,7 +329,7 @@ var prebuiltECRImageIDByRegion_inferentiaNeo = map[string]string{ endpoints.ApNortheast2RegionID: "151534178276", endpoints.ApNortheast3RegionID: "925152966179", endpoints.ApSouth1RegionID: "763008648453", - names.APSoutheast1RegionID: "324986816169", + endpoints.ApSoutheast1RegionID: "324986816169", names.APSoutheast2RegionID: "355873309152", names.CACentral1RegionID: "464438896020", names.CNNorth1RegionID: "472730292857", @@ -365,7 +365,7 @@ var prebuiltECRImageIDByRegion_SageMakerCustom = map[string]string{ // nosemgrep endpoints.ApNortheast1RegionID: "520713654638", endpoints.ApNortheast2RegionID: "520713654638", endpoints.ApSouth1RegionID: "520713654638", - names.APSoutheast1RegionID: "520713654638", + endpoints.ApSoutheast1RegionID: "520713654638", names.APSoutheast2RegionID: "520713654638", names.CACentral1RegionID: "520713654638", names.CNNorth1RegionID: "422961961927", @@ -395,7 +395,7 @@ var prebuiltECRImageIDByRegion_SageMakerRL = map[string]string{ // nosemgrep:ci. endpoints.ApNortheast1RegionID: "462105765813", endpoints.ApNortheast2RegionID: "462105765813", endpoints.ApSouth1RegionID: "462105765813", - names.APSoutheast1RegionID: "462105765813", + endpoints.ApSoutheast1RegionID: "462105765813", names.APSoutheast2RegionID: "462105765813", names.CACentral1RegionID: "462105765813", names.EUCentral1RegionID: "462105765813", @@ -417,7 +417,7 @@ var prebuiltECRImageIDByRegion_spark = map[string]string{ endpoints.ApNortheast3RegionID: "102471314380", endpoints.ApSouth1RegionID: "105495057255", endpoints.ApSouth2RegionID: "873151114052", - names.APSoutheast1RegionID: "759080221371", + endpoints.ApSoutheast1RegionID: "759080221371", names.APSoutheast2RegionID: "440695851116", names.APSoutheast3RegionID: "800295151634", names.APSoutheast4RegionID: "819679513684", @@ -454,7 +454,7 @@ var prebuiltECRImageIDByRegion_SageMakerBasePython = map[string]string{ // nosem endpoints.ApNortheast2RegionID: "806072073708", endpoints.ApNortheast3RegionID: "792733760839", endpoints.ApSouth1RegionID: "394103062818", - names.APSoutheast1RegionID: "492261229750", + endpoints.ApSoutheast1RegionID: "492261229750", names.APSoutheast2RegionID: "452832661640", names.APSoutheast3RegionID: "276181064229", names.CACentral1RegionID: "310906938811", @@ -495,7 +495,7 @@ var prebuiltECRImageIDByRegion_deepAR = map[string]string{ endpoints.ApNortheast3RegionID: "867004704886", endpoints.ApSouth1RegionID: "991648021394", endpoints.ApSouth2RegionID: "628508329040", - names.APSoutheast1RegionID: "475088953585", + endpoints.ApSoutheast1RegionID: "475088953585", names.APSoutheast2RegionID: "514117268639", names.APSoutheast3RegionID: "951798379941", names.APSoutheast4RegionID: "106583098589", @@ -540,7 +540,7 @@ var prebuiltECRImageIDByRegion_factorMachines = map[string]string{ endpoints.ApNortheast3RegionID: "867004704886", endpoints.ApSouth1RegionID: "991648021394", endpoints.ApSouth2RegionID: "628508329040", - names.APSoutheast1RegionID: "475088953585", + endpoints.ApSoutheast1RegionID: "475088953585", names.APSoutheast2RegionID: "712309505854", names.APSoutheast3RegionID: "951798379941", names.APSoutheast4RegionID: "106583098589", @@ -576,7 +576,7 @@ var prebuiltECRImageIDByRegion_lda = map[string]string{ endpoints.ApNortheast1RegionID: "258307448986", endpoints.ApNortheast2RegionID: "293181348795", endpoints.ApSouth1RegionID: "991648021394", - names.APSoutheast1RegionID: "475088953585", + endpoints.ApSoutheast1RegionID: "475088953585", names.APSoutheast2RegionID: "297031611018", names.CACentral1RegionID: "469771592824", names.EUCentral1RegionID: "353608530281", @@ -605,7 +605,7 @@ var prebuiltECRImageIDByRegion_XGBoost = map[string]string{ endpoints.ApNortheast3RegionID: "867004704886", endpoints.ApSouth1RegionID: "720646828776", endpoints.ApSouth2RegionID: "628508329040", - names.APSoutheast1RegionID: "121021644041", + endpoints.ApSoutheast1RegionID: "121021644041", names.APSoutheast2RegionID: "783357654285", names.APSoutheast3RegionID: "951798379941", names.APSoutheast4RegionID: "106583098589", @@ -657,7 +657,7 @@ var prebuiltECRImageIDByRegion_deepLearning = map[string]string{ endpoints.ApNortheast3RegionID: "364406365360", endpoints.ApSouth1RegionID: "763104351884", endpoints.ApSouth2RegionID: "772153158452", - names.APSoutheast1RegionID: "763104351884", + endpoints.ApSoutheast1RegionID: "763104351884", names.APSoutheast2RegionID: "763104351884", names.APSoutheast3RegionID: "907027046896", names.APSoutheast4RegionID: "457447274322", @@ -696,7 +696,7 @@ var prebuiltECRImageIDByRegion_modelMonitor = map[string]string{ endpoints.ApNortheast2RegionID: "709848358524", endpoints.ApNortheast3RegionID: "990339680094", endpoints.ApSouth1RegionID: "126357580389", - names.APSoutheast1RegionID: "245545462676", + endpoints.ApSoutheast1RegionID: "245545462676", names.APSoutheast2RegionID: "563025443158", names.APSoutheast3RegionID: "669540362728", names.CACentral1RegionID: "536280801234", diff --git a/names/names.go b/names/names.go index 9aa8fe414b4..06374636ed8 100644 --- a/names/names.go +++ b/names/names.go @@ -149,7 +149,6 @@ const ( // AWS Standard partition's regions. GlobalRegionID = "aws-global" // AWS Standard global region. - APSoutheast1RegionID = "ap-southeast-1" // Asia Pacific (Singapore). APSoutheast2RegionID = "ap-southeast-2" // Asia Pacific (Sydney). APSoutheast3RegionID = "ap-southeast-3" // Asia Pacific (Jakarta). APSoutheast4RegionID = "ap-southeast-4" // Asia Pacific (Melbourne). From 69b40c03ee68eddc82c658bf5db53c9c4de94864 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 15:15:09 -0500 Subject: [PATCH 274/304] 'names.APSoutheast2RegionID' -> 'endpoints.ApSoutheast2RegionID'. --- .../apprunner/hosted_zone_id_data_source.go | 2 +- .../cloudtrail/service_account_data_source.go | 2 +- ...nvironment_blueprint_configuration_test.go | 5 ++-- .../service/dynamodb/global_table_test.go | 2 +- .../hosted_zone_data_source.go | 2 +- .../service/elb/hosted_zone_id_data_source.go | 2 +- .../elb/service_account_data_source.go | 2 +- .../elbv2/hosted_zone_id_data_source.go | 4 +-- internal/service/gamelift/gamelift_test.go | 2 +- internal/service/lambda/function.go | 2 +- .../redshift/service_account_data_source.go | 2 +- internal/service/s3/hosted_zones.go | 2 +- .../prebuilt_ecr_image_data_source.go | 30 +++++++++---------- names/names.go | 1 - 14 files changed, 30 insertions(+), 30 deletions(-) diff --git a/internal/service/apprunner/hosted_zone_id_data_source.go b/internal/service/apprunner/hosted_zone_id_data_source.go index 44af4f37bc9..c5233f3a56e 100644 --- a/internal/service/apprunner/hosted_zone_id_data_source.go +++ b/internal/service/apprunner/hosted_zone_id_data_source.go @@ -23,7 +23,7 @@ var hostedZoneIDPerRegionMap = map[string]string{ names.USWest2RegionID: "Z02243383FTQ64HJ5772Q", endpoints.ApSouth1RegionID: "Z00855883LBHKTIC4ODF2", endpoints.ApSoutheast1RegionID: "Z09819469CZ3KQ8PWMCL", - names.APSoutheast2RegionID: "Z03657752RA8799S0TI5I", + endpoints.ApSoutheast2RegionID: "Z03657752RA8799S0TI5I", endpoints.ApNortheast1RegionID: "Z08491812XW6IPYLR6CCA", names.EUCentral1RegionID: "Z0334911C2FDI2Q9M4FZ", names.EUWest1RegionID: "Z087551914Z2PCAU0QHMW", diff --git a/internal/service/cloudtrail/service_account_data_source.go b/internal/service/cloudtrail/service_account_data_source.go index aeb2aff0bdd..5f814972fd5 100644 --- a/internal/service/cloudtrail/service_account_data_source.go +++ b/internal/service/cloudtrail/service_account_data_source.go @@ -28,7 +28,7 @@ var serviceAccountPerRegionMap = map[string]string{ endpoints.ApSouth1RegionID: "977081816279", endpoints.ApSouth2RegionID: "582488909970", endpoints.ApSoutheast1RegionID: "903692715234", - names.APSoutheast2RegionID: "284668455005", + endpoints.ApSoutheast2RegionID: "284668455005", names.APSoutheast3RegionID: "069019280451", names.APSoutheast4RegionID: "187074758985", names.CACentral1RegionID: "819402241893", diff --git a/internal/service/datazone/environment_blueprint_configuration_test.go b/internal/service/datazone/environment_blueprint_configuration_test.go index 3de6a3d5483..6b535f4abec 100644 --- a/internal/service/datazone/environment_blueprint_configuration_test.go +++ b/internal/service/datazone/environment_blueprint_configuration_test.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/datazone" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -117,12 +118,12 @@ func TestAccDataZoneEnvironmentBlueprintConfiguration_enabled_regions(t *testing ImportStateVerifyIdentifierAttribute: "environment_blueprint_id", }, { - Config: testAccEnvironmentBlueprintConfigurationConfig_enabled_regions(domainName, names.APSoutheast2RegionID), + Config: testAccEnvironmentBlueprintConfigurationConfig_enabled_regions(domainName, endpoints.ApSoutheast2RegionID), Check: resource.ComposeTestCheckFunc( testAccCheckEnvironmentBlueprintConfigurationExists(ctx, resourceName, &environmentblueprintconfiguration), resource.TestCheckResourceAttrSet(resourceName, "environment_blueprint_id"), resource.TestCheckResourceAttr(resourceName, "enabled_regions.#", "1"), - resource.TestCheckResourceAttr(resourceName, "enabled_regions.0", names.APSoutheast2RegionID), + resource.TestCheckResourceAttr(resourceName, "enabled_regions.0", endpoints.ApSoutheast2RegionID), ), }, }, diff --git a/internal/service/dynamodb/global_table_test.go b/internal/service/dynamodb/global_table_test.go index d7988ec71dd..64d95caaa28 100644 --- a/internal/service/dynamodb/global_table_test.go +++ b/internal/service/dynamodb/global_table_test.go @@ -160,7 +160,7 @@ func testAccPreCheckGlobalTable(ctx context.Context, t *testing.T) { endpoints.ApNortheast1RegionID, endpoints.ApNortheast2RegionID, endpoints.ApSoutheast1RegionID, - names.APSoutheast2RegionID, + endpoints.ApSoutheast2RegionID, names.EUCentral1RegionID, names.EUWest1RegionID, names.EUWest2RegionID, diff --git a/internal/service/elasticbeanstalk/hosted_zone_data_source.go b/internal/service/elasticbeanstalk/hosted_zone_data_source.go index b819b10d3e1..aef85e34d75 100644 --- a/internal/service/elasticbeanstalk/hosted_zone_data_source.go +++ b/internal/service/elasticbeanstalk/hosted_zone_data_source.go @@ -19,7 +19,7 @@ import ( var hostedZoneIDs = map[string]string{ endpoints.AfSouth1RegionID: "Z1EI3BVKMKK4AM", endpoints.ApSoutheast1RegionID: "Z16FZ9L249IFLT", - names.APSoutheast2RegionID: "Z2PCDNR3VC2G1N", + endpoints.ApSoutheast2RegionID: "Z2PCDNR3VC2G1N", names.APSoutheast3RegionID: "Z05913172VM7EAZB40TA8", endpoints.ApEast1RegionID: "ZPWYUBWRU171A", endpoints.ApNortheast1RegionID: "Z1R25G3KIG2GBW", diff --git a/internal/service/elb/hosted_zone_id_data_source.go b/internal/service/elb/hosted_zone_id_data_source.go index e376ae98bfe..a46011eb52a 100644 --- a/internal/service/elb/hosted_zone_id_data_source.go +++ b/internal/service/elb/hosted_zone_id_data_source.go @@ -24,7 +24,7 @@ var hostedZoneIDPerRegionMap = map[string]string{ endpoints.ApSouth1RegionID: "ZP97RAFLXTNZK", endpoints.ApSouth2RegionID: "Z0173938T07WNTVAEPZN", endpoints.ApSoutheast1RegionID: "Z1LMS91P8CMLE5", - names.APSoutheast2RegionID: "Z1GM3OXH4ZPM65", + endpoints.ApSoutheast2RegionID: "Z1GM3OXH4ZPM65", names.APSoutheast3RegionID: "Z08888821HLRG5A9ZRTER", names.APSoutheast4RegionID: "Z09517862IB2WZLPXG76F", names.APSoutheast5RegionID: "Z06010284QMVVW7WO5J", diff --git a/internal/service/elb/service_account_data_source.go b/internal/service/elb/service_account_data_source.go index 2674afa46d9..13d107d4e54 100644 --- a/internal/service/elb/service_account_data_source.go +++ b/internal/service/elb/service_account_data_source.go @@ -25,7 +25,7 @@ var accountIDPerRegionMap = map[string]string{ endpoints.ApNortheast3RegionID: "383597477331", endpoints.ApSouth1RegionID: "718504428378", endpoints.ApSoutheast1RegionID: "114774131450", - names.APSoutheast2RegionID: "783225319266", + endpoints.ApSoutheast2RegionID: "783225319266", names.APSoutheast3RegionID: "589379963580", names.CACentral1RegionID: "985666609251", names.CNNorth1RegionID: "638102146993", diff --git a/internal/service/elbv2/hosted_zone_id_data_source.go b/internal/service/elbv2/hosted_zone_id_data_source.go index 6d996fda6ba..33b4b56b441 100644 --- a/internal/service/elbv2/hosted_zone_id_data_source.go +++ b/internal/service/elbv2/hosted_zone_id_data_source.go @@ -28,7 +28,7 @@ var hostedZoneIDPerRegionALBMap = map[string]string{ endpoints.ApSouth1RegionID: "ZP97RAFLXTNZK", endpoints.ApSouth2RegionID: "Z0173938T07WNTVAEPZN", endpoints.ApSoutheast1RegionID: "Z1LMS91P8CMLE5", - names.APSoutheast2RegionID: "Z1GM3OXH4ZPM65", + endpoints.ApSoutheast2RegionID: "Z1GM3OXH4ZPM65", names.APSoutheast3RegionID: "Z08888821HLRG5A9ZRTER", names.APSoutheast4RegionID: "Z09517862IB2WZLPXG76F", names.APSoutheast5RegionID: "Z06010284QMVVW7WO5J", @@ -66,7 +66,7 @@ var hostedZoneIDPerRegionNLBMap = map[string]string{ endpoints.ApSouth1RegionID: "ZVDDRBQ08TROA", endpoints.ApSouth2RegionID: "Z0711778386UTO08407HT", endpoints.ApSoutheast1RegionID: "ZKVM4W9LS7TM", - names.APSoutheast2RegionID: "ZCT6FZBF4DROD", + endpoints.ApSoutheast2RegionID: "ZCT6FZBF4DROD", names.APSoutheast3RegionID: "Z01971771FYVNCOVWJU1G", names.APSoutheast4RegionID: "Z01156963G8MIIL7X90IV", names.APSoutheast5RegionID: "Z026317210H9ACVTRO6FB", diff --git a/internal/service/gamelift/gamelift_test.go b/internal/service/gamelift/gamelift_test.go index 2597283b8b5..19db49bf046 100644 --- a/internal/service/gamelift/gamelift_test.go +++ b/internal/service/gamelift/gamelift_test.go @@ -55,7 +55,7 @@ func testAccAccountIdByRegion(region string) (string, error) { endpoints.ApNortheast2RegionID: "805673136642", endpoints.ApSouth1RegionID: "134975661615", endpoints.ApSoutheast1RegionID: "077577004113", - names.APSoutheast2RegionID: "112188327105", + endpoints.ApSoutheast2RegionID: "112188327105", names.CACentral1RegionID: "800535022691", names.EUCentral1RegionID: "797584052317", names.EUWest1RegionID: "319803218673", diff --git a/internal/service/lambda/function.go b/internal/service/lambda/function.go index f2d46b3dc32..f50c3a72b90 100644 --- a/internal/service/lambda/function.go +++ b/internal/service/lambda/function.go @@ -1408,7 +1408,7 @@ func signerServiceIsAvailable(region string) bool { endpoints.ApSouth1RegionID: {}, endpoints.ApNortheast2RegionID: {}, endpoints.ApSoutheast1RegionID: {}, - names.APSoutheast2RegionID: {}, + endpoints.ApSoutheast2RegionID: {}, endpoints.ApNortheast1RegionID: {}, names.CACentral1RegionID: {}, names.EUCentral1RegionID: {}, diff --git a/internal/service/redshift/service_account_data_source.go b/internal/service/redshift/service_account_data_source.go index 2450692b641..bd1ebc62fcd 100644 --- a/internal/service/redshift/service_account_data_source.go +++ b/internal/service/redshift/service_account_data_source.go @@ -27,7 +27,7 @@ var ServiceAccountPerRegionMap = map[string]string{ endpoints.ApNortheast3RegionID: "090321488786", endpoints.ApSouth1RegionID: "865932855811", endpoints.ApSoutheast1RegionID: "361669875840", - names.APSoutheast2RegionID: "762762565011", + endpoints.ApSoutheast2RegionID: "762762565011", names.CACentral1RegionID: "907379612154", names.CNNorth1RegionID: "111890595117", names.CNNorthwest1RegionID: "660998842044", diff --git a/internal/service/s3/hosted_zones.go b/internal/service/s3/hosted_zones.go index 5860fa74e2a..9edc6cf5a50 100644 --- a/internal/service/s3/hosted_zones.go +++ b/internal/service/s3/hosted_zones.go @@ -20,7 +20,7 @@ var hostedZoneIDsMap = map[string]string{ endpoints.ApSouth1RegionID: "Z11RGJOFQNVJUP", endpoints.ApSouth2RegionID: "Z02976202B4EZMXIPMXF7", endpoints.ApSoutheast1RegionID: "Z3O0J2DXBE1FTB", - names.APSoutheast2RegionID: "Z1WCIGYICN2BYD", + endpoints.ApSoutheast2RegionID: "Z1WCIGYICN2BYD", names.APSoutheast3RegionID: "Z01846753K324LI26A3VV", names.APSoutheast4RegionID: "Z0312387243XT5FE14WFO", names.APSoutheast5RegionID: "Z08660063OXLMA7F1FJHU", diff --git a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go index e3ba7206b92..c026b476632 100644 --- a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go +++ b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go @@ -197,7 +197,7 @@ var prebuiltECRImageIDByRegion_blazing = map[string]string{ endpoints.ApSouth1RegionID: "991648021394", endpoints.ApSouth2RegionID: "628508329040", endpoints.ApSoutheast1RegionID: "475088953585", - names.APSoutheast2RegionID: "544295431143", + endpoints.ApSoutheast2RegionID: "544295431143", names.APSoutheast3RegionID: "951798379941", names.APSoutheast4RegionID: "106583098589", names.CACentral1RegionID: "469771592824", @@ -236,7 +236,7 @@ var prebuiltECRImageIDByRegion_clarify = map[string]string{ endpoints.ApNortheast3RegionID: "912233562940", endpoints.ApSouth1RegionID: "452307495513", endpoints.ApSoutheast1RegionID: "834264404009", - names.APSoutheast2RegionID: "007051062584", + endpoints.ApSoutheast2RegionID: "007051062584", names.APSoutheast3RegionID: "705930551576", names.CACentral1RegionID: "675030665977", names.CNNorth1RegionID: "122526803553", @@ -266,7 +266,7 @@ var prebuiltECRImageIDByRegion_dataWrangler = map[string]string{ endpoints.ApNortheast3RegionID: "913387583493", endpoints.ApSouth1RegionID: "089933028263", endpoints.ApSoutheast1RegionID: "119527597002", - names.APSoutheast2RegionID: "422173101802", + endpoints.ApSoutheast2RegionID: "422173101802", names.CACentral1RegionID: "557239378090", names.CNNorth1RegionID: "245909111842", names.CNNorthwest1RegionID: "249157047649", @@ -295,7 +295,7 @@ var prebuiltECRImageIDByRegion_debugger = map[string]string{ endpoints.ApNortheast3RegionID: "479947661362", endpoints.ApSouth1RegionID: "904829902805", endpoints.ApSoutheast1RegionID: "972752614525", - names.APSoutheast2RegionID: "184798709955", + endpoints.ApSoutheast2RegionID: "184798709955", names.CACentral1RegionID: "519511493484", names.CNNorth1RegionID: "618459771430", names.CNNorthwest1RegionID: "658757709296", @@ -330,7 +330,7 @@ var prebuiltECRImageIDByRegion_inferentiaNeo = map[string]string{ endpoints.ApNortheast3RegionID: "925152966179", endpoints.ApSouth1RegionID: "763008648453", endpoints.ApSoutheast1RegionID: "324986816169", - names.APSoutheast2RegionID: "355873309152", + endpoints.ApSoutheast2RegionID: "355873309152", names.CACentral1RegionID: "464438896020", names.CNNorth1RegionID: "472730292857", names.CNNorthwest1RegionID: "474822919863", @@ -366,7 +366,7 @@ var prebuiltECRImageIDByRegion_SageMakerCustom = map[string]string{ // nosemgrep endpoints.ApNortheast2RegionID: "520713654638", endpoints.ApSouth1RegionID: "520713654638", endpoints.ApSoutheast1RegionID: "520713654638", - names.APSoutheast2RegionID: "520713654638", + endpoints.ApSoutheast2RegionID: "520713654638", names.CACentral1RegionID: "520713654638", names.CNNorth1RegionID: "422961961927", names.CNNorthwest1RegionID: "423003514399", @@ -396,7 +396,7 @@ var prebuiltECRImageIDByRegion_SageMakerRL = map[string]string{ // nosemgrep:ci. endpoints.ApNortheast2RegionID: "462105765813", endpoints.ApSouth1RegionID: "462105765813", endpoints.ApSoutheast1RegionID: "462105765813", - names.APSoutheast2RegionID: "462105765813", + endpoints.ApSoutheast2RegionID: "462105765813", names.CACentral1RegionID: "462105765813", names.EUCentral1RegionID: "462105765813", names.EUWest1RegionID: "462105765813", @@ -418,7 +418,7 @@ var prebuiltECRImageIDByRegion_spark = map[string]string{ endpoints.ApSouth1RegionID: "105495057255", endpoints.ApSouth2RegionID: "873151114052", endpoints.ApSoutheast1RegionID: "759080221371", - names.APSoutheast2RegionID: "440695851116", + endpoints.ApSoutheast2RegionID: "440695851116", names.APSoutheast3RegionID: "800295151634", names.APSoutheast4RegionID: "819679513684", names.CACentral1RegionID: "446299261295", @@ -455,7 +455,7 @@ var prebuiltECRImageIDByRegion_SageMakerBasePython = map[string]string{ // nosem endpoints.ApNortheast3RegionID: "792733760839", endpoints.ApSouth1RegionID: "394103062818", endpoints.ApSoutheast1RegionID: "492261229750", - names.APSoutheast2RegionID: "452832661640", + endpoints.ApSoutheast2RegionID: "452832661640", names.APSoutheast3RegionID: "276181064229", names.CACentral1RegionID: "310906938811", names.CNNorth1RegionID: "390048526115", @@ -496,7 +496,7 @@ var prebuiltECRImageIDByRegion_deepAR = map[string]string{ endpoints.ApSouth1RegionID: "991648021394", endpoints.ApSouth2RegionID: "628508329040", endpoints.ApSoutheast1RegionID: "475088953585", - names.APSoutheast2RegionID: "514117268639", + endpoints.ApSoutheast2RegionID: "514117268639", names.APSoutheast3RegionID: "951798379941", names.APSoutheast4RegionID: "106583098589", names.CACentral1RegionID: "469771592824", @@ -541,7 +541,7 @@ var prebuiltECRImageIDByRegion_factorMachines = map[string]string{ endpoints.ApSouth1RegionID: "991648021394", endpoints.ApSouth2RegionID: "628508329040", endpoints.ApSoutheast1RegionID: "475088953585", - names.APSoutheast2RegionID: "712309505854", + endpoints.ApSoutheast2RegionID: "712309505854", names.APSoutheast3RegionID: "951798379941", names.APSoutheast4RegionID: "106583098589", names.CACentral1RegionID: "469771592824", @@ -577,7 +577,7 @@ var prebuiltECRImageIDByRegion_lda = map[string]string{ endpoints.ApNortheast2RegionID: "293181348795", endpoints.ApSouth1RegionID: "991648021394", endpoints.ApSoutheast1RegionID: "475088953585", - names.APSoutheast2RegionID: "297031611018", + endpoints.ApSoutheast2RegionID: "297031611018", names.CACentral1RegionID: "469771592824", names.EUCentral1RegionID: "353608530281", names.EUWest1RegionID: "999678624901", @@ -606,7 +606,7 @@ var prebuiltECRImageIDByRegion_XGBoost = map[string]string{ endpoints.ApSouth1RegionID: "720646828776", endpoints.ApSouth2RegionID: "628508329040", endpoints.ApSoutheast1RegionID: "121021644041", - names.APSoutheast2RegionID: "783357654285", + endpoints.ApSoutheast2RegionID: "783357654285", names.APSoutheast3RegionID: "951798379941", names.APSoutheast4RegionID: "106583098589", names.CACentral1RegionID: "341280168497", @@ -658,7 +658,7 @@ var prebuiltECRImageIDByRegion_deepLearning = map[string]string{ endpoints.ApSouth1RegionID: "763104351884", endpoints.ApSouth2RegionID: "772153158452", endpoints.ApSoutheast1RegionID: "763104351884", - names.APSoutheast2RegionID: "763104351884", + endpoints.ApSoutheast2RegionID: "763104351884", names.APSoutheast3RegionID: "907027046896", names.APSoutheast4RegionID: "457447274322", names.CACentral1RegionID: "763104351884", @@ -697,7 +697,7 @@ var prebuiltECRImageIDByRegion_modelMonitor = map[string]string{ endpoints.ApNortheast3RegionID: "990339680094", endpoints.ApSouth1RegionID: "126357580389", endpoints.ApSoutheast1RegionID: "245545462676", - names.APSoutheast2RegionID: "563025443158", + endpoints.ApSoutheast2RegionID: "563025443158", names.APSoutheast3RegionID: "669540362728", names.CACentral1RegionID: "536280801234", names.CNNorth1RegionID: "453000072557", diff --git a/names/names.go b/names/names.go index 06374636ed8..911939c7881 100644 --- a/names/names.go +++ b/names/names.go @@ -149,7 +149,6 @@ const ( // AWS Standard partition's regions. GlobalRegionID = "aws-global" // AWS Standard global region. - APSoutheast2RegionID = "ap-southeast-2" // Asia Pacific (Sydney). APSoutheast3RegionID = "ap-southeast-3" // Asia Pacific (Jakarta). APSoutheast4RegionID = "ap-southeast-4" // Asia Pacific (Melbourne). APSoutheast5RegionID = "ap-southeast-5" // Asia Pacific (Malaysia). From 0aa0409648e09f6e1121cb6ff80b9d15b1e5556d Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 15:16:31 -0500 Subject: [PATCH 275/304] 'names.APSoutheast3RegionID' -> 'endpoints.ApSoutheast3RegionID'. --- internal/service/account/region_test.go | 5 +++-- .../acmpca/certificate_authority_test.go | 2 +- .../cloudtrail/service_account_data_source.go | 2 +- .../hosted_zone_data_source.go | 2 +- .../service/elb/hosted_zone_id_data_source.go | 2 +- .../service/elb/service_account_data_source.go | 2 +- .../elbv2/hosted_zone_id_data_source.go | 4 ++-- internal/service/s3/hosted_zones.go | 2 +- .../prebuilt_ecr_image_data_source.go | 18 +++++++++--------- names/names.go | 1 - 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/internal/service/account/region_test.go b/internal/service/account/region_test.go index ccb1fcf9a29..545a85b0802 100644 --- a/internal/service/account/region_test.go +++ b/internal/service/account/region_test.go @@ -9,6 +9,7 @@ import ( "testing" "github.com/aws/aws-sdk-go-v2/service/account/types" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-aws/internal/acctest" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -19,7 +20,7 @@ import ( func testAccRegion_basic(t *testing.T) { ctx := acctest.Context(t) resourceName := "aws_account_region.test" - regionName := names.APSoutheast3RegionID + regionName := endpoints.ApSoutheast3RegionID resource.Test(t, resource.TestCase{ PreCheck: func() { @@ -61,7 +62,7 @@ func testAccRegion_basic(t *testing.T) { func testAccRegion_accountID(t *testing.T) { // nosemgrep:ci.account-in-func-name ctx := acctest.Context(t) resourceName := "aws_account_region.test" - regionName := names.APSoutheast3RegionID + regionName := endpoints.ApSoutheast3RegionID resource.Test(t, resource.TestCase{ PreCheck: func() { diff --git a/internal/service/acmpca/certificate_authority_test.go b/internal/service/acmpca/certificate_authority_test.go index 31e7bd604c2..bbd4a458c93 100644 --- a/internal/service/acmpca/certificate_authority_test.go +++ b/internal/service/acmpca/certificate_authority_test.go @@ -184,7 +184,7 @@ func TestAccACMPCACertificateAuthority_keyStorageSecurityStandard(t *testing.T) PreCheck: func() { acctest.PreCheck(ctx, t) // See https://docs.aws.amazon.com/privateca/latest/userguide/data-protection.html#private-keys. - acctest.PreCheckRegion(t, endpoints.ApSouth2RegionID, names.APSoutheast3RegionID, names.APSoutheast4RegionID, names.EUCentral2RegionID, names.EUSouth2RegionID, names.MECentral1RegionID) + acctest.PreCheckRegion(t, endpoints.ApSouth2RegionID, endpoints.ApSoutheast3RegionID, names.APSoutheast4RegionID, names.EUCentral2RegionID, names.EUSouth2RegionID, names.MECentral1RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.ACMPCAServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, diff --git a/internal/service/cloudtrail/service_account_data_source.go b/internal/service/cloudtrail/service_account_data_source.go index 5f814972fd5..da846b628c5 100644 --- a/internal/service/cloudtrail/service_account_data_source.go +++ b/internal/service/cloudtrail/service_account_data_source.go @@ -29,7 +29,7 @@ var serviceAccountPerRegionMap = map[string]string{ endpoints.ApSouth2RegionID: "582488909970", endpoints.ApSoutheast1RegionID: "903692715234", endpoints.ApSoutheast2RegionID: "284668455005", - names.APSoutheast3RegionID: "069019280451", + endpoints.ApSoutheast3RegionID: "069019280451", names.APSoutheast4RegionID: "187074758985", names.CACentral1RegionID: "819402241893", names.CNNorth1RegionID: "193415116832", diff --git a/internal/service/elasticbeanstalk/hosted_zone_data_source.go b/internal/service/elasticbeanstalk/hosted_zone_data_source.go index aef85e34d75..5f35ef8e8c4 100644 --- a/internal/service/elasticbeanstalk/hosted_zone_data_source.go +++ b/internal/service/elasticbeanstalk/hosted_zone_data_source.go @@ -20,7 +20,7 @@ var hostedZoneIDs = map[string]string{ endpoints.AfSouth1RegionID: "Z1EI3BVKMKK4AM", endpoints.ApSoutheast1RegionID: "Z16FZ9L249IFLT", endpoints.ApSoutheast2RegionID: "Z2PCDNR3VC2G1N", - names.APSoutheast3RegionID: "Z05913172VM7EAZB40TA8", + endpoints.ApSoutheast3RegionID: "Z05913172VM7EAZB40TA8", endpoints.ApEast1RegionID: "ZPWYUBWRU171A", endpoints.ApNortheast1RegionID: "Z1R25G3KIG2GBW", endpoints.ApNortheast2RegionID: "Z3JE5OI70TWKCP", diff --git a/internal/service/elb/hosted_zone_id_data_source.go b/internal/service/elb/hosted_zone_id_data_source.go index a46011eb52a..5c2cebb51bd 100644 --- a/internal/service/elb/hosted_zone_id_data_source.go +++ b/internal/service/elb/hosted_zone_id_data_source.go @@ -25,7 +25,7 @@ var hostedZoneIDPerRegionMap = map[string]string{ endpoints.ApSouth2RegionID: "Z0173938T07WNTVAEPZN", endpoints.ApSoutheast1RegionID: "Z1LMS91P8CMLE5", endpoints.ApSoutheast2RegionID: "Z1GM3OXH4ZPM65", - names.APSoutheast3RegionID: "Z08888821HLRG5A9ZRTER", + endpoints.ApSoutheast3RegionID: "Z08888821HLRG5A9ZRTER", names.APSoutheast4RegionID: "Z09517862IB2WZLPXG76F", names.APSoutheast5RegionID: "Z06010284QMVVW7WO5J", names.CACentral1RegionID: "ZQSVJUPU6J1EY", diff --git a/internal/service/elb/service_account_data_source.go b/internal/service/elb/service_account_data_source.go index 13d107d4e54..6f1d07fb589 100644 --- a/internal/service/elb/service_account_data_source.go +++ b/internal/service/elb/service_account_data_source.go @@ -26,7 +26,7 @@ var accountIDPerRegionMap = map[string]string{ endpoints.ApSouth1RegionID: "718504428378", endpoints.ApSoutheast1RegionID: "114774131450", endpoints.ApSoutheast2RegionID: "783225319266", - names.APSoutheast3RegionID: "589379963580", + endpoints.ApSoutheast3RegionID: "589379963580", names.CACentral1RegionID: "985666609251", names.CNNorth1RegionID: "638102146993", names.CNNorthwest1RegionID: "037604701340", diff --git a/internal/service/elbv2/hosted_zone_id_data_source.go b/internal/service/elbv2/hosted_zone_id_data_source.go index 33b4b56b441..16699b41ce5 100644 --- a/internal/service/elbv2/hosted_zone_id_data_source.go +++ b/internal/service/elbv2/hosted_zone_id_data_source.go @@ -29,7 +29,7 @@ var hostedZoneIDPerRegionALBMap = map[string]string{ endpoints.ApSouth2RegionID: "Z0173938T07WNTVAEPZN", endpoints.ApSoutheast1RegionID: "Z1LMS91P8CMLE5", endpoints.ApSoutheast2RegionID: "Z1GM3OXH4ZPM65", - names.APSoutheast3RegionID: "Z08888821HLRG5A9ZRTER", + endpoints.ApSoutheast3RegionID: "Z08888821HLRG5A9ZRTER", names.APSoutheast4RegionID: "Z09517862IB2WZLPXG76F", names.APSoutheast5RegionID: "Z06010284QMVVW7WO5J", names.CACentral1RegionID: "ZQSVJUPU6J1EY", @@ -67,7 +67,7 @@ var hostedZoneIDPerRegionNLBMap = map[string]string{ endpoints.ApSouth2RegionID: "Z0711778386UTO08407HT", endpoints.ApSoutheast1RegionID: "ZKVM4W9LS7TM", endpoints.ApSoutheast2RegionID: "ZCT6FZBF4DROD", - names.APSoutheast3RegionID: "Z01971771FYVNCOVWJU1G", + endpoints.ApSoutheast3RegionID: "Z01971771FYVNCOVWJU1G", names.APSoutheast4RegionID: "Z01156963G8MIIL7X90IV", names.APSoutheast5RegionID: "Z026317210H9ACVTRO6FB", names.CACentral1RegionID: "Z2EPGBW3API2WT", diff --git a/internal/service/s3/hosted_zones.go b/internal/service/s3/hosted_zones.go index 9edc6cf5a50..b4ed4528201 100644 --- a/internal/service/s3/hosted_zones.go +++ b/internal/service/s3/hosted_zones.go @@ -21,7 +21,7 @@ var hostedZoneIDsMap = map[string]string{ endpoints.ApSouth2RegionID: "Z02976202B4EZMXIPMXF7", endpoints.ApSoutheast1RegionID: "Z3O0J2DXBE1FTB", endpoints.ApSoutheast2RegionID: "Z1WCIGYICN2BYD", - names.APSoutheast3RegionID: "Z01846753K324LI26A3VV", + endpoints.ApSoutheast3RegionID: "Z01846753K324LI26A3VV", names.APSoutheast4RegionID: "Z0312387243XT5FE14WFO", names.APSoutheast5RegionID: "Z08660063OXLMA7F1FJHU", names.CACentral1RegionID: "Z1QDHH18159H29", diff --git a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go index c026b476632..5ce8ea39029 100644 --- a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go +++ b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go @@ -198,7 +198,7 @@ var prebuiltECRImageIDByRegion_blazing = map[string]string{ endpoints.ApSouth2RegionID: "628508329040", endpoints.ApSoutheast1RegionID: "475088953585", endpoints.ApSoutheast2RegionID: "544295431143", - names.APSoutheast3RegionID: "951798379941", + endpoints.ApSoutheast3RegionID: "951798379941", names.APSoutheast4RegionID: "106583098589", names.CACentral1RegionID: "469771592824", names.CAWest1RegionID: "190319476487", @@ -237,7 +237,7 @@ var prebuiltECRImageIDByRegion_clarify = map[string]string{ endpoints.ApSouth1RegionID: "452307495513", endpoints.ApSoutheast1RegionID: "834264404009", endpoints.ApSoutheast2RegionID: "007051062584", - names.APSoutheast3RegionID: "705930551576", + endpoints.ApSoutheast3RegionID: "705930551576", names.CACentral1RegionID: "675030665977", names.CNNorth1RegionID: "122526803553", names.CNNorthwest1RegionID: "122578899357", @@ -419,7 +419,7 @@ var prebuiltECRImageIDByRegion_spark = map[string]string{ endpoints.ApSouth2RegionID: "873151114052", endpoints.ApSoutheast1RegionID: "759080221371", endpoints.ApSoutheast2RegionID: "440695851116", - names.APSoutheast3RegionID: "800295151634", + endpoints.ApSoutheast3RegionID: "800295151634", names.APSoutheast4RegionID: "819679513684", names.CACentral1RegionID: "446299261295", names.CAWest1RegionID: "000907499111", @@ -456,7 +456,7 @@ var prebuiltECRImageIDByRegion_SageMakerBasePython = map[string]string{ // nosem endpoints.ApSouth1RegionID: "394103062818", endpoints.ApSoutheast1RegionID: "492261229750", endpoints.ApSoutheast2RegionID: "452832661640", - names.APSoutheast3RegionID: "276181064229", + endpoints.ApSoutheast3RegionID: "276181064229", names.CACentral1RegionID: "310906938811", names.CNNorth1RegionID: "390048526115", names.CNNorthwest1RegionID: "390780980154", @@ -497,7 +497,7 @@ var prebuiltECRImageIDByRegion_deepAR = map[string]string{ endpoints.ApSouth2RegionID: "628508329040", endpoints.ApSoutheast1RegionID: "475088953585", endpoints.ApSoutheast2RegionID: "514117268639", - names.APSoutheast3RegionID: "951798379941", + endpoints.ApSoutheast3RegionID: "951798379941", names.APSoutheast4RegionID: "106583098589", names.CACentral1RegionID: "469771592824", names.CAWest1RegionID: "190319476487", @@ -542,7 +542,7 @@ var prebuiltECRImageIDByRegion_factorMachines = map[string]string{ endpoints.ApSouth2RegionID: "628508329040", endpoints.ApSoutheast1RegionID: "475088953585", endpoints.ApSoutheast2RegionID: "712309505854", - names.APSoutheast3RegionID: "951798379941", + endpoints.ApSoutheast3RegionID: "951798379941", names.APSoutheast4RegionID: "106583098589", names.CACentral1RegionID: "469771592824", names.CAWest1RegionID: "190319476487", @@ -607,7 +607,7 @@ var prebuiltECRImageIDByRegion_XGBoost = map[string]string{ endpoints.ApSouth2RegionID: "628508329040", endpoints.ApSoutheast1RegionID: "121021644041", endpoints.ApSoutheast2RegionID: "783357654285", - names.APSoutheast3RegionID: "951798379941", + endpoints.ApSoutheast3RegionID: "951798379941", names.APSoutheast4RegionID: "106583098589", names.CACentral1RegionID: "341280168497", names.CAWest1RegionID: "190319476487", @@ -659,7 +659,7 @@ var prebuiltECRImageIDByRegion_deepLearning = map[string]string{ endpoints.ApSouth2RegionID: "772153158452", endpoints.ApSoutheast1RegionID: "763104351884", endpoints.ApSoutheast2RegionID: "763104351884", - names.APSoutheast3RegionID: "907027046896", + endpoints.ApSoutheast3RegionID: "907027046896", names.APSoutheast4RegionID: "457447274322", names.CACentral1RegionID: "763104351884", names.CAWest1RegionID: "204538143572", @@ -698,7 +698,7 @@ var prebuiltECRImageIDByRegion_modelMonitor = map[string]string{ endpoints.ApSouth1RegionID: "126357580389", endpoints.ApSoutheast1RegionID: "245545462676", endpoints.ApSoutheast2RegionID: "563025443158", - names.APSoutheast3RegionID: "669540362728", + endpoints.ApSoutheast3RegionID: "669540362728", names.CACentral1RegionID: "536280801234", names.CNNorth1RegionID: "453000072557", names.CNNorthwest1RegionID: "453252182341", diff --git a/names/names.go b/names/names.go index 911939c7881..38c25814843 100644 --- a/names/names.go +++ b/names/names.go @@ -149,7 +149,6 @@ const ( // AWS Standard partition's regions. GlobalRegionID = "aws-global" // AWS Standard global region. - APSoutheast3RegionID = "ap-southeast-3" // Asia Pacific (Jakarta). APSoutheast4RegionID = "ap-southeast-4" // Asia Pacific (Melbourne). APSoutheast5RegionID = "ap-southeast-5" // Asia Pacific (Malaysia). CACentral1RegionID = "ca-central-1" // Canada (Central). From 41b3f937d9f19b6d09c064a7c222521180d0a70a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 15:17:56 -0500 Subject: [PATCH 276/304] 'names.APSoutheast4RegionID' -> 'endpoints.ApSoutheast4RegionID'. --- .../service/acmpca/certificate_authority_test.go | 2 +- .../cloudtrail/service_account_data_source.go | 2 +- internal/service/elb/hosted_zone_id_data_source.go | 2 +- internal/service/elbv2/hosted_zone_id_data_source.go | 4 ++-- internal/service/s3/hosted_zones.go | 2 +- .../sagemaker/prebuilt_ecr_image_data_source.go | 12 ++++++------ names/names.go | 1 - 7 files changed, 12 insertions(+), 13 deletions(-) diff --git a/internal/service/acmpca/certificate_authority_test.go b/internal/service/acmpca/certificate_authority_test.go index bbd4a458c93..717afd7d0a1 100644 --- a/internal/service/acmpca/certificate_authority_test.go +++ b/internal/service/acmpca/certificate_authority_test.go @@ -184,7 +184,7 @@ func TestAccACMPCACertificateAuthority_keyStorageSecurityStandard(t *testing.T) PreCheck: func() { acctest.PreCheck(ctx, t) // See https://docs.aws.amazon.com/privateca/latest/userguide/data-protection.html#private-keys. - acctest.PreCheckRegion(t, endpoints.ApSouth2RegionID, endpoints.ApSoutheast3RegionID, names.APSoutheast4RegionID, names.EUCentral2RegionID, names.EUSouth2RegionID, names.MECentral1RegionID) + acctest.PreCheckRegion(t, endpoints.ApSouth2RegionID, endpoints.ApSoutheast3RegionID, endpoints.ApSoutheast4RegionID, names.EUCentral2RegionID, names.EUSouth2RegionID, names.MECentral1RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.ACMPCAServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, diff --git a/internal/service/cloudtrail/service_account_data_source.go b/internal/service/cloudtrail/service_account_data_source.go index da846b628c5..8099c29016a 100644 --- a/internal/service/cloudtrail/service_account_data_source.go +++ b/internal/service/cloudtrail/service_account_data_source.go @@ -30,7 +30,7 @@ var serviceAccountPerRegionMap = map[string]string{ endpoints.ApSoutheast1RegionID: "903692715234", endpoints.ApSoutheast2RegionID: "284668455005", endpoints.ApSoutheast3RegionID: "069019280451", - names.APSoutheast4RegionID: "187074758985", + endpoints.ApSoutheast4RegionID: "187074758985", names.CACentral1RegionID: "819402241893", names.CNNorth1RegionID: "193415116832", names.CNNorthwest1RegionID: "681348832753", diff --git a/internal/service/elb/hosted_zone_id_data_source.go b/internal/service/elb/hosted_zone_id_data_source.go index 5c2cebb51bd..dfbd36e0f75 100644 --- a/internal/service/elb/hosted_zone_id_data_source.go +++ b/internal/service/elb/hosted_zone_id_data_source.go @@ -26,7 +26,7 @@ var hostedZoneIDPerRegionMap = map[string]string{ endpoints.ApSoutheast1RegionID: "Z1LMS91P8CMLE5", endpoints.ApSoutheast2RegionID: "Z1GM3OXH4ZPM65", endpoints.ApSoutheast3RegionID: "Z08888821HLRG5A9ZRTER", - names.APSoutheast4RegionID: "Z09517862IB2WZLPXG76F", + endpoints.ApSoutheast4RegionID: "Z09517862IB2WZLPXG76F", names.APSoutheast5RegionID: "Z06010284QMVVW7WO5J", names.CACentral1RegionID: "ZQSVJUPU6J1EY", names.CAWest1RegionID: "Z06473681N0SF6OS049SD", diff --git a/internal/service/elbv2/hosted_zone_id_data_source.go b/internal/service/elbv2/hosted_zone_id_data_source.go index 16699b41ce5..0953d0c7e8c 100644 --- a/internal/service/elbv2/hosted_zone_id_data_source.go +++ b/internal/service/elbv2/hosted_zone_id_data_source.go @@ -30,7 +30,7 @@ var hostedZoneIDPerRegionALBMap = map[string]string{ endpoints.ApSoutheast1RegionID: "Z1LMS91P8CMLE5", endpoints.ApSoutheast2RegionID: "Z1GM3OXH4ZPM65", endpoints.ApSoutheast3RegionID: "Z08888821HLRG5A9ZRTER", - names.APSoutheast4RegionID: "Z09517862IB2WZLPXG76F", + endpoints.ApSoutheast4RegionID: "Z09517862IB2WZLPXG76F", names.APSoutheast5RegionID: "Z06010284QMVVW7WO5J", names.CACentral1RegionID: "ZQSVJUPU6J1EY", names.CAWest1RegionID: "Z06473681N0SF6OS049SD", @@ -68,7 +68,7 @@ var hostedZoneIDPerRegionNLBMap = map[string]string{ endpoints.ApSoutheast1RegionID: "ZKVM4W9LS7TM", endpoints.ApSoutheast2RegionID: "ZCT6FZBF4DROD", endpoints.ApSoutheast3RegionID: "Z01971771FYVNCOVWJU1G", - names.APSoutheast4RegionID: "Z01156963G8MIIL7X90IV", + endpoints.ApSoutheast4RegionID: "Z01156963G8MIIL7X90IV", names.APSoutheast5RegionID: "Z026317210H9ACVTRO6FB", names.CACentral1RegionID: "Z2EPGBW3API2WT", names.CAWest1RegionID: "Z02754302KBB00W2LKWZ9", diff --git a/internal/service/s3/hosted_zones.go b/internal/service/s3/hosted_zones.go index b4ed4528201..0f3793fabe4 100644 --- a/internal/service/s3/hosted_zones.go +++ b/internal/service/s3/hosted_zones.go @@ -22,7 +22,7 @@ var hostedZoneIDsMap = map[string]string{ endpoints.ApSoutheast1RegionID: "Z3O0J2DXBE1FTB", endpoints.ApSoutheast2RegionID: "Z1WCIGYICN2BYD", endpoints.ApSoutheast3RegionID: "Z01846753K324LI26A3VV", - names.APSoutheast4RegionID: "Z0312387243XT5FE14WFO", + endpoints.ApSoutheast4RegionID: "Z0312387243XT5FE14WFO", names.APSoutheast5RegionID: "Z08660063OXLMA7F1FJHU", names.CACentral1RegionID: "Z1QDHH18159H29", names.CAWest1RegionID: "Z03565811Z33SLEZTHOUL", diff --git a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go index 5ce8ea39029..79e9e35d7d9 100644 --- a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go +++ b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go @@ -199,7 +199,7 @@ var prebuiltECRImageIDByRegion_blazing = map[string]string{ endpoints.ApSoutheast1RegionID: "475088953585", endpoints.ApSoutheast2RegionID: "544295431143", endpoints.ApSoutheast3RegionID: "951798379941", - names.APSoutheast4RegionID: "106583098589", + endpoints.ApSoutheast4RegionID: "106583098589", names.CACentral1RegionID: "469771592824", names.CAWest1RegionID: "190319476487", names.CNNorth1RegionID: "390948362332", @@ -420,7 +420,7 @@ var prebuiltECRImageIDByRegion_spark = map[string]string{ endpoints.ApSoutheast1RegionID: "759080221371", endpoints.ApSoutheast2RegionID: "440695851116", endpoints.ApSoutheast3RegionID: "800295151634", - names.APSoutheast4RegionID: "819679513684", + endpoints.ApSoutheast4RegionID: "819679513684", names.CACentral1RegionID: "446299261295", names.CAWest1RegionID: "000907499111", names.CNNorth1RegionID: "671472414489", @@ -498,7 +498,7 @@ var prebuiltECRImageIDByRegion_deepAR = map[string]string{ endpoints.ApSoutheast1RegionID: "475088953585", endpoints.ApSoutheast2RegionID: "514117268639", endpoints.ApSoutheast3RegionID: "951798379941", - names.APSoutheast4RegionID: "106583098589", + endpoints.ApSoutheast4RegionID: "106583098589", names.CACentral1RegionID: "469771592824", names.CAWest1RegionID: "190319476487", names.CNNorth1RegionID: "390948362332", @@ -543,7 +543,7 @@ var prebuiltECRImageIDByRegion_factorMachines = map[string]string{ endpoints.ApSoutheast1RegionID: "475088953585", endpoints.ApSoutheast2RegionID: "712309505854", endpoints.ApSoutheast3RegionID: "951798379941", - names.APSoutheast4RegionID: "106583098589", + endpoints.ApSoutheast4RegionID: "106583098589", names.CACentral1RegionID: "469771592824", names.CAWest1RegionID: "190319476487", names.CNNorth1RegionID: "390948362332", @@ -608,7 +608,7 @@ var prebuiltECRImageIDByRegion_XGBoost = map[string]string{ endpoints.ApSoutheast1RegionID: "121021644041", endpoints.ApSoutheast2RegionID: "783357654285", endpoints.ApSoutheast3RegionID: "951798379941", - names.APSoutheast4RegionID: "106583098589", + endpoints.ApSoutheast4RegionID: "106583098589", names.CACentral1RegionID: "341280168497", names.CAWest1RegionID: "190319476487", names.CNNorth1RegionID: "450853457545", @@ -660,7 +660,7 @@ var prebuiltECRImageIDByRegion_deepLearning = map[string]string{ endpoints.ApSoutheast1RegionID: "763104351884", endpoints.ApSoutheast2RegionID: "763104351884", endpoints.ApSoutheast3RegionID: "907027046896", - names.APSoutheast4RegionID: "457447274322", + endpoints.ApSoutheast4RegionID: "457447274322", names.CACentral1RegionID: "763104351884", names.CAWest1RegionID: "204538143572", names.CNNorth1RegionID: "727897471807", diff --git a/names/names.go b/names/names.go index 38c25814843..4eb841b930f 100644 --- a/names/names.go +++ b/names/names.go @@ -149,7 +149,6 @@ const ( // AWS Standard partition's regions. GlobalRegionID = "aws-global" // AWS Standard global region. - APSoutheast4RegionID = "ap-southeast-4" // Asia Pacific (Melbourne). APSoutheast5RegionID = "ap-southeast-5" // Asia Pacific (Malaysia). CACentral1RegionID = "ca-central-1" // Canada (Central). CAWest1RegionID = "ca-west-1" // Canada West (Calgary). From aab5e8ff80fe0064ab91aa4c6e7563aed7592654 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 15:19:03 -0500 Subject: [PATCH 277/304] 'names.APSoutheast5RegionID' -> 'endpoints.ApSoutheast5RegionID'. --- .../service/elb/hosted_zone_id_data_source.go | 2 +- .../elbv2/hosted_zone_id_data_source.go | 4 +- internal/service/s3/hosted_zones.go | 2 +- names/names.go | 37 +++++++++---------- 4 files changed, 22 insertions(+), 23 deletions(-) diff --git a/internal/service/elb/hosted_zone_id_data_source.go b/internal/service/elb/hosted_zone_id_data_source.go index dfbd36e0f75..ffec7430d5e 100644 --- a/internal/service/elb/hosted_zone_id_data_source.go +++ b/internal/service/elb/hosted_zone_id_data_source.go @@ -27,7 +27,7 @@ var hostedZoneIDPerRegionMap = map[string]string{ endpoints.ApSoutheast2RegionID: "Z1GM3OXH4ZPM65", endpoints.ApSoutheast3RegionID: "Z08888821HLRG5A9ZRTER", endpoints.ApSoutheast4RegionID: "Z09517862IB2WZLPXG76F", - names.APSoutheast5RegionID: "Z06010284QMVVW7WO5J", + endpoints.ApSoutheast5RegionID: "Z06010284QMVVW7WO5J", names.CACentral1RegionID: "ZQSVJUPU6J1EY", names.CAWest1RegionID: "Z06473681N0SF6OS049SD", names.CNNorth1RegionID: "Z1GDH35T77C1KE", diff --git a/internal/service/elbv2/hosted_zone_id_data_source.go b/internal/service/elbv2/hosted_zone_id_data_source.go index 0953d0c7e8c..beaa293f69b 100644 --- a/internal/service/elbv2/hosted_zone_id_data_source.go +++ b/internal/service/elbv2/hosted_zone_id_data_source.go @@ -31,7 +31,7 @@ var hostedZoneIDPerRegionALBMap = map[string]string{ endpoints.ApSoutheast2RegionID: "Z1GM3OXH4ZPM65", endpoints.ApSoutheast3RegionID: "Z08888821HLRG5A9ZRTER", endpoints.ApSoutheast4RegionID: "Z09517862IB2WZLPXG76F", - names.APSoutheast5RegionID: "Z06010284QMVVW7WO5J", + endpoints.ApSoutheast5RegionID: "Z06010284QMVVW7WO5J", names.CACentral1RegionID: "ZQSVJUPU6J1EY", names.CAWest1RegionID: "Z06473681N0SF6OS049SD", names.CNNorth1RegionID: "Z1GDH35T77C1KE", @@ -69,7 +69,7 @@ var hostedZoneIDPerRegionNLBMap = map[string]string{ endpoints.ApSoutheast2RegionID: "ZCT6FZBF4DROD", endpoints.ApSoutheast3RegionID: "Z01971771FYVNCOVWJU1G", endpoints.ApSoutheast4RegionID: "Z01156963G8MIIL7X90IV", - names.APSoutheast5RegionID: "Z026317210H9ACVTRO6FB", + endpoints.ApSoutheast5RegionID: "Z026317210H9ACVTRO6FB", names.CACentral1RegionID: "Z2EPGBW3API2WT", names.CAWest1RegionID: "Z02754302KBB00W2LKWZ9", names.CNNorth1RegionID: "Z3QFB96KMJ7ED6", diff --git a/internal/service/s3/hosted_zones.go b/internal/service/s3/hosted_zones.go index 0f3793fabe4..dab6a3e27b9 100644 --- a/internal/service/s3/hosted_zones.go +++ b/internal/service/s3/hosted_zones.go @@ -23,7 +23,7 @@ var hostedZoneIDsMap = map[string]string{ endpoints.ApSoutheast2RegionID: "Z1WCIGYICN2BYD", endpoints.ApSoutheast3RegionID: "Z01846753K324LI26A3VV", endpoints.ApSoutheast4RegionID: "Z0312387243XT5FE14WFO", - names.APSoutheast5RegionID: "Z08660063OXLMA7F1FJHU", + endpoints.ApSoutheast5RegionID: "Z08660063OXLMA7F1FJHU", names.CACentral1RegionID: "Z1QDHH18159H29", names.CAWest1RegionID: "Z03565811Z33SLEZTHOUL", names.CNNorth1RegionID: "Z5CN8UMXT92WN", diff --git a/names/names.go b/names/names.go index 4eb841b930f..7925f8f79f8 100644 --- a/names/names.go +++ b/names/names.go @@ -149,25 +149,24 @@ const ( // AWS Standard partition's regions. GlobalRegionID = "aws-global" // AWS Standard global region. - APSoutheast5RegionID = "ap-southeast-5" // Asia Pacific (Malaysia). - CACentral1RegionID = "ca-central-1" // Canada (Central). - CAWest1RegionID = "ca-west-1" // Canada West (Calgary). - EUCentral1RegionID = "eu-central-1" // Europe (Frankfurt). - EUCentral2RegionID = "eu-central-2" // Europe (Zurich). - EUNorth1RegionID = "eu-north-1" // Europe (Stockholm). - EUSouth1RegionID = "eu-south-1" // Europe (Milan). - EUSouth2RegionID = "eu-south-2" // Europe (Spain). - EUWest1RegionID = "eu-west-1" // Europe (Ireland). - EUWest2RegionID = "eu-west-2" // Europe (London). - EUWest3RegionID = "eu-west-3" // Europe (Paris). - ILCentral1RegionID = "il-central-1" // Israel (Tel Aviv). - MECentral1RegionID = "me-central-1" // Middle East (UAE). - MESouth1RegionID = "me-south-1" // Middle East (Bahrain). - SAEast1RegionID = "sa-east-1" // South America (Sao Paulo). - USEast1RegionID = "us-east-1" // US East (N. Virginia). - USEast2RegionID = "us-east-2" // US East (Ohio). - USWest1RegionID = "us-west-1" // US West (N. California). - USWest2RegionID = "us-west-2" // US West (Oregon). + CACentral1RegionID = "ca-central-1" // Canada (Central). + CAWest1RegionID = "ca-west-1" // Canada West (Calgary). + EUCentral1RegionID = "eu-central-1" // Europe (Frankfurt). + EUCentral2RegionID = "eu-central-2" // Europe (Zurich). + EUNorth1RegionID = "eu-north-1" // Europe (Stockholm). + EUSouth1RegionID = "eu-south-1" // Europe (Milan). + EUSouth2RegionID = "eu-south-2" // Europe (Spain). + EUWest1RegionID = "eu-west-1" // Europe (Ireland). + EUWest2RegionID = "eu-west-2" // Europe (London). + EUWest3RegionID = "eu-west-3" // Europe (Paris). + ILCentral1RegionID = "il-central-1" // Israel (Tel Aviv). + MECentral1RegionID = "me-central-1" // Middle East (UAE). + MESouth1RegionID = "me-south-1" // Middle East (Bahrain). + SAEast1RegionID = "sa-east-1" // South America (Sao Paulo). + USEast1RegionID = "us-east-1" // US East (N. Virginia). + USEast2RegionID = "us-east-2" // US East (Ohio). + USWest1RegionID = "us-west-1" // US West (N. California). + USWest2RegionID = "us-west-2" // US West (Oregon). // AWS China partition's regions. CNNorth1RegionID = "cn-north-1" // China (Beijing). From db7271440b2bb6815085dba694c76b8b310d9a31 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 15:20:09 -0500 Subject: [PATCH 278/304] 'names.CACentral1RegionID' -> 'endpoints.CaCentral1RegionID'. --- .../cloudtrail/service_account_data_source.go | 2 +- .../hosted_zone_data_source.go | 2 +- .../service/elb/hosted_zone_id_data_source.go | 2 +- .../elb/service_account_data_source.go | 2 +- .../elbv2/hosted_zone_id_data_source.go | 4 +-- internal/service/gamelift/gamelift_test.go | 2 +- internal/service/lambda/function.go | 2 +- .../redshift/service_account_data_source.go | 2 +- internal/service/s3/hosted_zones.go | 2 +- .../prebuilt_ecr_image_data_source.go | 30 +++++++++---------- names/names.go | 1 - 11 files changed, 25 insertions(+), 26 deletions(-) diff --git a/internal/service/cloudtrail/service_account_data_source.go b/internal/service/cloudtrail/service_account_data_source.go index 8099c29016a..23092133f3f 100644 --- a/internal/service/cloudtrail/service_account_data_source.go +++ b/internal/service/cloudtrail/service_account_data_source.go @@ -31,7 +31,7 @@ var serviceAccountPerRegionMap = map[string]string{ endpoints.ApSoutheast2RegionID: "284668455005", endpoints.ApSoutheast3RegionID: "069019280451", endpoints.ApSoutheast4RegionID: "187074758985", - names.CACentral1RegionID: "819402241893", + endpoints.CaCentral1RegionID: "819402241893", names.CNNorth1RegionID: "193415116832", names.CNNorthwest1RegionID: "681348832753", names.EUCentral1RegionID: "035351147821", diff --git a/internal/service/elasticbeanstalk/hosted_zone_data_source.go b/internal/service/elasticbeanstalk/hosted_zone_data_source.go index 5f35ef8e8c4..9c786f68531 100644 --- a/internal/service/elasticbeanstalk/hosted_zone_data_source.go +++ b/internal/service/elasticbeanstalk/hosted_zone_data_source.go @@ -26,7 +26,7 @@ var hostedZoneIDs = map[string]string{ endpoints.ApNortheast2RegionID: "Z3JE5OI70TWKCP", endpoints.ApNortheast3RegionID: "ZNE5GEY1TIAGY", endpoints.ApSouth1RegionID: "Z18NTBI3Y7N9TZ", - names.CACentral1RegionID: "ZJFCZL7SSZB5I", + endpoints.CaCentral1RegionID: "ZJFCZL7SSZB5I", names.EUCentral1RegionID: "Z1FRNW7UH4DEZJ", names.EUNorth1RegionID: "Z23GO28BZ5AETM", names.EUSouth1RegionID: "Z10VDYYOA2JFKM", diff --git a/internal/service/elb/hosted_zone_id_data_source.go b/internal/service/elb/hosted_zone_id_data_source.go index ffec7430d5e..eb80b528772 100644 --- a/internal/service/elb/hosted_zone_id_data_source.go +++ b/internal/service/elb/hosted_zone_id_data_source.go @@ -28,7 +28,7 @@ var hostedZoneIDPerRegionMap = map[string]string{ endpoints.ApSoutheast3RegionID: "Z08888821HLRG5A9ZRTER", endpoints.ApSoutheast4RegionID: "Z09517862IB2WZLPXG76F", endpoints.ApSoutheast5RegionID: "Z06010284QMVVW7WO5J", - names.CACentral1RegionID: "ZQSVJUPU6J1EY", + endpoints.CaCentral1RegionID: "ZQSVJUPU6J1EY", names.CAWest1RegionID: "Z06473681N0SF6OS049SD", names.CNNorth1RegionID: "Z1GDH35T77C1KE", names.CNNorthwest1RegionID: "ZM7IZAIOVVDZF", diff --git a/internal/service/elb/service_account_data_source.go b/internal/service/elb/service_account_data_source.go index 6f1d07fb589..e6b2362bb93 100644 --- a/internal/service/elb/service_account_data_source.go +++ b/internal/service/elb/service_account_data_source.go @@ -27,7 +27,7 @@ var accountIDPerRegionMap = map[string]string{ endpoints.ApSoutheast1RegionID: "114774131450", endpoints.ApSoutheast2RegionID: "783225319266", endpoints.ApSoutheast3RegionID: "589379963580", - names.CACentral1RegionID: "985666609251", + endpoints.CaCentral1RegionID: "985666609251", names.CNNorth1RegionID: "638102146993", names.CNNorthwest1RegionID: "037604701340", names.EUCentral1RegionID: "054676820928", diff --git a/internal/service/elbv2/hosted_zone_id_data_source.go b/internal/service/elbv2/hosted_zone_id_data_source.go index beaa293f69b..a9942cbb0d8 100644 --- a/internal/service/elbv2/hosted_zone_id_data_source.go +++ b/internal/service/elbv2/hosted_zone_id_data_source.go @@ -32,7 +32,7 @@ var hostedZoneIDPerRegionALBMap = map[string]string{ endpoints.ApSoutheast3RegionID: "Z08888821HLRG5A9ZRTER", endpoints.ApSoutheast4RegionID: "Z09517862IB2WZLPXG76F", endpoints.ApSoutheast5RegionID: "Z06010284QMVVW7WO5J", - names.CACentral1RegionID: "ZQSVJUPU6J1EY", + endpoints.CaCentral1RegionID: "ZQSVJUPU6J1EY", names.CAWest1RegionID: "Z06473681N0SF6OS049SD", names.CNNorth1RegionID: "Z1GDH35T77C1KE", names.CNNorthwest1RegionID: "ZM7IZAIOVVDZF", @@ -70,7 +70,7 @@ var hostedZoneIDPerRegionNLBMap = map[string]string{ endpoints.ApSoutheast3RegionID: "Z01971771FYVNCOVWJU1G", endpoints.ApSoutheast4RegionID: "Z01156963G8MIIL7X90IV", endpoints.ApSoutheast5RegionID: "Z026317210H9ACVTRO6FB", - names.CACentral1RegionID: "Z2EPGBW3API2WT", + endpoints.CaCentral1RegionID: "Z2EPGBW3API2WT", names.CAWest1RegionID: "Z02754302KBB00W2LKWZ9", names.CNNorth1RegionID: "Z3QFB96KMJ7ED6", names.CNNorthwest1RegionID: "ZQEIKTCZ8352D", diff --git a/internal/service/gamelift/gamelift_test.go b/internal/service/gamelift/gamelift_test.go index 19db49bf046..670ed7ab816 100644 --- a/internal/service/gamelift/gamelift_test.go +++ b/internal/service/gamelift/gamelift_test.go @@ -56,7 +56,7 @@ func testAccAccountIdByRegion(region string) (string, error) { endpoints.ApSouth1RegionID: "134975661615", endpoints.ApSoutheast1RegionID: "077577004113", endpoints.ApSoutheast2RegionID: "112188327105", - names.CACentral1RegionID: "800535022691", + endpoints.CaCentral1RegionID: "800535022691", names.EUCentral1RegionID: "797584052317", names.EUWest1RegionID: "319803218673", names.EUWest2RegionID: "937342764187", diff --git a/internal/service/lambda/function.go b/internal/service/lambda/function.go index f50c3a72b90..00994ea523d 100644 --- a/internal/service/lambda/function.go +++ b/internal/service/lambda/function.go @@ -1410,7 +1410,7 @@ func signerServiceIsAvailable(region string) bool { endpoints.ApSoutheast1RegionID: {}, endpoints.ApSoutheast2RegionID: {}, endpoints.ApNortheast1RegionID: {}, - names.CACentral1RegionID: {}, + endpoints.CaCentral1RegionID: {}, names.EUCentral1RegionID: {}, names.EUWest1RegionID: {}, names.EUWest2RegionID: {}, diff --git a/internal/service/redshift/service_account_data_source.go b/internal/service/redshift/service_account_data_source.go index bd1ebc62fcd..3fa60aef37c 100644 --- a/internal/service/redshift/service_account_data_source.go +++ b/internal/service/redshift/service_account_data_source.go @@ -28,7 +28,7 @@ var ServiceAccountPerRegionMap = map[string]string{ endpoints.ApSouth1RegionID: "865932855811", endpoints.ApSoutheast1RegionID: "361669875840", endpoints.ApSoutheast2RegionID: "762762565011", - names.CACentral1RegionID: "907379612154", + endpoints.CaCentral1RegionID: "907379612154", names.CNNorth1RegionID: "111890595117", names.CNNorthwest1RegionID: "660998842044", names.EUCentral1RegionID: "053454850223", diff --git a/internal/service/s3/hosted_zones.go b/internal/service/s3/hosted_zones.go index dab6a3e27b9..9773c916203 100644 --- a/internal/service/s3/hosted_zones.go +++ b/internal/service/s3/hosted_zones.go @@ -24,7 +24,7 @@ var hostedZoneIDsMap = map[string]string{ endpoints.ApSoutheast3RegionID: "Z01846753K324LI26A3VV", endpoints.ApSoutheast4RegionID: "Z0312387243XT5FE14WFO", endpoints.ApSoutheast5RegionID: "Z08660063OXLMA7F1FJHU", - names.CACentral1RegionID: "Z1QDHH18159H29", + endpoints.CaCentral1RegionID: "Z1QDHH18159H29", names.CAWest1RegionID: "Z03565811Z33SLEZTHOUL", names.CNNorth1RegionID: "Z5CN8UMXT92WN", names.CNNorthwest1RegionID: "Z282HJ1KT0DH03", diff --git a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go index 79e9e35d7d9..69baa887638 100644 --- a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go +++ b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go @@ -200,7 +200,7 @@ var prebuiltECRImageIDByRegion_blazing = map[string]string{ endpoints.ApSoutheast2RegionID: "544295431143", endpoints.ApSoutheast3RegionID: "951798379941", endpoints.ApSoutheast4RegionID: "106583098589", - names.CACentral1RegionID: "469771592824", + endpoints.CaCentral1RegionID: "469771592824", names.CAWest1RegionID: "190319476487", names.CNNorth1RegionID: "390948362332", names.CNNorthwest1RegionID: "387376663083", @@ -238,7 +238,7 @@ var prebuiltECRImageIDByRegion_clarify = map[string]string{ endpoints.ApSoutheast1RegionID: "834264404009", endpoints.ApSoutheast2RegionID: "007051062584", endpoints.ApSoutheast3RegionID: "705930551576", - names.CACentral1RegionID: "675030665977", + endpoints.CaCentral1RegionID: "675030665977", names.CNNorth1RegionID: "122526803553", names.CNNorthwest1RegionID: "122578899357", names.EUCentral1RegionID: "017069133835", @@ -267,7 +267,7 @@ var prebuiltECRImageIDByRegion_dataWrangler = map[string]string{ endpoints.ApSouth1RegionID: "089933028263", endpoints.ApSoutheast1RegionID: "119527597002", endpoints.ApSoutheast2RegionID: "422173101802", - names.CACentral1RegionID: "557239378090", + endpoints.CaCentral1RegionID: "557239378090", names.CNNorth1RegionID: "245909111842", names.CNNorthwest1RegionID: "249157047649", names.EUCentral1RegionID: "024640144536", @@ -296,7 +296,7 @@ var prebuiltECRImageIDByRegion_debugger = map[string]string{ endpoints.ApSouth1RegionID: "904829902805", endpoints.ApSoutheast1RegionID: "972752614525", endpoints.ApSoutheast2RegionID: "184798709955", - names.CACentral1RegionID: "519511493484", + endpoints.CaCentral1RegionID: "519511493484", names.CNNorth1RegionID: "618459771430", names.CNNorthwest1RegionID: "658757709296", names.EUCentral1RegionID: "482524230118", @@ -331,7 +331,7 @@ var prebuiltECRImageIDByRegion_inferentiaNeo = map[string]string{ endpoints.ApSouth1RegionID: "763008648453", endpoints.ApSoutheast1RegionID: "324986816169", endpoints.ApSoutheast2RegionID: "355873309152", - names.CACentral1RegionID: "464438896020", + endpoints.CaCentral1RegionID: "464438896020", names.CNNorth1RegionID: "472730292857", names.CNNorthwest1RegionID: "474822919863", names.EUCentral1RegionID: "746233611703", @@ -367,7 +367,7 @@ var prebuiltECRImageIDByRegion_SageMakerCustom = map[string]string{ // nosemgrep endpoints.ApSouth1RegionID: "520713654638", endpoints.ApSoutheast1RegionID: "520713654638", endpoints.ApSoutheast2RegionID: "520713654638", - names.CACentral1RegionID: "520713654638", + endpoints.CaCentral1RegionID: "520713654638", names.CNNorth1RegionID: "422961961927", names.CNNorthwest1RegionID: "423003514399", names.EUCentral1RegionID: "520713654638", @@ -397,7 +397,7 @@ var prebuiltECRImageIDByRegion_SageMakerRL = map[string]string{ // nosemgrep:ci. endpoints.ApSouth1RegionID: "462105765813", endpoints.ApSoutheast1RegionID: "462105765813", endpoints.ApSoutheast2RegionID: "462105765813", - names.CACentral1RegionID: "462105765813", + endpoints.CaCentral1RegionID: "462105765813", names.EUCentral1RegionID: "462105765813", names.EUWest1RegionID: "462105765813", names.EUWest2RegionID: "462105765813", @@ -421,7 +421,7 @@ var prebuiltECRImageIDByRegion_spark = map[string]string{ endpoints.ApSoutheast2RegionID: "440695851116", endpoints.ApSoutheast3RegionID: "800295151634", endpoints.ApSoutheast4RegionID: "819679513684", - names.CACentral1RegionID: "446299261295", + endpoints.CaCentral1RegionID: "446299261295", names.CAWest1RegionID: "000907499111", names.CNNorth1RegionID: "671472414489", names.CNNorthwest1RegionID: "844356804704", @@ -457,7 +457,7 @@ var prebuiltECRImageIDByRegion_SageMakerBasePython = map[string]string{ // nosem endpoints.ApSoutheast1RegionID: "492261229750", endpoints.ApSoutheast2RegionID: "452832661640", endpoints.ApSoutheast3RegionID: "276181064229", - names.CACentral1RegionID: "310906938811", + endpoints.CaCentral1RegionID: "310906938811", names.CNNorth1RegionID: "390048526115", names.CNNorthwest1RegionID: "390780980154", names.EUCentral1RegionID: "936697816551", @@ -499,7 +499,7 @@ var prebuiltECRImageIDByRegion_deepAR = map[string]string{ endpoints.ApSoutheast2RegionID: "514117268639", endpoints.ApSoutheast3RegionID: "951798379941", endpoints.ApSoutheast4RegionID: "106583098589", - names.CACentral1RegionID: "469771592824", + endpoints.CaCentral1RegionID: "469771592824", names.CAWest1RegionID: "190319476487", names.CNNorth1RegionID: "390948362332", names.CNNorthwest1RegionID: "387376663083", @@ -544,7 +544,7 @@ var prebuiltECRImageIDByRegion_factorMachines = map[string]string{ endpoints.ApSoutheast2RegionID: "712309505854", endpoints.ApSoutheast3RegionID: "951798379941", endpoints.ApSoutheast4RegionID: "106583098589", - names.CACentral1RegionID: "469771592824", + endpoints.CaCentral1RegionID: "469771592824", names.CAWest1RegionID: "190319476487", names.CNNorth1RegionID: "390948362332", names.CNNorthwest1RegionID: "387376663083", @@ -578,7 +578,7 @@ var prebuiltECRImageIDByRegion_lda = map[string]string{ endpoints.ApSouth1RegionID: "991648021394", endpoints.ApSoutheast1RegionID: "475088953585", endpoints.ApSoutheast2RegionID: "297031611018", - names.CACentral1RegionID: "469771592824", + endpoints.CaCentral1RegionID: "469771592824", names.EUCentral1RegionID: "353608530281", names.EUWest1RegionID: "999678624901", names.EUWest2RegionID: "644912444149", @@ -609,7 +609,7 @@ var prebuiltECRImageIDByRegion_XGBoost = map[string]string{ endpoints.ApSoutheast2RegionID: "783357654285", endpoints.ApSoutheast3RegionID: "951798379941", endpoints.ApSoutheast4RegionID: "106583098589", - names.CACentral1RegionID: "341280168497", + endpoints.CaCentral1RegionID: "341280168497", names.CAWest1RegionID: "190319476487", names.CNNorth1RegionID: "450853457545", names.CNNorthwest1RegionID: "451049120500", @@ -661,7 +661,7 @@ var prebuiltECRImageIDByRegion_deepLearning = map[string]string{ endpoints.ApSoutheast2RegionID: "763104351884", endpoints.ApSoutheast3RegionID: "907027046896", endpoints.ApSoutheast4RegionID: "457447274322", - names.CACentral1RegionID: "763104351884", + endpoints.CaCentral1RegionID: "763104351884", names.CAWest1RegionID: "204538143572", names.CNNorth1RegionID: "727897471807", names.CNNorthwest1RegionID: "727897471807", @@ -699,7 +699,7 @@ var prebuiltECRImageIDByRegion_modelMonitor = map[string]string{ endpoints.ApSoutheast1RegionID: "245545462676", endpoints.ApSoutheast2RegionID: "563025443158", endpoints.ApSoutheast3RegionID: "669540362728", - names.CACentral1RegionID: "536280801234", + endpoints.CaCentral1RegionID: "536280801234", names.CNNorth1RegionID: "453000072557", names.CNNorthwest1RegionID: "453252182341", names.EUCentral1RegionID: "048819808253", diff --git a/names/names.go b/names/names.go index 7925f8f79f8..ff235c82fc1 100644 --- a/names/names.go +++ b/names/names.go @@ -149,7 +149,6 @@ const ( // AWS Standard partition's regions. GlobalRegionID = "aws-global" // AWS Standard global region. - CACentral1RegionID = "ca-central-1" // Canada (Central). CAWest1RegionID = "ca-west-1" // Canada West (Calgary). EUCentral1RegionID = "eu-central-1" // Europe (Frankfurt). EUCentral2RegionID = "eu-central-2" // Europe (Zurich). From eea063a444930398c96579e032d2aca3bb612825 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 15:20:56 -0500 Subject: [PATCH 279/304] 'names.CAWest1RegionID' -> 'endpoints.CaWest1RegionID'. --- internal/service/elb/hosted_zone_id_data_source.go | 2 +- internal/service/elbv2/hosted_zone_id_data_source.go | 4 ++-- internal/service/s3/hosted_zones.go | 2 +- .../sagemaker/prebuilt_ecr_image_data_source.go | 12 ++++++------ names/names.go | 1 - 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/internal/service/elb/hosted_zone_id_data_source.go b/internal/service/elb/hosted_zone_id_data_source.go index eb80b528772..abd30532f65 100644 --- a/internal/service/elb/hosted_zone_id_data_source.go +++ b/internal/service/elb/hosted_zone_id_data_source.go @@ -29,7 +29,7 @@ var hostedZoneIDPerRegionMap = map[string]string{ endpoints.ApSoutheast4RegionID: "Z09517862IB2WZLPXG76F", endpoints.ApSoutheast5RegionID: "Z06010284QMVVW7WO5J", endpoints.CaCentral1RegionID: "ZQSVJUPU6J1EY", - names.CAWest1RegionID: "Z06473681N0SF6OS049SD", + endpoints.CaWest1RegionID: "Z06473681N0SF6OS049SD", names.CNNorth1RegionID: "Z1GDH35T77C1KE", names.CNNorthwest1RegionID: "ZM7IZAIOVVDZF", names.EUCentral1RegionID: "Z215JYRZR1TBD5", diff --git a/internal/service/elbv2/hosted_zone_id_data_source.go b/internal/service/elbv2/hosted_zone_id_data_source.go index a9942cbb0d8..58f71c3ca59 100644 --- a/internal/service/elbv2/hosted_zone_id_data_source.go +++ b/internal/service/elbv2/hosted_zone_id_data_source.go @@ -33,7 +33,7 @@ var hostedZoneIDPerRegionALBMap = map[string]string{ endpoints.ApSoutheast4RegionID: "Z09517862IB2WZLPXG76F", endpoints.ApSoutheast5RegionID: "Z06010284QMVVW7WO5J", endpoints.CaCentral1RegionID: "ZQSVJUPU6J1EY", - names.CAWest1RegionID: "Z06473681N0SF6OS049SD", + endpoints.CaWest1RegionID: "Z06473681N0SF6OS049SD", names.CNNorth1RegionID: "Z1GDH35T77C1KE", names.CNNorthwest1RegionID: "ZM7IZAIOVVDZF", names.EUCentral1RegionID: "Z215JYRZR1TBD5", @@ -71,7 +71,7 @@ var hostedZoneIDPerRegionNLBMap = map[string]string{ endpoints.ApSoutheast4RegionID: "Z01156963G8MIIL7X90IV", endpoints.ApSoutheast5RegionID: "Z026317210H9ACVTRO6FB", endpoints.CaCentral1RegionID: "Z2EPGBW3API2WT", - names.CAWest1RegionID: "Z02754302KBB00W2LKWZ9", + endpoints.CaWest1RegionID: "Z02754302KBB00W2LKWZ9", names.CNNorth1RegionID: "Z3QFB96KMJ7ED6", names.CNNorthwest1RegionID: "ZQEIKTCZ8352D", names.EUCentral1RegionID: "Z3F0SRJ5LGBH90", diff --git a/internal/service/s3/hosted_zones.go b/internal/service/s3/hosted_zones.go index 9773c916203..1638bbfb39a 100644 --- a/internal/service/s3/hosted_zones.go +++ b/internal/service/s3/hosted_zones.go @@ -25,7 +25,7 @@ var hostedZoneIDsMap = map[string]string{ endpoints.ApSoutheast4RegionID: "Z0312387243XT5FE14WFO", endpoints.ApSoutheast5RegionID: "Z08660063OXLMA7F1FJHU", endpoints.CaCentral1RegionID: "Z1QDHH18159H29", - names.CAWest1RegionID: "Z03565811Z33SLEZTHOUL", + endpoints.CaWest1RegionID: "Z03565811Z33SLEZTHOUL", names.CNNorth1RegionID: "Z5CN8UMXT92WN", names.CNNorthwest1RegionID: "Z282HJ1KT0DH03", names.EUCentral1RegionID: "Z21DNDUVLTQW6Q", diff --git a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go index 69baa887638..3404745866c 100644 --- a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go +++ b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go @@ -201,7 +201,7 @@ var prebuiltECRImageIDByRegion_blazing = map[string]string{ endpoints.ApSoutheast3RegionID: "951798379941", endpoints.ApSoutheast4RegionID: "106583098589", endpoints.CaCentral1RegionID: "469771592824", - names.CAWest1RegionID: "190319476487", + endpoints.CaWest1RegionID: "190319476487", names.CNNorth1RegionID: "390948362332", names.CNNorthwest1RegionID: "387376663083", names.EUCentral1RegionID: "813361260812", @@ -422,7 +422,7 @@ var prebuiltECRImageIDByRegion_spark = map[string]string{ endpoints.ApSoutheast3RegionID: "800295151634", endpoints.ApSoutheast4RegionID: "819679513684", endpoints.CaCentral1RegionID: "446299261295", - names.CAWest1RegionID: "000907499111", + endpoints.CaWest1RegionID: "000907499111", names.CNNorth1RegionID: "671472414489", names.CNNorthwest1RegionID: "844356804704", names.EUCentral1RegionID: "906073651304", @@ -500,7 +500,7 @@ var prebuiltECRImageIDByRegion_deepAR = map[string]string{ endpoints.ApSoutheast3RegionID: "951798379941", endpoints.ApSoutheast4RegionID: "106583098589", endpoints.CaCentral1RegionID: "469771592824", - names.CAWest1RegionID: "190319476487", + endpoints.CaWest1RegionID: "190319476487", names.CNNorth1RegionID: "390948362332", names.CNNorthwest1RegionID: "387376663083", names.EUCentral1RegionID: "495149712605", @@ -545,7 +545,7 @@ var prebuiltECRImageIDByRegion_factorMachines = map[string]string{ endpoints.ApSoutheast3RegionID: "951798379941", endpoints.ApSoutheast4RegionID: "106583098589", endpoints.CaCentral1RegionID: "469771592824", - names.CAWest1RegionID: "190319476487", + endpoints.CaWest1RegionID: "190319476487", names.CNNorth1RegionID: "390948362332", names.CNNorthwest1RegionID: "387376663083", names.EUCentral1RegionID: "664544806723", @@ -610,7 +610,7 @@ var prebuiltECRImageIDByRegion_XGBoost = map[string]string{ endpoints.ApSoutheast3RegionID: "951798379941", endpoints.ApSoutheast4RegionID: "106583098589", endpoints.CaCentral1RegionID: "341280168497", - names.CAWest1RegionID: "190319476487", + endpoints.CaWest1RegionID: "190319476487", names.CNNorth1RegionID: "450853457545", names.CNNorthwest1RegionID: "451049120500", names.EUCentral1RegionID: "492215442770", @@ -662,7 +662,7 @@ var prebuiltECRImageIDByRegion_deepLearning = map[string]string{ endpoints.ApSoutheast3RegionID: "907027046896", endpoints.ApSoutheast4RegionID: "457447274322", endpoints.CaCentral1RegionID: "763104351884", - names.CAWest1RegionID: "204538143572", + endpoints.CaWest1RegionID: "204538143572", names.CNNorth1RegionID: "727897471807", names.CNNorthwest1RegionID: "727897471807", names.EUCentral1RegionID: "763104351884", diff --git a/names/names.go b/names/names.go index ff235c82fc1..e2379eb8c71 100644 --- a/names/names.go +++ b/names/names.go @@ -149,7 +149,6 @@ const ( // AWS Standard partition's regions. GlobalRegionID = "aws-global" // AWS Standard global region. - CAWest1RegionID = "ca-west-1" // Canada West (Calgary). EUCentral1RegionID = "eu-central-1" // Europe (Frankfurt). EUCentral2RegionID = "eu-central-2" // Europe (Zurich). EUNorth1RegionID = "eu-north-1" // Europe (Stockholm). From 45abf603af7166fd0b8f2cc08df52d951ee3e759 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 15:22:54 -0500 Subject: [PATCH 280/304] 'names.EUCentral1RegionID' -> 'endpoints.EuCentral1RegionID'. --- .../apprunner/hosted_zone_id_data_source.go | 2 +- .../cloudtrail/service_account_data_source.go | 2 +- .../service/dynamodb/global_table_test.go | 2 +- .../hosted_zone_data_source.go | 2 +- .../service/elb/hosted_zone_id_data_source.go | 2 +- .../elb/service_account_data_source.go | 2 +- .../elbv2/hosted_zone_id_data_source.go | 4 +-- internal/service/gamelift/gamelift_test.go | 2 +- internal/service/iam/access_key_test.go | 5 ++-- internal/service/lambda/function.go | 2 +- .../redshift/service_account_data_source.go | 2 +- internal/service/s3/hosted_zones.go | 2 +- .../prebuilt_ecr_image_data_source.go | 30 +++++++++---------- names/names.go | 1 - 14 files changed, 30 insertions(+), 30 deletions(-) diff --git a/internal/service/apprunner/hosted_zone_id_data_source.go b/internal/service/apprunner/hosted_zone_id_data_source.go index c5233f3a56e..b2542de4f7c 100644 --- a/internal/service/apprunner/hosted_zone_id_data_source.go +++ b/internal/service/apprunner/hosted_zone_id_data_source.go @@ -25,7 +25,7 @@ var hostedZoneIDPerRegionMap = map[string]string{ endpoints.ApSoutheast1RegionID: "Z09819469CZ3KQ8PWMCL", endpoints.ApSoutheast2RegionID: "Z03657752RA8799S0TI5I", endpoints.ApNortheast1RegionID: "Z08491812XW6IPYLR6CCA", - names.EUCentral1RegionID: "Z0334911C2FDI2Q9M4FZ", + endpoints.EuCentral1RegionID: "Z0334911C2FDI2Q9M4FZ", names.EUWest1RegionID: "Z087551914Z2PCAU0QHMW", names.EUWest2RegionID: "Z098228427VC6B3IX76ON", names.EUWest3RegionID: "Z087117439MBKHYM69QS6", diff --git a/internal/service/cloudtrail/service_account_data_source.go b/internal/service/cloudtrail/service_account_data_source.go index 23092133f3f..6666ded80aa 100644 --- a/internal/service/cloudtrail/service_account_data_source.go +++ b/internal/service/cloudtrail/service_account_data_source.go @@ -34,7 +34,7 @@ var serviceAccountPerRegionMap = map[string]string{ endpoints.CaCentral1RegionID: "819402241893", names.CNNorth1RegionID: "193415116832", names.CNNorthwest1RegionID: "681348832753", - names.EUCentral1RegionID: "035351147821", + endpoints.EuCentral1RegionID: "035351147821", names.EUCentral2RegionID: "453052556044", names.EUNorth1RegionID: "829690693026", names.EUSouth1RegionID: "669305197877", diff --git a/internal/service/dynamodb/global_table_test.go b/internal/service/dynamodb/global_table_test.go index 64d95caaa28..10492947d90 100644 --- a/internal/service/dynamodb/global_table_test.go +++ b/internal/service/dynamodb/global_table_test.go @@ -161,7 +161,7 @@ func testAccPreCheckGlobalTable(ctx context.Context, t *testing.T) { endpoints.ApNortheast2RegionID, endpoints.ApSoutheast1RegionID, endpoints.ApSoutheast2RegionID, - names.EUCentral1RegionID, + endpoints.EuCentral1RegionID, names.EUWest1RegionID, names.EUWest2RegionID, names.USEast1RegionID, diff --git a/internal/service/elasticbeanstalk/hosted_zone_data_source.go b/internal/service/elasticbeanstalk/hosted_zone_data_source.go index 9c786f68531..4aad2cac655 100644 --- a/internal/service/elasticbeanstalk/hosted_zone_data_source.go +++ b/internal/service/elasticbeanstalk/hosted_zone_data_source.go @@ -27,7 +27,7 @@ var hostedZoneIDs = map[string]string{ endpoints.ApNortheast3RegionID: "ZNE5GEY1TIAGY", endpoints.ApSouth1RegionID: "Z18NTBI3Y7N9TZ", endpoints.CaCentral1RegionID: "ZJFCZL7SSZB5I", - names.EUCentral1RegionID: "Z1FRNW7UH4DEZJ", + endpoints.EuCentral1RegionID: "Z1FRNW7UH4DEZJ", names.EUNorth1RegionID: "Z23GO28BZ5AETM", names.EUSouth1RegionID: "Z10VDYYOA2JFKM", names.EUWest1RegionID: "Z2NYPWQ7DFZAZH", diff --git a/internal/service/elb/hosted_zone_id_data_source.go b/internal/service/elb/hosted_zone_id_data_source.go index abd30532f65..92b7ee5be43 100644 --- a/internal/service/elb/hosted_zone_id_data_source.go +++ b/internal/service/elb/hosted_zone_id_data_source.go @@ -32,7 +32,7 @@ var hostedZoneIDPerRegionMap = map[string]string{ endpoints.CaWest1RegionID: "Z06473681N0SF6OS049SD", names.CNNorth1RegionID: "Z1GDH35T77C1KE", names.CNNorthwest1RegionID: "ZM7IZAIOVVDZF", - names.EUCentral1RegionID: "Z215JYRZR1TBD5", + endpoints.EuCentral1RegionID: "Z215JYRZR1TBD5", names.EUCentral2RegionID: "Z06391101F2ZOEP8P5EB3", names.EUNorth1RegionID: "Z23TAZ6LKFMNIO", names.EUSouth1RegionID: "Z3ULH7SSC9OV64", diff --git a/internal/service/elb/service_account_data_source.go b/internal/service/elb/service_account_data_source.go index e6b2362bb93..73dc0611579 100644 --- a/internal/service/elb/service_account_data_source.go +++ b/internal/service/elb/service_account_data_source.go @@ -30,7 +30,7 @@ var accountIDPerRegionMap = map[string]string{ endpoints.CaCentral1RegionID: "985666609251", names.CNNorth1RegionID: "638102146993", names.CNNorthwest1RegionID: "037604701340", - names.EUCentral1RegionID: "054676820928", + endpoints.EuCentral1RegionID: "054676820928", names.EUNorth1RegionID: "897822967062", names.EUSouth1RegionID: "635631232127", names.EUWest1RegionID: "156460612806", diff --git a/internal/service/elbv2/hosted_zone_id_data_source.go b/internal/service/elbv2/hosted_zone_id_data_source.go index 58f71c3ca59..521f03bb017 100644 --- a/internal/service/elbv2/hosted_zone_id_data_source.go +++ b/internal/service/elbv2/hosted_zone_id_data_source.go @@ -36,7 +36,7 @@ var hostedZoneIDPerRegionALBMap = map[string]string{ endpoints.CaWest1RegionID: "Z06473681N0SF6OS049SD", names.CNNorth1RegionID: "Z1GDH35T77C1KE", names.CNNorthwest1RegionID: "ZM7IZAIOVVDZF", - names.EUCentral1RegionID: "Z215JYRZR1TBD5", + endpoints.EuCentral1RegionID: "Z215JYRZR1TBD5", names.EUCentral2RegionID: "Z06391101F2ZOEP8P5EB3", names.EUNorth1RegionID: "Z23TAZ6LKFMNIO", names.EUSouth1RegionID: "Z3ULH7SSC9OV64", @@ -74,7 +74,7 @@ var hostedZoneIDPerRegionNLBMap = map[string]string{ endpoints.CaWest1RegionID: "Z02754302KBB00W2LKWZ9", names.CNNorth1RegionID: "Z3QFB96KMJ7ED6", names.CNNorthwest1RegionID: "ZQEIKTCZ8352D", - names.EUCentral1RegionID: "Z3F0SRJ5LGBH90", + endpoints.EuCentral1RegionID: "Z3F0SRJ5LGBH90", names.EUCentral2RegionID: "Z02239872DOALSIDCX66S", names.EUNorth1RegionID: "Z1UDT6IFJ4EJM", names.EUSouth1RegionID: "Z23146JA1KNAFP", diff --git a/internal/service/gamelift/gamelift_test.go b/internal/service/gamelift/gamelift_test.go index 670ed7ab816..18e9d0a01bf 100644 --- a/internal/service/gamelift/gamelift_test.go +++ b/internal/service/gamelift/gamelift_test.go @@ -57,7 +57,7 @@ func testAccAccountIdByRegion(region string) (string, error) { endpoints.ApSoutheast1RegionID: "077577004113", endpoints.ApSoutheast2RegionID: "112188327105", endpoints.CaCentral1RegionID: "800535022691", - names.EUCentral1RegionID: "797584052317", + endpoints.EuCentral1RegionID: "797584052317", names.EUWest1RegionID: "319803218673", names.EUWest2RegionID: "937342764187", names.SAEast1RegionID: "028872612690", diff --git a/internal/service/iam/access_key_test.go b/internal/service/iam/access_key_test.go index 4eab1c0345b..1974579b379 100644 --- a/internal/service/iam/access_key_test.go +++ b/internal/service/iam/access_key_test.go @@ -11,6 +11,7 @@ import ( "testing" awstypes "github.com/aws/aws-sdk-go-v2/service/iam/types" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -301,8 +302,8 @@ func TestSESSMTPPasswordFromSecretKeySigV4(t *testing.T) { Input string Expected string }{ - {names.EUCentral1RegionID, "some+secret+key", "BMXhUYlu5Z3gSXVQORxlVa7XPaz91aGWdfHxvkOZdWZ2"}, - {names.EUCentral1RegionID, "another+secret+key", "BBbphbrQmrKMx42d1N6+C7VINYEBGI5v9VsZeTxwskfh"}, + {endpoints.EuCentral1RegionID, "some+secret+key", "BMXhUYlu5Z3gSXVQORxlVa7XPaz91aGWdfHxvkOZdWZ2"}, + {endpoints.EuCentral1RegionID, "another+secret+key", "BBbphbrQmrKMx42d1N6+C7VINYEBGI5v9VsZeTxwskfh"}, {names.USWest1RegionID, "some+secret+key", "BH+jbMzper5WwlwUar9E1ySBqHa9whi0GPo+sJ0mVYJj"}, {names.USWest1RegionID, "another+secret+key", "BKVmjjMDFk/qqw8EROW99bjCS65PF8WKvK5bSr4Y6EqF"}, } diff --git a/internal/service/lambda/function.go b/internal/service/lambda/function.go index 00994ea523d..18b682a7d7d 100644 --- a/internal/service/lambda/function.go +++ b/internal/service/lambda/function.go @@ -1411,7 +1411,7 @@ func signerServiceIsAvailable(region string) bool { endpoints.ApSoutheast2RegionID: {}, endpoints.ApNortheast1RegionID: {}, endpoints.CaCentral1RegionID: {}, - names.EUCentral1RegionID: {}, + endpoints.EuCentral1RegionID: {}, names.EUWest1RegionID: {}, names.EUWest2RegionID: {}, names.EUSouth1RegionID: {}, diff --git a/internal/service/redshift/service_account_data_source.go b/internal/service/redshift/service_account_data_source.go index 3fa60aef37c..3d584cc6d6e 100644 --- a/internal/service/redshift/service_account_data_source.go +++ b/internal/service/redshift/service_account_data_source.go @@ -31,7 +31,7 @@ var ServiceAccountPerRegionMap = map[string]string{ endpoints.CaCentral1RegionID: "907379612154", names.CNNorth1RegionID: "111890595117", names.CNNorthwest1RegionID: "660998842044", - names.EUCentral1RegionID: "053454850223", + endpoints.EuCentral1RegionID: "053454850223", names.EUNorth1RegionID: "729911121831", names.EUSouth1RegionID: "945612479654", names.EUWest1RegionID: "210876761215", diff --git a/internal/service/s3/hosted_zones.go b/internal/service/s3/hosted_zones.go index 1638bbfb39a..7e0aadc6fcc 100644 --- a/internal/service/s3/hosted_zones.go +++ b/internal/service/s3/hosted_zones.go @@ -28,7 +28,7 @@ var hostedZoneIDsMap = map[string]string{ endpoints.CaWest1RegionID: "Z03565811Z33SLEZTHOUL", names.CNNorth1RegionID: "Z5CN8UMXT92WN", names.CNNorthwest1RegionID: "Z282HJ1KT0DH03", - names.EUCentral1RegionID: "Z21DNDUVLTQW6Q", + endpoints.EuCentral1RegionID: "Z21DNDUVLTQW6Q", names.EUCentral2RegionID: "Z030506016YDQGETNASS", names.EUNorth1RegionID: "Z3BAZG2TWCNX0D", names.EUSouth1RegionID: "Z30OZKI7KPW7MI", diff --git a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go index 3404745866c..d29f38673ba 100644 --- a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go +++ b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go @@ -204,7 +204,7 @@ var prebuiltECRImageIDByRegion_blazing = map[string]string{ endpoints.CaWest1RegionID: "190319476487", names.CNNorth1RegionID: "390948362332", names.CNNorthwest1RegionID: "387376663083", - names.EUCentral1RegionID: "813361260812", + endpoints.EuCentral1RegionID: "813361260812", names.EUCentral2RegionID: "680994064768", names.EUNorth1RegionID: "669576153137", names.EUSouth1RegionID: "257386234256", @@ -241,7 +241,7 @@ var prebuiltECRImageIDByRegion_clarify = map[string]string{ endpoints.CaCentral1RegionID: "675030665977", names.CNNorth1RegionID: "122526803553", names.CNNorthwest1RegionID: "122578899357", - names.EUCentral1RegionID: "017069133835", + endpoints.EuCentral1RegionID: "017069133835", names.EUNorth1RegionID: "763603941244", names.EUSouth1RegionID: "638885417683", names.EUWest1RegionID: "131013547314", @@ -270,7 +270,7 @@ var prebuiltECRImageIDByRegion_dataWrangler = map[string]string{ endpoints.CaCentral1RegionID: "557239378090", names.CNNorth1RegionID: "245909111842", names.CNNorthwest1RegionID: "249157047649", - names.EUCentral1RegionID: "024640144536", + endpoints.EuCentral1RegionID: "024640144536", names.EUNorth1RegionID: "054986407534", names.EUSouth1RegionID: "488287956546", names.EUWest1RegionID: "245179582081", @@ -299,7 +299,7 @@ var prebuiltECRImageIDByRegion_debugger = map[string]string{ endpoints.CaCentral1RegionID: "519511493484", names.CNNorth1RegionID: "618459771430", names.CNNorthwest1RegionID: "658757709296", - names.EUCentral1RegionID: "482524230118", + endpoints.EuCentral1RegionID: "482524230118", names.EUNorth1RegionID: "314864569078", names.EUSouth1RegionID: "563282790590", names.EUWest1RegionID: "929884845733", @@ -334,7 +334,7 @@ var prebuiltECRImageIDByRegion_inferentiaNeo = map[string]string{ endpoints.CaCentral1RegionID: "464438896020", names.CNNorth1RegionID: "472730292857", names.CNNorthwest1RegionID: "474822919863", - names.EUCentral1RegionID: "746233611703", + endpoints.EuCentral1RegionID: "746233611703", names.EUNorth1RegionID: "601324751636", names.EUSouth1RegionID: "966458181534", names.EUWest1RegionID: "802834080501", @@ -370,7 +370,7 @@ var prebuiltECRImageIDByRegion_SageMakerCustom = map[string]string{ // nosemgrep endpoints.CaCentral1RegionID: "520713654638", names.CNNorth1RegionID: "422961961927", names.CNNorthwest1RegionID: "423003514399", - names.EUCentral1RegionID: "520713654638", + endpoints.EuCentral1RegionID: "520713654638", names.EUNorth1RegionID: "520713654638", names.EUSouth1RegionID: "048378556238", names.EUWest1RegionID: "520713654638", @@ -398,7 +398,7 @@ var prebuiltECRImageIDByRegion_SageMakerRL = map[string]string{ // nosemgrep:ci. endpoints.ApSoutheast1RegionID: "462105765813", endpoints.ApSoutheast2RegionID: "462105765813", endpoints.CaCentral1RegionID: "462105765813", - names.EUCentral1RegionID: "462105765813", + endpoints.EuCentral1RegionID: "462105765813", names.EUWest1RegionID: "462105765813", names.EUWest2RegionID: "462105765813", names.USEast1RegionID: "462105765813", @@ -425,7 +425,7 @@ var prebuiltECRImageIDByRegion_spark = map[string]string{ endpoints.CaWest1RegionID: "000907499111", names.CNNorth1RegionID: "671472414489", names.CNNorthwest1RegionID: "844356804704", - names.EUCentral1RegionID: "906073651304", + endpoints.EuCentral1RegionID: "906073651304", names.EUCentral2RegionID: "142351485170", names.EUNorth1RegionID: "330188676905", names.EUSouth1RegionID: "753923664805", @@ -460,7 +460,7 @@ var prebuiltECRImageIDByRegion_SageMakerBasePython = map[string]string{ // nosem endpoints.CaCentral1RegionID: "310906938811", names.CNNorth1RegionID: "390048526115", names.CNNorthwest1RegionID: "390780980154", - names.EUCentral1RegionID: "936697816551", + endpoints.EuCentral1RegionID: "936697816551", names.EUNorth1RegionID: "243637512696", names.EUSouth1RegionID: "592751261982", names.EUSouth2RegionID: "127363102723", @@ -503,7 +503,7 @@ var prebuiltECRImageIDByRegion_deepAR = map[string]string{ endpoints.CaWest1RegionID: "190319476487", names.CNNorth1RegionID: "390948362332", names.CNNorthwest1RegionID: "387376663083", - names.EUCentral1RegionID: "495149712605", + endpoints.EuCentral1RegionID: "495149712605", names.EUCentral2RegionID: "680994064768", names.EUNorth1RegionID: "669576153137", names.EUSouth1RegionID: "257386234256", @@ -548,7 +548,7 @@ var prebuiltECRImageIDByRegion_factorMachines = map[string]string{ endpoints.CaWest1RegionID: "190319476487", names.CNNorth1RegionID: "390948362332", names.CNNorthwest1RegionID: "387376663083", - names.EUCentral1RegionID: "664544806723", + endpoints.EuCentral1RegionID: "664544806723", names.EUCentral2RegionID: "680994064768", names.EUNorth1RegionID: "669576153137", names.EUSouth1RegionID: "257386234256", @@ -579,7 +579,7 @@ var prebuiltECRImageIDByRegion_lda = map[string]string{ endpoints.ApSoutheast1RegionID: "475088953585", endpoints.ApSoutheast2RegionID: "297031611018", endpoints.CaCentral1RegionID: "469771592824", - names.EUCentral1RegionID: "353608530281", + endpoints.EuCentral1RegionID: "353608530281", names.EUWest1RegionID: "999678624901", names.EUWest2RegionID: "644912444149", names.USEast1RegionID: "766337827248", @@ -613,7 +613,7 @@ var prebuiltECRImageIDByRegion_XGBoost = map[string]string{ endpoints.CaWest1RegionID: "190319476487", names.CNNorth1RegionID: "450853457545", names.CNNorthwest1RegionID: "451049120500", - names.EUCentral1RegionID: "492215442770", + endpoints.EuCentral1RegionID: "492215442770", names.EUCentral2RegionID: "680994064768", names.EUNorth1RegionID: "662702820516", names.EUSouth1RegionID: "978288397137", @@ -665,7 +665,7 @@ var prebuiltECRImageIDByRegion_deepLearning = map[string]string{ endpoints.CaWest1RegionID: "204538143572", names.CNNorth1RegionID: "727897471807", names.CNNorthwest1RegionID: "727897471807", - names.EUCentral1RegionID: "763104351884", + endpoints.EuCentral1RegionID: "763104351884", names.EUCentral2RegionID: "380420809688", names.EUNorth1RegionID: "763104351884", names.EUWest1RegionID: "763104351884", @@ -702,7 +702,7 @@ var prebuiltECRImageIDByRegion_modelMonitor = map[string]string{ endpoints.CaCentral1RegionID: "536280801234", names.CNNorth1RegionID: "453000072557", names.CNNorthwest1RegionID: "453252182341", - names.EUCentral1RegionID: "048819808253", + endpoints.EuCentral1RegionID: "048819808253", names.EUNorth1RegionID: "895015795356", names.EUSouth1RegionID: "933208885752", names.EUSouth2RegionID: "437450045455", diff --git a/names/names.go b/names/names.go index e2379eb8c71..25dc2982778 100644 --- a/names/names.go +++ b/names/names.go @@ -149,7 +149,6 @@ const ( // AWS Standard partition's regions. GlobalRegionID = "aws-global" // AWS Standard global region. - EUCentral1RegionID = "eu-central-1" // Europe (Frankfurt). EUCentral2RegionID = "eu-central-2" // Europe (Zurich). EUNorth1RegionID = "eu-north-1" // Europe (Stockholm). EUSouth1RegionID = "eu-south-1" // Europe (Milan). From 7c01eaa35ae2a06fffae08394213c9d067ba0fb8 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 15:23:44 -0500 Subject: [PATCH 281/304] 'names.EUCentral2RegionID' -> 'endpoints.EuCentral2RegionID'. --- .../service/acmpca/certificate_authority_test.go | 2 +- .../cloudtrail/service_account_data_source.go | 2 +- internal/service/elb/hosted_zone_id_data_source.go | 2 +- internal/service/elbv2/hosted_zone_id_data_source.go | 4 ++-- internal/service/s3/hosted_zones.go | 2 +- .../sagemaker/prebuilt_ecr_image_data_source.go | 12 ++++++------ names/names.go | 1 - 7 files changed, 12 insertions(+), 13 deletions(-) diff --git a/internal/service/acmpca/certificate_authority_test.go b/internal/service/acmpca/certificate_authority_test.go index 717afd7d0a1..102651ac485 100644 --- a/internal/service/acmpca/certificate_authority_test.go +++ b/internal/service/acmpca/certificate_authority_test.go @@ -184,7 +184,7 @@ func TestAccACMPCACertificateAuthority_keyStorageSecurityStandard(t *testing.T) PreCheck: func() { acctest.PreCheck(ctx, t) // See https://docs.aws.amazon.com/privateca/latest/userguide/data-protection.html#private-keys. - acctest.PreCheckRegion(t, endpoints.ApSouth2RegionID, endpoints.ApSoutheast3RegionID, endpoints.ApSoutheast4RegionID, names.EUCentral2RegionID, names.EUSouth2RegionID, names.MECentral1RegionID) + acctest.PreCheckRegion(t, endpoints.ApSouth2RegionID, endpoints.ApSoutheast3RegionID, endpoints.ApSoutheast4RegionID, endpoints.EuCentral2RegionID, names.EUSouth2RegionID, names.MECentral1RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.ACMPCAServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, diff --git a/internal/service/cloudtrail/service_account_data_source.go b/internal/service/cloudtrail/service_account_data_source.go index 6666ded80aa..5146cc44756 100644 --- a/internal/service/cloudtrail/service_account_data_source.go +++ b/internal/service/cloudtrail/service_account_data_source.go @@ -35,7 +35,7 @@ var serviceAccountPerRegionMap = map[string]string{ names.CNNorth1RegionID: "193415116832", names.CNNorthwest1RegionID: "681348832753", endpoints.EuCentral1RegionID: "035351147821", - names.EUCentral2RegionID: "453052556044", + endpoints.EuCentral2RegionID: "453052556044", names.EUNorth1RegionID: "829690693026", names.EUSouth1RegionID: "669305197877", names.EUSouth2RegionID: "757211635381", diff --git a/internal/service/elb/hosted_zone_id_data_source.go b/internal/service/elb/hosted_zone_id_data_source.go index 92b7ee5be43..a5d22fa88f1 100644 --- a/internal/service/elb/hosted_zone_id_data_source.go +++ b/internal/service/elb/hosted_zone_id_data_source.go @@ -33,7 +33,7 @@ var hostedZoneIDPerRegionMap = map[string]string{ names.CNNorth1RegionID: "Z1GDH35T77C1KE", names.CNNorthwest1RegionID: "ZM7IZAIOVVDZF", endpoints.EuCentral1RegionID: "Z215JYRZR1TBD5", - names.EUCentral2RegionID: "Z06391101F2ZOEP8P5EB3", + endpoints.EuCentral2RegionID: "Z06391101F2ZOEP8P5EB3", names.EUNorth1RegionID: "Z23TAZ6LKFMNIO", names.EUSouth1RegionID: "Z3ULH7SSC9OV64", names.EUSouth2RegionID: "Z0956581394HF5D5LXGAP", diff --git a/internal/service/elbv2/hosted_zone_id_data_source.go b/internal/service/elbv2/hosted_zone_id_data_source.go index 521f03bb017..a64673d21b3 100644 --- a/internal/service/elbv2/hosted_zone_id_data_source.go +++ b/internal/service/elbv2/hosted_zone_id_data_source.go @@ -37,7 +37,7 @@ var hostedZoneIDPerRegionALBMap = map[string]string{ names.CNNorth1RegionID: "Z1GDH35T77C1KE", names.CNNorthwest1RegionID: "ZM7IZAIOVVDZF", endpoints.EuCentral1RegionID: "Z215JYRZR1TBD5", - names.EUCentral2RegionID: "Z06391101F2ZOEP8P5EB3", + endpoints.EuCentral2RegionID: "Z06391101F2ZOEP8P5EB3", names.EUNorth1RegionID: "Z23TAZ6LKFMNIO", names.EUSouth1RegionID: "Z3ULH7SSC9OV64", names.EUSouth2RegionID: "Z0956581394HF5D5LXGAP", @@ -75,7 +75,7 @@ var hostedZoneIDPerRegionNLBMap = map[string]string{ names.CNNorth1RegionID: "Z3QFB96KMJ7ED6", names.CNNorthwest1RegionID: "ZQEIKTCZ8352D", endpoints.EuCentral1RegionID: "Z3F0SRJ5LGBH90", - names.EUCentral2RegionID: "Z02239872DOALSIDCX66S", + endpoints.EuCentral2RegionID: "Z02239872DOALSIDCX66S", names.EUNorth1RegionID: "Z1UDT6IFJ4EJM", names.EUSouth1RegionID: "Z23146JA1KNAFP", names.EUSouth2RegionID: "Z1011216NVTVYADP1SSV", diff --git a/internal/service/s3/hosted_zones.go b/internal/service/s3/hosted_zones.go index 7e0aadc6fcc..6ee6f7885bd 100644 --- a/internal/service/s3/hosted_zones.go +++ b/internal/service/s3/hosted_zones.go @@ -29,7 +29,7 @@ var hostedZoneIDsMap = map[string]string{ names.CNNorth1RegionID: "Z5CN8UMXT92WN", names.CNNorthwest1RegionID: "Z282HJ1KT0DH03", endpoints.EuCentral1RegionID: "Z21DNDUVLTQW6Q", - names.EUCentral2RegionID: "Z030506016YDQGETNASS", + endpoints.EuCentral2RegionID: "Z030506016YDQGETNASS", names.EUNorth1RegionID: "Z3BAZG2TWCNX0D", names.EUSouth1RegionID: "Z30OZKI7KPW7MI", names.EUSouth2RegionID: "Z0081959F7139GRJC19J", diff --git a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go index d29f38673ba..b7c698c4e8b 100644 --- a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go +++ b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go @@ -205,7 +205,7 @@ var prebuiltECRImageIDByRegion_blazing = map[string]string{ names.CNNorth1RegionID: "390948362332", names.CNNorthwest1RegionID: "387376663083", endpoints.EuCentral1RegionID: "813361260812", - names.EUCentral2RegionID: "680994064768", + endpoints.EuCentral2RegionID: "680994064768", names.EUNorth1RegionID: "669576153137", names.EUSouth1RegionID: "257386234256", names.EUSouth2RegionID: "104374241257", @@ -426,7 +426,7 @@ var prebuiltECRImageIDByRegion_spark = map[string]string{ names.CNNorth1RegionID: "671472414489", names.CNNorthwest1RegionID: "844356804704", endpoints.EuCentral1RegionID: "906073651304", - names.EUCentral2RegionID: "142351485170", + endpoints.EuCentral2RegionID: "142351485170", names.EUNorth1RegionID: "330188676905", names.EUSouth1RegionID: "753923664805", names.EUSouth2RegionID: "833944533722", @@ -504,7 +504,7 @@ var prebuiltECRImageIDByRegion_deepAR = map[string]string{ names.CNNorth1RegionID: "390948362332", names.CNNorthwest1RegionID: "387376663083", endpoints.EuCentral1RegionID: "495149712605", - names.EUCentral2RegionID: "680994064768", + endpoints.EuCentral2RegionID: "680994064768", names.EUNorth1RegionID: "669576153137", names.EUSouth1RegionID: "257386234256", names.EUSouth2RegionID: "104374241257", @@ -549,7 +549,7 @@ var prebuiltECRImageIDByRegion_factorMachines = map[string]string{ names.CNNorth1RegionID: "390948362332", names.CNNorthwest1RegionID: "387376663083", endpoints.EuCentral1RegionID: "664544806723", - names.EUCentral2RegionID: "680994064768", + endpoints.EuCentral2RegionID: "680994064768", names.EUNorth1RegionID: "669576153137", names.EUSouth1RegionID: "257386234256", names.EUSouth2RegionID: "104374241257", @@ -614,7 +614,7 @@ var prebuiltECRImageIDByRegion_XGBoost = map[string]string{ names.CNNorth1RegionID: "450853457545", names.CNNorthwest1RegionID: "451049120500", endpoints.EuCentral1RegionID: "492215442770", - names.EUCentral2RegionID: "680994064768", + endpoints.EuCentral2RegionID: "680994064768", names.EUNorth1RegionID: "662702820516", names.EUSouth1RegionID: "978288397137", names.EUSouth2RegionID: "104374241257", @@ -666,7 +666,7 @@ var prebuiltECRImageIDByRegion_deepLearning = map[string]string{ names.CNNorth1RegionID: "727897471807", names.CNNorthwest1RegionID: "727897471807", endpoints.EuCentral1RegionID: "763104351884", - names.EUCentral2RegionID: "380420809688", + endpoints.EuCentral2RegionID: "380420809688", names.EUNorth1RegionID: "763104351884", names.EUWest1RegionID: "763104351884", names.EUWest2RegionID: "763104351884", diff --git a/names/names.go b/names/names.go index 25dc2982778..33dc9de74b0 100644 --- a/names/names.go +++ b/names/names.go @@ -149,7 +149,6 @@ const ( // AWS Standard partition's regions. GlobalRegionID = "aws-global" // AWS Standard global region. - EUCentral2RegionID = "eu-central-2" // Europe (Zurich). EUNorth1RegionID = "eu-north-1" // Europe (Stockholm). EUSouth1RegionID = "eu-south-1" // Europe (Milan). EUSouth2RegionID = "eu-south-2" // Europe (Spain). From 64035232af731062885d4918b70d3c840e9e0614 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 15:24:51 -0500 Subject: [PATCH 282/304] 'names.EUNorth1RegionID' -> 'endpoints.EuNorth1RegionID'. --- .../cloudtrail/service_account_data_source.go | 2 +- .../hosted_zone_data_source.go | 2 +- .../service/elb/hosted_zone_id_data_source.go | 2 +- .../elb/service_account_data_source.go | 2 +- .../elbv2/hosted_zone_id_data_source.go | 4 +-- internal/service/lambda/function.go | 2 +- .../redshift/service_account_data_source.go | 2 +- internal/service/s3/hosted_zones.go | 2 +- .../prebuilt_ecr_image_data_source.go | 26 +++++++++---------- names/names.go | 1 - 10 files changed, 22 insertions(+), 23 deletions(-) diff --git a/internal/service/cloudtrail/service_account_data_source.go b/internal/service/cloudtrail/service_account_data_source.go index 5146cc44756..42969c63a0f 100644 --- a/internal/service/cloudtrail/service_account_data_source.go +++ b/internal/service/cloudtrail/service_account_data_source.go @@ -36,7 +36,7 @@ var serviceAccountPerRegionMap = map[string]string{ names.CNNorthwest1RegionID: "681348832753", endpoints.EuCentral1RegionID: "035351147821", endpoints.EuCentral2RegionID: "453052556044", - names.EUNorth1RegionID: "829690693026", + endpoints.EuNorth1RegionID: "829690693026", names.EUSouth1RegionID: "669305197877", names.EUSouth2RegionID: "757211635381", names.EUWest1RegionID: "859597730677", diff --git a/internal/service/elasticbeanstalk/hosted_zone_data_source.go b/internal/service/elasticbeanstalk/hosted_zone_data_source.go index 4aad2cac655..aa19aabb12b 100644 --- a/internal/service/elasticbeanstalk/hosted_zone_data_source.go +++ b/internal/service/elasticbeanstalk/hosted_zone_data_source.go @@ -28,7 +28,7 @@ var hostedZoneIDs = map[string]string{ endpoints.ApSouth1RegionID: "Z18NTBI3Y7N9TZ", endpoints.CaCentral1RegionID: "ZJFCZL7SSZB5I", endpoints.EuCentral1RegionID: "Z1FRNW7UH4DEZJ", - names.EUNorth1RegionID: "Z23GO28BZ5AETM", + endpoints.EuNorth1RegionID: "Z23GO28BZ5AETM", names.EUSouth1RegionID: "Z10VDYYOA2JFKM", names.EUWest1RegionID: "Z2NYPWQ7DFZAZH", names.EUWest2RegionID: "Z1GKAAAUGATPF1", diff --git a/internal/service/elb/hosted_zone_id_data_source.go b/internal/service/elb/hosted_zone_id_data_source.go index a5d22fa88f1..29d3b375409 100644 --- a/internal/service/elb/hosted_zone_id_data_source.go +++ b/internal/service/elb/hosted_zone_id_data_source.go @@ -34,7 +34,7 @@ var hostedZoneIDPerRegionMap = map[string]string{ names.CNNorthwest1RegionID: "ZM7IZAIOVVDZF", endpoints.EuCentral1RegionID: "Z215JYRZR1TBD5", endpoints.EuCentral2RegionID: "Z06391101F2ZOEP8P5EB3", - names.EUNorth1RegionID: "Z23TAZ6LKFMNIO", + endpoints.EuNorth1RegionID: "Z23TAZ6LKFMNIO", names.EUSouth1RegionID: "Z3ULH7SSC9OV64", names.EUSouth2RegionID: "Z0956581394HF5D5LXGAP", names.EUWest1RegionID: "Z32O12XQLNTSW2", diff --git a/internal/service/elb/service_account_data_source.go b/internal/service/elb/service_account_data_source.go index 73dc0611579..5ace851ded6 100644 --- a/internal/service/elb/service_account_data_source.go +++ b/internal/service/elb/service_account_data_source.go @@ -31,7 +31,7 @@ var accountIDPerRegionMap = map[string]string{ names.CNNorth1RegionID: "638102146993", names.CNNorthwest1RegionID: "037604701340", endpoints.EuCentral1RegionID: "054676820928", - names.EUNorth1RegionID: "897822967062", + endpoints.EuNorth1RegionID: "897822967062", names.EUSouth1RegionID: "635631232127", names.EUWest1RegionID: "156460612806", names.EUWest2RegionID: "652711504416", diff --git a/internal/service/elbv2/hosted_zone_id_data_source.go b/internal/service/elbv2/hosted_zone_id_data_source.go index a64673d21b3..c5ba4f618a2 100644 --- a/internal/service/elbv2/hosted_zone_id_data_source.go +++ b/internal/service/elbv2/hosted_zone_id_data_source.go @@ -38,7 +38,7 @@ var hostedZoneIDPerRegionALBMap = map[string]string{ names.CNNorthwest1RegionID: "ZM7IZAIOVVDZF", endpoints.EuCentral1RegionID: "Z215JYRZR1TBD5", endpoints.EuCentral2RegionID: "Z06391101F2ZOEP8P5EB3", - names.EUNorth1RegionID: "Z23TAZ6LKFMNIO", + endpoints.EuNorth1RegionID: "Z23TAZ6LKFMNIO", names.EUSouth1RegionID: "Z3ULH7SSC9OV64", names.EUSouth2RegionID: "Z0956581394HF5D5LXGAP", names.EUWest1RegionID: "Z32O12XQLNTSW2", @@ -76,7 +76,7 @@ var hostedZoneIDPerRegionNLBMap = map[string]string{ names.CNNorthwest1RegionID: "ZQEIKTCZ8352D", endpoints.EuCentral1RegionID: "Z3F0SRJ5LGBH90", endpoints.EuCentral2RegionID: "Z02239872DOALSIDCX66S", - names.EUNorth1RegionID: "Z1UDT6IFJ4EJM", + endpoints.EuNorth1RegionID: "Z1UDT6IFJ4EJM", names.EUSouth1RegionID: "Z23146JA1KNAFP", names.EUSouth2RegionID: "Z1011216NVTVYADP1SSV", names.EUWest1RegionID: "Z2IFOLAFXWLO4F", diff --git a/internal/service/lambda/function.go b/internal/service/lambda/function.go index 18b682a7d7d..03f535bb908 100644 --- a/internal/service/lambda/function.go +++ b/internal/service/lambda/function.go @@ -1416,7 +1416,7 @@ func signerServiceIsAvailable(region string) bool { names.EUWest2RegionID: {}, names.EUSouth1RegionID: {}, names.EUWest3RegionID: {}, - names.EUNorth1RegionID: {}, + endpoints.EuNorth1RegionID: {}, names.MESouth1RegionID: {}, names.SAEast1RegionID: {}, } diff --git a/internal/service/redshift/service_account_data_source.go b/internal/service/redshift/service_account_data_source.go index 3d584cc6d6e..e0b58986f24 100644 --- a/internal/service/redshift/service_account_data_source.go +++ b/internal/service/redshift/service_account_data_source.go @@ -32,7 +32,7 @@ var ServiceAccountPerRegionMap = map[string]string{ names.CNNorth1RegionID: "111890595117", names.CNNorthwest1RegionID: "660998842044", endpoints.EuCentral1RegionID: "053454850223", - names.EUNorth1RegionID: "729911121831", + endpoints.EuNorth1RegionID: "729911121831", names.EUSouth1RegionID: "945612479654", names.EUWest1RegionID: "210876761215", names.EUWest2RegionID: "307160386991", diff --git a/internal/service/s3/hosted_zones.go b/internal/service/s3/hosted_zones.go index 6ee6f7885bd..b8de2f0dbcc 100644 --- a/internal/service/s3/hosted_zones.go +++ b/internal/service/s3/hosted_zones.go @@ -30,7 +30,7 @@ var hostedZoneIDsMap = map[string]string{ names.CNNorthwest1RegionID: "Z282HJ1KT0DH03", endpoints.EuCentral1RegionID: "Z21DNDUVLTQW6Q", endpoints.EuCentral2RegionID: "Z030506016YDQGETNASS", - names.EUNorth1RegionID: "Z3BAZG2TWCNX0D", + endpoints.EuNorth1RegionID: "Z3BAZG2TWCNX0D", names.EUSouth1RegionID: "Z30OZKI7KPW7MI", names.EUSouth2RegionID: "Z0081959F7139GRJC19J", names.EUWest1RegionID: "Z1BKCTXD74EZPE", diff --git a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go index b7c698c4e8b..2701ca3e9d0 100644 --- a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go +++ b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go @@ -206,7 +206,7 @@ var prebuiltECRImageIDByRegion_blazing = map[string]string{ names.CNNorthwest1RegionID: "387376663083", endpoints.EuCentral1RegionID: "813361260812", endpoints.EuCentral2RegionID: "680994064768", - names.EUNorth1RegionID: "669576153137", + endpoints.EuNorth1RegionID: "669576153137", names.EUSouth1RegionID: "257386234256", names.EUSouth2RegionID: "104374241257", names.EUWest1RegionID: "685385470294", @@ -242,7 +242,7 @@ var prebuiltECRImageIDByRegion_clarify = map[string]string{ names.CNNorth1RegionID: "122526803553", names.CNNorthwest1RegionID: "122578899357", endpoints.EuCentral1RegionID: "017069133835", - names.EUNorth1RegionID: "763603941244", + endpoints.EuNorth1RegionID: "763603941244", names.EUSouth1RegionID: "638885417683", names.EUWest1RegionID: "131013547314", names.EUWest2RegionID: "440796970383", @@ -271,7 +271,7 @@ var prebuiltECRImageIDByRegion_dataWrangler = map[string]string{ names.CNNorth1RegionID: "245909111842", names.CNNorthwest1RegionID: "249157047649", endpoints.EuCentral1RegionID: "024640144536", - names.EUNorth1RegionID: "054986407534", + endpoints.EuNorth1RegionID: "054986407534", names.EUSouth1RegionID: "488287956546", names.EUWest1RegionID: "245179582081", names.EUWest2RegionID: "894491911112", @@ -300,7 +300,7 @@ var prebuiltECRImageIDByRegion_debugger = map[string]string{ names.CNNorth1RegionID: "618459771430", names.CNNorthwest1RegionID: "658757709296", endpoints.EuCentral1RegionID: "482524230118", - names.EUNorth1RegionID: "314864569078", + endpoints.EuNorth1RegionID: "314864569078", names.EUSouth1RegionID: "563282790590", names.EUWest1RegionID: "929884845733", names.EUWest2RegionID: "250201462417", @@ -335,7 +335,7 @@ var prebuiltECRImageIDByRegion_inferentiaNeo = map[string]string{ names.CNNorth1RegionID: "472730292857", names.CNNorthwest1RegionID: "474822919863", endpoints.EuCentral1RegionID: "746233611703", - names.EUNorth1RegionID: "601324751636", + endpoints.EuNorth1RegionID: "601324751636", names.EUSouth1RegionID: "966458181534", names.EUWest1RegionID: "802834080501", names.EUWest2RegionID: "205493899709", @@ -371,7 +371,7 @@ var prebuiltECRImageIDByRegion_SageMakerCustom = map[string]string{ // nosemgrep names.CNNorth1RegionID: "422961961927", names.CNNorthwest1RegionID: "423003514399", endpoints.EuCentral1RegionID: "520713654638", - names.EUNorth1RegionID: "520713654638", + endpoints.EuNorth1RegionID: "520713654638", names.EUSouth1RegionID: "048378556238", names.EUWest1RegionID: "520713654638", names.EUWest2RegionID: "520713654638", @@ -427,7 +427,7 @@ var prebuiltECRImageIDByRegion_spark = map[string]string{ names.CNNorthwest1RegionID: "844356804704", endpoints.EuCentral1RegionID: "906073651304", endpoints.EuCentral2RegionID: "142351485170", - names.EUNorth1RegionID: "330188676905", + endpoints.EuNorth1RegionID: "330188676905", names.EUSouth1RegionID: "753923664805", names.EUSouth2RegionID: "833944533722", names.EUWest1RegionID: "571004829621", @@ -461,7 +461,7 @@ var prebuiltECRImageIDByRegion_SageMakerBasePython = map[string]string{ // nosem names.CNNorth1RegionID: "390048526115", names.CNNorthwest1RegionID: "390780980154", endpoints.EuCentral1RegionID: "936697816551", - names.EUNorth1RegionID: "243637512696", + endpoints.EuNorth1RegionID: "243637512696", names.EUSouth1RegionID: "592751261982", names.EUSouth2RegionID: "127363102723", names.EUWest1RegionID: "470317259841", @@ -505,7 +505,7 @@ var prebuiltECRImageIDByRegion_deepAR = map[string]string{ names.CNNorthwest1RegionID: "387376663083", endpoints.EuCentral1RegionID: "495149712605", endpoints.EuCentral2RegionID: "680994064768", - names.EUNorth1RegionID: "669576153137", + endpoints.EuNorth1RegionID: "669576153137", names.EUSouth1RegionID: "257386234256", names.EUSouth2RegionID: "104374241257", names.EUWest1RegionID: "224300973850", @@ -550,7 +550,7 @@ var prebuiltECRImageIDByRegion_factorMachines = map[string]string{ names.CNNorthwest1RegionID: "387376663083", endpoints.EuCentral1RegionID: "664544806723", endpoints.EuCentral2RegionID: "680994064768", - names.EUNorth1RegionID: "669576153137", + endpoints.EuNorth1RegionID: "669576153137", names.EUSouth1RegionID: "257386234256", names.EUSouth2RegionID: "104374241257", names.EUWest1RegionID: "438346466558", @@ -615,7 +615,7 @@ var prebuiltECRImageIDByRegion_XGBoost = map[string]string{ names.CNNorthwest1RegionID: "451049120500", endpoints.EuCentral1RegionID: "492215442770", endpoints.EuCentral2RegionID: "680994064768", - names.EUNorth1RegionID: "662702820516", + endpoints.EuNorth1RegionID: "662702820516", names.EUSouth1RegionID: "978288397137", names.EUSouth2RegionID: "104374241257", names.EUWest1RegionID: "141502667606", @@ -667,7 +667,7 @@ var prebuiltECRImageIDByRegion_deepLearning = map[string]string{ names.CNNorthwest1RegionID: "727897471807", endpoints.EuCentral1RegionID: "763104351884", endpoints.EuCentral2RegionID: "380420809688", - names.EUNorth1RegionID: "763104351884", + endpoints.EuNorth1RegionID: "763104351884", names.EUWest1RegionID: "763104351884", names.EUWest2RegionID: "763104351884", names.EUWest3RegionID: "763104351884", @@ -703,7 +703,7 @@ var prebuiltECRImageIDByRegion_modelMonitor = map[string]string{ names.CNNorth1RegionID: "453000072557", names.CNNorthwest1RegionID: "453252182341", endpoints.EuCentral1RegionID: "048819808253", - names.EUNorth1RegionID: "895015795356", + endpoints.EuNorth1RegionID: "895015795356", names.EUSouth1RegionID: "933208885752", names.EUSouth2RegionID: "437450045455", names.EUWest1RegionID: "468650794304", diff --git a/names/names.go b/names/names.go index 33dc9de74b0..2b8e10e4caa 100644 --- a/names/names.go +++ b/names/names.go @@ -149,7 +149,6 @@ const ( // AWS Standard partition's regions. GlobalRegionID = "aws-global" // AWS Standard global region. - EUNorth1RegionID = "eu-north-1" // Europe (Stockholm). EUSouth1RegionID = "eu-south-1" // Europe (Milan). EUSouth2RegionID = "eu-south-2" // Europe (Spain). EUWest1RegionID = "eu-west-1" // Europe (Ireland). From 0c45f15a4660fad42c3e937a287ac5cc317e6386 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 15:26:01 -0500 Subject: [PATCH 283/304] 'names.EUSouth1RegionID' -> 'endpoints.EuSouth1RegionID'. --- .../cloudtrail/service_account_data_source.go | 2 +- .../hosted_zone_data_source.go | 2 +- .../service/elb/hosted_zone_id_data_source.go | 2 +- .../elb/service_account_data_source.go | 2 +- .../elbv2/hosted_zone_id_data_source.go | 4 +-- internal/service/lambda/function.go | 2 +- .../redshift/service_account_data_source.go | 2 +- internal/service/s3/hosted_zones.go | 2 +- .../prebuilt_ecr_image_data_source.go | 26 +++++++++---------- names/names.go | 1 - 10 files changed, 22 insertions(+), 23 deletions(-) diff --git a/internal/service/cloudtrail/service_account_data_source.go b/internal/service/cloudtrail/service_account_data_source.go index 42969c63a0f..d4df9e72ad7 100644 --- a/internal/service/cloudtrail/service_account_data_source.go +++ b/internal/service/cloudtrail/service_account_data_source.go @@ -37,7 +37,7 @@ var serviceAccountPerRegionMap = map[string]string{ endpoints.EuCentral1RegionID: "035351147821", endpoints.EuCentral2RegionID: "453052556044", endpoints.EuNorth1RegionID: "829690693026", - names.EUSouth1RegionID: "669305197877", + endpoints.EuSouth1RegionID: "669305197877", names.EUSouth2RegionID: "757211635381", names.EUWest1RegionID: "859597730677", names.EUWest2RegionID: "282025262664", diff --git a/internal/service/elasticbeanstalk/hosted_zone_data_source.go b/internal/service/elasticbeanstalk/hosted_zone_data_source.go index aa19aabb12b..7f1ae6e5c42 100644 --- a/internal/service/elasticbeanstalk/hosted_zone_data_source.go +++ b/internal/service/elasticbeanstalk/hosted_zone_data_source.go @@ -29,7 +29,7 @@ var hostedZoneIDs = map[string]string{ endpoints.CaCentral1RegionID: "ZJFCZL7SSZB5I", endpoints.EuCentral1RegionID: "Z1FRNW7UH4DEZJ", endpoints.EuNorth1RegionID: "Z23GO28BZ5AETM", - names.EUSouth1RegionID: "Z10VDYYOA2JFKM", + endpoints.EuSouth1RegionID: "Z10VDYYOA2JFKM", names.EUWest1RegionID: "Z2NYPWQ7DFZAZH", names.EUWest2RegionID: "Z1GKAAAUGATPF1", names.EUWest3RegionID: "Z5WN6GAYWG5OB", diff --git a/internal/service/elb/hosted_zone_id_data_source.go b/internal/service/elb/hosted_zone_id_data_source.go index 29d3b375409..176eb4f9998 100644 --- a/internal/service/elb/hosted_zone_id_data_source.go +++ b/internal/service/elb/hosted_zone_id_data_source.go @@ -35,7 +35,7 @@ var hostedZoneIDPerRegionMap = map[string]string{ endpoints.EuCentral1RegionID: "Z215JYRZR1TBD5", endpoints.EuCentral2RegionID: "Z06391101F2ZOEP8P5EB3", endpoints.EuNorth1RegionID: "Z23TAZ6LKFMNIO", - names.EUSouth1RegionID: "Z3ULH7SSC9OV64", + endpoints.EuSouth1RegionID: "Z3ULH7SSC9OV64", names.EUSouth2RegionID: "Z0956581394HF5D5LXGAP", names.EUWest1RegionID: "Z32O12XQLNTSW2", names.EUWest2RegionID: "ZHURV8PSTC4K8", diff --git a/internal/service/elb/service_account_data_source.go b/internal/service/elb/service_account_data_source.go index 5ace851ded6..8a645cad4eb 100644 --- a/internal/service/elb/service_account_data_source.go +++ b/internal/service/elb/service_account_data_source.go @@ -32,7 +32,7 @@ var accountIDPerRegionMap = map[string]string{ names.CNNorthwest1RegionID: "037604701340", endpoints.EuCentral1RegionID: "054676820928", endpoints.EuNorth1RegionID: "897822967062", - names.EUSouth1RegionID: "635631232127", + endpoints.EuSouth1RegionID: "635631232127", names.EUWest1RegionID: "156460612806", names.EUWest2RegionID: "652711504416", names.EUWest3RegionID: "009996457667", diff --git a/internal/service/elbv2/hosted_zone_id_data_source.go b/internal/service/elbv2/hosted_zone_id_data_source.go index c5ba4f618a2..e3110866b25 100644 --- a/internal/service/elbv2/hosted_zone_id_data_source.go +++ b/internal/service/elbv2/hosted_zone_id_data_source.go @@ -39,7 +39,7 @@ var hostedZoneIDPerRegionALBMap = map[string]string{ endpoints.EuCentral1RegionID: "Z215JYRZR1TBD5", endpoints.EuCentral2RegionID: "Z06391101F2ZOEP8P5EB3", endpoints.EuNorth1RegionID: "Z23TAZ6LKFMNIO", - names.EUSouth1RegionID: "Z3ULH7SSC9OV64", + endpoints.EuSouth1RegionID: "Z3ULH7SSC9OV64", names.EUSouth2RegionID: "Z0956581394HF5D5LXGAP", names.EUWest1RegionID: "Z32O12XQLNTSW2", names.EUWest2RegionID: "ZHURV8PSTC4K8", @@ -77,7 +77,7 @@ var hostedZoneIDPerRegionNLBMap = map[string]string{ endpoints.EuCentral1RegionID: "Z3F0SRJ5LGBH90", endpoints.EuCentral2RegionID: "Z02239872DOALSIDCX66S", endpoints.EuNorth1RegionID: "Z1UDT6IFJ4EJM", - names.EUSouth1RegionID: "Z23146JA1KNAFP", + endpoints.EuSouth1RegionID: "Z23146JA1KNAFP", names.EUSouth2RegionID: "Z1011216NVTVYADP1SSV", names.EUWest1RegionID: "Z2IFOLAFXWLO4F", names.EUWest2RegionID: "ZD4D7Y8KGAS4G", diff --git a/internal/service/lambda/function.go b/internal/service/lambda/function.go index 03f535bb908..2d66a27f0ae 100644 --- a/internal/service/lambda/function.go +++ b/internal/service/lambda/function.go @@ -1414,7 +1414,7 @@ func signerServiceIsAvailable(region string) bool { endpoints.EuCentral1RegionID: {}, names.EUWest1RegionID: {}, names.EUWest2RegionID: {}, - names.EUSouth1RegionID: {}, + endpoints.EuSouth1RegionID: {}, names.EUWest3RegionID: {}, endpoints.EuNorth1RegionID: {}, names.MESouth1RegionID: {}, diff --git a/internal/service/redshift/service_account_data_source.go b/internal/service/redshift/service_account_data_source.go index e0b58986f24..44ec5b3051d 100644 --- a/internal/service/redshift/service_account_data_source.go +++ b/internal/service/redshift/service_account_data_source.go @@ -33,7 +33,7 @@ var ServiceAccountPerRegionMap = map[string]string{ names.CNNorthwest1RegionID: "660998842044", endpoints.EuCentral1RegionID: "053454850223", endpoints.EuNorth1RegionID: "729911121831", - names.EUSouth1RegionID: "945612479654", + endpoints.EuSouth1RegionID: "945612479654", names.EUWest1RegionID: "210876761215", names.EUWest2RegionID: "307160386991", names.EUWest3RegionID: "915173422425", diff --git a/internal/service/s3/hosted_zones.go b/internal/service/s3/hosted_zones.go index b8de2f0dbcc..74105934c2b 100644 --- a/internal/service/s3/hosted_zones.go +++ b/internal/service/s3/hosted_zones.go @@ -31,7 +31,7 @@ var hostedZoneIDsMap = map[string]string{ endpoints.EuCentral1RegionID: "Z21DNDUVLTQW6Q", endpoints.EuCentral2RegionID: "Z030506016YDQGETNASS", endpoints.EuNorth1RegionID: "Z3BAZG2TWCNX0D", - names.EUSouth1RegionID: "Z30OZKI7KPW7MI", + endpoints.EuSouth1RegionID: "Z30OZKI7KPW7MI", names.EUSouth2RegionID: "Z0081959F7139GRJC19J", names.EUWest1RegionID: "Z1BKCTXD74EZPE", names.EUWest2RegionID: "Z3GKZC51ZF0DB4", diff --git a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go index 2701ca3e9d0..6b5ab7211c1 100644 --- a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go +++ b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go @@ -207,7 +207,7 @@ var prebuiltECRImageIDByRegion_blazing = map[string]string{ endpoints.EuCentral1RegionID: "813361260812", endpoints.EuCentral2RegionID: "680994064768", endpoints.EuNorth1RegionID: "669576153137", - names.EUSouth1RegionID: "257386234256", + endpoints.EuSouth1RegionID: "257386234256", names.EUSouth2RegionID: "104374241257", names.EUWest1RegionID: "685385470294", names.EUWest2RegionID: "644912444149", @@ -243,7 +243,7 @@ var prebuiltECRImageIDByRegion_clarify = map[string]string{ names.CNNorthwest1RegionID: "122578899357", endpoints.EuCentral1RegionID: "017069133835", endpoints.EuNorth1RegionID: "763603941244", - names.EUSouth1RegionID: "638885417683", + endpoints.EuSouth1RegionID: "638885417683", names.EUWest1RegionID: "131013547314", names.EUWest2RegionID: "440796970383", names.EUWest3RegionID: "341593696636", @@ -272,7 +272,7 @@ var prebuiltECRImageIDByRegion_dataWrangler = map[string]string{ names.CNNorthwest1RegionID: "249157047649", endpoints.EuCentral1RegionID: "024640144536", endpoints.EuNorth1RegionID: "054986407534", - names.EUSouth1RegionID: "488287956546", + endpoints.EuSouth1RegionID: "488287956546", names.EUWest1RegionID: "245179582081", names.EUWest2RegionID: "894491911112", names.EUWest3RegionID: "807237891255", @@ -301,7 +301,7 @@ var prebuiltECRImageIDByRegion_debugger = map[string]string{ names.CNNorthwest1RegionID: "658757709296", endpoints.EuCentral1RegionID: "482524230118", endpoints.EuNorth1RegionID: "314864569078", - names.EUSouth1RegionID: "563282790590", + endpoints.EuSouth1RegionID: "563282790590", names.EUWest1RegionID: "929884845733", names.EUWest2RegionID: "250201462417", names.EUWest3RegionID: "447278800020", @@ -336,7 +336,7 @@ var prebuiltECRImageIDByRegion_inferentiaNeo = map[string]string{ names.CNNorthwest1RegionID: "474822919863", endpoints.EuCentral1RegionID: "746233611703", endpoints.EuNorth1RegionID: "601324751636", - names.EUSouth1RegionID: "966458181534", + endpoints.EuSouth1RegionID: "966458181534", names.EUWest1RegionID: "802834080501", names.EUWest2RegionID: "205493899709", names.EUWest3RegionID: "254080097072", @@ -372,7 +372,7 @@ var prebuiltECRImageIDByRegion_SageMakerCustom = map[string]string{ // nosemgrep names.CNNorthwest1RegionID: "423003514399", endpoints.EuCentral1RegionID: "520713654638", endpoints.EuNorth1RegionID: "520713654638", - names.EUSouth1RegionID: "048378556238", + endpoints.EuSouth1RegionID: "048378556238", names.EUWest1RegionID: "520713654638", names.EUWest2RegionID: "520713654638", names.EUWest3RegionID: "520713654638", @@ -428,7 +428,7 @@ var prebuiltECRImageIDByRegion_spark = map[string]string{ endpoints.EuCentral1RegionID: "906073651304", endpoints.EuCentral2RegionID: "142351485170", endpoints.EuNorth1RegionID: "330188676905", - names.EUSouth1RegionID: "753923664805", + endpoints.EuSouth1RegionID: "753923664805", names.EUSouth2RegionID: "833944533722", names.EUWest1RegionID: "571004829621", names.EUWest2RegionID: "836651553127", @@ -462,7 +462,7 @@ var prebuiltECRImageIDByRegion_SageMakerBasePython = map[string]string{ // nosem names.CNNorthwest1RegionID: "390780980154", endpoints.EuCentral1RegionID: "936697816551", endpoints.EuNorth1RegionID: "243637512696", - names.EUSouth1RegionID: "592751261982", + endpoints.EuSouth1RegionID: "592751261982", names.EUSouth2RegionID: "127363102723", names.EUWest1RegionID: "470317259841", names.EUWest2RegionID: "712779665605", @@ -506,7 +506,7 @@ var prebuiltECRImageIDByRegion_deepAR = map[string]string{ endpoints.EuCentral1RegionID: "495149712605", endpoints.EuCentral2RegionID: "680994064768", endpoints.EuNorth1RegionID: "669576153137", - names.EUSouth1RegionID: "257386234256", + endpoints.EuSouth1RegionID: "257386234256", names.EUSouth2RegionID: "104374241257", names.EUWest1RegionID: "224300973850", names.EUWest2RegionID: "644912444149", @@ -551,7 +551,7 @@ var prebuiltECRImageIDByRegion_factorMachines = map[string]string{ endpoints.EuCentral1RegionID: "664544806723", endpoints.EuCentral2RegionID: "680994064768", endpoints.EuNorth1RegionID: "669576153137", - names.EUSouth1RegionID: "257386234256", + endpoints.EuSouth1RegionID: "257386234256", names.EUSouth2RegionID: "104374241257", names.EUWest1RegionID: "438346466558", names.EUWest2RegionID: "644912444149", @@ -616,7 +616,7 @@ var prebuiltECRImageIDByRegion_XGBoost = map[string]string{ endpoints.EuCentral1RegionID: "492215442770", endpoints.EuCentral2RegionID: "680994064768", endpoints.EuNorth1RegionID: "662702820516", - names.EUSouth1RegionID: "978288397137", + endpoints.EuSouth1RegionID: "978288397137", names.EUSouth2RegionID: "104374241257", names.EUWest1RegionID: "141502667606", names.EUWest2RegionID: "764974769150", @@ -671,7 +671,7 @@ var prebuiltECRImageIDByRegion_deepLearning = map[string]string{ names.EUWest1RegionID: "763104351884", names.EUWest2RegionID: "763104351884", names.EUWest3RegionID: "763104351884", - names.EUSouth1RegionID: "692866216735", + endpoints.EuSouth1RegionID: "692866216735", names.EUSouth2RegionID: "503227376785", names.ILCentral1RegionID: "780543022126", names.MECentral1RegionID: "914824155844", @@ -704,7 +704,7 @@ var prebuiltECRImageIDByRegion_modelMonitor = map[string]string{ names.CNNorthwest1RegionID: "453252182341", endpoints.EuCentral1RegionID: "048819808253", endpoints.EuNorth1RegionID: "895015795356", - names.EUSouth1RegionID: "933208885752", + endpoints.EuSouth1RegionID: "933208885752", names.EUSouth2RegionID: "437450045455", names.EUWest1RegionID: "468650794304", names.EUWest2RegionID: "749857270468", diff --git a/names/names.go b/names/names.go index 2b8e10e4caa..c8778fa9900 100644 --- a/names/names.go +++ b/names/names.go @@ -149,7 +149,6 @@ const ( // AWS Standard partition's regions. GlobalRegionID = "aws-global" // AWS Standard global region. - EUSouth1RegionID = "eu-south-1" // Europe (Milan). EUSouth2RegionID = "eu-south-2" // Europe (Spain). EUWest1RegionID = "eu-west-1" // Europe (Ireland). EUWest2RegionID = "eu-west-2" // Europe (London). From 79f6f88fcb3e705cc63ecd9bf0b1d040fb5a1bb7 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 15:26:50 -0500 Subject: [PATCH 284/304] 'names.EUSouth2RegionID' -> 'endpoints.EuSouth2RegionID'. --- .../service/acmpca/certificate_authority_test.go | 2 +- .../cloudtrail/service_account_data_source.go | 2 +- .../service/elb/hosted_zone_id_data_source.go | 2 +- .../service/elbv2/hosted_zone_id_data_source.go | 4 ++-- internal/service/s3/hosted_zones.go | 2 +- .../sagemaker/prebuilt_ecr_image_data_source.go | 16 ++++++++-------- names/names.go | 1 - 7 files changed, 14 insertions(+), 15 deletions(-) diff --git a/internal/service/acmpca/certificate_authority_test.go b/internal/service/acmpca/certificate_authority_test.go index 102651ac485..da06cf5b51d 100644 --- a/internal/service/acmpca/certificate_authority_test.go +++ b/internal/service/acmpca/certificate_authority_test.go @@ -184,7 +184,7 @@ func TestAccACMPCACertificateAuthority_keyStorageSecurityStandard(t *testing.T) PreCheck: func() { acctest.PreCheck(ctx, t) // See https://docs.aws.amazon.com/privateca/latest/userguide/data-protection.html#private-keys. - acctest.PreCheckRegion(t, endpoints.ApSouth2RegionID, endpoints.ApSoutheast3RegionID, endpoints.ApSoutheast4RegionID, endpoints.EuCentral2RegionID, names.EUSouth2RegionID, names.MECentral1RegionID) + acctest.PreCheckRegion(t, endpoints.ApSouth2RegionID, endpoints.ApSoutheast3RegionID, endpoints.ApSoutheast4RegionID, endpoints.EuCentral2RegionID, endpoints.EuSouth2RegionID, names.MECentral1RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.ACMPCAServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, diff --git a/internal/service/cloudtrail/service_account_data_source.go b/internal/service/cloudtrail/service_account_data_source.go index d4df9e72ad7..985d5b1ac4e 100644 --- a/internal/service/cloudtrail/service_account_data_source.go +++ b/internal/service/cloudtrail/service_account_data_source.go @@ -38,7 +38,7 @@ var serviceAccountPerRegionMap = map[string]string{ endpoints.EuCentral2RegionID: "453052556044", endpoints.EuNorth1RegionID: "829690693026", endpoints.EuSouth1RegionID: "669305197877", - names.EUSouth2RegionID: "757211635381", + endpoints.EuSouth2RegionID: "757211635381", names.EUWest1RegionID: "859597730677", names.EUWest2RegionID: "282025262664", names.EUWest3RegionID: "262312530599", diff --git a/internal/service/elb/hosted_zone_id_data_source.go b/internal/service/elb/hosted_zone_id_data_source.go index 176eb4f9998..1128c70a9f6 100644 --- a/internal/service/elb/hosted_zone_id_data_source.go +++ b/internal/service/elb/hosted_zone_id_data_source.go @@ -36,7 +36,7 @@ var hostedZoneIDPerRegionMap = map[string]string{ endpoints.EuCentral2RegionID: "Z06391101F2ZOEP8P5EB3", endpoints.EuNorth1RegionID: "Z23TAZ6LKFMNIO", endpoints.EuSouth1RegionID: "Z3ULH7SSC9OV64", - names.EUSouth2RegionID: "Z0956581394HF5D5LXGAP", + endpoints.EuSouth2RegionID: "Z0956581394HF5D5LXGAP", names.EUWest1RegionID: "Z32O12XQLNTSW2", names.EUWest2RegionID: "ZHURV8PSTC4K8", names.EUWest3RegionID: "Z3Q77PNBQS71R4", diff --git a/internal/service/elbv2/hosted_zone_id_data_source.go b/internal/service/elbv2/hosted_zone_id_data_source.go index e3110866b25..2af4c71edc1 100644 --- a/internal/service/elbv2/hosted_zone_id_data_source.go +++ b/internal/service/elbv2/hosted_zone_id_data_source.go @@ -40,7 +40,7 @@ var hostedZoneIDPerRegionALBMap = map[string]string{ endpoints.EuCentral2RegionID: "Z06391101F2ZOEP8P5EB3", endpoints.EuNorth1RegionID: "Z23TAZ6LKFMNIO", endpoints.EuSouth1RegionID: "Z3ULH7SSC9OV64", - names.EUSouth2RegionID: "Z0956581394HF5D5LXGAP", + endpoints.EuSouth2RegionID: "Z0956581394HF5D5LXGAP", names.EUWest1RegionID: "Z32O12XQLNTSW2", names.EUWest2RegionID: "ZHURV8PSTC4K8", names.EUWest3RegionID: "Z3Q77PNBQS71R4", @@ -78,7 +78,7 @@ var hostedZoneIDPerRegionNLBMap = map[string]string{ endpoints.EuCentral2RegionID: "Z02239872DOALSIDCX66S", endpoints.EuNorth1RegionID: "Z1UDT6IFJ4EJM", endpoints.EuSouth1RegionID: "Z23146JA1KNAFP", - names.EUSouth2RegionID: "Z1011216NVTVYADP1SSV", + endpoints.EuSouth2RegionID: "Z1011216NVTVYADP1SSV", names.EUWest1RegionID: "Z2IFOLAFXWLO4F", names.EUWest2RegionID: "ZD4D7Y8KGAS4G", names.EUWest3RegionID: "Z1CMS0P5QUZ6D5", diff --git a/internal/service/s3/hosted_zones.go b/internal/service/s3/hosted_zones.go index 74105934c2b..cb5ff32061d 100644 --- a/internal/service/s3/hosted_zones.go +++ b/internal/service/s3/hosted_zones.go @@ -32,7 +32,7 @@ var hostedZoneIDsMap = map[string]string{ endpoints.EuCentral2RegionID: "Z030506016YDQGETNASS", endpoints.EuNorth1RegionID: "Z3BAZG2TWCNX0D", endpoints.EuSouth1RegionID: "Z30OZKI7KPW7MI", - names.EUSouth2RegionID: "Z0081959F7139GRJC19J", + endpoints.EuSouth2RegionID: "Z0081959F7139GRJC19J", names.EUWest1RegionID: "Z1BKCTXD74EZPE", names.EUWest2RegionID: "Z3GKZC51ZF0DB4", names.EUWest3RegionID: "Z3R1K369G5AVDG", diff --git a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go index 6b5ab7211c1..4cb0840e18f 100644 --- a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go +++ b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go @@ -208,7 +208,7 @@ var prebuiltECRImageIDByRegion_blazing = map[string]string{ endpoints.EuCentral2RegionID: "680994064768", endpoints.EuNorth1RegionID: "669576153137", endpoints.EuSouth1RegionID: "257386234256", - names.EUSouth2RegionID: "104374241257", + endpoints.EuSouth2RegionID: "104374241257", names.EUWest1RegionID: "685385470294", names.EUWest2RegionID: "644912444149", names.EUWest3RegionID: "749696950732", @@ -429,7 +429,7 @@ var prebuiltECRImageIDByRegion_spark = map[string]string{ endpoints.EuCentral2RegionID: "142351485170", endpoints.EuNorth1RegionID: "330188676905", endpoints.EuSouth1RegionID: "753923664805", - names.EUSouth2RegionID: "833944533722", + endpoints.EuSouth2RegionID: "833944533722", names.EUWest1RegionID: "571004829621", names.EUWest2RegionID: "836651553127", names.EUWest3RegionID: "136845547031", @@ -463,7 +463,7 @@ var prebuiltECRImageIDByRegion_SageMakerBasePython = map[string]string{ // nosem endpoints.EuCentral1RegionID: "936697816551", endpoints.EuNorth1RegionID: "243637512696", endpoints.EuSouth1RegionID: "592751261982", - names.EUSouth2RegionID: "127363102723", + endpoints.EuSouth2RegionID: "127363102723", names.EUWest1RegionID: "470317259841", names.EUWest2RegionID: "712779665605", names.EUWest3RegionID: "615547856133", @@ -507,7 +507,7 @@ var prebuiltECRImageIDByRegion_deepAR = map[string]string{ endpoints.EuCentral2RegionID: "680994064768", endpoints.EuNorth1RegionID: "669576153137", endpoints.EuSouth1RegionID: "257386234256", - names.EUSouth2RegionID: "104374241257", + endpoints.EuSouth2RegionID: "104374241257", names.EUWest1RegionID: "224300973850", names.EUWest2RegionID: "644912444149", names.EUWest3RegionID: "749696950732", @@ -552,7 +552,7 @@ var prebuiltECRImageIDByRegion_factorMachines = map[string]string{ endpoints.EuCentral2RegionID: "680994064768", endpoints.EuNorth1RegionID: "669576153137", endpoints.EuSouth1RegionID: "257386234256", - names.EUSouth2RegionID: "104374241257", + endpoints.EuSouth2RegionID: "104374241257", names.EUWest1RegionID: "438346466558", names.EUWest2RegionID: "644912444149", names.EUWest3RegionID: "749696950732", @@ -617,7 +617,7 @@ var prebuiltECRImageIDByRegion_XGBoost = map[string]string{ endpoints.EuCentral2RegionID: "680994064768", endpoints.EuNorth1RegionID: "662702820516", endpoints.EuSouth1RegionID: "978288397137", - names.EUSouth2RegionID: "104374241257", + endpoints.EuSouth2RegionID: "104374241257", names.EUWest1RegionID: "141502667606", names.EUWest2RegionID: "764974769150", names.EUWest3RegionID: "659782779980", @@ -672,7 +672,7 @@ var prebuiltECRImageIDByRegion_deepLearning = map[string]string{ names.EUWest2RegionID: "763104351884", names.EUWest3RegionID: "763104351884", endpoints.EuSouth1RegionID: "692866216735", - names.EUSouth2RegionID: "503227376785", + endpoints.EuSouth2RegionID: "503227376785", names.ILCentral1RegionID: "780543022126", names.MECentral1RegionID: "914824155844", names.MESouth1RegionID: "217643126080", @@ -705,7 +705,7 @@ var prebuiltECRImageIDByRegion_modelMonitor = map[string]string{ endpoints.EuCentral1RegionID: "048819808253", endpoints.EuNorth1RegionID: "895015795356", endpoints.EuSouth1RegionID: "933208885752", - names.EUSouth2RegionID: "437450045455", + endpoints.EuSouth2RegionID: "437450045455", names.EUWest1RegionID: "468650794304", names.EUWest2RegionID: "749857270468", names.EUWest3RegionID: "680080141114", diff --git a/names/names.go b/names/names.go index c8778fa9900..85748e2a290 100644 --- a/names/names.go +++ b/names/names.go @@ -149,7 +149,6 @@ const ( // AWS Standard partition's regions. GlobalRegionID = "aws-global" // AWS Standard global region. - EUSouth2RegionID = "eu-south-2" // Europe (Spain). EUWest1RegionID = "eu-west-1" // Europe (Ireland). EUWest2RegionID = "eu-west-2" // Europe (London). EUWest3RegionID = "eu-west-3" // Europe (Paris). From a3fef34830c7c05715b5fef6cff7cc5b682ab8a5 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 15:28:07 -0500 Subject: [PATCH 285/304] 'names.EUWest1RegionID' -> 'endpoints.EuWest1RegionID'. --- .../app_authorization_connection_test.go | 4 +-- .../appfabric/app_authorization_test.go | 8 ++--- internal/service/appfabric/app_bundle_test.go | 6 ++-- .../appfabric/ingestion_destination_test.go | 10 +++---- internal/service/appfabric/ingestion_test.go | 6 ++-- .../apprunner/hosted_zone_id_data_source.go | 2 +- internal/service/chatbot/service_package.go | 2 +- .../cloudtrail/service_account_data_source.go | 2 +- .../service/dynamodb/global_table_test.go | 2 +- .../hosted_zone_data_source.go | 2 +- .../service/elb/hosted_zone_id_data_source.go | 2 +- .../elb/service_account_data_source.go | 2 +- .../elbv2/hosted_zone_id_data_source.go | 4 +-- internal/service/gamelift/gamelift_test.go | 2 +- internal/service/lambda/function.go | 2 +- .../redshift/service_account_data_source.go | 2 +- internal/service/route53/health_check_test.go | 2 +- internal/service/route53/record_test.go | 2 +- .../readiness_check_test.go | 9 +++--- .../resource_set_test.go | 17 ++++++----- internal/service/s3/hosted_zones.go | 2 +- .../prebuilt_ecr_image_data_source.go | 30 +++++++++---------- .../securityhub/finding_aggregator_test.go | 5 ++-- names/names.go | 1 - 24 files changed, 64 insertions(+), 62 deletions(-) diff --git a/internal/service/appfabric/app_authorization_connection_test.go b/internal/service/appfabric/app_authorization_connection_test.go index e15b43cd108..63fb64610a9 100644 --- a/internal/service/appfabric/app_authorization_connection_test.go +++ b/internal/service/appfabric/app_authorization_connection_test.go @@ -31,7 +31,7 @@ func testAccAppAuthorizationConnection_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, names.EUWest1RegionID) + acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), @@ -66,7 +66,7 @@ func testAccAppAuthorizationConnection_OAuth2(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, names.EUWest1RegionID) + acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), diff --git a/internal/service/appfabric/app_authorization_test.go b/internal/service/appfabric/app_authorization_test.go index 72777b9b6d7..896d6d77c41 100644 --- a/internal/service/appfabric/app_authorization_test.go +++ b/internal/service/appfabric/app_authorization_test.go @@ -29,7 +29,7 @@ func testAccAppAuthorization_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, names.EUWest1RegionID) + acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), @@ -69,7 +69,7 @@ func testAccAppAuthorization_disappears(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, names.EUWest1RegionID) + acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), @@ -105,7 +105,7 @@ func testAccAppAuthorization_apiKeyUpdate(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, names.EUWest1RegionID) + acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), @@ -165,7 +165,7 @@ func testAccAppAuthorization_oath2Update(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, names.EUWest1RegionID) + acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), diff --git a/internal/service/appfabric/app_bundle_test.go b/internal/service/appfabric/app_bundle_test.go index 8b78906be15..99cb0bc6293 100644 --- a/internal/service/appfabric/app_bundle_test.go +++ b/internal/service/appfabric/app_bundle_test.go @@ -28,7 +28,7 @@ func testAccAppBundle_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, names.EUWest1RegionID) + acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), @@ -60,7 +60,7 @@ func testAccAppBundle_disappears(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, names.EUWest1RegionID) + acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), @@ -88,7 +88,7 @@ func testAccAppBundle_cmk(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, names.EUWest1RegionID) + acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), diff --git a/internal/service/appfabric/ingestion_destination_test.go b/internal/service/appfabric/ingestion_destination_test.go index 6124e4a9afd..d4d931886eb 100644 --- a/internal/service/appfabric/ingestion_destination_test.go +++ b/internal/service/appfabric/ingestion_destination_test.go @@ -32,7 +32,7 @@ func testAccIngestionDestination_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, names.EUWest1RegionID) + acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), @@ -81,7 +81,7 @@ func testAccIngestionDestination_disappears(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, names.EUWest1RegionID) + acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), @@ -112,7 +112,7 @@ func testAccIngestionDestination_tags(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, names.EUWest1RegionID) + acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), @@ -165,7 +165,7 @@ func testAccIngestionDestination_update(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, names.EUWest1RegionID) + acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), @@ -219,7 +219,7 @@ func testAccIngestionDestination_firehose(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, names.EUWest1RegionID) + acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), diff --git a/internal/service/appfabric/ingestion_test.go b/internal/service/appfabric/ingestion_test.go index 4ba0c6afcff..bcfc5b17096 100644 --- a/internal/service/appfabric/ingestion_test.go +++ b/internal/service/appfabric/ingestion_test.go @@ -32,7 +32,7 @@ func testAccIngestion_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, names.EUWest1RegionID) + acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), @@ -70,7 +70,7 @@ func testAccIngestion_disappears(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, names.EUWest1RegionID) + acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), @@ -101,7 +101,7 @@ func testAccIngestion_tags(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, names.EUWest1RegionID) + acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), diff --git a/internal/service/apprunner/hosted_zone_id_data_source.go b/internal/service/apprunner/hosted_zone_id_data_source.go index b2542de4f7c..45c9135b899 100644 --- a/internal/service/apprunner/hosted_zone_id_data_source.go +++ b/internal/service/apprunner/hosted_zone_id_data_source.go @@ -26,7 +26,7 @@ var hostedZoneIDPerRegionMap = map[string]string{ endpoints.ApSoutheast2RegionID: "Z03657752RA8799S0TI5I", endpoints.ApNortheast1RegionID: "Z08491812XW6IPYLR6CCA", endpoints.EuCentral1RegionID: "Z0334911C2FDI2Q9M4FZ", - names.EUWest1RegionID: "Z087551914Z2PCAU0QHMW", + endpoints.EuWest1RegionID: "Z087551914Z2PCAU0QHMW", names.EUWest2RegionID: "Z098228427VC6B3IX76ON", names.EUWest3RegionID: "Z087117439MBKHYM69QS6", } diff --git a/internal/service/chatbot/service_package.go b/internal/service/chatbot/service_package.go index d9d722f2c20..60bc0bf1421 100644 --- a/internal/service/chatbot/service_package.go +++ b/internal/service/chatbot/service_package.go @@ -25,7 +25,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( if config["partition"].(string) == endpoints.AwsPartitionID { // Chatbot endpoint is available only in the 4 regions us-east-2, us-west-2, eu-west-1, and ap-southeast-1. // If the region from the context is one of those four, then use that region. If not default to us-west-2 - if slices.Contains([]string{names.USEast2RegionID, names.USWest2RegionID, names.EUWest1RegionID, endpoints.ApSoutheast1RegionID}, cfg.Region) { + if slices.Contains([]string{names.USEast2RegionID, names.USWest2RegionID, endpoints.EuWest1RegionID, endpoints.ApSoutheast1RegionID}, cfg.Region) { o.Region = cfg.Region } else { tflog.Info(ctx, "overriding region", map[string]any{ diff --git a/internal/service/cloudtrail/service_account_data_source.go b/internal/service/cloudtrail/service_account_data_source.go index 985d5b1ac4e..bf9b556cc01 100644 --- a/internal/service/cloudtrail/service_account_data_source.go +++ b/internal/service/cloudtrail/service_account_data_source.go @@ -39,7 +39,7 @@ var serviceAccountPerRegionMap = map[string]string{ endpoints.EuNorth1RegionID: "829690693026", endpoints.EuSouth1RegionID: "669305197877", endpoints.EuSouth2RegionID: "757211635381", - names.EUWest1RegionID: "859597730677", + endpoints.EuWest1RegionID: "859597730677", names.EUWest2RegionID: "282025262664", names.EUWest3RegionID: "262312530599", names.ILCentral1RegionID: "683224464357", diff --git a/internal/service/dynamodb/global_table_test.go b/internal/service/dynamodb/global_table_test.go index 10492947d90..9b000b101cd 100644 --- a/internal/service/dynamodb/global_table_test.go +++ b/internal/service/dynamodb/global_table_test.go @@ -162,7 +162,7 @@ func testAccPreCheckGlobalTable(ctx context.Context, t *testing.T) { endpoints.ApSoutheast1RegionID, endpoints.ApSoutheast2RegionID, endpoints.EuCentral1RegionID, - names.EUWest1RegionID, + endpoints.EuWest1RegionID, names.EUWest2RegionID, names.USEast1RegionID, names.USEast2RegionID, diff --git a/internal/service/elasticbeanstalk/hosted_zone_data_source.go b/internal/service/elasticbeanstalk/hosted_zone_data_source.go index 7f1ae6e5c42..b794a87c582 100644 --- a/internal/service/elasticbeanstalk/hosted_zone_data_source.go +++ b/internal/service/elasticbeanstalk/hosted_zone_data_source.go @@ -30,7 +30,7 @@ var hostedZoneIDs = map[string]string{ endpoints.EuCentral1RegionID: "Z1FRNW7UH4DEZJ", endpoints.EuNorth1RegionID: "Z23GO28BZ5AETM", endpoints.EuSouth1RegionID: "Z10VDYYOA2JFKM", - names.EUWest1RegionID: "Z2NYPWQ7DFZAZH", + endpoints.EuWest1RegionID: "Z2NYPWQ7DFZAZH", names.EUWest2RegionID: "Z1GKAAAUGATPF1", names.EUWest3RegionID: "Z5WN6GAYWG5OB", names.ILCentral1RegionID: "Z02941091PERNCB1MI5H7", diff --git a/internal/service/elb/hosted_zone_id_data_source.go b/internal/service/elb/hosted_zone_id_data_source.go index 1128c70a9f6..8942e49f77c 100644 --- a/internal/service/elb/hosted_zone_id_data_source.go +++ b/internal/service/elb/hosted_zone_id_data_source.go @@ -37,7 +37,7 @@ var hostedZoneIDPerRegionMap = map[string]string{ endpoints.EuNorth1RegionID: "Z23TAZ6LKFMNIO", endpoints.EuSouth1RegionID: "Z3ULH7SSC9OV64", endpoints.EuSouth2RegionID: "Z0956581394HF5D5LXGAP", - names.EUWest1RegionID: "Z32O12XQLNTSW2", + endpoints.EuWest1RegionID: "Z32O12XQLNTSW2", names.EUWest2RegionID: "ZHURV8PSTC4K8", names.EUWest3RegionID: "Z3Q77PNBQS71R4", names.ILCentral1RegionID: "Z09170902867EHPV2DABU", diff --git a/internal/service/elb/service_account_data_source.go b/internal/service/elb/service_account_data_source.go index 8a645cad4eb..16ff0bd1a13 100644 --- a/internal/service/elb/service_account_data_source.go +++ b/internal/service/elb/service_account_data_source.go @@ -33,7 +33,7 @@ var accountIDPerRegionMap = map[string]string{ endpoints.EuCentral1RegionID: "054676820928", endpoints.EuNorth1RegionID: "897822967062", endpoints.EuSouth1RegionID: "635631232127", - names.EUWest1RegionID: "156460612806", + endpoints.EuWest1RegionID: "156460612806", names.EUWest2RegionID: "652711504416", names.EUWest3RegionID: "009996457667", // names.MECentral1RegionID: "", diff --git a/internal/service/elbv2/hosted_zone_id_data_source.go b/internal/service/elbv2/hosted_zone_id_data_source.go index 2af4c71edc1..7a43bacdff6 100644 --- a/internal/service/elbv2/hosted_zone_id_data_source.go +++ b/internal/service/elbv2/hosted_zone_id_data_source.go @@ -41,7 +41,7 @@ var hostedZoneIDPerRegionALBMap = map[string]string{ endpoints.EuNorth1RegionID: "Z23TAZ6LKFMNIO", endpoints.EuSouth1RegionID: "Z3ULH7SSC9OV64", endpoints.EuSouth2RegionID: "Z0956581394HF5D5LXGAP", - names.EUWest1RegionID: "Z32O12XQLNTSW2", + endpoints.EuWest1RegionID: "Z32O12XQLNTSW2", names.EUWest2RegionID: "ZHURV8PSTC4K8", names.EUWest3RegionID: "Z3Q77PNBQS71R4", names.ILCentral1RegionID: "Z09170902867EHPV2DABU", @@ -79,7 +79,7 @@ var hostedZoneIDPerRegionNLBMap = map[string]string{ endpoints.EuNorth1RegionID: "Z1UDT6IFJ4EJM", endpoints.EuSouth1RegionID: "Z23146JA1KNAFP", endpoints.EuSouth2RegionID: "Z1011216NVTVYADP1SSV", - names.EUWest1RegionID: "Z2IFOLAFXWLO4F", + endpoints.EuWest1RegionID: "Z2IFOLAFXWLO4F", names.EUWest2RegionID: "ZD4D7Y8KGAS4G", names.EUWest3RegionID: "Z1CMS0P5QUZ6D5", names.ILCentral1RegionID: "Z0313266YDI6ZRHTGQY4", diff --git a/internal/service/gamelift/gamelift_test.go b/internal/service/gamelift/gamelift_test.go index 18e9d0a01bf..c1ce75c794f 100644 --- a/internal/service/gamelift/gamelift_test.go +++ b/internal/service/gamelift/gamelift_test.go @@ -58,7 +58,7 @@ func testAccAccountIdByRegion(region string) (string, error) { endpoints.ApSoutheast2RegionID: "112188327105", endpoints.CaCentral1RegionID: "800535022691", endpoints.EuCentral1RegionID: "797584052317", - names.EUWest1RegionID: "319803218673", + endpoints.EuWest1RegionID: "319803218673", names.EUWest2RegionID: "937342764187", names.SAEast1RegionID: "028872612690", names.USEast1RegionID: "783764748367", diff --git a/internal/service/lambda/function.go b/internal/service/lambda/function.go index 2d66a27f0ae..f2fecd10811 100644 --- a/internal/service/lambda/function.go +++ b/internal/service/lambda/function.go @@ -1412,7 +1412,7 @@ func signerServiceIsAvailable(region string) bool { endpoints.ApNortheast1RegionID: {}, endpoints.CaCentral1RegionID: {}, endpoints.EuCentral1RegionID: {}, - names.EUWest1RegionID: {}, + endpoints.EuWest1RegionID: {}, names.EUWest2RegionID: {}, endpoints.EuSouth1RegionID: {}, names.EUWest3RegionID: {}, diff --git a/internal/service/redshift/service_account_data_source.go b/internal/service/redshift/service_account_data_source.go index 44ec5b3051d..60148a5f4ac 100644 --- a/internal/service/redshift/service_account_data_source.go +++ b/internal/service/redshift/service_account_data_source.go @@ -34,7 +34,7 @@ var ServiceAccountPerRegionMap = map[string]string{ endpoints.EuCentral1RegionID: "053454850223", endpoints.EuNorth1RegionID: "729911121831", endpoints.EuSouth1RegionID: "945612479654", - names.EUWest1RegionID: "210876761215", + endpoints.EuWest1RegionID: "210876761215", names.EUWest2RegionID: "307160386991", names.EUWest3RegionID: "915173422425", // names.MECentral1RegionID: "", diff --git a/internal/service/route53/health_check_test.go b/internal/service/route53/health_check_test.go index fe686309f91..3fb68f4a71c 100644 --- a/internal/service/route53/health_check_test.go +++ b/internal/service/route53/health_check_test.go @@ -181,7 +181,7 @@ func TestAccRoute53HealthCheck_withHealthCheckRegions(t *testing.T) { CheckDestroy: testAccCheckHealthCheckDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccHealthCheckConfig_regions(names.USWest2RegionID, names.USEast1RegionID, names.EUWest1RegionID), + Config: testAccHealthCheckConfig_regions(names.USWest2RegionID, names.USEast1RegionID, endpoints.EuWest1RegionID), Check: resource.ComposeTestCheckFunc( testAccCheckHealthCheckExists(ctx, resourceName, &check), resource.TestCheckResourceAttr(resourceName, "regions.#", "3"), diff --git a/internal/service/route53/record_test.go b/internal/service/route53/record_test.go index 2024fda9aa0..0c33c7700ab 100644 --- a/internal/service/route53/record_test.go +++ b/internal/service/route53/record_test.go @@ -850,7 +850,7 @@ func TestAccRoute53Record_Latency_basic(t *testing.T) { CheckDestroy: testAccCheckRecordDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccRecordConfig_latencyCNAME(names.USEast1RegionID, names.EUWest1RegionID, endpoints.ApNortheast1RegionID), + Config: testAccRecordConfig_latencyCNAME(names.USEast1RegionID, endpoints.EuWest1RegionID, endpoints.ApNortheast1RegionID), Check: resource.ComposeTestCheckFunc( testAccCheckRecordExists(ctx, resourceName, &record1), testAccCheckRecordExists(ctx, "aws_route53_record.second_region", &record2), diff --git a/internal/service/route53recoveryreadiness/readiness_check_test.go b/internal/service/route53recoveryreadiness/readiness_check_test.go index 68e74309b8f..1938470d11d 100644 --- a/internal/service/route53recoveryreadiness/readiness_check_test.go +++ b/internal/service/route53recoveryreadiness/readiness_check_test.go @@ -10,6 +10,7 @@ import ( "github.com/YakDriver/regexache" "github.com/aws/aws-sdk-go-v2/aws/arn" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -28,7 +29,7 @@ func TestAccRoute53RecoveryReadinessReadinessCheck_basic(t *testing.T) { cwArn := arn.ARN{ AccountID: acctest.Ct12Digit, Partition: acctest.Partition(), - Region: names.EUWest1RegionID, + Region: endpoints.EuWest1RegionID, Resource: "alarm:zzzzzzzzz", Service: "cloudwatch", }.String() @@ -64,7 +65,7 @@ func TestAccRoute53RecoveryReadinessReadinessCheck_disappears(t *testing.T) { cwArn := arn.ARN{ AccountID: acctest.Ct12Digit, Partition: acctest.Partition(), - Region: names.EUWest1RegionID, + Region: endpoints.EuWest1RegionID, Resource: "alarm:zzzzzzzzz", Service: "cloudwatch", }.String() @@ -94,7 +95,7 @@ func TestAccRoute53RecoveryReadinessReadinessCheck_tags(t *testing.T) { cwArn := arn.ARN{ AccountID: acctest.Ct12Digit, Partition: acctest.Partition(), - Region: names.EUWest1RegionID, + Region: endpoints.EuWest1RegionID, Resource: "alarm:zzzzzzzzz", Service: "cloudwatch", }.String() @@ -147,7 +148,7 @@ func TestAccRoute53RecoveryReadinessReadinessCheck_timeout(t *testing.T) { cwArn := arn.ARN{ AccountID: acctest.Ct12Digit, Partition: acctest.Partition(), - Region: names.EUWest1RegionID, + Region: endpoints.EuWest1RegionID, Resource: "alarm:zzzzzzzzz", Service: "cloudwatch", }.String() diff --git a/internal/service/route53recoveryreadiness/resource_set_test.go b/internal/service/route53recoveryreadiness/resource_set_test.go index 718a4bc298b..2b3475f3f8f 100644 --- a/internal/service/route53recoveryreadiness/resource_set_test.go +++ b/internal/service/route53recoveryreadiness/resource_set_test.go @@ -11,6 +11,7 @@ import ( "github.com/YakDriver/regexache" "github.com/aws/aws-sdk-go-v2/aws/arn" "github.com/aws/aws-sdk-go-v2/service/route53recoveryreadiness" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -27,7 +28,7 @@ func TestAccRoute53RecoveryReadinessResourceSet_basic(t *testing.T) { cwArn := arn.ARN{ AccountID: acctest.Ct12Digit, Partition: acctest.Partition(), - Region: names.EUWest1RegionID, + Region: endpoints.EuWest1RegionID, Resource: "alarm:zzzzzzzzz", Service: "cloudwatch", }.String() @@ -63,7 +64,7 @@ func TestAccRoute53RecoveryReadinessResourceSet_disappears(t *testing.T) { cwArn := arn.ARN{ AccountID: acctest.Ct12Digit, Partition: acctest.Partition(), - Region: names.EUWest1RegionID, + Region: endpoints.EuWest1RegionID, Resource: "alarm:zzzzzzzzz", Service: "cloudwatch", }.String() @@ -94,7 +95,7 @@ func TestAccRoute53RecoveryReadinessResourceSet_tags(t *testing.T) { cwArn := arn.ARN{ AccountID: acctest.Ct12Digit, Partition: acctest.Partition(), - Region: names.EUWest1RegionID, + Region: endpoints.EuWest1RegionID, Resource: "alarm:zzzzzzzzz", Service: "cloudwatch", }.String() @@ -146,7 +147,7 @@ func TestAccRoute53RecoveryReadinessResourceSet_readinessScope(t *testing.T) { cwArn := arn.ARN{ AccountID: acctest.Ct12Digit, Partition: acctest.Partition(), - Region: names.EUWest1RegionID, + Region: endpoints.EuWest1RegionID, Resource: "alarm:zzzzzzzzz", Service: "cloudwatch", }.String() @@ -182,7 +183,7 @@ func TestAccRoute53RecoveryReadinessResourceSet_basicDNSTargetResource(t *testin hzArn := arn.ARN{ AccountID: acctest.Ct12Digit, Partition: acctest.Partition(), - Region: names.EUWest1RegionID, + Region: endpoints.EuWest1RegionID, Resource: "hostedzone/zzzzzzzzz", Service: "route53", }.String() @@ -225,7 +226,7 @@ func TestAccRoute53RecoveryReadinessResourceSet_dnsTargetResourceNLBTarget(t *te hzArn := arn.ARN{ AccountID: acctest.Ct12Digit, Partition: acctest.Partition(), - Region: names.EUWest1RegionID, + Region: endpoints.EuWest1RegionID, Resource: "hostedzone/zzzzzzzzz", Service: "route53", }.String() @@ -263,7 +264,7 @@ func TestAccRoute53RecoveryReadinessResourceSet_dnsTargetResourceR53Target(t *te hzArn := arn.ARN{ AccountID: acctest.Ct12Digit, Partition: acctest.Partition(), - Region: names.EUWest1RegionID, + Region: endpoints.EuWest1RegionID, Resource: "hostedzone/zzzzzzzzz", Service: "route53", }.String() @@ -303,7 +304,7 @@ func TestAccRoute53RecoveryReadinessResourceSet_timeout(t *testing.T) { cwArn := arn.ARN{ AccountID: acctest.Ct12Digit, Partition: acctest.Partition(), - Region: names.EUWest1RegionID, + Region: endpoints.EuWest1RegionID, Resource: "alarm:zzzzzzzzz", Service: "cloudwatch", }.String() diff --git a/internal/service/s3/hosted_zones.go b/internal/service/s3/hosted_zones.go index cb5ff32061d..6907c8d4e87 100644 --- a/internal/service/s3/hosted_zones.go +++ b/internal/service/s3/hosted_zones.go @@ -33,7 +33,7 @@ var hostedZoneIDsMap = map[string]string{ endpoints.EuNorth1RegionID: "Z3BAZG2TWCNX0D", endpoints.EuSouth1RegionID: "Z30OZKI7KPW7MI", endpoints.EuSouth2RegionID: "Z0081959F7139GRJC19J", - names.EUWest1RegionID: "Z1BKCTXD74EZPE", + endpoints.EuWest1RegionID: "Z1BKCTXD74EZPE", names.EUWest2RegionID: "Z3GKZC51ZF0DB4", names.EUWest3RegionID: "Z3R1K369G5AVDG", names.ILCentral1RegionID: "Z09640613K4A3MN55U7GU", diff --git a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go index 4cb0840e18f..69ac24305c3 100644 --- a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go +++ b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go @@ -209,7 +209,7 @@ var prebuiltECRImageIDByRegion_blazing = map[string]string{ endpoints.EuNorth1RegionID: "669576153137", endpoints.EuSouth1RegionID: "257386234256", endpoints.EuSouth2RegionID: "104374241257", - names.EUWest1RegionID: "685385470294", + endpoints.EuWest1RegionID: "685385470294", names.EUWest2RegionID: "644912444149", names.EUWest3RegionID: "749696950732", names.ILCentral1RegionID: "898809789911", @@ -244,7 +244,7 @@ var prebuiltECRImageIDByRegion_clarify = map[string]string{ endpoints.EuCentral1RegionID: "017069133835", endpoints.EuNorth1RegionID: "763603941244", endpoints.EuSouth1RegionID: "638885417683", - names.EUWest1RegionID: "131013547314", + endpoints.EuWest1RegionID: "131013547314", names.EUWest2RegionID: "440796970383", names.EUWest3RegionID: "341593696636", names.MESouth1RegionID: "835444307964", @@ -273,7 +273,7 @@ var prebuiltECRImageIDByRegion_dataWrangler = map[string]string{ endpoints.EuCentral1RegionID: "024640144536", endpoints.EuNorth1RegionID: "054986407534", endpoints.EuSouth1RegionID: "488287956546", - names.EUWest1RegionID: "245179582081", + endpoints.EuWest1RegionID: "245179582081", names.EUWest2RegionID: "894491911112", names.EUWest3RegionID: "807237891255", names.ILCentral1RegionID: "406833011540", @@ -302,7 +302,7 @@ var prebuiltECRImageIDByRegion_debugger = map[string]string{ endpoints.EuCentral1RegionID: "482524230118", endpoints.EuNorth1RegionID: "314864569078", endpoints.EuSouth1RegionID: "563282790590", - names.EUWest1RegionID: "929884845733", + endpoints.EuWest1RegionID: "929884845733", names.EUWest2RegionID: "250201462417", names.EUWest3RegionID: "447278800020", names.MESouth1RegionID: "986000313247", @@ -337,7 +337,7 @@ var prebuiltECRImageIDByRegion_inferentiaNeo = map[string]string{ endpoints.EuCentral1RegionID: "746233611703", endpoints.EuNorth1RegionID: "601324751636", endpoints.EuSouth1RegionID: "966458181534", - names.EUWest1RegionID: "802834080501", + endpoints.EuWest1RegionID: "802834080501", names.EUWest2RegionID: "205493899709", names.EUWest3RegionID: "254080097072", names.ILCentral1RegionID: "275950707576", @@ -373,7 +373,7 @@ var prebuiltECRImageIDByRegion_SageMakerCustom = map[string]string{ // nosemgrep endpoints.EuCentral1RegionID: "520713654638", endpoints.EuNorth1RegionID: "520713654638", endpoints.EuSouth1RegionID: "048378556238", - names.EUWest1RegionID: "520713654638", + endpoints.EuWest1RegionID: "520713654638", names.EUWest2RegionID: "520713654638", names.EUWest3RegionID: "520713654638", names.MESouth1RegionID: "724002660598", @@ -399,7 +399,7 @@ var prebuiltECRImageIDByRegion_SageMakerRL = map[string]string{ // nosemgrep:ci. endpoints.ApSoutheast2RegionID: "462105765813", endpoints.CaCentral1RegionID: "462105765813", endpoints.EuCentral1RegionID: "462105765813", - names.EUWest1RegionID: "462105765813", + endpoints.EuWest1RegionID: "462105765813", names.EUWest2RegionID: "462105765813", names.USEast1RegionID: "462105765813", names.USEast2RegionID: "462105765813", @@ -430,7 +430,7 @@ var prebuiltECRImageIDByRegion_spark = map[string]string{ endpoints.EuNorth1RegionID: "330188676905", endpoints.EuSouth1RegionID: "753923664805", endpoints.EuSouth2RegionID: "833944533722", - names.EUWest1RegionID: "571004829621", + endpoints.EuWest1RegionID: "571004829621", names.EUWest2RegionID: "836651553127", names.EUWest3RegionID: "136845547031", names.ILCentral1RegionID: "408426139102", @@ -464,7 +464,7 @@ var prebuiltECRImageIDByRegion_SageMakerBasePython = map[string]string{ // nosem endpoints.EuNorth1RegionID: "243637512696", endpoints.EuSouth1RegionID: "592751261982", endpoints.EuSouth2RegionID: "127363102723", - names.EUWest1RegionID: "470317259841", + endpoints.EuWest1RegionID: "470317259841", names.EUWest2RegionID: "712779665605", names.EUWest3RegionID: "615547856133", names.ILCentral1RegionID: "380164790875", @@ -508,7 +508,7 @@ var prebuiltECRImageIDByRegion_deepAR = map[string]string{ endpoints.EuNorth1RegionID: "669576153137", endpoints.EuSouth1RegionID: "257386234256", endpoints.EuSouth2RegionID: "104374241257", - names.EUWest1RegionID: "224300973850", + endpoints.EuWest1RegionID: "224300973850", names.EUWest2RegionID: "644912444149", names.EUWest3RegionID: "749696950732", names.ILCentral1RegionID: "898809789911", @@ -553,7 +553,7 @@ var prebuiltECRImageIDByRegion_factorMachines = map[string]string{ endpoints.EuNorth1RegionID: "669576153137", endpoints.EuSouth1RegionID: "257386234256", endpoints.EuSouth2RegionID: "104374241257", - names.EUWest1RegionID: "438346466558", + endpoints.EuWest1RegionID: "438346466558", names.EUWest2RegionID: "644912444149", names.EUWest3RegionID: "749696950732", names.ILCentral1RegionID: "898809789911", @@ -580,7 +580,7 @@ var prebuiltECRImageIDByRegion_lda = map[string]string{ endpoints.ApSoutheast2RegionID: "297031611018", endpoints.CaCentral1RegionID: "469771592824", endpoints.EuCentral1RegionID: "353608530281", - names.EUWest1RegionID: "999678624901", + endpoints.EuWest1RegionID: "999678624901", names.EUWest2RegionID: "644912444149", names.USEast1RegionID: "766337827248", names.USEast2RegionID: "999911452149", @@ -618,7 +618,7 @@ var prebuiltECRImageIDByRegion_XGBoost = map[string]string{ endpoints.EuNorth1RegionID: "662702820516", endpoints.EuSouth1RegionID: "978288397137", endpoints.EuSouth2RegionID: "104374241257", - names.EUWest1RegionID: "141502667606", + endpoints.EuWest1RegionID: "141502667606", names.EUWest2RegionID: "764974769150", names.EUWest3RegionID: "659782779980", names.ILCentral1RegionID: "898809789911", @@ -668,7 +668,7 @@ var prebuiltECRImageIDByRegion_deepLearning = map[string]string{ endpoints.EuCentral1RegionID: "763104351884", endpoints.EuCentral2RegionID: "380420809688", endpoints.EuNorth1RegionID: "763104351884", - names.EUWest1RegionID: "763104351884", + endpoints.EuWest1RegionID: "763104351884", names.EUWest2RegionID: "763104351884", names.EUWest3RegionID: "763104351884", endpoints.EuSouth1RegionID: "692866216735", @@ -706,7 +706,7 @@ var prebuiltECRImageIDByRegion_modelMonitor = map[string]string{ endpoints.EuNorth1RegionID: "895015795356", endpoints.EuSouth1RegionID: "933208885752", endpoints.EuSouth2RegionID: "437450045455", - names.EUWest1RegionID: "468650794304", + endpoints.EuWest1RegionID: "468650794304", names.EUWest2RegionID: "749857270468", names.EUWest3RegionID: "680080141114", names.ILCentral1RegionID: "843974653677", diff --git a/internal/service/securityhub/finding_aggregator_test.go b/internal/service/securityhub/finding_aggregator_test.go index 472989af87c..05f35b0d9d2 100644 --- a/internal/service/securityhub/finding_aggregator_test.go +++ b/internal/service/securityhub/finding_aggregator_test.go @@ -8,6 +8,7 @@ import ( "fmt" "testing" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-aws/internal/acctest" @@ -145,7 +146,7 @@ resource "aws_securityhub_finding_aggregator" "test_aggregator" { depends_on = [aws_securityhub_account.example] } -`, names.EUWest1RegionID, names.EUWest2RegionID, names.USEast1RegionID) +`, endpoints.EuWest1RegionID, names.EUWest2RegionID, names.USEast1RegionID) } func testAccFindingAggregatorConfig_allRegionsExceptSpecified() string { @@ -158,5 +159,5 @@ resource "aws_securityhub_finding_aggregator" "test_aggregator" { depends_on = [aws_securityhub_account.example] } -`, names.EUWest1RegionID, names.EUWest2RegionID) +`, endpoints.EuWest1RegionID, names.EUWest2RegionID) } diff --git a/names/names.go b/names/names.go index 85748e2a290..11d1886d7d7 100644 --- a/names/names.go +++ b/names/names.go @@ -149,7 +149,6 @@ const ( // AWS Standard partition's regions. GlobalRegionID = "aws-global" // AWS Standard global region. - EUWest1RegionID = "eu-west-1" // Europe (Ireland). EUWest2RegionID = "eu-west-2" // Europe (London). EUWest3RegionID = "eu-west-3" // Europe (Paris). ILCentral1RegionID = "il-central-1" // Israel (Tel Aviv). From 06df6bd5149a127126c777b81b0a79ed56514087 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 15:29:31 -0500 Subject: [PATCH 286/304] 'names.EUWest2RegionID' -> 'endpoints.EuWest2RegionID'. --- .../apprunner/hosted_zone_id_data_source.go | 2 +- .../cloudtrail/service_account_data_source.go | 2 +- .../service/dynamodb/global_table_test.go | 2 +- .../hosted_zone_data_source.go | 2 +- .../service/elb/hosted_zone_id_data_source.go | 2 +- .../elb/service_account_data_source.go | 2 +- .../elbv2/hosted_zone_id_data_source.go | 4 +-- internal/service/gamelift/gamelift_test.go | 2 +- internal/service/lambda/function.go | 2 +- .../redshift/service_account_data_source.go | 2 +- internal/service/s3/hosted_zones.go | 2 +- internal/service/sagemaker/app_test.go | 3 +- .../prebuilt_ecr_image_data_source.go | 30 +++++++++---------- .../securityhub/finding_aggregator_test.go | 4 +-- names/names.go | 1 - 15 files changed, 31 insertions(+), 31 deletions(-) diff --git a/internal/service/apprunner/hosted_zone_id_data_source.go b/internal/service/apprunner/hosted_zone_id_data_source.go index 45c9135b899..8ab143730a5 100644 --- a/internal/service/apprunner/hosted_zone_id_data_source.go +++ b/internal/service/apprunner/hosted_zone_id_data_source.go @@ -27,7 +27,7 @@ var hostedZoneIDPerRegionMap = map[string]string{ endpoints.ApNortheast1RegionID: "Z08491812XW6IPYLR6CCA", endpoints.EuCentral1RegionID: "Z0334911C2FDI2Q9M4FZ", endpoints.EuWest1RegionID: "Z087551914Z2PCAU0QHMW", - names.EUWest2RegionID: "Z098228427VC6B3IX76ON", + endpoints.EuWest2RegionID: "Z098228427VC6B3IX76ON", names.EUWest3RegionID: "Z087117439MBKHYM69QS6", } diff --git a/internal/service/cloudtrail/service_account_data_source.go b/internal/service/cloudtrail/service_account_data_source.go index bf9b556cc01..7972d8263de 100644 --- a/internal/service/cloudtrail/service_account_data_source.go +++ b/internal/service/cloudtrail/service_account_data_source.go @@ -40,7 +40,7 @@ var serviceAccountPerRegionMap = map[string]string{ endpoints.EuSouth1RegionID: "669305197877", endpoints.EuSouth2RegionID: "757211635381", endpoints.EuWest1RegionID: "859597730677", - names.EUWest2RegionID: "282025262664", + endpoints.EuWest2RegionID: "282025262664", names.EUWest3RegionID: "262312530599", names.ILCentral1RegionID: "683224464357", names.MECentral1RegionID: "585772288577", diff --git a/internal/service/dynamodb/global_table_test.go b/internal/service/dynamodb/global_table_test.go index 9b000b101cd..6a6cd35069b 100644 --- a/internal/service/dynamodb/global_table_test.go +++ b/internal/service/dynamodb/global_table_test.go @@ -163,7 +163,7 @@ func testAccPreCheckGlobalTable(ctx context.Context, t *testing.T) { endpoints.ApSoutheast2RegionID, endpoints.EuCentral1RegionID, endpoints.EuWest1RegionID, - names.EUWest2RegionID, + endpoints.EuWest2RegionID, names.USEast1RegionID, names.USEast2RegionID, names.USWest1RegionID, diff --git a/internal/service/elasticbeanstalk/hosted_zone_data_source.go b/internal/service/elasticbeanstalk/hosted_zone_data_source.go index b794a87c582..9a2a99f8b77 100644 --- a/internal/service/elasticbeanstalk/hosted_zone_data_source.go +++ b/internal/service/elasticbeanstalk/hosted_zone_data_source.go @@ -31,7 +31,7 @@ var hostedZoneIDs = map[string]string{ endpoints.EuNorth1RegionID: "Z23GO28BZ5AETM", endpoints.EuSouth1RegionID: "Z10VDYYOA2JFKM", endpoints.EuWest1RegionID: "Z2NYPWQ7DFZAZH", - names.EUWest2RegionID: "Z1GKAAAUGATPF1", + endpoints.EuWest2RegionID: "Z1GKAAAUGATPF1", names.EUWest3RegionID: "Z5WN6GAYWG5OB", names.ILCentral1RegionID: "Z02941091PERNCB1MI5H7", // names.MECentral1RegionID: "", diff --git a/internal/service/elb/hosted_zone_id_data_source.go b/internal/service/elb/hosted_zone_id_data_source.go index 8942e49f77c..92785cece00 100644 --- a/internal/service/elb/hosted_zone_id_data_source.go +++ b/internal/service/elb/hosted_zone_id_data_source.go @@ -38,7 +38,7 @@ var hostedZoneIDPerRegionMap = map[string]string{ endpoints.EuSouth1RegionID: "Z3ULH7SSC9OV64", endpoints.EuSouth2RegionID: "Z0956581394HF5D5LXGAP", endpoints.EuWest1RegionID: "Z32O12XQLNTSW2", - names.EUWest2RegionID: "ZHURV8PSTC4K8", + endpoints.EuWest2RegionID: "ZHURV8PSTC4K8", names.EUWest3RegionID: "Z3Q77PNBQS71R4", names.ILCentral1RegionID: "Z09170902867EHPV2DABU", names.MECentral1RegionID: "Z08230872XQRWHG2XF6I", diff --git a/internal/service/elb/service_account_data_source.go b/internal/service/elb/service_account_data_source.go index 16ff0bd1a13..1aad8ea2cf3 100644 --- a/internal/service/elb/service_account_data_source.go +++ b/internal/service/elb/service_account_data_source.go @@ -34,7 +34,7 @@ var accountIDPerRegionMap = map[string]string{ endpoints.EuNorth1RegionID: "897822967062", endpoints.EuSouth1RegionID: "635631232127", endpoints.EuWest1RegionID: "156460612806", - names.EUWest2RegionID: "652711504416", + endpoints.EuWest2RegionID: "652711504416", names.EUWest3RegionID: "009996457667", // names.MECentral1RegionID: "", names.MESouth1RegionID: "076674570225", diff --git a/internal/service/elbv2/hosted_zone_id_data_source.go b/internal/service/elbv2/hosted_zone_id_data_source.go index 7a43bacdff6..ed872134d43 100644 --- a/internal/service/elbv2/hosted_zone_id_data_source.go +++ b/internal/service/elbv2/hosted_zone_id_data_source.go @@ -42,7 +42,7 @@ var hostedZoneIDPerRegionALBMap = map[string]string{ endpoints.EuSouth1RegionID: "Z3ULH7SSC9OV64", endpoints.EuSouth2RegionID: "Z0956581394HF5D5LXGAP", endpoints.EuWest1RegionID: "Z32O12XQLNTSW2", - names.EUWest2RegionID: "ZHURV8PSTC4K8", + endpoints.EuWest2RegionID: "ZHURV8PSTC4K8", names.EUWest3RegionID: "Z3Q77PNBQS71R4", names.ILCentral1RegionID: "Z09170902867EHPV2DABU", names.MECentral1RegionID: "Z08230872XQRWHG2XF6I", @@ -80,7 +80,7 @@ var hostedZoneIDPerRegionNLBMap = map[string]string{ endpoints.EuSouth1RegionID: "Z23146JA1KNAFP", endpoints.EuSouth2RegionID: "Z1011216NVTVYADP1SSV", endpoints.EuWest1RegionID: "Z2IFOLAFXWLO4F", - names.EUWest2RegionID: "ZD4D7Y8KGAS4G", + endpoints.EuWest2RegionID: "ZD4D7Y8KGAS4G", names.EUWest3RegionID: "Z1CMS0P5QUZ6D5", names.ILCentral1RegionID: "Z0313266YDI6ZRHTGQY4", names.MECentral1RegionID: "Z00282643NTTLPANJJG2P", diff --git a/internal/service/gamelift/gamelift_test.go b/internal/service/gamelift/gamelift_test.go index c1ce75c794f..ec3ddbbde58 100644 --- a/internal/service/gamelift/gamelift_test.go +++ b/internal/service/gamelift/gamelift_test.go @@ -59,7 +59,7 @@ func testAccAccountIdByRegion(region string) (string, error) { endpoints.CaCentral1RegionID: "800535022691", endpoints.EuCentral1RegionID: "797584052317", endpoints.EuWest1RegionID: "319803218673", - names.EUWest2RegionID: "937342764187", + endpoints.EuWest2RegionID: "937342764187", names.SAEast1RegionID: "028872612690", names.USEast1RegionID: "783764748367", names.USEast2RegionID: "415729564621", diff --git a/internal/service/lambda/function.go b/internal/service/lambda/function.go index f2fecd10811..2cc179756a1 100644 --- a/internal/service/lambda/function.go +++ b/internal/service/lambda/function.go @@ -1413,7 +1413,7 @@ func signerServiceIsAvailable(region string) bool { endpoints.CaCentral1RegionID: {}, endpoints.EuCentral1RegionID: {}, endpoints.EuWest1RegionID: {}, - names.EUWest2RegionID: {}, + endpoints.EuWest2RegionID: {}, endpoints.EuSouth1RegionID: {}, names.EUWest3RegionID: {}, endpoints.EuNorth1RegionID: {}, diff --git a/internal/service/redshift/service_account_data_source.go b/internal/service/redshift/service_account_data_source.go index 60148a5f4ac..3f26526320d 100644 --- a/internal/service/redshift/service_account_data_source.go +++ b/internal/service/redshift/service_account_data_source.go @@ -35,7 +35,7 @@ var ServiceAccountPerRegionMap = map[string]string{ endpoints.EuNorth1RegionID: "729911121831", endpoints.EuSouth1RegionID: "945612479654", endpoints.EuWest1RegionID: "210876761215", - names.EUWest2RegionID: "307160386991", + endpoints.EuWest2RegionID: "307160386991", names.EUWest3RegionID: "915173422425", // names.MECentral1RegionID: "", names.MESouth1RegionID: "013126148197", diff --git a/internal/service/s3/hosted_zones.go b/internal/service/s3/hosted_zones.go index 6907c8d4e87..a273ce349bb 100644 --- a/internal/service/s3/hosted_zones.go +++ b/internal/service/s3/hosted_zones.go @@ -34,7 +34,7 @@ var hostedZoneIDsMap = map[string]string{ endpoints.EuSouth1RegionID: "Z30OZKI7KPW7MI", endpoints.EuSouth2RegionID: "Z0081959F7139GRJC19J", endpoints.EuWest1RegionID: "Z1BKCTXD74EZPE", - names.EUWest2RegionID: "Z3GKZC51ZF0DB4", + endpoints.EuWest2RegionID: "Z3GKZC51ZF0DB4", names.EUWest3RegionID: "Z3R1K369G5AVDG", names.ILCentral1RegionID: "Z09640613K4A3MN55U7GU", names.MECentral1RegionID: "Z06143092I8HRXZRUZROF", diff --git a/internal/service/sagemaker/app_test.go b/internal/service/sagemaker/app_test.go index 123a1355735..f5a21a32dc3 100644 --- a/internal/service/sagemaker/app_test.go +++ b/internal/service/sagemaker/app_test.go @@ -12,6 +12,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/arn" "github.com/aws/aws-sdk-go-v2/service/sagemaker" awstypes "github.com/aws/aws-sdk-go-v2/service/sagemaker/types" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -40,7 +41,7 @@ func testAccDecodeAppID(t *testing.T) { arn := arn.ARN{ AccountID: "012345678912", Partition: acctest.Partition(), - Region: names.EUWest2RegionID, + Region: endpoints.EuWest2RegionID, Resource: "app/domain-id/user-profile-name/%s/app-name", Service: names.SageMaker, }.String() diff --git a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go index 69ac24305c3..6d459419e5f 100644 --- a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go +++ b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go @@ -210,7 +210,7 @@ var prebuiltECRImageIDByRegion_blazing = map[string]string{ endpoints.EuSouth1RegionID: "257386234256", endpoints.EuSouth2RegionID: "104374241257", endpoints.EuWest1RegionID: "685385470294", - names.EUWest2RegionID: "644912444149", + endpoints.EuWest2RegionID: "644912444149", names.EUWest3RegionID: "749696950732", names.ILCentral1RegionID: "898809789911", names.MECentral1RegionID: "272398656194", @@ -245,7 +245,7 @@ var prebuiltECRImageIDByRegion_clarify = map[string]string{ endpoints.EuNorth1RegionID: "763603941244", endpoints.EuSouth1RegionID: "638885417683", endpoints.EuWest1RegionID: "131013547314", - names.EUWest2RegionID: "440796970383", + endpoints.EuWest2RegionID: "440796970383", names.EUWest3RegionID: "341593696636", names.MESouth1RegionID: "835444307964", names.SAEast1RegionID: "520018980103", @@ -274,7 +274,7 @@ var prebuiltECRImageIDByRegion_dataWrangler = map[string]string{ endpoints.EuNorth1RegionID: "054986407534", endpoints.EuSouth1RegionID: "488287956546", endpoints.EuWest1RegionID: "245179582081", - names.EUWest2RegionID: "894491911112", + endpoints.EuWest2RegionID: "894491911112", names.EUWest3RegionID: "807237891255", names.ILCentral1RegionID: "406833011540", names.MESouth1RegionID: "376037874950", @@ -303,7 +303,7 @@ var prebuiltECRImageIDByRegion_debugger = map[string]string{ endpoints.EuNorth1RegionID: "314864569078", endpoints.EuSouth1RegionID: "563282790590", endpoints.EuWest1RegionID: "929884845733", - names.EUWest2RegionID: "250201462417", + endpoints.EuWest2RegionID: "250201462417", names.EUWest3RegionID: "447278800020", names.MESouth1RegionID: "986000313247", names.SAEast1RegionID: "818342061345", @@ -338,7 +338,7 @@ var prebuiltECRImageIDByRegion_inferentiaNeo = map[string]string{ endpoints.EuNorth1RegionID: "601324751636", endpoints.EuSouth1RegionID: "966458181534", endpoints.EuWest1RegionID: "802834080501", - names.EUWest2RegionID: "205493899709", + endpoints.EuWest2RegionID: "205493899709", names.EUWest3RegionID: "254080097072", names.ILCentral1RegionID: "275950707576", names.MESouth1RegionID: "836785723513", @@ -374,7 +374,7 @@ var prebuiltECRImageIDByRegion_SageMakerCustom = map[string]string{ // nosemgrep endpoints.EuNorth1RegionID: "520713654638", endpoints.EuSouth1RegionID: "048378556238", endpoints.EuWest1RegionID: "520713654638", - names.EUWest2RegionID: "520713654638", + endpoints.EuWest2RegionID: "520713654638", names.EUWest3RegionID: "520713654638", names.MESouth1RegionID: "724002660598", names.SAEast1RegionID: "520713654638", @@ -400,7 +400,7 @@ var prebuiltECRImageIDByRegion_SageMakerRL = map[string]string{ // nosemgrep:ci. endpoints.CaCentral1RegionID: "462105765813", endpoints.EuCentral1RegionID: "462105765813", endpoints.EuWest1RegionID: "462105765813", - names.EUWest2RegionID: "462105765813", + endpoints.EuWest2RegionID: "462105765813", names.USEast1RegionID: "462105765813", names.USEast2RegionID: "462105765813", names.USWest1RegionID: "462105765813", @@ -431,7 +431,7 @@ var prebuiltECRImageIDByRegion_spark = map[string]string{ endpoints.EuSouth1RegionID: "753923664805", endpoints.EuSouth2RegionID: "833944533722", endpoints.EuWest1RegionID: "571004829621", - names.EUWest2RegionID: "836651553127", + endpoints.EuWest2RegionID: "836651553127", names.EUWest3RegionID: "136845547031", names.ILCentral1RegionID: "408426139102", names.MECentral1RegionID: "395420993607", @@ -465,7 +465,7 @@ var prebuiltECRImageIDByRegion_SageMakerBasePython = map[string]string{ // nosem endpoints.EuSouth1RegionID: "592751261982", endpoints.EuSouth2RegionID: "127363102723", endpoints.EuWest1RegionID: "470317259841", - names.EUWest2RegionID: "712779665605", + endpoints.EuWest2RegionID: "712779665605", names.EUWest3RegionID: "615547856133", names.ILCentral1RegionID: "380164790875", names.MECentral1RegionID: "103105715889", @@ -509,7 +509,7 @@ var prebuiltECRImageIDByRegion_deepAR = map[string]string{ endpoints.EuSouth1RegionID: "257386234256", endpoints.EuSouth2RegionID: "104374241257", endpoints.EuWest1RegionID: "224300973850", - names.EUWest2RegionID: "644912444149", + endpoints.EuWest2RegionID: "644912444149", names.EUWest3RegionID: "749696950732", names.ILCentral1RegionID: "898809789911", names.MECentral1RegionID: "272398656194", @@ -554,7 +554,7 @@ var prebuiltECRImageIDByRegion_factorMachines = map[string]string{ endpoints.EuSouth1RegionID: "257386234256", endpoints.EuSouth2RegionID: "104374241257", endpoints.EuWest1RegionID: "438346466558", - names.EUWest2RegionID: "644912444149", + endpoints.EuWest2RegionID: "644912444149", names.EUWest3RegionID: "749696950732", names.ILCentral1RegionID: "898809789911", names.MECentral1RegionID: "272398656194", @@ -581,7 +581,7 @@ var prebuiltECRImageIDByRegion_lda = map[string]string{ endpoints.CaCentral1RegionID: "469771592824", endpoints.EuCentral1RegionID: "353608530281", endpoints.EuWest1RegionID: "999678624901", - names.EUWest2RegionID: "644912444149", + endpoints.EuWest2RegionID: "644912444149", names.USEast1RegionID: "766337827248", names.USEast2RegionID: "999911452149", names.USGovWest1RegionID: "226302683700", @@ -619,7 +619,7 @@ var prebuiltECRImageIDByRegion_XGBoost = map[string]string{ endpoints.EuSouth1RegionID: "978288397137", endpoints.EuSouth2RegionID: "104374241257", endpoints.EuWest1RegionID: "141502667606", - names.EUWest2RegionID: "764974769150", + endpoints.EuWest2RegionID: "764974769150", names.EUWest3RegionID: "659782779980", names.ILCentral1RegionID: "898809789911", names.MECentral1RegionID: "272398656194", @@ -669,7 +669,7 @@ var prebuiltECRImageIDByRegion_deepLearning = map[string]string{ endpoints.EuCentral2RegionID: "380420809688", endpoints.EuNorth1RegionID: "763104351884", endpoints.EuWest1RegionID: "763104351884", - names.EUWest2RegionID: "763104351884", + endpoints.EuWest2RegionID: "763104351884", names.EUWest3RegionID: "763104351884", endpoints.EuSouth1RegionID: "692866216735", endpoints.EuSouth2RegionID: "503227376785", @@ -707,7 +707,7 @@ var prebuiltECRImageIDByRegion_modelMonitor = map[string]string{ endpoints.EuSouth1RegionID: "933208885752", endpoints.EuSouth2RegionID: "437450045455", endpoints.EuWest1RegionID: "468650794304", - names.EUWest2RegionID: "749857270468", + endpoints.EuWest2RegionID: "749857270468", names.EUWest3RegionID: "680080141114", names.ILCentral1RegionID: "843974653677", names.MECentral1RegionID: "588750061953", diff --git a/internal/service/securityhub/finding_aggregator_test.go b/internal/service/securityhub/finding_aggregator_test.go index 05f35b0d9d2..fcc036e5c72 100644 --- a/internal/service/securityhub/finding_aggregator_test.go +++ b/internal/service/securityhub/finding_aggregator_test.go @@ -146,7 +146,7 @@ resource "aws_securityhub_finding_aggregator" "test_aggregator" { depends_on = [aws_securityhub_account.example] } -`, endpoints.EuWest1RegionID, names.EUWest2RegionID, names.USEast1RegionID) +`, endpoints.EuWest1RegionID, endpoints.EuWest2RegionID, names.USEast1RegionID) } func testAccFindingAggregatorConfig_allRegionsExceptSpecified() string { @@ -159,5 +159,5 @@ resource "aws_securityhub_finding_aggregator" "test_aggregator" { depends_on = [aws_securityhub_account.example] } -`, endpoints.EuWest1RegionID, names.EUWest2RegionID) +`, endpoints.EuWest1RegionID, endpoints.EuWest2RegionID) } diff --git a/names/names.go b/names/names.go index 11d1886d7d7..dd173220202 100644 --- a/names/names.go +++ b/names/names.go @@ -149,7 +149,6 @@ const ( // AWS Standard partition's regions. GlobalRegionID = "aws-global" // AWS Standard global region. - EUWest2RegionID = "eu-west-2" // Europe (London). EUWest3RegionID = "eu-west-3" // Europe (Paris). ILCentral1RegionID = "il-central-1" // Israel (Tel Aviv). MECentral1RegionID = "me-central-1" // Middle East (UAE). From 580fd02e2da440a5caffb95e90ba28ee173b8696 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 15:30:19 -0500 Subject: [PATCH 287/304] 'names.EUWest3RegionID' -> 'endpoints.EuWest3RegionID'. --- .../apprunner/hosted_zone_id_data_source.go | 2 +- .../cloudtrail/service_account_data_source.go | 2 +- .../hosted_zone_data_source.go | 2 +- .../service/elb/hosted_zone_id_data_source.go | 2 +- .../elb/service_account_data_source.go | 2 +- .../elbv2/hosted_zone_id_data_source.go | 4 +-- internal/service/lambda/function.go | 2 +- .../redshift/service_account_data_source.go | 2 +- internal/service/s3/hosted_zones.go | 2 +- .../prebuilt_ecr_image_data_source.go | 26 +++++++++---------- names/names.go | 1 - 11 files changed, 23 insertions(+), 24 deletions(-) diff --git a/internal/service/apprunner/hosted_zone_id_data_source.go b/internal/service/apprunner/hosted_zone_id_data_source.go index 8ab143730a5..15f0349af6b 100644 --- a/internal/service/apprunner/hosted_zone_id_data_source.go +++ b/internal/service/apprunner/hosted_zone_id_data_source.go @@ -28,7 +28,7 @@ var hostedZoneIDPerRegionMap = map[string]string{ endpoints.EuCentral1RegionID: "Z0334911C2FDI2Q9M4FZ", endpoints.EuWest1RegionID: "Z087551914Z2PCAU0QHMW", endpoints.EuWest2RegionID: "Z098228427VC6B3IX76ON", - names.EUWest3RegionID: "Z087117439MBKHYM69QS6", + endpoints.EuWest3RegionID: "Z087117439MBKHYM69QS6", } // @FrameworkDataSource("aws_apprunner_hosted_zone_id", name="Hosted Zone ID") diff --git a/internal/service/cloudtrail/service_account_data_source.go b/internal/service/cloudtrail/service_account_data_source.go index 7972d8263de..78a75a87879 100644 --- a/internal/service/cloudtrail/service_account_data_source.go +++ b/internal/service/cloudtrail/service_account_data_source.go @@ -41,7 +41,7 @@ var serviceAccountPerRegionMap = map[string]string{ endpoints.EuSouth2RegionID: "757211635381", endpoints.EuWest1RegionID: "859597730677", endpoints.EuWest2RegionID: "282025262664", - names.EUWest3RegionID: "262312530599", + endpoints.EuWest3RegionID: "262312530599", names.ILCentral1RegionID: "683224464357", names.MECentral1RegionID: "585772288577", names.MESouth1RegionID: "034638983726", diff --git a/internal/service/elasticbeanstalk/hosted_zone_data_source.go b/internal/service/elasticbeanstalk/hosted_zone_data_source.go index 9a2a99f8b77..11cba0aa191 100644 --- a/internal/service/elasticbeanstalk/hosted_zone_data_source.go +++ b/internal/service/elasticbeanstalk/hosted_zone_data_source.go @@ -32,7 +32,7 @@ var hostedZoneIDs = map[string]string{ endpoints.EuSouth1RegionID: "Z10VDYYOA2JFKM", endpoints.EuWest1RegionID: "Z2NYPWQ7DFZAZH", endpoints.EuWest2RegionID: "Z1GKAAAUGATPF1", - names.EUWest3RegionID: "Z5WN6GAYWG5OB", + endpoints.EuWest3RegionID: "Z5WN6GAYWG5OB", names.ILCentral1RegionID: "Z02941091PERNCB1MI5H7", // names.MECentral1RegionID: "", names.MESouth1RegionID: "Z2BBTEKR2I36N2", diff --git a/internal/service/elb/hosted_zone_id_data_source.go b/internal/service/elb/hosted_zone_id_data_source.go index 92785cece00..d6f69f29be1 100644 --- a/internal/service/elb/hosted_zone_id_data_source.go +++ b/internal/service/elb/hosted_zone_id_data_source.go @@ -39,7 +39,7 @@ var hostedZoneIDPerRegionMap = map[string]string{ endpoints.EuSouth2RegionID: "Z0956581394HF5D5LXGAP", endpoints.EuWest1RegionID: "Z32O12XQLNTSW2", endpoints.EuWest2RegionID: "ZHURV8PSTC4K8", - names.EUWest3RegionID: "Z3Q77PNBQS71R4", + endpoints.EuWest3RegionID: "Z3Q77PNBQS71R4", names.ILCentral1RegionID: "Z09170902867EHPV2DABU", names.MECentral1RegionID: "Z08230872XQRWHG2XF6I", names.MESouth1RegionID: "ZS929ML54UICD", diff --git a/internal/service/elb/service_account_data_source.go b/internal/service/elb/service_account_data_source.go index 1aad8ea2cf3..a8dc5a71ed5 100644 --- a/internal/service/elb/service_account_data_source.go +++ b/internal/service/elb/service_account_data_source.go @@ -35,7 +35,7 @@ var accountIDPerRegionMap = map[string]string{ endpoints.EuSouth1RegionID: "635631232127", endpoints.EuWest1RegionID: "156460612806", endpoints.EuWest2RegionID: "652711504416", - names.EUWest3RegionID: "009996457667", + endpoints.EuWest3RegionID: "009996457667", // names.MECentral1RegionID: "", names.MESouth1RegionID: "076674570225", names.SAEast1RegionID: "507241528517", diff --git a/internal/service/elbv2/hosted_zone_id_data_source.go b/internal/service/elbv2/hosted_zone_id_data_source.go index ed872134d43..3e0aebc61b1 100644 --- a/internal/service/elbv2/hosted_zone_id_data_source.go +++ b/internal/service/elbv2/hosted_zone_id_data_source.go @@ -43,7 +43,7 @@ var hostedZoneIDPerRegionALBMap = map[string]string{ endpoints.EuSouth2RegionID: "Z0956581394HF5D5LXGAP", endpoints.EuWest1RegionID: "Z32O12XQLNTSW2", endpoints.EuWest2RegionID: "ZHURV8PSTC4K8", - names.EUWest3RegionID: "Z3Q77PNBQS71R4", + endpoints.EuWest3RegionID: "Z3Q77PNBQS71R4", names.ILCentral1RegionID: "Z09170902867EHPV2DABU", names.MECentral1RegionID: "Z08230872XQRWHG2XF6I", names.MESouth1RegionID: "ZS929ML54UICD", @@ -81,7 +81,7 @@ var hostedZoneIDPerRegionNLBMap = map[string]string{ endpoints.EuSouth2RegionID: "Z1011216NVTVYADP1SSV", endpoints.EuWest1RegionID: "Z2IFOLAFXWLO4F", endpoints.EuWest2RegionID: "ZD4D7Y8KGAS4G", - names.EUWest3RegionID: "Z1CMS0P5QUZ6D5", + endpoints.EuWest3RegionID: "Z1CMS0P5QUZ6D5", names.ILCentral1RegionID: "Z0313266YDI6ZRHTGQY4", names.MECentral1RegionID: "Z00282643NTTLPANJJG2P", names.MESouth1RegionID: "Z3QSRYVP46NYYV", diff --git a/internal/service/lambda/function.go b/internal/service/lambda/function.go index 2cc179756a1..99ec43273b2 100644 --- a/internal/service/lambda/function.go +++ b/internal/service/lambda/function.go @@ -1415,7 +1415,7 @@ func signerServiceIsAvailable(region string) bool { endpoints.EuWest1RegionID: {}, endpoints.EuWest2RegionID: {}, endpoints.EuSouth1RegionID: {}, - names.EUWest3RegionID: {}, + endpoints.EuWest3RegionID: {}, endpoints.EuNorth1RegionID: {}, names.MESouth1RegionID: {}, names.SAEast1RegionID: {}, diff --git a/internal/service/redshift/service_account_data_source.go b/internal/service/redshift/service_account_data_source.go index 3f26526320d..13f42ff900a 100644 --- a/internal/service/redshift/service_account_data_source.go +++ b/internal/service/redshift/service_account_data_source.go @@ -36,7 +36,7 @@ var ServiceAccountPerRegionMap = map[string]string{ endpoints.EuSouth1RegionID: "945612479654", endpoints.EuWest1RegionID: "210876761215", endpoints.EuWest2RegionID: "307160386991", - names.EUWest3RegionID: "915173422425", + endpoints.EuWest3RegionID: "915173422425", // names.MECentral1RegionID: "", names.MESouth1RegionID: "013126148197", names.SAEast1RegionID: "075028567923", diff --git a/internal/service/s3/hosted_zones.go b/internal/service/s3/hosted_zones.go index a273ce349bb..ddb7b73d033 100644 --- a/internal/service/s3/hosted_zones.go +++ b/internal/service/s3/hosted_zones.go @@ -35,7 +35,7 @@ var hostedZoneIDsMap = map[string]string{ endpoints.EuSouth2RegionID: "Z0081959F7139GRJC19J", endpoints.EuWest1RegionID: "Z1BKCTXD74EZPE", endpoints.EuWest2RegionID: "Z3GKZC51ZF0DB4", - names.EUWest3RegionID: "Z3R1K369G5AVDG", + endpoints.EuWest3RegionID: "Z3R1K369G5AVDG", names.ILCentral1RegionID: "Z09640613K4A3MN55U7GU", names.MECentral1RegionID: "Z06143092I8HRXZRUZROF", names.MESouth1RegionID: "Z1MPMWCPA7YB62", diff --git a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go index 6d459419e5f..85a76341db2 100644 --- a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go +++ b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go @@ -211,7 +211,7 @@ var prebuiltECRImageIDByRegion_blazing = map[string]string{ endpoints.EuSouth2RegionID: "104374241257", endpoints.EuWest1RegionID: "685385470294", endpoints.EuWest2RegionID: "644912444149", - names.EUWest3RegionID: "749696950732", + endpoints.EuWest3RegionID: "749696950732", names.ILCentral1RegionID: "898809789911", names.MECentral1RegionID: "272398656194", names.MESouth1RegionID: "249704162688", @@ -246,7 +246,7 @@ var prebuiltECRImageIDByRegion_clarify = map[string]string{ endpoints.EuSouth1RegionID: "638885417683", endpoints.EuWest1RegionID: "131013547314", endpoints.EuWest2RegionID: "440796970383", - names.EUWest3RegionID: "341593696636", + endpoints.EuWest3RegionID: "341593696636", names.MESouth1RegionID: "835444307964", names.SAEast1RegionID: "520018980103", names.USEast1RegionID: "205585389593", @@ -275,7 +275,7 @@ var prebuiltECRImageIDByRegion_dataWrangler = map[string]string{ endpoints.EuSouth1RegionID: "488287956546", endpoints.EuWest1RegionID: "245179582081", endpoints.EuWest2RegionID: "894491911112", - names.EUWest3RegionID: "807237891255", + endpoints.EuWest3RegionID: "807237891255", names.ILCentral1RegionID: "406833011540", names.MESouth1RegionID: "376037874950", names.SAEast1RegionID: "424196993095", @@ -304,7 +304,7 @@ var prebuiltECRImageIDByRegion_debugger = map[string]string{ endpoints.EuSouth1RegionID: "563282790590", endpoints.EuWest1RegionID: "929884845733", endpoints.EuWest2RegionID: "250201462417", - names.EUWest3RegionID: "447278800020", + endpoints.EuWest3RegionID: "447278800020", names.MESouth1RegionID: "986000313247", names.SAEast1RegionID: "818342061345", names.USEast1RegionID: "503895931360", @@ -339,7 +339,7 @@ var prebuiltECRImageIDByRegion_inferentiaNeo = map[string]string{ endpoints.EuSouth1RegionID: "966458181534", endpoints.EuWest1RegionID: "802834080501", endpoints.EuWest2RegionID: "205493899709", - names.EUWest3RegionID: "254080097072", + endpoints.EuWest3RegionID: "254080097072", names.ILCentral1RegionID: "275950707576", names.MESouth1RegionID: "836785723513", names.SAEast1RegionID: "756306329178", @@ -375,7 +375,7 @@ var prebuiltECRImageIDByRegion_SageMakerCustom = map[string]string{ // nosemgrep endpoints.EuSouth1RegionID: "048378556238", endpoints.EuWest1RegionID: "520713654638", endpoints.EuWest2RegionID: "520713654638", - names.EUWest3RegionID: "520713654638", + endpoints.EuWest3RegionID: "520713654638", names.MESouth1RegionID: "724002660598", names.SAEast1RegionID: "520713654638", names.USEast1RegionID: "520713654638", @@ -432,7 +432,7 @@ var prebuiltECRImageIDByRegion_spark = map[string]string{ endpoints.EuSouth2RegionID: "833944533722", endpoints.EuWest1RegionID: "571004829621", endpoints.EuWest2RegionID: "836651553127", - names.EUWest3RegionID: "136845547031", + endpoints.EuWest3RegionID: "136845547031", names.ILCentral1RegionID: "408426139102", names.MECentral1RegionID: "395420993607", names.MESouth1RegionID: "750251592176", @@ -466,7 +466,7 @@ var prebuiltECRImageIDByRegion_SageMakerBasePython = map[string]string{ // nosem endpoints.EuSouth2RegionID: "127363102723", endpoints.EuWest1RegionID: "470317259841", endpoints.EuWest2RegionID: "712779665605", - names.EUWest3RegionID: "615547856133", + endpoints.EuWest3RegionID: "615547856133", names.ILCentral1RegionID: "380164790875", names.MECentral1RegionID: "103105715889", names.MESouth1RegionID: "117516905037", @@ -510,7 +510,7 @@ var prebuiltECRImageIDByRegion_deepAR = map[string]string{ endpoints.EuSouth2RegionID: "104374241257", endpoints.EuWest1RegionID: "224300973850", endpoints.EuWest2RegionID: "644912444149", - names.EUWest3RegionID: "749696950732", + endpoints.EuWest3RegionID: "749696950732", names.ILCentral1RegionID: "898809789911", names.MECentral1RegionID: "272398656194", names.MESouth1RegionID: "249704162688", @@ -555,7 +555,7 @@ var prebuiltECRImageIDByRegion_factorMachines = map[string]string{ endpoints.EuSouth2RegionID: "104374241257", endpoints.EuWest1RegionID: "438346466558", endpoints.EuWest2RegionID: "644912444149", - names.EUWest3RegionID: "749696950732", + endpoints.EuWest3RegionID: "749696950732", names.ILCentral1RegionID: "898809789911", names.MECentral1RegionID: "272398656194", names.MESouth1RegionID: "249704162688", @@ -620,7 +620,7 @@ var prebuiltECRImageIDByRegion_XGBoost = map[string]string{ endpoints.EuSouth2RegionID: "104374241257", endpoints.EuWest1RegionID: "141502667606", endpoints.EuWest2RegionID: "764974769150", - names.EUWest3RegionID: "659782779980", + endpoints.EuWest3RegionID: "659782779980", names.ILCentral1RegionID: "898809789911", names.MECentral1RegionID: "272398656194", names.MESouth1RegionID: "801668240914", @@ -670,7 +670,7 @@ var prebuiltECRImageIDByRegion_deepLearning = map[string]string{ endpoints.EuNorth1RegionID: "763104351884", endpoints.EuWest1RegionID: "763104351884", endpoints.EuWest2RegionID: "763104351884", - names.EUWest3RegionID: "763104351884", + endpoints.EuWest3RegionID: "763104351884", endpoints.EuSouth1RegionID: "692866216735", endpoints.EuSouth2RegionID: "503227376785", names.ILCentral1RegionID: "780543022126", @@ -708,7 +708,7 @@ var prebuiltECRImageIDByRegion_modelMonitor = map[string]string{ endpoints.EuSouth2RegionID: "437450045455", endpoints.EuWest1RegionID: "468650794304", endpoints.EuWest2RegionID: "749857270468", - names.EUWest3RegionID: "680080141114", + endpoints.EuWest3RegionID: "680080141114", names.ILCentral1RegionID: "843974653677", names.MECentral1RegionID: "588750061953", names.MESouth1RegionID: "607024016150", diff --git a/names/names.go b/names/names.go index dd173220202..55cd25382e8 100644 --- a/names/names.go +++ b/names/names.go @@ -149,7 +149,6 @@ const ( // AWS Standard partition's regions. GlobalRegionID = "aws-global" // AWS Standard global region. - EUWest3RegionID = "eu-west-3" // Europe (Paris). ILCentral1RegionID = "il-central-1" // Israel (Tel Aviv). MECentral1RegionID = "me-central-1" // Middle East (UAE). MESouth1RegionID = "me-south-1" // Middle East (Bahrain). From 50e2dfa24e2ceef315bb588e763bbf1361b4e970 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 15:31:20 -0500 Subject: [PATCH 288/304] 'names.ILCentral1RegionID' -> 'endpoints.IlCentral1RegionID'. --- .../cloudtrail/service_account_data_source.go | 2 +- .../hosted_zone_data_source.go | 2 +- .../service/elb/hosted_zone_id_data_source.go | 2 +- .../elbv2/hosted_zone_id_data_source.go | 4 ++-- internal/service/s3/hosted_zones.go | 2 +- .../prebuilt_ecr_image_data_source.go | 20 +++++++++---------- names/names.go | 1 - 7 files changed, 16 insertions(+), 17 deletions(-) diff --git a/internal/service/cloudtrail/service_account_data_source.go b/internal/service/cloudtrail/service_account_data_source.go index 78a75a87879..421e619ac18 100644 --- a/internal/service/cloudtrail/service_account_data_source.go +++ b/internal/service/cloudtrail/service_account_data_source.go @@ -42,7 +42,7 @@ var serviceAccountPerRegionMap = map[string]string{ endpoints.EuWest1RegionID: "859597730677", endpoints.EuWest2RegionID: "282025262664", endpoints.EuWest3RegionID: "262312530599", - names.ILCentral1RegionID: "683224464357", + endpoints.IlCentral1RegionID: "683224464357", names.MECentral1RegionID: "585772288577", names.MESouth1RegionID: "034638983726", names.SAEast1RegionID: "814480443879", diff --git a/internal/service/elasticbeanstalk/hosted_zone_data_source.go b/internal/service/elasticbeanstalk/hosted_zone_data_source.go index 11cba0aa191..3d44100cd77 100644 --- a/internal/service/elasticbeanstalk/hosted_zone_data_source.go +++ b/internal/service/elasticbeanstalk/hosted_zone_data_source.go @@ -33,7 +33,7 @@ var hostedZoneIDs = map[string]string{ endpoints.EuWest1RegionID: "Z2NYPWQ7DFZAZH", endpoints.EuWest2RegionID: "Z1GKAAAUGATPF1", endpoints.EuWest3RegionID: "Z5WN6GAYWG5OB", - names.ILCentral1RegionID: "Z02941091PERNCB1MI5H7", + endpoints.IlCentral1RegionID: "Z02941091PERNCB1MI5H7", // names.MECentral1RegionID: "", names.MESouth1RegionID: "Z2BBTEKR2I36N2", names.SAEast1RegionID: "Z10X7K2B4QSOFV", diff --git a/internal/service/elb/hosted_zone_id_data_source.go b/internal/service/elb/hosted_zone_id_data_source.go index d6f69f29be1..831c17c47ad 100644 --- a/internal/service/elb/hosted_zone_id_data_source.go +++ b/internal/service/elb/hosted_zone_id_data_source.go @@ -40,7 +40,7 @@ var hostedZoneIDPerRegionMap = map[string]string{ endpoints.EuWest1RegionID: "Z32O12XQLNTSW2", endpoints.EuWest2RegionID: "ZHURV8PSTC4K8", endpoints.EuWest3RegionID: "Z3Q77PNBQS71R4", - names.ILCentral1RegionID: "Z09170902867EHPV2DABU", + endpoints.IlCentral1RegionID: "Z09170902867EHPV2DABU", names.MECentral1RegionID: "Z08230872XQRWHG2XF6I", names.MESouth1RegionID: "ZS929ML54UICD", names.SAEast1RegionID: "Z2P70J7HTTTPLU", diff --git a/internal/service/elbv2/hosted_zone_id_data_source.go b/internal/service/elbv2/hosted_zone_id_data_source.go index 3e0aebc61b1..4178221a6de 100644 --- a/internal/service/elbv2/hosted_zone_id_data_source.go +++ b/internal/service/elbv2/hosted_zone_id_data_source.go @@ -44,7 +44,7 @@ var hostedZoneIDPerRegionALBMap = map[string]string{ endpoints.EuWest1RegionID: "Z32O12XQLNTSW2", endpoints.EuWest2RegionID: "ZHURV8PSTC4K8", endpoints.EuWest3RegionID: "Z3Q77PNBQS71R4", - names.ILCentral1RegionID: "Z09170902867EHPV2DABU", + endpoints.IlCentral1RegionID: "Z09170902867EHPV2DABU", names.MECentral1RegionID: "Z08230872XQRWHG2XF6I", names.MESouth1RegionID: "ZS929ML54UICD", names.SAEast1RegionID: "Z2P70J7HTTTPLU", @@ -82,7 +82,7 @@ var hostedZoneIDPerRegionNLBMap = map[string]string{ endpoints.EuWest1RegionID: "Z2IFOLAFXWLO4F", endpoints.EuWest2RegionID: "ZD4D7Y8KGAS4G", endpoints.EuWest3RegionID: "Z1CMS0P5QUZ6D5", - names.ILCentral1RegionID: "Z0313266YDI6ZRHTGQY4", + endpoints.IlCentral1RegionID: "Z0313266YDI6ZRHTGQY4", names.MECentral1RegionID: "Z00282643NTTLPANJJG2P", names.MESouth1RegionID: "Z3QSRYVP46NYYV", names.SAEast1RegionID: "ZTK26PT1VY4CU", diff --git a/internal/service/s3/hosted_zones.go b/internal/service/s3/hosted_zones.go index ddb7b73d033..8d0d2e68564 100644 --- a/internal/service/s3/hosted_zones.go +++ b/internal/service/s3/hosted_zones.go @@ -36,7 +36,7 @@ var hostedZoneIDsMap = map[string]string{ endpoints.EuWest1RegionID: "Z1BKCTXD74EZPE", endpoints.EuWest2RegionID: "Z3GKZC51ZF0DB4", endpoints.EuWest3RegionID: "Z3R1K369G5AVDG", - names.ILCentral1RegionID: "Z09640613K4A3MN55U7GU", + endpoints.IlCentral1RegionID: "Z09640613K4A3MN55U7GU", names.MECentral1RegionID: "Z06143092I8HRXZRUZROF", names.MESouth1RegionID: "Z1MPMWCPA7YB62", names.SAEast1RegionID: "Z7KQH4QJS55SO", diff --git a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go index 85a76341db2..44d886b06c2 100644 --- a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go +++ b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go @@ -212,7 +212,7 @@ var prebuiltECRImageIDByRegion_blazing = map[string]string{ endpoints.EuWest1RegionID: "685385470294", endpoints.EuWest2RegionID: "644912444149", endpoints.EuWest3RegionID: "749696950732", - names.ILCentral1RegionID: "898809789911", + endpoints.IlCentral1RegionID: "898809789911", names.MECentral1RegionID: "272398656194", names.MESouth1RegionID: "249704162688", names.SAEast1RegionID: "855470959533", @@ -276,7 +276,7 @@ var prebuiltECRImageIDByRegion_dataWrangler = map[string]string{ endpoints.EuWest1RegionID: "245179582081", endpoints.EuWest2RegionID: "894491911112", endpoints.EuWest3RegionID: "807237891255", - names.ILCentral1RegionID: "406833011540", + endpoints.IlCentral1RegionID: "406833011540", names.MESouth1RegionID: "376037874950", names.SAEast1RegionID: "424196993095", names.USEast1RegionID: "663277389841", @@ -340,7 +340,7 @@ var prebuiltECRImageIDByRegion_inferentiaNeo = map[string]string{ endpoints.EuWest1RegionID: "802834080501", endpoints.EuWest2RegionID: "205493899709", endpoints.EuWest3RegionID: "254080097072", - names.ILCentral1RegionID: "275950707576", + endpoints.IlCentral1RegionID: "275950707576", names.MESouth1RegionID: "836785723513", names.SAEast1RegionID: "756306329178", names.USEast1RegionID: "785573368785", @@ -433,7 +433,7 @@ var prebuiltECRImageIDByRegion_spark = map[string]string{ endpoints.EuWest1RegionID: "571004829621", endpoints.EuWest2RegionID: "836651553127", endpoints.EuWest3RegionID: "136845547031", - names.ILCentral1RegionID: "408426139102", + endpoints.IlCentral1RegionID: "408426139102", names.MECentral1RegionID: "395420993607", names.MESouth1RegionID: "750251592176", names.SAEast1RegionID: "737130764395", @@ -467,7 +467,7 @@ var prebuiltECRImageIDByRegion_SageMakerBasePython = map[string]string{ // nosem endpoints.EuWest1RegionID: "470317259841", endpoints.EuWest2RegionID: "712779665605", endpoints.EuWest3RegionID: "615547856133", - names.ILCentral1RegionID: "380164790875", + endpoints.IlCentral1RegionID: "380164790875", names.MECentral1RegionID: "103105715889", names.MESouth1RegionID: "117516905037", names.SAEast1RegionID: "782484402741", @@ -511,7 +511,7 @@ var prebuiltECRImageIDByRegion_deepAR = map[string]string{ endpoints.EuWest1RegionID: "224300973850", endpoints.EuWest2RegionID: "644912444149", endpoints.EuWest3RegionID: "749696950732", - names.ILCentral1RegionID: "898809789911", + endpoints.IlCentral1RegionID: "898809789911", names.MECentral1RegionID: "272398656194", names.MESouth1RegionID: "249704162688", names.SAEast1RegionID: "855470959533", @@ -556,7 +556,7 @@ var prebuiltECRImageIDByRegion_factorMachines = map[string]string{ endpoints.EuWest1RegionID: "438346466558", endpoints.EuWest2RegionID: "644912444149", endpoints.EuWest3RegionID: "749696950732", - names.ILCentral1RegionID: "898809789911", + endpoints.IlCentral1RegionID: "898809789911", names.MECentral1RegionID: "272398656194", names.MESouth1RegionID: "249704162688", names.SAEast1RegionID: "855470959533", @@ -621,7 +621,7 @@ var prebuiltECRImageIDByRegion_XGBoost = map[string]string{ endpoints.EuWest1RegionID: "141502667606", endpoints.EuWest2RegionID: "764974769150", endpoints.EuWest3RegionID: "659782779980", - names.ILCentral1RegionID: "898809789911", + endpoints.IlCentral1RegionID: "898809789911", names.MECentral1RegionID: "272398656194", names.MESouth1RegionID: "801668240914", names.SAEast1RegionID: "737474898029", @@ -673,7 +673,7 @@ var prebuiltECRImageIDByRegion_deepLearning = map[string]string{ endpoints.EuWest3RegionID: "763104351884", endpoints.EuSouth1RegionID: "692866216735", endpoints.EuSouth2RegionID: "503227376785", - names.ILCentral1RegionID: "780543022126", + endpoints.IlCentral1RegionID: "780543022126", names.MECentral1RegionID: "914824155844", names.MESouth1RegionID: "217643126080", names.SAEast1RegionID: "763104351884", @@ -709,7 +709,7 @@ var prebuiltECRImageIDByRegion_modelMonitor = map[string]string{ endpoints.EuWest1RegionID: "468650794304", endpoints.EuWest2RegionID: "749857270468", endpoints.EuWest3RegionID: "680080141114", - names.ILCentral1RegionID: "843974653677", + endpoints.IlCentral1RegionID: "843974653677", names.MECentral1RegionID: "588750061953", names.MESouth1RegionID: "607024016150", names.SAEast1RegionID: "539772159869", diff --git a/names/names.go b/names/names.go index 55cd25382e8..6a4875a131c 100644 --- a/names/names.go +++ b/names/names.go @@ -149,7 +149,6 @@ const ( // AWS Standard partition's regions. GlobalRegionID = "aws-global" // AWS Standard global region. - ILCentral1RegionID = "il-central-1" // Israel (Tel Aviv). MECentral1RegionID = "me-central-1" // Middle East (UAE). MESouth1RegionID = "me-south-1" // Middle East (Bahrain). SAEast1RegionID = "sa-east-1" // South America (Sao Paulo). From 4e5f5829f421aa22536b79926f5c44ffaa4e5389 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 15:32:13 -0500 Subject: [PATCH 289/304] 'names.MECentral1RegionID' -> 'endpoints.MeCentral1RegionID'. --- .../service/acmpca/certificate_authority_test.go | 2 +- .../cloudtrail/service_account_data_source.go | 2 +- .../elasticbeanstalk/hosted_zone_data_source.go | 2 +- .../service/elb/hosted_zone_id_data_source.go | 2 +- .../service/elb/service_account_data_source.go | 2 +- .../service/elbv2/hosted_zone_id_data_source.go | 4 ++-- .../redshift/service_account_data_source.go | 2 +- internal/service/s3/hosted_zones.go | 2 +- .../sagemaker/prebuilt_ecr_image_data_source.go | 16 ++++++++-------- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/internal/service/acmpca/certificate_authority_test.go b/internal/service/acmpca/certificate_authority_test.go index da06cf5b51d..a45edd9fc5d 100644 --- a/internal/service/acmpca/certificate_authority_test.go +++ b/internal/service/acmpca/certificate_authority_test.go @@ -184,7 +184,7 @@ func TestAccACMPCACertificateAuthority_keyStorageSecurityStandard(t *testing.T) PreCheck: func() { acctest.PreCheck(ctx, t) // See https://docs.aws.amazon.com/privateca/latest/userguide/data-protection.html#private-keys. - acctest.PreCheckRegion(t, endpoints.ApSouth2RegionID, endpoints.ApSoutheast3RegionID, endpoints.ApSoutheast4RegionID, endpoints.EuCentral2RegionID, endpoints.EuSouth2RegionID, names.MECentral1RegionID) + acctest.PreCheckRegion(t, endpoints.ApSouth2RegionID, endpoints.ApSoutheast3RegionID, endpoints.ApSoutheast4RegionID, endpoints.EuCentral2RegionID, endpoints.EuSouth2RegionID, endpoints.MeCentral1RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.ACMPCAServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, diff --git a/internal/service/cloudtrail/service_account_data_source.go b/internal/service/cloudtrail/service_account_data_source.go index 421e619ac18..e3513334c59 100644 --- a/internal/service/cloudtrail/service_account_data_source.go +++ b/internal/service/cloudtrail/service_account_data_source.go @@ -43,7 +43,7 @@ var serviceAccountPerRegionMap = map[string]string{ endpoints.EuWest2RegionID: "282025262664", endpoints.EuWest3RegionID: "262312530599", endpoints.IlCentral1RegionID: "683224464357", - names.MECentral1RegionID: "585772288577", + endpoints.MeCentral1RegionID: "585772288577", names.MESouth1RegionID: "034638983726", names.SAEast1RegionID: "814480443879", names.USEast1RegionID: "086441151436", diff --git a/internal/service/elasticbeanstalk/hosted_zone_data_source.go b/internal/service/elasticbeanstalk/hosted_zone_data_source.go index 3d44100cd77..b46f4331646 100644 --- a/internal/service/elasticbeanstalk/hosted_zone_data_source.go +++ b/internal/service/elasticbeanstalk/hosted_zone_data_source.go @@ -34,7 +34,7 @@ var hostedZoneIDs = map[string]string{ endpoints.EuWest2RegionID: "Z1GKAAAUGATPF1", endpoints.EuWest3RegionID: "Z5WN6GAYWG5OB", endpoints.IlCentral1RegionID: "Z02941091PERNCB1MI5H7", - // names.MECentral1RegionID: "", + // endpoints.MeCentral1RegionID: "", names.MESouth1RegionID: "Z2BBTEKR2I36N2", names.SAEast1RegionID: "Z10X7K2B4QSOFV", names.USEast1RegionID: "Z117KPS5GTRQ2G", diff --git a/internal/service/elb/hosted_zone_id_data_source.go b/internal/service/elb/hosted_zone_id_data_source.go index 831c17c47ad..a6c3b29e39e 100644 --- a/internal/service/elb/hosted_zone_id_data_source.go +++ b/internal/service/elb/hosted_zone_id_data_source.go @@ -41,7 +41,7 @@ var hostedZoneIDPerRegionMap = map[string]string{ endpoints.EuWest2RegionID: "ZHURV8PSTC4K8", endpoints.EuWest3RegionID: "Z3Q77PNBQS71R4", endpoints.IlCentral1RegionID: "Z09170902867EHPV2DABU", - names.MECentral1RegionID: "Z08230872XQRWHG2XF6I", + endpoints.MeCentral1RegionID: "Z08230872XQRWHG2XF6I", names.MESouth1RegionID: "ZS929ML54UICD", names.SAEast1RegionID: "Z2P70J7HTTTPLU", names.USEast1RegionID: "Z35SXDOTRQ7X7K", diff --git a/internal/service/elb/service_account_data_source.go b/internal/service/elb/service_account_data_source.go index a8dc5a71ed5..da04e6a400c 100644 --- a/internal/service/elb/service_account_data_source.go +++ b/internal/service/elb/service_account_data_source.go @@ -36,7 +36,7 @@ var accountIDPerRegionMap = map[string]string{ endpoints.EuWest1RegionID: "156460612806", endpoints.EuWest2RegionID: "652711504416", endpoints.EuWest3RegionID: "009996457667", - // names.MECentral1RegionID: "", + // endpoints.MeCentral1RegionID: "", names.MESouth1RegionID: "076674570225", names.SAEast1RegionID: "507241528517", names.USEast1RegionID: "127311923021", diff --git a/internal/service/elbv2/hosted_zone_id_data_source.go b/internal/service/elbv2/hosted_zone_id_data_source.go index 4178221a6de..50eddfdc696 100644 --- a/internal/service/elbv2/hosted_zone_id_data_source.go +++ b/internal/service/elbv2/hosted_zone_id_data_source.go @@ -45,7 +45,7 @@ var hostedZoneIDPerRegionALBMap = map[string]string{ endpoints.EuWest2RegionID: "ZHURV8PSTC4K8", endpoints.EuWest3RegionID: "Z3Q77PNBQS71R4", endpoints.IlCentral1RegionID: "Z09170902867EHPV2DABU", - names.MECentral1RegionID: "Z08230872XQRWHG2XF6I", + endpoints.MeCentral1RegionID: "Z08230872XQRWHG2XF6I", names.MESouth1RegionID: "ZS929ML54UICD", names.SAEast1RegionID: "Z2P70J7HTTTPLU", names.USEast1RegionID: "Z35SXDOTRQ7X7K", @@ -83,7 +83,7 @@ var hostedZoneIDPerRegionNLBMap = map[string]string{ endpoints.EuWest2RegionID: "ZD4D7Y8KGAS4G", endpoints.EuWest3RegionID: "Z1CMS0P5QUZ6D5", endpoints.IlCentral1RegionID: "Z0313266YDI6ZRHTGQY4", - names.MECentral1RegionID: "Z00282643NTTLPANJJG2P", + endpoints.MeCentral1RegionID: "Z00282643NTTLPANJJG2P", names.MESouth1RegionID: "Z3QSRYVP46NYYV", names.SAEast1RegionID: "ZTK26PT1VY4CU", names.USEast1RegionID: "Z26RNL4JYFTOTI", diff --git a/internal/service/redshift/service_account_data_source.go b/internal/service/redshift/service_account_data_source.go index 13f42ff900a..f4f55b354c5 100644 --- a/internal/service/redshift/service_account_data_source.go +++ b/internal/service/redshift/service_account_data_source.go @@ -37,7 +37,7 @@ var ServiceAccountPerRegionMap = map[string]string{ endpoints.EuWest1RegionID: "210876761215", endpoints.EuWest2RegionID: "307160386991", endpoints.EuWest3RegionID: "915173422425", - // names.MECentral1RegionID: "", + // endpoints.MeCentral1RegionID: "", names.MESouth1RegionID: "013126148197", names.SAEast1RegionID: "075028567923", names.USEast1RegionID: "193672423079", diff --git a/internal/service/s3/hosted_zones.go b/internal/service/s3/hosted_zones.go index 8d0d2e68564..e72e576441c 100644 --- a/internal/service/s3/hosted_zones.go +++ b/internal/service/s3/hosted_zones.go @@ -37,7 +37,7 @@ var hostedZoneIDsMap = map[string]string{ endpoints.EuWest2RegionID: "Z3GKZC51ZF0DB4", endpoints.EuWest3RegionID: "Z3R1K369G5AVDG", endpoints.IlCentral1RegionID: "Z09640613K4A3MN55U7GU", - names.MECentral1RegionID: "Z06143092I8HRXZRUZROF", + endpoints.MeCentral1RegionID: "Z06143092I8HRXZRUZROF", names.MESouth1RegionID: "Z1MPMWCPA7YB62", names.SAEast1RegionID: "Z7KQH4QJS55SO", names.USEast1RegionID: "Z3AQBSTGFYJSTF", diff --git a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go index 44d886b06c2..acd2579dda0 100644 --- a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go +++ b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go @@ -213,7 +213,7 @@ var prebuiltECRImageIDByRegion_blazing = map[string]string{ endpoints.EuWest2RegionID: "644912444149", endpoints.EuWest3RegionID: "749696950732", endpoints.IlCentral1RegionID: "898809789911", - names.MECentral1RegionID: "272398656194", + endpoints.MeCentral1RegionID: "272398656194", names.MESouth1RegionID: "249704162688", names.SAEast1RegionID: "855470959533", names.USEast1RegionID: "811284229777", @@ -434,7 +434,7 @@ var prebuiltECRImageIDByRegion_spark = map[string]string{ endpoints.EuWest2RegionID: "836651553127", endpoints.EuWest3RegionID: "136845547031", endpoints.IlCentral1RegionID: "408426139102", - names.MECentral1RegionID: "395420993607", + endpoints.MeCentral1RegionID: "395420993607", names.MESouth1RegionID: "750251592176", names.SAEast1RegionID: "737130764395", names.USEast1RegionID: "173754725891", @@ -468,7 +468,7 @@ var prebuiltECRImageIDByRegion_SageMakerBasePython = map[string]string{ // nosem endpoints.EuWest2RegionID: "712779665605", endpoints.EuWest3RegionID: "615547856133", endpoints.IlCentral1RegionID: "380164790875", - names.MECentral1RegionID: "103105715889", + endpoints.MeCentral1RegionID: "103105715889", names.MESouth1RegionID: "117516905037", names.SAEast1RegionID: "782484402741", names.USEast1RegionID: "081325390199", @@ -512,7 +512,7 @@ var prebuiltECRImageIDByRegion_deepAR = map[string]string{ endpoints.EuWest2RegionID: "644912444149", endpoints.EuWest3RegionID: "749696950732", endpoints.IlCentral1RegionID: "898809789911", - names.MECentral1RegionID: "272398656194", + endpoints.MeCentral1RegionID: "272398656194", names.MESouth1RegionID: "249704162688", names.SAEast1RegionID: "855470959533", names.USEast1RegionID: "522234722520", @@ -557,7 +557,7 @@ var prebuiltECRImageIDByRegion_factorMachines = map[string]string{ endpoints.EuWest2RegionID: "644912444149", endpoints.EuWest3RegionID: "749696950732", endpoints.IlCentral1RegionID: "898809789911", - names.MECentral1RegionID: "272398656194", + endpoints.MeCentral1RegionID: "272398656194", names.MESouth1RegionID: "249704162688", names.SAEast1RegionID: "855470959533", names.USEast1RegionID: "382416733822", @@ -622,7 +622,7 @@ var prebuiltECRImageIDByRegion_XGBoost = map[string]string{ endpoints.EuWest2RegionID: "764974769150", endpoints.EuWest3RegionID: "659782779980", endpoints.IlCentral1RegionID: "898809789911", - names.MECentral1RegionID: "272398656194", + endpoints.MeCentral1RegionID: "272398656194", names.MESouth1RegionID: "801668240914", names.SAEast1RegionID: "737474898029", names.USEast1RegionID: "683313688378", @@ -674,7 +674,7 @@ var prebuiltECRImageIDByRegion_deepLearning = map[string]string{ endpoints.EuSouth1RegionID: "692866216735", endpoints.EuSouth2RegionID: "503227376785", endpoints.IlCentral1RegionID: "780543022126", - names.MECentral1RegionID: "914824155844", + endpoints.MeCentral1RegionID: "914824155844", names.MESouth1RegionID: "217643126080", names.SAEast1RegionID: "763104351884", names.USEast1RegionID: "763104351884", @@ -710,7 +710,7 @@ var prebuiltECRImageIDByRegion_modelMonitor = map[string]string{ endpoints.EuWest2RegionID: "749857270468", endpoints.EuWest3RegionID: "680080141114", endpoints.IlCentral1RegionID: "843974653677", - names.MECentral1RegionID: "588750061953", + endpoints.MeCentral1RegionID: "588750061953", names.MESouth1RegionID: "607024016150", names.SAEast1RegionID: "539772159869", names.USEast1RegionID: "156813124566", From f6d45e022a886180ad9de1459cdcb320d1ed428a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 15:33:10 -0500 Subject: [PATCH 290/304] 'names.MESouth1RegionID' -> 'endpoints.MeSouth1RegionID'. --- .../cloudtrail/service_account_data_source.go | 2 +- .../hosted_zone_data_source.go | 2 +- .../service/elb/hosted_zone_id_data_source.go | 2 +- .../elb/service_account_data_source.go | 2 +- .../elbv2/hosted_zone_id_data_source.go | 4 +-- internal/service/lambda/function.go | 2 +- .../redshift/service_account_data_source.go | 2 +- internal/service/s3/hosted_zones.go | 2 +- .../prebuilt_ecr_image_data_source.go | 26 +++++++++---------- names/names.go | 12 ++++----- 10 files changed, 27 insertions(+), 29 deletions(-) diff --git a/internal/service/cloudtrail/service_account_data_source.go b/internal/service/cloudtrail/service_account_data_source.go index e3513334c59..f1de953f582 100644 --- a/internal/service/cloudtrail/service_account_data_source.go +++ b/internal/service/cloudtrail/service_account_data_source.go @@ -44,7 +44,7 @@ var serviceAccountPerRegionMap = map[string]string{ endpoints.EuWest3RegionID: "262312530599", endpoints.IlCentral1RegionID: "683224464357", endpoints.MeCentral1RegionID: "585772288577", - names.MESouth1RegionID: "034638983726", + endpoints.MeSouth1RegionID: "034638983726", names.SAEast1RegionID: "814480443879", names.USEast1RegionID: "086441151436", names.USEast2RegionID: "475085895292", diff --git a/internal/service/elasticbeanstalk/hosted_zone_data_source.go b/internal/service/elasticbeanstalk/hosted_zone_data_source.go index b46f4331646..58a40ccc897 100644 --- a/internal/service/elasticbeanstalk/hosted_zone_data_source.go +++ b/internal/service/elasticbeanstalk/hosted_zone_data_source.go @@ -35,7 +35,7 @@ var hostedZoneIDs = map[string]string{ endpoints.EuWest3RegionID: "Z5WN6GAYWG5OB", endpoints.IlCentral1RegionID: "Z02941091PERNCB1MI5H7", // endpoints.MeCentral1RegionID: "", - names.MESouth1RegionID: "Z2BBTEKR2I36N2", + endpoints.MeSouth1RegionID: "Z2BBTEKR2I36N2", names.SAEast1RegionID: "Z10X7K2B4QSOFV", names.USEast1RegionID: "Z117KPS5GTRQ2G", names.USEast2RegionID: "Z14LCN19Q5QHIC", diff --git a/internal/service/elb/hosted_zone_id_data_source.go b/internal/service/elb/hosted_zone_id_data_source.go index a6c3b29e39e..83f5fb2336b 100644 --- a/internal/service/elb/hosted_zone_id_data_source.go +++ b/internal/service/elb/hosted_zone_id_data_source.go @@ -42,7 +42,7 @@ var hostedZoneIDPerRegionMap = map[string]string{ endpoints.EuWest3RegionID: "Z3Q77PNBQS71R4", endpoints.IlCentral1RegionID: "Z09170902867EHPV2DABU", endpoints.MeCentral1RegionID: "Z08230872XQRWHG2XF6I", - names.MESouth1RegionID: "ZS929ML54UICD", + endpoints.MeSouth1RegionID: "ZS929ML54UICD", names.SAEast1RegionID: "Z2P70J7HTTTPLU", names.USEast1RegionID: "Z35SXDOTRQ7X7K", names.USEast2RegionID: "Z3AADJGX6KTTL2", diff --git a/internal/service/elb/service_account_data_source.go b/internal/service/elb/service_account_data_source.go index da04e6a400c..c3b8b25595b 100644 --- a/internal/service/elb/service_account_data_source.go +++ b/internal/service/elb/service_account_data_source.go @@ -37,7 +37,7 @@ var accountIDPerRegionMap = map[string]string{ endpoints.EuWest2RegionID: "652711504416", endpoints.EuWest3RegionID: "009996457667", // endpoints.MeCentral1RegionID: "", - names.MESouth1RegionID: "076674570225", + endpoints.MeSouth1RegionID: "076674570225", names.SAEast1RegionID: "507241528517", names.USEast1RegionID: "127311923021", names.USEast2RegionID: "033677994240", diff --git a/internal/service/elbv2/hosted_zone_id_data_source.go b/internal/service/elbv2/hosted_zone_id_data_source.go index 50eddfdc696..2418484b4dc 100644 --- a/internal/service/elbv2/hosted_zone_id_data_source.go +++ b/internal/service/elbv2/hosted_zone_id_data_source.go @@ -46,7 +46,7 @@ var hostedZoneIDPerRegionALBMap = map[string]string{ endpoints.EuWest3RegionID: "Z3Q77PNBQS71R4", endpoints.IlCentral1RegionID: "Z09170902867EHPV2DABU", endpoints.MeCentral1RegionID: "Z08230872XQRWHG2XF6I", - names.MESouth1RegionID: "ZS929ML54UICD", + endpoints.MeSouth1RegionID: "ZS929ML54UICD", names.SAEast1RegionID: "Z2P70J7HTTTPLU", names.USEast1RegionID: "Z35SXDOTRQ7X7K", names.USEast2RegionID: "Z3AADJGX6KTTL2", @@ -84,7 +84,7 @@ var hostedZoneIDPerRegionNLBMap = map[string]string{ endpoints.EuWest3RegionID: "Z1CMS0P5QUZ6D5", endpoints.IlCentral1RegionID: "Z0313266YDI6ZRHTGQY4", endpoints.MeCentral1RegionID: "Z00282643NTTLPANJJG2P", - names.MESouth1RegionID: "Z3QSRYVP46NYYV", + endpoints.MeSouth1RegionID: "Z3QSRYVP46NYYV", names.SAEast1RegionID: "ZTK26PT1VY4CU", names.USEast1RegionID: "Z26RNL4JYFTOTI", names.USEast2RegionID: "ZLMOA37VPKANP", diff --git a/internal/service/lambda/function.go b/internal/service/lambda/function.go index 99ec43273b2..c5153598492 100644 --- a/internal/service/lambda/function.go +++ b/internal/service/lambda/function.go @@ -1417,7 +1417,7 @@ func signerServiceIsAvailable(region string) bool { endpoints.EuSouth1RegionID: {}, endpoints.EuWest3RegionID: {}, endpoints.EuNorth1RegionID: {}, - names.MESouth1RegionID: {}, + endpoints.MeSouth1RegionID: {}, names.SAEast1RegionID: {}, } _, ok := availableRegions[region] diff --git a/internal/service/redshift/service_account_data_source.go b/internal/service/redshift/service_account_data_source.go index f4f55b354c5..e25bd1cb960 100644 --- a/internal/service/redshift/service_account_data_source.go +++ b/internal/service/redshift/service_account_data_source.go @@ -38,7 +38,7 @@ var ServiceAccountPerRegionMap = map[string]string{ endpoints.EuWest2RegionID: "307160386991", endpoints.EuWest3RegionID: "915173422425", // endpoints.MeCentral1RegionID: "", - names.MESouth1RegionID: "013126148197", + endpoints.MeSouth1RegionID: "013126148197", names.SAEast1RegionID: "075028567923", names.USEast1RegionID: "193672423079", names.USEast2RegionID: "391106570357", diff --git a/internal/service/s3/hosted_zones.go b/internal/service/s3/hosted_zones.go index e72e576441c..d3158d5538e 100644 --- a/internal/service/s3/hosted_zones.go +++ b/internal/service/s3/hosted_zones.go @@ -38,7 +38,7 @@ var hostedZoneIDsMap = map[string]string{ endpoints.EuWest3RegionID: "Z3R1K369G5AVDG", endpoints.IlCentral1RegionID: "Z09640613K4A3MN55U7GU", endpoints.MeCentral1RegionID: "Z06143092I8HRXZRUZROF", - names.MESouth1RegionID: "Z1MPMWCPA7YB62", + endpoints.MeSouth1RegionID: "Z1MPMWCPA7YB62", names.SAEast1RegionID: "Z7KQH4QJS55SO", names.USEast1RegionID: "Z3AQBSTGFYJSTF", names.USEast2RegionID: "Z2O1EMRO9K5GLX", diff --git a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go index acd2579dda0..9f157fcf3dc 100644 --- a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go +++ b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go @@ -214,7 +214,7 @@ var prebuiltECRImageIDByRegion_blazing = map[string]string{ endpoints.EuWest3RegionID: "749696950732", endpoints.IlCentral1RegionID: "898809789911", endpoints.MeCentral1RegionID: "272398656194", - names.MESouth1RegionID: "249704162688", + endpoints.MeSouth1RegionID: "249704162688", names.SAEast1RegionID: "855470959533", names.USEast1RegionID: "811284229777", names.USEast2RegionID: "825641698319", @@ -247,7 +247,7 @@ var prebuiltECRImageIDByRegion_clarify = map[string]string{ endpoints.EuWest1RegionID: "131013547314", endpoints.EuWest2RegionID: "440796970383", endpoints.EuWest3RegionID: "341593696636", - names.MESouth1RegionID: "835444307964", + endpoints.MeSouth1RegionID: "835444307964", names.SAEast1RegionID: "520018980103", names.USEast1RegionID: "205585389593", names.USEast2RegionID: "211330385671", @@ -277,7 +277,7 @@ var prebuiltECRImageIDByRegion_dataWrangler = map[string]string{ endpoints.EuWest2RegionID: "894491911112", endpoints.EuWest3RegionID: "807237891255", endpoints.IlCentral1RegionID: "406833011540", - names.MESouth1RegionID: "376037874950", + endpoints.MeSouth1RegionID: "376037874950", names.SAEast1RegionID: "424196993095", names.USEast1RegionID: "663277389841", names.USEast2RegionID: "415577184552", @@ -305,7 +305,7 @@ var prebuiltECRImageIDByRegion_debugger = map[string]string{ endpoints.EuWest1RegionID: "929884845733", endpoints.EuWest2RegionID: "250201462417", endpoints.EuWest3RegionID: "447278800020", - names.MESouth1RegionID: "986000313247", + endpoints.MeSouth1RegionID: "986000313247", names.SAEast1RegionID: "818342061345", names.USEast1RegionID: "503895931360", names.USEast2RegionID: "915447279597", @@ -341,7 +341,7 @@ var prebuiltECRImageIDByRegion_inferentiaNeo = map[string]string{ endpoints.EuWest2RegionID: "205493899709", endpoints.EuWest3RegionID: "254080097072", endpoints.IlCentral1RegionID: "275950707576", - names.MESouth1RegionID: "836785723513", + endpoints.MeSouth1RegionID: "836785723513", names.SAEast1RegionID: "756306329178", names.USEast1RegionID: "785573368785", names.USEast2RegionID: "007439368137", @@ -376,7 +376,7 @@ var prebuiltECRImageIDByRegion_SageMakerCustom = map[string]string{ // nosemgrep endpoints.EuWest1RegionID: "520713654638", endpoints.EuWest2RegionID: "520713654638", endpoints.EuWest3RegionID: "520713654638", - names.MESouth1RegionID: "724002660598", + endpoints.MeSouth1RegionID: "724002660598", names.SAEast1RegionID: "520713654638", names.USEast1RegionID: "520713654638", names.USEast2RegionID: "520713654638", @@ -435,7 +435,7 @@ var prebuiltECRImageIDByRegion_spark = map[string]string{ endpoints.EuWest3RegionID: "136845547031", endpoints.IlCentral1RegionID: "408426139102", endpoints.MeCentral1RegionID: "395420993607", - names.MESouth1RegionID: "750251592176", + endpoints.MeSouth1RegionID: "750251592176", names.SAEast1RegionID: "737130764395", names.USEast1RegionID: "173754725891", names.USEast2RegionID: "314815235551", @@ -469,7 +469,7 @@ var prebuiltECRImageIDByRegion_SageMakerBasePython = map[string]string{ // nosem endpoints.EuWest3RegionID: "615547856133", endpoints.IlCentral1RegionID: "380164790875", endpoints.MeCentral1RegionID: "103105715889", - names.MESouth1RegionID: "117516905037", + endpoints.MeSouth1RegionID: "117516905037", names.SAEast1RegionID: "782484402741", names.USEast1RegionID: "081325390199", names.USEast2RegionID: "429704687514", @@ -513,7 +513,7 @@ var prebuiltECRImageIDByRegion_deepAR = map[string]string{ endpoints.EuWest3RegionID: "749696950732", endpoints.IlCentral1RegionID: "898809789911", endpoints.MeCentral1RegionID: "272398656194", - names.MESouth1RegionID: "249704162688", + endpoints.MeSouth1RegionID: "249704162688", names.SAEast1RegionID: "855470959533", names.USEast1RegionID: "522234722520", names.USEast2RegionID: "566113047672", @@ -558,7 +558,7 @@ var prebuiltECRImageIDByRegion_factorMachines = map[string]string{ endpoints.EuWest3RegionID: "749696950732", endpoints.IlCentral1RegionID: "898809789911", endpoints.MeCentral1RegionID: "272398656194", - names.MESouth1RegionID: "249704162688", + endpoints.MeSouth1RegionID: "249704162688", names.SAEast1RegionID: "855470959533", names.USEast1RegionID: "382416733822", names.USEast2RegionID: "404615174143", @@ -623,7 +623,7 @@ var prebuiltECRImageIDByRegion_XGBoost = map[string]string{ endpoints.EuWest3RegionID: "659782779980", endpoints.IlCentral1RegionID: "898809789911", endpoints.MeCentral1RegionID: "272398656194", - names.MESouth1RegionID: "801668240914", + endpoints.MeSouth1RegionID: "801668240914", names.SAEast1RegionID: "737474898029", names.USEast1RegionID: "683313688378", names.USEast2RegionID: "257758044811", @@ -675,7 +675,7 @@ var prebuiltECRImageIDByRegion_deepLearning = map[string]string{ endpoints.EuSouth2RegionID: "503227376785", endpoints.IlCentral1RegionID: "780543022126", endpoints.MeCentral1RegionID: "914824155844", - names.MESouth1RegionID: "217643126080", + endpoints.MeSouth1RegionID: "217643126080", names.SAEast1RegionID: "763104351884", names.USEast1RegionID: "763104351884", names.USEast2RegionID: "763104351884", @@ -711,7 +711,7 @@ var prebuiltECRImageIDByRegion_modelMonitor = map[string]string{ endpoints.EuWest3RegionID: "680080141114", endpoints.IlCentral1RegionID: "843974653677", endpoints.MeCentral1RegionID: "588750061953", - names.MESouth1RegionID: "607024016150", + endpoints.MeSouth1RegionID: "607024016150", names.SAEast1RegionID: "539772159869", names.USEast1RegionID: "156813124566", names.USEast2RegionID: "777275614652", diff --git a/names/names.go b/names/names.go index 6a4875a131c..b3bb7fb4f58 100644 --- a/names/names.go +++ b/names/names.go @@ -149,13 +149,11 @@ const ( // AWS Standard partition's regions. GlobalRegionID = "aws-global" // AWS Standard global region. - MECentral1RegionID = "me-central-1" // Middle East (UAE). - MESouth1RegionID = "me-south-1" // Middle East (Bahrain). - SAEast1RegionID = "sa-east-1" // South America (Sao Paulo). - USEast1RegionID = "us-east-1" // US East (N. Virginia). - USEast2RegionID = "us-east-2" // US East (Ohio). - USWest1RegionID = "us-west-1" // US West (N. California). - USWest2RegionID = "us-west-2" // US West (Oregon). + SAEast1RegionID = "sa-east-1" // South America (Sao Paulo). + USEast1RegionID = "us-east-1" // US East (N. Virginia). + USEast2RegionID = "us-east-2" // US East (Ohio). + USWest1RegionID = "us-west-1" // US West (N. California). + USWest2RegionID = "us-west-2" // US West (Oregon). // AWS China partition's regions. CNNorth1RegionID = "cn-north-1" // China (Beijing). From ecd947ac04cd21dbc488583b0f8fb7b51311802f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 15:34:07 -0500 Subject: [PATCH 291/304] 'names.SAEast1RegionID' -> 'endpoints.SaEast1RegionID'. --- .../cloudtrail/service_account_data_source.go | 2 +- .../hosted_zone_data_source.go | 2 +- .../service/elb/hosted_zone_id_data_source.go | 2 +- .../elb/service_account_data_source.go | 2 +- .../elbv2/hosted_zone_id_data_source.go | 4 +-- internal/service/gamelift/gamelift_test.go | 2 +- internal/service/lambda/function.go | 2 +- .../redshift/service_account_data_source.go | 2 +- internal/service/s3/hosted_zones.go | 2 +- .../prebuilt_ecr_image_data_source.go | 26 +++++++++---------- names/names.go | 1 - 11 files changed, 23 insertions(+), 24 deletions(-) diff --git a/internal/service/cloudtrail/service_account_data_source.go b/internal/service/cloudtrail/service_account_data_source.go index f1de953f582..16bea764579 100644 --- a/internal/service/cloudtrail/service_account_data_source.go +++ b/internal/service/cloudtrail/service_account_data_source.go @@ -45,7 +45,7 @@ var serviceAccountPerRegionMap = map[string]string{ endpoints.IlCentral1RegionID: "683224464357", endpoints.MeCentral1RegionID: "585772288577", endpoints.MeSouth1RegionID: "034638983726", - names.SAEast1RegionID: "814480443879", + endpoints.SaEast1RegionID: "814480443879", names.USEast1RegionID: "086441151436", names.USEast2RegionID: "475085895292", names.USGovEast1RegionID: "608710470296", diff --git a/internal/service/elasticbeanstalk/hosted_zone_data_source.go b/internal/service/elasticbeanstalk/hosted_zone_data_source.go index 58a40ccc897..42cc602fad8 100644 --- a/internal/service/elasticbeanstalk/hosted_zone_data_source.go +++ b/internal/service/elasticbeanstalk/hosted_zone_data_source.go @@ -36,7 +36,7 @@ var hostedZoneIDs = map[string]string{ endpoints.IlCentral1RegionID: "Z02941091PERNCB1MI5H7", // endpoints.MeCentral1RegionID: "", endpoints.MeSouth1RegionID: "Z2BBTEKR2I36N2", - names.SAEast1RegionID: "Z10X7K2B4QSOFV", + endpoints.SaEast1RegionID: "Z10X7K2B4QSOFV", names.USEast1RegionID: "Z117KPS5GTRQ2G", names.USEast2RegionID: "Z14LCN19Q5QHIC", names.USWest1RegionID: "Z1LQECGX5PH1X", diff --git a/internal/service/elb/hosted_zone_id_data_source.go b/internal/service/elb/hosted_zone_id_data_source.go index 83f5fb2336b..2380aef3b50 100644 --- a/internal/service/elb/hosted_zone_id_data_source.go +++ b/internal/service/elb/hosted_zone_id_data_source.go @@ -43,7 +43,7 @@ var hostedZoneIDPerRegionMap = map[string]string{ endpoints.IlCentral1RegionID: "Z09170902867EHPV2DABU", endpoints.MeCentral1RegionID: "Z08230872XQRWHG2XF6I", endpoints.MeSouth1RegionID: "ZS929ML54UICD", - names.SAEast1RegionID: "Z2P70J7HTTTPLU", + endpoints.SaEast1RegionID: "Z2P70J7HTTTPLU", names.USEast1RegionID: "Z35SXDOTRQ7X7K", names.USEast2RegionID: "Z3AADJGX6KTTL2", names.USGovEast1RegionID: "Z166TLBEWOO7G0", diff --git a/internal/service/elb/service_account_data_source.go b/internal/service/elb/service_account_data_source.go index c3b8b25595b..06e4b97a6ed 100644 --- a/internal/service/elb/service_account_data_source.go +++ b/internal/service/elb/service_account_data_source.go @@ -38,7 +38,7 @@ var accountIDPerRegionMap = map[string]string{ endpoints.EuWest3RegionID: "009996457667", // endpoints.MeCentral1RegionID: "", endpoints.MeSouth1RegionID: "076674570225", - names.SAEast1RegionID: "507241528517", + endpoints.SaEast1RegionID: "507241528517", names.USEast1RegionID: "127311923021", names.USEast2RegionID: "033677994240", names.USGovEast1RegionID: "190560391635", diff --git a/internal/service/elbv2/hosted_zone_id_data_source.go b/internal/service/elbv2/hosted_zone_id_data_source.go index 2418484b4dc..8ef81894f3c 100644 --- a/internal/service/elbv2/hosted_zone_id_data_source.go +++ b/internal/service/elbv2/hosted_zone_id_data_source.go @@ -47,7 +47,7 @@ var hostedZoneIDPerRegionALBMap = map[string]string{ endpoints.IlCentral1RegionID: "Z09170902867EHPV2DABU", endpoints.MeCentral1RegionID: "Z08230872XQRWHG2XF6I", endpoints.MeSouth1RegionID: "ZS929ML54UICD", - names.SAEast1RegionID: "Z2P70J7HTTTPLU", + endpoints.SaEast1RegionID: "Z2P70J7HTTTPLU", names.USEast1RegionID: "Z35SXDOTRQ7X7K", names.USEast2RegionID: "Z3AADJGX6KTTL2", names.USGovEast1RegionID: "Z166TLBEWOO7G0", @@ -85,7 +85,7 @@ var hostedZoneIDPerRegionNLBMap = map[string]string{ endpoints.IlCentral1RegionID: "Z0313266YDI6ZRHTGQY4", endpoints.MeCentral1RegionID: "Z00282643NTTLPANJJG2P", endpoints.MeSouth1RegionID: "Z3QSRYVP46NYYV", - names.SAEast1RegionID: "ZTK26PT1VY4CU", + endpoints.SaEast1RegionID: "ZTK26PT1VY4CU", names.USEast1RegionID: "Z26RNL4JYFTOTI", names.USEast2RegionID: "ZLMOA37VPKANP", names.USGovEast1RegionID: "Z1ZSMQQ6Q24QQ8", diff --git a/internal/service/gamelift/gamelift_test.go b/internal/service/gamelift/gamelift_test.go index ec3ddbbde58..6b486400110 100644 --- a/internal/service/gamelift/gamelift_test.go +++ b/internal/service/gamelift/gamelift_test.go @@ -60,7 +60,7 @@ func testAccAccountIdByRegion(region string) (string, error) { endpoints.EuCentral1RegionID: "797584052317", endpoints.EuWest1RegionID: "319803218673", endpoints.EuWest2RegionID: "937342764187", - names.SAEast1RegionID: "028872612690", + endpoints.SaEast1RegionID: "028872612690", names.USEast1RegionID: "783764748367", names.USEast2RegionID: "415729564621", names.USWest1RegionID: "715879310420", diff --git a/internal/service/lambda/function.go b/internal/service/lambda/function.go index c5153598492..1a05a6f8070 100644 --- a/internal/service/lambda/function.go +++ b/internal/service/lambda/function.go @@ -1418,7 +1418,7 @@ func signerServiceIsAvailable(region string) bool { endpoints.EuWest3RegionID: {}, endpoints.EuNorth1RegionID: {}, endpoints.MeSouth1RegionID: {}, - names.SAEast1RegionID: {}, + endpoints.SaEast1RegionID: {}, } _, ok := availableRegions[region] diff --git a/internal/service/redshift/service_account_data_source.go b/internal/service/redshift/service_account_data_source.go index e25bd1cb960..56d6b20e689 100644 --- a/internal/service/redshift/service_account_data_source.go +++ b/internal/service/redshift/service_account_data_source.go @@ -39,7 +39,7 @@ var ServiceAccountPerRegionMap = map[string]string{ endpoints.EuWest3RegionID: "915173422425", // endpoints.MeCentral1RegionID: "", endpoints.MeSouth1RegionID: "013126148197", - names.SAEast1RegionID: "075028567923", + endpoints.SaEast1RegionID: "075028567923", names.USEast1RegionID: "193672423079", names.USEast2RegionID: "391106570357", names.USGovEast1RegionID: "665727464434", diff --git a/internal/service/s3/hosted_zones.go b/internal/service/s3/hosted_zones.go index d3158d5538e..4cb1063e6e6 100644 --- a/internal/service/s3/hosted_zones.go +++ b/internal/service/s3/hosted_zones.go @@ -39,7 +39,7 @@ var hostedZoneIDsMap = map[string]string{ endpoints.IlCentral1RegionID: "Z09640613K4A3MN55U7GU", endpoints.MeCentral1RegionID: "Z06143092I8HRXZRUZROF", endpoints.MeSouth1RegionID: "Z1MPMWCPA7YB62", - names.SAEast1RegionID: "Z7KQH4QJS55SO", + endpoints.SaEast1RegionID: "Z7KQH4QJS55SO", names.USEast1RegionID: "Z3AQBSTGFYJSTF", names.USEast2RegionID: "Z2O1EMRO9K5GLX", names.USGovEast1RegionID: "Z2NIFVYYW2VKV1", diff --git a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go index 9f157fcf3dc..5cb5ceaa06c 100644 --- a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go +++ b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go @@ -215,7 +215,7 @@ var prebuiltECRImageIDByRegion_blazing = map[string]string{ endpoints.IlCentral1RegionID: "898809789911", endpoints.MeCentral1RegionID: "272398656194", endpoints.MeSouth1RegionID: "249704162688", - names.SAEast1RegionID: "855470959533", + endpoints.SaEast1RegionID: "855470959533", names.USEast1RegionID: "811284229777", names.USEast2RegionID: "825641698319", names.USGovEast1RegionID: "237065988967", @@ -248,7 +248,7 @@ var prebuiltECRImageIDByRegion_clarify = map[string]string{ endpoints.EuWest2RegionID: "440796970383", endpoints.EuWest3RegionID: "341593696636", endpoints.MeSouth1RegionID: "835444307964", - names.SAEast1RegionID: "520018980103", + endpoints.SaEast1RegionID: "520018980103", names.USEast1RegionID: "205585389593", names.USEast2RegionID: "211330385671", names.USGovWest1RegionID: "598674086554", @@ -278,7 +278,7 @@ var prebuiltECRImageIDByRegion_dataWrangler = map[string]string{ endpoints.EuWest3RegionID: "807237891255", endpoints.IlCentral1RegionID: "406833011540", endpoints.MeSouth1RegionID: "376037874950", - names.SAEast1RegionID: "424196993095", + endpoints.SaEast1RegionID: "424196993095", names.USEast1RegionID: "663277389841", names.USEast2RegionID: "415577184552", names.USWest1RegionID: "926135532090", @@ -306,7 +306,7 @@ var prebuiltECRImageIDByRegion_debugger = map[string]string{ endpoints.EuWest2RegionID: "250201462417", endpoints.EuWest3RegionID: "447278800020", endpoints.MeSouth1RegionID: "986000313247", - names.SAEast1RegionID: "818342061345", + endpoints.SaEast1RegionID: "818342061345", names.USEast1RegionID: "503895931360", names.USEast2RegionID: "915447279597", names.USGovWest1RegionID: "515509971035", @@ -342,7 +342,7 @@ var prebuiltECRImageIDByRegion_inferentiaNeo = map[string]string{ endpoints.EuWest3RegionID: "254080097072", endpoints.IlCentral1RegionID: "275950707576", endpoints.MeSouth1RegionID: "836785723513", - names.SAEast1RegionID: "756306329178", + endpoints.SaEast1RegionID: "756306329178", names.USEast1RegionID: "785573368785", names.USEast2RegionID: "007439368137", names.USGovWest1RegionID: "263933020539", @@ -377,7 +377,7 @@ var prebuiltECRImageIDByRegion_SageMakerCustom = map[string]string{ // nosemgrep endpoints.EuWest2RegionID: "520713654638", endpoints.EuWest3RegionID: "520713654638", endpoints.MeSouth1RegionID: "724002660598", - names.SAEast1RegionID: "520713654638", + endpoints.SaEast1RegionID: "520713654638", names.USEast1RegionID: "520713654638", names.USEast2RegionID: "520713654638", names.USGovWest1RegionID: "246785580436", @@ -436,7 +436,7 @@ var prebuiltECRImageIDByRegion_spark = map[string]string{ endpoints.IlCentral1RegionID: "408426139102", endpoints.MeCentral1RegionID: "395420993607", endpoints.MeSouth1RegionID: "750251592176", - names.SAEast1RegionID: "737130764395", + endpoints.SaEast1RegionID: "737130764395", names.USEast1RegionID: "173754725891", names.USEast2RegionID: "314815235551", names.USGovEast1RegionID: "260923028637", @@ -470,7 +470,7 @@ var prebuiltECRImageIDByRegion_SageMakerBasePython = map[string]string{ // nosem endpoints.IlCentral1RegionID: "380164790875", endpoints.MeCentral1RegionID: "103105715889", endpoints.MeSouth1RegionID: "117516905037", - names.SAEast1RegionID: "782484402741", + endpoints.SaEast1RegionID: "782484402741", names.USEast1RegionID: "081325390199", names.USEast2RegionID: "429704687514", names.USGovEast1RegionID: "107072934176", @@ -514,7 +514,7 @@ var prebuiltECRImageIDByRegion_deepAR = map[string]string{ endpoints.IlCentral1RegionID: "898809789911", endpoints.MeCentral1RegionID: "272398656194", endpoints.MeSouth1RegionID: "249704162688", - names.SAEast1RegionID: "855470959533", + endpoints.SaEast1RegionID: "855470959533", names.USEast1RegionID: "522234722520", names.USEast2RegionID: "566113047672", names.USGovEast1RegionID: "237065988967", @@ -559,7 +559,7 @@ var prebuiltECRImageIDByRegion_factorMachines = map[string]string{ endpoints.IlCentral1RegionID: "898809789911", endpoints.MeCentral1RegionID: "272398656194", endpoints.MeSouth1RegionID: "249704162688", - names.SAEast1RegionID: "855470959533", + endpoints.SaEast1RegionID: "855470959533", names.USEast1RegionID: "382416733822", names.USEast2RegionID: "404615174143", names.USGovEast1RegionID: "237065988967", @@ -624,7 +624,7 @@ var prebuiltECRImageIDByRegion_XGBoost = map[string]string{ endpoints.IlCentral1RegionID: "898809789911", endpoints.MeCentral1RegionID: "272398656194", endpoints.MeSouth1RegionID: "801668240914", - names.SAEast1RegionID: "737474898029", + endpoints.SaEast1RegionID: "737474898029", names.USEast1RegionID: "683313688378", names.USEast2RegionID: "257758044811", names.USGovEast1RegionID: "237065988967", @@ -676,7 +676,7 @@ var prebuiltECRImageIDByRegion_deepLearning = map[string]string{ endpoints.IlCentral1RegionID: "780543022126", endpoints.MeCentral1RegionID: "914824155844", endpoints.MeSouth1RegionID: "217643126080", - names.SAEast1RegionID: "763104351884", + endpoints.SaEast1RegionID: "763104351884", names.USEast1RegionID: "763104351884", names.USEast2RegionID: "763104351884", names.USWest1RegionID: "763104351884", @@ -712,7 +712,7 @@ var prebuiltECRImageIDByRegion_modelMonitor = map[string]string{ endpoints.IlCentral1RegionID: "843974653677", endpoints.MeCentral1RegionID: "588750061953", endpoints.MeSouth1RegionID: "607024016150", - names.SAEast1RegionID: "539772159869", + endpoints.SaEast1RegionID: "539772159869", names.USEast1RegionID: "156813124566", names.USEast2RegionID: "777275614652", names.USWest1RegionID: "890145073186", diff --git a/names/names.go b/names/names.go index b3bb7fb4f58..e16a3814713 100644 --- a/names/names.go +++ b/names/names.go @@ -149,7 +149,6 @@ const ( // AWS Standard partition's regions. GlobalRegionID = "aws-global" // AWS Standard global region. - SAEast1RegionID = "sa-east-1" // South America (Sao Paulo). USEast1RegionID = "us-east-1" // US East (N. Virginia). USEast2RegionID = "us-east-2" // US East (Ohio). USWest1RegionID = "us-west-1" // US West (N. California). From 8b8dcb098b8a20c0fb820f6ed1cac5f18b095bdf Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 15:35:01 -0500 Subject: [PATCH 292/304] 'names.CNNorth1RegionID' -> 'endpoints.CnNorth1RegionID'. --- internal/acctest/partition_test.go | 4 +-- .../cloudtrail/service_account_data_source.go | 2 +- .../service/elb/hosted_zone_id_data_source.go | 2 +- .../elb/service_account_data_source.go | 2 +- .../elbv2/hosted_zone_id_data_source.go | 4 +-- .../service/meta/service_data_source_test.go | 4 +-- .../redshift/service_account_data_source.go | 2 +- internal/service/s3/bucket_test.go | 8 +++--- internal/service/s3/hosted_zones.go | 2 +- .../prebuilt_ecr_image_data_source.go | 26 +++++++++---------- names/names.go | 1 - 11 files changed, 28 insertions(+), 29 deletions(-) diff --git a/internal/acctest/partition_test.go b/internal/acctest/partition_test.go index e9eb57ee1e1..d8fed875350 100644 --- a/internal/acctest/partition_test.go +++ b/internal/acctest/partition_test.go @@ -71,7 +71,7 @@ func TestIsIsolatedRegion(t *testing.T) { expected: false, }, { - input: names.CNNorth1RegionID, + input: endpoints.CnNorth1RegionID, expected: false, }, { @@ -163,7 +163,7 @@ func TestIsStandardRegion(t *testing.T) { expected: true, }, { - input: names.CNNorth1RegionID, + input: endpoints.CnNorth1RegionID, expected: false, }, { diff --git a/internal/service/cloudtrail/service_account_data_source.go b/internal/service/cloudtrail/service_account_data_source.go index 16bea764579..b88c5e41f85 100644 --- a/internal/service/cloudtrail/service_account_data_source.go +++ b/internal/service/cloudtrail/service_account_data_source.go @@ -32,7 +32,7 @@ var serviceAccountPerRegionMap = map[string]string{ endpoints.ApSoutheast3RegionID: "069019280451", endpoints.ApSoutheast4RegionID: "187074758985", endpoints.CaCentral1RegionID: "819402241893", - names.CNNorth1RegionID: "193415116832", + endpoints.CnNorth1RegionID: "193415116832", names.CNNorthwest1RegionID: "681348832753", endpoints.EuCentral1RegionID: "035351147821", endpoints.EuCentral2RegionID: "453052556044", diff --git a/internal/service/elb/hosted_zone_id_data_source.go b/internal/service/elb/hosted_zone_id_data_source.go index 2380aef3b50..0d527c6cf92 100644 --- a/internal/service/elb/hosted_zone_id_data_source.go +++ b/internal/service/elb/hosted_zone_id_data_source.go @@ -30,7 +30,7 @@ var hostedZoneIDPerRegionMap = map[string]string{ endpoints.ApSoutheast5RegionID: "Z06010284QMVVW7WO5J", endpoints.CaCentral1RegionID: "ZQSVJUPU6J1EY", endpoints.CaWest1RegionID: "Z06473681N0SF6OS049SD", - names.CNNorth1RegionID: "Z1GDH35T77C1KE", + endpoints.CnNorth1RegionID: "Z1GDH35T77C1KE", names.CNNorthwest1RegionID: "ZM7IZAIOVVDZF", endpoints.EuCentral1RegionID: "Z215JYRZR1TBD5", endpoints.EuCentral2RegionID: "Z06391101F2ZOEP8P5EB3", diff --git a/internal/service/elb/service_account_data_source.go b/internal/service/elb/service_account_data_source.go index 06e4b97a6ed..a44393f016d 100644 --- a/internal/service/elb/service_account_data_source.go +++ b/internal/service/elb/service_account_data_source.go @@ -28,7 +28,7 @@ var accountIDPerRegionMap = map[string]string{ endpoints.ApSoutheast2RegionID: "783225319266", endpoints.ApSoutheast3RegionID: "589379963580", endpoints.CaCentral1RegionID: "985666609251", - names.CNNorth1RegionID: "638102146993", + endpoints.CnNorth1RegionID: "638102146993", names.CNNorthwest1RegionID: "037604701340", endpoints.EuCentral1RegionID: "054676820928", endpoints.EuNorth1RegionID: "897822967062", diff --git a/internal/service/elbv2/hosted_zone_id_data_source.go b/internal/service/elbv2/hosted_zone_id_data_source.go index 8ef81894f3c..4f063c36c72 100644 --- a/internal/service/elbv2/hosted_zone_id_data_source.go +++ b/internal/service/elbv2/hosted_zone_id_data_source.go @@ -34,7 +34,7 @@ var hostedZoneIDPerRegionALBMap = map[string]string{ endpoints.ApSoutheast5RegionID: "Z06010284QMVVW7WO5J", endpoints.CaCentral1RegionID: "ZQSVJUPU6J1EY", endpoints.CaWest1RegionID: "Z06473681N0SF6OS049SD", - names.CNNorth1RegionID: "Z1GDH35T77C1KE", + endpoints.CnNorth1RegionID: "Z1GDH35T77C1KE", names.CNNorthwest1RegionID: "ZM7IZAIOVVDZF", endpoints.EuCentral1RegionID: "Z215JYRZR1TBD5", endpoints.EuCentral2RegionID: "Z06391101F2ZOEP8P5EB3", @@ -72,7 +72,7 @@ var hostedZoneIDPerRegionNLBMap = map[string]string{ endpoints.ApSoutheast5RegionID: "Z026317210H9ACVTRO6FB", endpoints.CaCentral1RegionID: "Z2EPGBW3API2WT", endpoints.CaWest1RegionID: "Z02754302KBB00W2LKWZ9", - names.CNNorth1RegionID: "Z3QFB96KMJ7ED6", + endpoints.CnNorth1RegionID: "Z3QFB96KMJ7ED6", names.CNNorthwest1RegionID: "ZQEIKTCZ8352D", endpoints.EuCentral1RegionID: "Z3F0SRJ5LGBH90", endpoints.EuCentral2RegionID: "Z02239872DOALSIDCX66S", diff --git a/internal/service/meta/service_data_source_test.go b/internal/service/meta/service_data_source_test.go index 20fbd4a93ef..630346034d2 100644 --- a/internal/service/meta/service_data_source_test.go +++ b/internal/service/meta/service_data_source_test.go @@ -103,8 +103,8 @@ func TestAccMetaServiceDataSource_byReverseDNSName(t *testing.T) { { Config: testAccServiceDataSourceConfig_byReverseDNSName(), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr(dataSourceName, names.AttrRegion, names.CNNorth1RegionID), - resource.TestCheckResourceAttr(dataSourceName, "reverse_dns_name", fmt.Sprintf("%s.%s.%s", "cn.com.amazonaws", names.CNNorth1RegionID, names.S3)), + resource.TestCheckResourceAttr(dataSourceName, names.AttrRegion, endpoints.CnNorth1RegionID), + resource.TestCheckResourceAttr(dataSourceName, "reverse_dns_name", fmt.Sprintf("%s.%s.%s", "cn.com.amazonaws", endpoints.CnNorth1RegionID, names.S3)), resource.TestCheckResourceAttr(dataSourceName, "reverse_dns_prefix", "cn.com.amazonaws"), resource.TestCheckResourceAttr(dataSourceName, "service_id", names.S3), resource.TestCheckResourceAttr(dataSourceName, "supported", acctest.CtTrue), diff --git a/internal/service/redshift/service_account_data_source.go b/internal/service/redshift/service_account_data_source.go index 56d6b20e689..9db6540bcdd 100644 --- a/internal/service/redshift/service_account_data_source.go +++ b/internal/service/redshift/service_account_data_source.go @@ -29,7 +29,7 @@ var ServiceAccountPerRegionMap = map[string]string{ endpoints.ApSoutheast1RegionID: "361669875840", endpoints.ApSoutheast2RegionID: "762762565011", endpoints.CaCentral1RegionID: "907379612154", - names.CNNorth1RegionID: "111890595117", + endpoints.CnNorth1RegionID: "111890595117", names.CNNorthwest1RegionID: "660998842044", endpoints.EuCentral1RegionID: "053454850223", endpoints.EuNorth1RegionID: "729911121831", diff --git a/internal/service/s3/bucket_test.go b/internal/service/s3/bucket_test.go index 1ba3a415f76..bb7319c811b 100644 --- a/internal/service/s3/bucket_test.go +++ b/internal/service/s3/bucket_test.go @@ -2384,9 +2384,9 @@ func TestBucketRegionalDomainName(t *testing.T) { ExpectedOutput: bucket + fmt.Sprintf(".s3.%s.%s", names.USGovWest1RegionID, acctest.PartitionDNSSuffix()), }, { - Region: names.CNNorth1RegionID, + Region: endpoints.CnNorth1RegionID, ExpectedErrCount: 0, - ExpectedOutput: bucket + fmt.Sprintf(".s3.%s.amazonaws.com.cn", names.CNNorth1RegionID), + ExpectedOutput: bucket + fmt.Sprintf(".s3.%s.amazonaws.com.cn", endpoints.CnNorth1RegionID), }, } @@ -2428,8 +2428,8 @@ func TestWebsiteEndpoint(t *testing.T) { Expected: fmt.Sprintf("bucket-name.s3-website.%s.sc2s.sgov.gov", names.USISOBEast1RegionID), }, { - LocationConstraint: names.CNNorth1RegionID, - Expected: fmt.Sprintf("bucket-name.s3-website.%s.amazonaws.com.cn", names.CNNorth1RegionID), + LocationConstraint: endpoints.CnNorth1RegionID, + Expected: fmt.Sprintf("bucket-name.s3-website.%s.amazonaws.com.cn", endpoints.CnNorth1RegionID), }, } diff --git a/internal/service/s3/hosted_zones.go b/internal/service/s3/hosted_zones.go index 4cb1063e6e6..02f42065207 100644 --- a/internal/service/s3/hosted_zones.go +++ b/internal/service/s3/hosted_zones.go @@ -26,7 +26,7 @@ var hostedZoneIDsMap = map[string]string{ endpoints.ApSoutheast5RegionID: "Z08660063OXLMA7F1FJHU", endpoints.CaCentral1RegionID: "Z1QDHH18159H29", endpoints.CaWest1RegionID: "Z03565811Z33SLEZTHOUL", - names.CNNorth1RegionID: "Z5CN8UMXT92WN", + endpoints.CnNorth1RegionID: "Z5CN8UMXT92WN", names.CNNorthwest1RegionID: "Z282HJ1KT0DH03", endpoints.EuCentral1RegionID: "Z21DNDUVLTQW6Q", endpoints.EuCentral2RegionID: "Z030506016YDQGETNASS", diff --git a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go index 5cb5ceaa06c..b2f805b6ddc 100644 --- a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go +++ b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go @@ -202,7 +202,7 @@ var prebuiltECRImageIDByRegion_blazing = map[string]string{ endpoints.ApSoutheast4RegionID: "106583098589", endpoints.CaCentral1RegionID: "469771592824", endpoints.CaWest1RegionID: "190319476487", - names.CNNorth1RegionID: "390948362332", + endpoints.CnNorth1RegionID: "390948362332", names.CNNorthwest1RegionID: "387376663083", endpoints.EuCentral1RegionID: "813361260812", endpoints.EuCentral2RegionID: "680994064768", @@ -239,7 +239,7 @@ var prebuiltECRImageIDByRegion_clarify = map[string]string{ endpoints.ApSoutheast2RegionID: "007051062584", endpoints.ApSoutheast3RegionID: "705930551576", endpoints.CaCentral1RegionID: "675030665977", - names.CNNorth1RegionID: "122526803553", + endpoints.CnNorth1RegionID: "122526803553", names.CNNorthwest1RegionID: "122578899357", endpoints.EuCentral1RegionID: "017069133835", endpoints.EuNorth1RegionID: "763603941244", @@ -268,7 +268,7 @@ var prebuiltECRImageIDByRegion_dataWrangler = map[string]string{ endpoints.ApSoutheast1RegionID: "119527597002", endpoints.ApSoutheast2RegionID: "422173101802", endpoints.CaCentral1RegionID: "557239378090", - names.CNNorth1RegionID: "245909111842", + endpoints.CnNorth1RegionID: "245909111842", names.CNNorthwest1RegionID: "249157047649", endpoints.EuCentral1RegionID: "024640144536", endpoints.EuNorth1RegionID: "054986407534", @@ -297,7 +297,7 @@ var prebuiltECRImageIDByRegion_debugger = map[string]string{ endpoints.ApSoutheast1RegionID: "972752614525", endpoints.ApSoutheast2RegionID: "184798709955", endpoints.CaCentral1RegionID: "519511493484", - names.CNNorth1RegionID: "618459771430", + endpoints.CnNorth1RegionID: "618459771430", names.CNNorthwest1RegionID: "658757709296", endpoints.EuCentral1RegionID: "482524230118", endpoints.EuNorth1RegionID: "314864569078", @@ -332,7 +332,7 @@ var prebuiltECRImageIDByRegion_inferentiaNeo = map[string]string{ endpoints.ApSoutheast1RegionID: "324986816169", endpoints.ApSoutheast2RegionID: "355873309152", endpoints.CaCentral1RegionID: "464438896020", - names.CNNorth1RegionID: "472730292857", + endpoints.CnNorth1RegionID: "472730292857", names.CNNorthwest1RegionID: "474822919863", endpoints.EuCentral1RegionID: "746233611703", endpoints.EuNorth1RegionID: "601324751636", @@ -368,7 +368,7 @@ var prebuiltECRImageIDByRegion_SageMakerCustom = map[string]string{ // nosemgrep endpoints.ApSoutheast1RegionID: "520713654638", endpoints.ApSoutheast2RegionID: "520713654638", endpoints.CaCentral1RegionID: "520713654638", - names.CNNorth1RegionID: "422961961927", + endpoints.CnNorth1RegionID: "422961961927", names.CNNorthwest1RegionID: "423003514399", endpoints.EuCentral1RegionID: "520713654638", endpoints.EuNorth1RegionID: "520713654638", @@ -423,7 +423,7 @@ var prebuiltECRImageIDByRegion_spark = map[string]string{ endpoints.ApSoutheast4RegionID: "819679513684", endpoints.CaCentral1RegionID: "446299261295", endpoints.CaWest1RegionID: "000907499111", - names.CNNorth1RegionID: "671472414489", + endpoints.CnNorth1RegionID: "671472414489", names.CNNorthwest1RegionID: "844356804704", endpoints.EuCentral1RegionID: "906073651304", endpoints.EuCentral2RegionID: "142351485170", @@ -458,7 +458,7 @@ var prebuiltECRImageIDByRegion_SageMakerBasePython = map[string]string{ // nosem endpoints.ApSoutheast2RegionID: "452832661640", endpoints.ApSoutheast3RegionID: "276181064229", endpoints.CaCentral1RegionID: "310906938811", - names.CNNorth1RegionID: "390048526115", + endpoints.CnNorth1RegionID: "390048526115", names.CNNorthwest1RegionID: "390780980154", endpoints.EuCentral1RegionID: "936697816551", endpoints.EuNorth1RegionID: "243637512696", @@ -501,7 +501,7 @@ var prebuiltECRImageIDByRegion_deepAR = map[string]string{ endpoints.ApSoutheast4RegionID: "106583098589", endpoints.CaCentral1RegionID: "469771592824", endpoints.CaWest1RegionID: "190319476487", - names.CNNorth1RegionID: "390948362332", + endpoints.CnNorth1RegionID: "390948362332", names.CNNorthwest1RegionID: "387376663083", endpoints.EuCentral1RegionID: "495149712605", endpoints.EuCentral2RegionID: "680994064768", @@ -546,7 +546,7 @@ var prebuiltECRImageIDByRegion_factorMachines = map[string]string{ endpoints.ApSoutheast4RegionID: "106583098589", endpoints.CaCentral1RegionID: "469771592824", endpoints.CaWest1RegionID: "190319476487", - names.CNNorth1RegionID: "390948362332", + endpoints.CnNorth1RegionID: "390948362332", names.CNNorthwest1RegionID: "387376663083", endpoints.EuCentral1RegionID: "664544806723", endpoints.EuCentral2RegionID: "680994064768", @@ -611,7 +611,7 @@ var prebuiltECRImageIDByRegion_XGBoost = map[string]string{ endpoints.ApSoutheast4RegionID: "106583098589", endpoints.CaCentral1RegionID: "341280168497", endpoints.CaWest1RegionID: "190319476487", - names.CNNorth1RegionID: "450853457545", + endpoints.CnNorth1RegionID: "450853457545", names.CNNorthwest1RegionID: "451049120500", endpoints.EuCentral1RegionID: "492215442770", endpoints.EuCentral2RegionID: "680994064768", @@ -663,7 +663,7 @@ var prebuiltECRImageIDByRegion_deepLearning = map[string]string{ endpoints.ApSoutheast4RegionID: "457447274322", endpoints.CaCentral1RegionID: "763104351884", endpoints.CaWest1RegionID: "204538143572", - names.CNNorth1RegionID: "727897471807", + endpoints.CnNorth1RegionID: "727897471807", names.CNNorthwest1RegionID: "727897471807", endpoints.EuCentral1RegionID: "763104351884", endpoints.EuCentral2RegionID: "380420809688", @@ -700,7 +700,7 @@ var prebuiltECRImageIDByRegion_modelMonitor = map[string]string{ endpoints.ApSoutheast2RegionID: "563025443158", endpoints.ApSoutheast3RegionID: "669540362728", endpoints.CaCentral1RegionID: "536280801234", - names.CNNorth1RegionID: "453000072557", + endpoints.CnNorth1RegionID: "453000072557", names.CNNorthwest1RegionID: "453252182341", endpoints.EuCentral1RegionID: "048819808253", endpoints.EuNorth1RegionID: "895015795356", diff --git a/names/names.go b/names/names.go index e16a3814713..4210945949a 100644 --- a/names/names.go +++ b/names/names.go @@ -155,7 +155,6 @@ const ( USWest2RegionID = "us-west-2" // US West (Oregon). // AWS China partition's regions. - CNNorth1RegionID = "cn-north-1" // China (Beijing). CNNorthwest1RegionID = "cn-northwest-1" // China (Ningxia). // AWS GovCloud (US) partition's regions. From ec43fc1e501ea5e70ffdb1490fd53122a7dbb90c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 15:37:02 -0500 Subject: [PATCH 293/304] 'names.CNNorthwest1RegionID' -> 'endpoints.CnNorthwest1RegionID'. --- internal/acctest/acctest.go | 2 +- internal/provider/provider_acc_test.go | 2 +- .../service/cloudfront/distribution_test.go | 2 +- ...very_canonical_user_id_data_source_test.go | 3 ++- .../cloudtrail/service_account_data_source.go | 2 +- .../service/elb/hosted_zone_id_data_source.go | 2 +- .../elb/service_account_data_source.go | 2 +- .../elbv2/hosted_zone_id_data_source.go | 4 +-- .../redshift/service_account_data_source.go | 2 +- internal/service/route53/service_package.go | 2 +- internal/service/s3/hosted_zones.go | 2 +- .../prebuilt_ecr_image_data_source.go | 26 +++++++++---------- 12 files changed, 26 insertions(+), 25 deletions(-) diff --git a/internal/acctest/acctest.go b/internal/acctest/acctest.go index d115d944cd8..575c1385c77 100644 --- a/internal/acctest/acctest.go +++ b/internal/acctest/acctest.go @@ -1376,7 +1376,7 @@ func PreCheckWAFV2CloudFrontScope(ctx context.Context, t *testing.T) { case endpoints.AwsPartitionID: PreCheckRegion(t, names.USEast1RegionID) case endpoints.AwsCnPartitionID: - PreCheckRegion(t, names.CNNorthwest1RegionID) + PreCheckRegion(t, endpoints.CnNorthwest1RegionID) } conn := Provider.Meta().(*conns.AWSClient).WAFV2Client(ctx) diff --git a/internal/provider/provider_acc_test.go b/internal/provider/provider_acc_test.go index 481c724ff05..2d749e43aea 100644 --- a/internal/provider/provider_acc_test.go +++ b/internal/provider/provider_acc_test.go @@ -541,7 +541,7 @@ func TestAccProvider_Region_china(t *testing.T) { CheckDestroy: nil, Steps: []resource.TestStep{ { - Config: testAccProviderConfig_region(names.CNNorthwest1RegionID), + Config: testAccProviderConfig_region(endpoints.CnNorthwest1RegionID), Check: resource.ComposeTestCheckFunc( testAccCheckDNSSuffix(ctx, t, &provider, "amazonaws.com.cn"), testAccCheckPartition(ctx, t, &provider, endpoints.AwsCnPartitionID), diff --git a/internal/service/cloudfront/distribution_test.go b/internal/service/cloudfront/distribution_test.go index 39ae34e0e47..d4f8c7940d7 100644 --- a/internal/service/cloudfront/distribution_test.go +++ b/internal/service/cloudfront/distribution_test.go @@ -1561,7 +1561,7 @@ func testAccRegionProviderConfig() string { case endpoints.AwsPartitionID: return acctest.ConfigRegionalProvider(names.USEast1RegionID) case endpoints.AwsCnPartitionID: - return acctest.ConfigRegionalProvider(names.CNNorthwest1RegionID) + return acctest.ConfigRegionalProvider(endpoints.CnNorthwest1RegionID) default: return acctest.ConfigRegionalProvider(acctest.Region()) } diff --git a/internal/service/cloudfront/log_delivery_canonical_user_id_data_source_test.go b/internal/service/cloudfront/log_delivery_canonical_user_id_data_source_test.go index cbf1d8569c6..53735a3555a 100644 --- a/internal/service/cloudfront/log_delivery_canonical_user_id_data_source_test.go +++ b/internal/service/cloudfront/log_delivery_canonical_user_id_data_source_test.go @@ -7,6 +7,7 @@ import ( "fmt" "testing" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-aws/internal/acctest" "github.com/hashicorp/terraform-provider-aws/names" @@ -60,7 +61,7 @@ func TestAccCloudFrontLogDeliveryCanonicalUserIDDataSource_cn(t *testing.T) { ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, Steps: []resource.TestStep{ { - Config: testAccLogDeliveryCanonicalUserIdDataSourceConfig_basic(names.CNNorthwest1RegionID), + Config: testAccLogDeliveryCanonicalUserIdDataSourceConfig_basic(endpoints.CnNorthwest1RegionID), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr(dataSourceName, names.AttrID, "a52cb28745c0c06e84ec548334e44bfa7fc2a85c54af20cd59e4969344b7af56"), ), diff --git a/internal/service/cloudtrail/service_account_data_source.go b/internal/service/cloudtrail/service_account_data_source.go index b88c5e41f85..8aa7a7633ed 100644 --- a/internal/service/cloudtrail/service_account_data_source.go +++ b/internal/service/cloudtrail/service_account_data_source.go @@ -33,7 +33,7 @@ var serviceAccountPerRegionMap = map[string]string{ endpoints.ApSoutheast4RegionID: "187074758985", endpoints.CaCentral1RegionID: "819402241893", endpoints.CnNorth1RegionID: "193415116832", - names.CNNorthwest1RegionID: "681348832753", + endpoints.CnNorthwest1RegionID: "681348832753", endpoints.EuCentral1RegionID: "035351147821", endpoints.EuCentral2RegionID: "453052556044", endpoints.EuNorth1RegionID: "829690693026", diff --git a/internal/service/elb/hosted_zone_id_data_source.go b/internal/service/elb/hosted_zone_id_data_source.go index 0d527c6cf92..bf546c5fdd2 100644 --- a/internal/service/elb/hosted_zone_id_data_source.go +++ b/internal/service/elb/hosted_zone_id_data_source.go @@ -31,7 +31,7 @@ var hostedZoneIDPerRegionMap = map[string]string{ endpoints.CaCentral1RegionID: "ZQSVJUPU6J1EY", endpoints.CaWest1RegionID: "Z06473681N0SF6OS049SD", endpoints.CnNorth1RegionID: "Z1GDH35T77C1KE", - names.CNNorthwest1RegionID: "ZM7IZAIOVVDZF", + endpoints.CnNorthwest1RegionID: "ZM7IZAIOVVDZF", endpoints.EuCentral1RegionID: "Z215JYRZR1TBD5", endpoints.EuCentral2RegionID: "Z06391101F2ZOEP8P5EB3", endpoints.EuNorth1RegionID: "Z23TAZ6LKFMNIO", diff --git a/internal/service/elb/service_account_data_source.go b/internal/service/elb/service_account_data_source.go index a44393f016d..404b5d4a0af 100644 --- a/internal/service/elb/service_account_data_source.go +++ b/internal/service/elb/service_account_data_source.go @@ -29,7 +29,7 @@ var accountIDPerRegionMap = map[string]string{ endpoints.ApSoutheast3RegionID: "589379963580", endpoints.CaCentral1RegionID: "985666609251", endpoints.CnNorth1RegionID: "638102146993", - names.CNNorthwest1RegionID: "037604701340", + endpoints.CnNorthwest1RegionID: "037604701340", endpoints.EuCentral1RegionID: "054676820928", endpoints.EuNorth1RegionID: "897822967062", endpoints.EuSouth1RegionID: "635631232127", diff --git a/internal/service/elbv2/hosted_zone_id_data_source.go b/internal/service/elbv2/hosted_zone_id_data_source.go index 4f063c36c72..cb7946c1ff4 100644 --- a/internal/service/elbv2/hosted_zone_id_data_source.go +++ b/internal/service/elbv2/hosted_zone_id_data_source.go @@ -35,7 +35,7 @@ var hostedZoneIDPerRegionALBMap = map[string]string{ endpoints.CaCentral1RegionID: "ZQSVJUPU6J1EY", endpoints.CaWest1RegionID: "Z06473681N0SF6OS049SD", endpoints.CnNorth1RegionID: "Z1GDH35T77C1KE", - names.CNNorthwest1RegionID: "ZM7IZAIOVVDZF", + endpoints.CnNorthwest1RegionID: "ZM7IZAIOVVDZF", endpoints.EuCentral1RegionID: "Z215JYRZR1TBD5", endpoints.EuCentral2RegionID: "Z06391101F2ZOEP8P5EB3", endpoints.EuNorth1RegionID: "Z23TAZ6LKFMNIO", @@ -73,7 +73,7 @@ var hostedZoneIDPerRegionNLBMap = map[string]string{ endpoints.CaCentral1RegionID: "Z2EPGBW3API2WT", endpoints.CaWest1RegionID: "Z02754302KBB00W2LKWZ9", endpoints.CnNorth1RegionID: "Z3QFB96KMJ7ED6", - names.CNNorthwest1RegionID: "ZQEIKTCZ8352D", + endpoints.CnNorthwest1RegionID: "ZQEIKTCZ8352D", endpoints.EuCentral1RegionID: "Z3F0SRJ5LGBH90", endpoints.EuCentral2RegionID: "Z02239872DOALSIDCX66S", endpoints.EuNorth1RegionID: "Z1UDT6IFJ4EJM", diff --git a/internal/service/redshift/service_account_data_source.go b/internal/service/redshift/service_account_data_source.go index 9db6540bcdd..92b3348a537 100644 --- a/internal/service/redshift/service_account_data_source.go +++ b/internal/service/redshift/service_account_data_source.go @@ -30,7 +30,7 @@ var ServiceAccountPerRegionMap = map[string]string{ endpoints.ApSoutheast2RegionID: "762762565011", endpoints.CaCentral1RegionID: "907379612154", endpoints.CnNorth1RegionID: "111890595117", - names.CNNorthwest1RegionID: "660998842044", + endpoints.CnNorthwest1RegionID: "660998842044", endpoints.EuCentral1RegionID: "053454850223", endpoints.EuNorth1RegionID: "729911121831", endpoints.EuSouth1RegionID: "945612479654", diff --git a/internal/service/route53/service_package.go b/internal/service/route53/service_package.go index f3733ce2bc2..892e724f39a 100644 --- a/internal/service/route53/service_package.go +++ b/internal/service/route53/service_package.go @@ -38,7 +38,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( if aws.ToString(o.BaseEndpoint) == "" { o.BaseEndpoint = aws.String("https://api.route53.cn") } - o.Region = names.CNNorthwest1RegionID + o.Region = endpoints.CnNorthwest1RegionID case endpoints.AwsUsGovPartitionID: if cfg.Region != names.USGovWest1RegionID { tflog.Info(ctx, "overriding region", map[string]any{ diff --git a/internal/service/s3/hosted_zones.go b/internal/service/s3/hosted_zones.go index 02f42065207..11dc3f7657d 100644 --- a/internal/service/s3/hosted_zones.go +++ b/internal/service/s3/hosted_zones.go @@ -27,7 +27,7 @@ var hostedZoneIDsMap = map[string]string{ endpoints.CaCentral1RegionID: "Z1QDHH18159H29", endpoints.CaWest1RegionID: "Z03565811Z33SLEZTHOUL", endpoints.CnNorth1RegionID: "Z5CN8UMXT92WN", - names.CNNorthwest1RegionID: "Z282HJ1KT0DH03", + endpoints.CnNorthwest1RegionID: "Z282HJ1KT0DH03", endpoints.EuCentral1RegionID: "Z21DNDUVLTQW6Q", endpoints.EuCentral2RegionID: "Z030506016YDQGETNASS", endpoints.EuNorth1RegionID: "Z3BAZG2TWCNX0D", diff --git a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go index b2f805b6ddc..c5e0489c9fc 100644 --- a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go +++ b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go @@ -203,7 +203,7 @@ var prebuiltECRImageIDByRegion_blazing = map[string]string{ endpoints.CaCentral1RegionID: "469771592824", endpoints.CaWest1RegionID: "190319476487", endpoints.CnNorth1RegionID: "390948362332", - names.CNNorthwest1RegionID: "387376663083", + endpoints.CnNorthwest1RegionID: "387376663083", endpoints.EuCentral1RegionID: "813361260812", endpoints.EuCentral2RegionID: "680994064768", endpoints.EuNorth1RegionID: "669576153137", @@ -240,7 +240,7 @@ var prebuiltECRImageIDByRegion_clarify = map[string]string{ endpoints.ApSoutheast3RegionID: "705930551576", endpoints.CaCentral1RegionID: "675030665977", endpoints.CnNorth1RegionID: "122526803553", - names.CNNorthwest1RegionID: "122578899357", + endpoints.CnNorthwest1RegionID: "122578899357", endpoints.EuCentral1RegionID: "017069133835", endpoints.EuNorth1RegionID: "763603941244", endpoints.EuSouth1RegionID: "638885417683", @@ -269,7 +269,7 @@ var prebuiltECRImageIDByRegion_dataWrangler = map[string]string{ endpoints.ApSoutheast2RegionID: "422173101802", endpoints.CaCentral1RegionID: "557239378090", endpoints.CnNorth1RegionID: "245909111842", - names.CNNorthwest1RegionID: "249157047649", + endpoints.CnNorthwest1RegionID: "249157047649", endpoints.EuCentral1RegionID: "024640144536", endpoints.EuNorth1RegionID: "054986407534", endpoints.EuSouth1RegionID: "488287956546", @@ -298,7 +298,7 @@ var prebuiltECRImageIDByRegion_debugger = map[string]string{ endpoints.ApSoutheast2RegionID: "184798709955", endpoints.CaCentral1RegionID: "519511493484", endpoints.CnNorth1RegionID: "618459771430", - names.CNNorthwest1RegionID: "658757709296", + endpoints.CnNorthwest1RegionID: "658757709296", endpoints.EuCentral1RegionID: "482524230118", endpoints.EuNorth1RegionID: "314864569078", endpoints.EuSouth1RegionID: "563282790590", @@ -333,7 +333,7 @@ var prebuiltECRImageIDByRegion_inferentiaNeo = map[string]string{ endpoints.ApSoutheast2RegionID: "355873309152", endpoints.CaCentral1RegionID: "464438896020", endpoints.CnNorth1RegionID: "472730292857", - names.CNNorthwest1RegionID: "474822919863", + endpoints.CnNorthwest1RegionID: "474822919863", endpoints.EuCentral1RegionID: "746233611703", endpoints.EuNorth1RegionID: "601324751636", endpoints.EuSouth1RegionID: "966458181534", @@ -369,7 +369,7 @@ var prebuiltECRImageIDByRegion_SageMakerCustom = map[string]string{ // nosemgrep endpoints.ApSoutheast2RegionID: "520713654638", endpoints.CaCentral1RegionID: "520713654638", endpoints.CnNorth1RegionID: "422961961927", - names.CNNorthwest1RegionID: "423003514399", + endpoints.CnNorthwest1RegionID: "423003514399", endpoints.EuCentral1RegionID: "520713654638", endpoints.EuNorth1RegionID: "520713654638", endpoints.EuSouth1RegionID: "048378556238", @@ -424,7 +424,7 @@ var prebuiltECRImageIDByRegion_spark = map[string]string{ endpoints.CaCentral1RegionID: "446299261295", endpoints.CaWest1RegionID: "000907499111", endpoints.CnNorth1RegionID: "671472414489", - names.CNNorthwest1RegionID: "844356804704", + endpoints.CnNorthwest1RegionID: "844356804704", endpoints.EuCentral1RegionID: "906073651304", endpoints.EuCentral2RegionID: "142351485170", endpoints.EuNorth1RegionID: "330188676905", @@ -459,7 +459,7 @@ var prebuiltECRImageIDByRegion_SageMakerBasePython = map[string]string{ // nosem endpoints.ApSoutheast3RegionID: "276181064229", endpoints.CaCentral1RegionID: "310906938811", endpoints.CnNorth1RegionID: "390048526115", - names.CNNorthwest1RegionID: "390780980154", + endpoints.CnNorthwest1RegionID: "390780980154", endpoints.EuCentral1RegionID: "936697816551", endpoints.EuNorth1RegionID: "243637512696", endpoints.EuSouth1RegionID: "592751261982", @@ -502,7 +502,7 @@ var prebuiltECRImageIDByRegion_deepAR = map[string]string{ endpoints.CaCentral1RegionID: "469771592824", endpoints.CaWest1RegionID: "190319476487", endpoints.CnNorth1RegionID: "390948362332", - names.CNNorthwest1RegionID: "387376663083", + endpoints.CnNorthwest1RegionID: "387376663083", endpoints.EuCentral1RegionID: "495149712605", endpoints.EuCentral2RegionID: "680994064768", endpoints.EuNorth1RegionID: "669576153137", @@ -547,7 +547,7 @@ var prebuiltECRImageIDByRegion_factorMachines = map[string]string{ endpoints.CaCentral1RegionID: "469771592824", endpoints.CaWest1RegionID: "190319476487", endpoints.CnNorth1RegionID: "390948362332", - names.CNNorthwest1RegionID: "387376663083", + endpoints.CnNorthwest1RegionID: "387376663083", endpoints.EuCentral1RegionID: "664544806723", endpoints.EuCentral2RegionID: "680994064768", endpoints.EuNorth1RegionID: "669576153137", @@ -612,7 +612,7 @@ var prebuiltECRImageIDByRegion_XGBoost = map[string]string{ endpoints.CaCentral1RegionID: "341280168497", endpoints.CaWest1RegionID: "190319476487", endpoints.CnNorth1RegionID: "450853457545", - names.CNNorthwest1RegionID: "451049120500", + endpoints.CnNorthwest1RegionID: "451049120500", endpoints.EuCentral1RegionID: "492215442770", endpoints.EuCentral2RegionID: "680994064768", endpoints.EuNorth1RegionID: "662702820516", @@ -664,7 +664,7 @@ var prebuiltECRImageIDByRegion_deepLearning = map[string]string{ endpoints.CaCentral1RegionID: "763104351884", endpoints.CaWest1RegionID: "204538143572", endpoints.CnNorth1RegionID: "727897471807", - names.CNNorthwest1RegionID: "727897471807", + endpoints.CnNorthwest1RegionID: "727897471807", endpoints.EuCentral1RegionID: "763104351884", endpoints.EuCentral2RegionID: "380420809688", endpoints.EuNorth1RegionID: "763104351884", @@ -701,7 +701,7 @@ var prebuiltECRImageIDByRegion_modelMonitor = map[string]string{ endpoints.ApSoutheast3RegionID: "669540362728", endpoints.CaCentral1RegionID: "536280801234", endpoints.CnNorth1RegionID: "453000072557", - names.CNNorthwest1RegionID: "453252182341", + endpoints.CnNorthwest1RegionID: "453252182341", endpoints.EuCentral1RegionID: "048819808253", endpoints.EuNorth1RegionID: "895015795356", endpoints.EuSouth1RegionID: "933208885752", From 5022f804bfb266323dc72ec28a160fdf104b0003 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 15:38:38 -0500 Subject: [PATCH 294/304] 'names.USGovEast1RegionID' -> 'endpoints.UsGovEast1RegionID'. --- internal/acctest/partition_test.go | 4 ++-- .../cloudtrail/service_account_data_source.go | 2 +- internal/service/codestarconnections/sweep.go | 5 +++-- .../elasticbeanstalk/hosted_zone_data_source.go | 2 +- internal/service/elb/hosted_zone_id_data_source.go | 2 +- .../service/elb/service_account_data_source.go | 2 +- .../service/elbv2/hosted_zone_id_data_source.go | 4 ++-- internal/service/opensearchserverless/sweep.go | 11 ++++++----- .../redshift/service_account_data_source.go | 2 +- internal/service/route53/sweep.go | 5 +++-- internal/service/s3/bucket_test.go | 4 ++-- internal/service/s3/hosted_zones.go | 2 +- internal/service/s3control/sweep.go | 3 ++- .../sagemaker/prebuilt_ecr_image_data_source.go | 14 +++++++------- names/names.go | 4 ---- 15 files changed, 33 insertions(+), 33 deletions(-) diff --git a/internal/acctest/partition_test.go b/internal/acctest/partition_test.go index d8fed875350..874b6c581dd 100644 --- a/internal/acctest/partition_test.go +++ b/internal/acctest/partition_test.go @@ -75,7 +75,7 @@ func TestIsIsolatedRegion(t *testing.T) { expected: false, }, { - input: names.USGovEast1RegionID, + input: endpoints.UsGovEast1RegionID, expected: false, }, { @@ -167,7 +167,7 @@ func TestIsStandardRegion(t *testing.T) { expected: false, }, { - input: names.USGovEast1RegionID, + input: endpoints.UsGovEast1RegionID, expected: false, }, { diff --git a/internal/service/cloudtrail/service_account_data_source.go b/internal/service/cloudtrail/service_account_data_source.go index 8aa7a7633ed..0f55fa6462c 100644 --- a/internal/service/cloudtrail/service_account_data_source.go +++ b/internal/service/cloudtrail/service_account_data_source.go @@ -48,7 +48,7 @@ var serviceAccountPerRegionMap = map[string]string{ endpoints.SaEast1RegionID: "814480443879", names.USEast1RegionID: "086441151436", names.USEast2RegionID: "475085895292", - names.USGovEast1RegionID: "608710470296", + endpoints.UsGovEast1RegionID: "608710470296", names.USGovWest1RegionID: "608710470296", names.USWest1RegionID: "388731089494", names.USWest2RegionID: "113285607260", diff --git a/internal/service/codestarconnections/sweep.go b/internal/service/codestarconnections/sweep.go index 8afd0db8a5c..976844146b7 100644 --- a/internal/service/codestarconnections/sweep.go +++ b/internal/service/codestarconnections/sweep.go @@ -9,6 +9,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/codestarconnections" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-aws/internal/sweep" "github.com/hashicorp/terraform-provider-aws/internal/sweep/awsv2" @@ -32,7 +33,7 @@ func RegisterSweepers() { func sweepConnections(region string) error { ctx := sweep.Context(region) - if region == names.USGovEast1RegionID || region == names.USGovWest1RegionID { + if region == endpoints.UsGovEast1RegionID || region == names.USGovWest1RegionID { log.Printf("[WARN] Skipping CodeStar Connections Connection sweep for region: %s", region) return nil } @@ -77,7 +78,7 @@ func sweepConnections(region string) error { func sweepHosts(region string) error { ctx := sweep.Context(region) - if region == names.USGovEast1RegionID || region == names.USGovWest1RegionID { + if region == endpoints.UsGovEast1RegionID || region == names.USGovWest1RegionID { log.Printf("[WARN] Skipping CodeStar Connections Host sweep for region: %s", region) return nil } diff --git a/internal/service/elasticbeanstalk/hosted_zone_data_source.go b/internal/service/elasticbeanstalk/hosted_zone_data_source.go index 42cc602fad8..7db70dca031 100644 --- a/internal/service/elasticbeanstalk/hosted_zone_data_source.go +++ b/internal/service/elasticbeanstalk/hosted_zone_data_source.go @@ -41,7 +41,7 @@ var hostedZoneIDs = map[string]string{ names.USEast2RegionID: "Z14LCN19Q5QHIC", names.USWest1RegionID: "Z1LQECGX5PH1X", names.USWest2RegionID: "Z38NKT9BP95V3O", - names.USGovEast1RegionID: "Z35TSARG0EJ4VU", + endpoints.UsGovEast1RegionID: "Z35TSARG0EJ4VU", names.USGovWest1RegionID: "Z4KAURWC4UUUG", } diff --git a/internal/service/elb/hosted_zone_id_data_source.go b/internal/service/elb/hosted_zone_id_data_source.go index bf546c5fdd2..28d8074825c 100644 --- a/internal/service/elb/hosted_zone_id_data_source.go +++ b/internal/service/elb/hosted_zone_id_data_source.go @@ -46,7 +46,7 @@ var hostedZoneIDPerRegionMap = map[string]string{ endpoints.SaEast1RegionID: "Z2P70J7HTTTPLU", names.USEast1RegionID: "Z35SXDOTRQ7X7K", names.USEast2RegionID: "Z3AADJGX6KTTL2", - names.USGovEast1RegionID: "Z166TLBEWOO7G0", + endpoints.UsGovEast1RegionID: "Z166TLBEWOO7G0", names.USGovWest1RegionID: "Z33AYJ8TM3BH4J", names.USWest1RegionID: "Z368ELLRRE2KJ0", names.USWest2RegionID: "Z1H1FL5HABSF5", diff --git a/internal/service/elb/service_account_data_source.go b/internal/service/elb/service_account_data_source.go index 404b5d4a0af..b41447cd90f 100644 --- a/internal/service/elb/service_account_data_source.go +++ b/internal/service/elb/service_account_data_source.go @@ -41,7 +41,7 @@ var accountIDPerRegionMap = map[string]string{ endpoints.SaEast1RegionID: "507241528517", names.USEast1RegionID: "127311923021", names.USEast2RegionID: "033677994240", - names.USGovEast1RegionID: "190560391635", + endpoints.UsGovEast1RegionID: "190560391635", names.USGovWest1RegionID: "048591011584", names.USWest1RegionID: "027434742980", names.USWest2RegionID: "797873946194", diff --git a/internal/service/elbv2/hosted_zone_id_data_source.go b/internal/service/elbv2/hosted_zone_id_data_source.go index cb7946c1ff4..ac1bdc133b9 100644 --- a/internal/service/elbv2/hosted_zone_id_data_source.go +++ b/internal/service/elbv2/hosted_zone_id_data_source.go @@ -50,7 +50,7 @@ var hostedZoneIDPerRegionALBMap = map[string]string{ endpoints.SaEast1RegionID: "Z2P70J7HTTTPLU", names.USEast1RegionID: "Z35SXDOTRQ7X7K", names.USEast2RegionID: "Z3AADJGX6KTTL2", - names.USGovEast1RegionID: "Z166TLBEWOO7G0", + endpoints.UsGovEast1RegionID: "Z166TLBEWOO7G0", names.USGovWest1RegionID: "Z33AYJ8TM3BH4J", names.USWest1RegionID: "Z368ELLRRE2KJ0", names.USWest2RegionID: "Z1H1FL5HABSF5", @@ -88,7 +88,7 @@ var hostedZoneIDPerRegionNLBMap = map[string]string{ endpoints.SaEast1RegionID: "ZTK26PT1VY4CU", names.USEast1RegionID: "Z26RNL4JYFTOTI", names.USEast2RegionID: "ZLMOA37VPKANP", - names.USGovEast1RegionID: "Z1ZSMQQ6Q24QQ8", + endpoints.UsGovEast1RegionID: "Z1ZSMQQ6Q24QQ8", names.USGovWest1RegionID: "ZMG1MZ2THAWF1", names.USWest1RegionID: "Z24FKFUX50B4VW", names.USWest2RegionID: "Z18D5FSROUN65G", diff --git a/internal/service/opensearchserverless/sweep.go b/internal/service/opensearchserverless/sweep.go index b611fd7f412..75cd0f51d69 100644 --- a/internal/service/opensearchserverless/sweep.go +++ b/internal/service/opensearchserverless/sweep.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/opensearchserverless" "github.com/aws/aws-sdk-go-v2/service/opensearchserverless/types" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/aws-sdk-go-base/v2/tfawserr" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-aws/internal/sweep" @@ -43,7 +44,7 @@ func RegisterSweepers() { func sweepAccessPolicies(region string) error { ctx := sweep.Context(region) - if region == names.USWest1RegionID || region == names.USGovEast1RegionID { + if region == names.USWest1RegionID || region == endpoints.UsGovEast1RegionID { log.Printf("[WARN] Skipping OpenSearch Serverless Access Policy sweep for region: %s", region) return nil } @@ -90,7 +91,7 @@ func sweepAccessPolicies(region string) error { func sweepCollections(region string) error { ctx := sweep.Context(region) - if region == names.USWest1RegionID || region == names.USGovEast1RegionID { + if region == names.USWest1RegionID || region == endpoints.UsGovEast1RegionID { log.Printf("[WARN] Skipping OpenSearch Serverless Collection sweep for region: %s", region) return nil } @@ -133,7 +134,7 @@ func sweepCollections(region string) error { func sweepSecurityConfigs(region string) error { ctx := sweep.Context(region) - if region == names.USWest1RegionID || region == names.USGovEast1RegionID { + if region == names.USWest1RegionID || region == endpoints.UsGovEast1RegionID { log.Printf("[WARN] Skipping OpenSearch Serverless Security Config sweep for region: %s", region) return nil } @@ -178,7 +179,7 @@ func sweepSecurityConfigs(region string) error { func sweepSecurityPolicies(region string) error { ctx := sweep.Context(region) - if region == names.USWest1RegionID || region == names.USGovEast1RegionID { + if region == names.USWest1RegionID || region == endpoints.UsGovEast1RegionID { log.Printf("[WARN] Skipping OpenSearch Serverless Security Policy sweep for region: %s", region) return nil } @@ -252,7 +253,7 @@ func sweepSecurityPolicies(region string) error { func sweepVPCEndpoints(region string) error { ctx := sweep.Context(region) - if region == names.USWest1RegionID || region == names.USGovEast1RegionID { + if region == names.USWest1RegionID || region == endpoints.UsGovEast1RegionID { log.Printf("[WARN] Skipping OpenSearch Serverless Security Policy sweep for region: %s", region) return nil } diff --git a/internal/service/redshift/service_account_data_source.go b/internal/service/redshift/service_account_data_source.go index 92b3348a537..ac728ec80bc 100644 --- a/internal/service/redshift/service_account_data_source.go +++ b/internal/service/redshift/service_account_data_source.go @@ -42,7 +42,7 @@ var ServiceAccountPerRegionMap = map[string]string{ endpoints.SaEast1RegionID: "075028567923", names.USEast1RegionID: "193672423079", names.USEast2RegionID: "391106570357", - names.USGovEast1RegionID: "665727464434", + endpoints.UsGovEast1RegionID: "665727464434", names.USGovWest1RegionID: "665727464434", names.USWest1RegionID: "262260360010", names.USWest2RegionID: "902366379725", diff --git a/internal/service/route53/sweep.go b/internal/service/route53/sweep.go index 732075a4c46..560477e4c84 100644 --- a/internal/service/route53/sweep.go +++ b/internal/service/route53/sweep.go @@ -10,6 +10,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/route53" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/aws-sdk-go-base/v2/tfawserr" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-aws/internal/sweep" @@ -217,7 +218,7 @@ func sweepQueryLogs(region string) error { func sweepTrafficPolicies(region string) error { ctx := sweep.Context(region) - if region == names.USGovEast1RegionID || region == names.USGovWest1RegionID { + if region == endpoints.UsGovEast1RegionID || region == names.USGovWest1RegionID { log.Printf("[WARN] Skipping Route 53 Traffic Policy sweep for region: %s", region) return nil } @@ -265,7 +266,7 @@ func sweepTrafficPolicies(region string) error { func sweepTrafficPolicyInstances(region string) error { ctx := sweep.Context(region) - if region == names.USGovEast1RegionID || region == names.USGovWest1RegionID { + if region == endpoints.UsGovEast1RegionID || region == names.USGovWest1RegionID { log.Printf("[WARN] Skipping Route 53 Traffic Policy Instance sweep for region: %s", region) return nil } diff --git a/internal/service/s3/bucket_test.go b/internal/service/s3/bucket_test.go index bb7319c811b..af6a83b48e6 100644 --- a/internal/service/s3/bucket_test.go +++ b/internal/service/s3/bucket_test.go @@ -2416,8 +2416,8 @@ func TestWebsiteEndpoint(t *testing.T) { Expected: fmt.Sprintf("bucket-name.s3-website.%s.%s", names.USEast2RegionID, acctest.PartitionDNSSuffix()), }, { - LocationConstraint: names.USGovEast1RegionID, - Expected: fmt.Sprintf("bucket-name.s3-website.%s.%s", names.USGovEast1RegionID, acctest.PartitionDNSSuffix()), + LocationConstraint: endpoints.UsGovEast1RegionID, + Expected: fmt.Sprintf("bucket-name.s3-website.%s.%s", endpoints.UsGovEast1RegionID, acctest.PartitionDNSSuffix()), }, { LocationConstraint: names.USISOEast1RegionID, diff --git a/internal/service/s3/hosted_zones.go b/internal/service/s3/hosted_zones.go index 11dc3f7657d..378bf991350 100644 --- a/internal/service/s3/hosted_zones.go +++ b/internal/service/s3/hosted_zones.go @@ -42,7 +42,7 @@ var hostedZoneIDsMap = map[string]string{ endpoints.SaEast1RegionID: "Z7KQH4QJS55SO", names.USEast1RegionID: "Z3AQBSTGFYJSTF", names.USEast2RegionID: "Z2O1EMRO9K5GLX", - names.USGovEast1RegionID: "Z2NIFVYYW2VKV1", + endpoints.UsGovEast1RegionID: "Z2NIFVYYW2VKV1", names.USGovWest1RegionID: "Z31GFT0UA1I2HV", names.USWest1RegionID: "Z2F56UZL2M1ACD", names.USWest2RegionID: "Z3BJ6K6RIION7M", diff --git a/internal/service/s3control/sweep.go b/internal/service/s3control/sweep.go index 86a435a8725..8d7ee22ce81 100644 --- a/internal/service/s3control/sweep.go +++ b/internal/service/s3control/sweep.go @@ -9,6 +9,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/s3control" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-aws/internal/flex" "github.com/hashicorp/terraform-provider-aws/internal/sweep" @@ -334,7 +335,7 @@ func sweepObjectLambdaAccessPoints(region string) error { func sweepStorageLensConfigurations(region string) error { ctx := sweep.Context(region) - if region == names.USGovEast1RegionID || region == names.USGovWest1RegionID { + if region == endpoints.UsGovEast1RegionID || region == names.USGovWest1RegionID { log.Printf("[WARN] Skipping S3 Storage Lens Configuration sweep for region: %s", region) return nil } diff --git a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go index c5e0489c9fc..a0c2ec7c8af 100644 --- a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go +++ b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go @@ -218,7 +218,7 @@ var prebuiltECRImageIDByRegion_blazing = map[string]string{ endpoints.SaEast1RegionID: "855470959533", names.USEast1RegionID: "811284229777", names.USEast2RegionID: "825641698319", - names.USGovEast1RegionID: "237065988967", + endpoints.UsGovEast1RegionID: "237065988967", names.USGovWest1RegionID: "226302683700", names.USISOEast1RegionID: "490574956308", names.USISOBEast1RegionID: "765400339828", @@ -439,7 +439,7 @@ var prebuiltECRImageIDByRegion_spark = map[string]string{ endpoints.SaEast1RegionID: "737130764395", names.USEast1RegionID: "173754725891", names.USEast2RegionID: "314815235551", - names.USGovEast1RegionID: "260923028637", + endpoints.UsGovEast1RegionID: "260923028637", names.USGovWest1RegionID: "271483468897", names.USWest1RegionID: "667973535471", names.USWest2RegionID: "153931337802", @@ -473,7 +473,7 @@ var prebuiltECRImageIDByRegion_SageMakerBasePython = map[string]string{ // nosem endpoints.SaEast1RegionID: "782484402741", names.USEast1RegionID: "081325390199", names.USEast2RegionID: "429704687514", - names.USGovEast1RegionID: "107072934176", + endpoints.UsGovEast1RegionID: "107072934176", names.USGovWest1RegionID: "107173498710", names.USWest1RegionID: "742091327244", names.USWest2RegionID: "236514542706", @@ -517,7 +517,7 @@ var prebuiltECRImageIDByRegion_deepAR = map[string]string{ endpoints.SaEast1RegionID: "855470959533", names.USEast1RegionID: "522234722520", names.USEast2RegionID: "566113047672", - names.USGovEast1RegionID: "237065988967", + endpoints.UsGovEast1RegionID: "237065988967", names.USGovWest1RegionID: "226302683700", names.USISOEast1RegionID: "490574956308", names.USISOBEast1RegionID: "765400339828", @@ -562,7 +562,7 @@ var prebuiltECRImageIDByRegion_factorMachines = map[string]string{ endpoints.SaEast1RegionID: "855470959533", names.USEast1RegionID: "382416733822", names.USEast2RegionID: "404615174143", - names.USGovEast1RegionID: "237065988967", + endpoints.UsGovEast1RegionID: "237065988967", names.USGovWest1RegionID: "226302683700", names.USISOEast1RegionID: "490574956308", names.USISOBEast1RegionID: "765400339828", @@ -627,7 +627,7 @@ var prebuiltECRImageIDByRegion_XGBoost = map[string]string{ endpoints.SaEast1RegionID: "737474898029", names.USEast1RegionID: "683313688378", names.USEast2RegionID: "257758044811", - names.USGovEast1RegionID: "237065988967", + endpoints.UsGovEast1RegionID: "237065988967", names.USGovWest1RegionID: "414596584902", names.USISOEast1RegionID: "833128469047", names.USISOBEast1RegionID: "281123927165", @@ -681,7 +681,7 @@ var prebuiltECRImageIDByRegion_deepLearning = map[string]string{ names.USEast2RegionID: "763104351884", names.USWest1RegionID: "763104351884", names.USWest2RegionID: "763104351884", - names.USGovEast1RegionID: "446045086412", + endpoints.UsGovEast1RegionID: "446045086412", names.USGovWest1RegionID: "442386744353", names.USISOEast1RegionID: "886529160074", names.USISOBEast1RegionID: "094389454867", diff --git a/names/names.go b/names/names.go index 4210945949a..b15cc0e24d7 100644 --- a/names/names.go +++ b/names/names.go @@ -154,11 +154,7 @@ const ( USWest1RegionID = "us-west-1" // US West (N. California). USWest2RegionID = "us-west-2" // US West (Oregon). - // AWS China partition's regions. - CNNorthwest1RegionID = "cn-northwest-1" // China (Ningxia). - // AWS GovCloud (US) partition's regions. - USGovEast1RegionID = "us-gov-east-1" // AWS GovCloud (US-East). USGovWest1RegionID = "us-gov-west-1" // AWS GovCloud (US-West). // AWS ISO (US) partition's regions. From 535c6a8c69f877681287fe5b97445ce4f0d19d04 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 15:40:10 -0500 Subject: [PATCH 295/304] 'names.USGovWest1RegionID' -> 'endpoints.UsGovWest1RegionID'. --- internal/provider/provider_acc_test.go | 2 +- .../cloudtrail/service_account_data_source.go | 2 +- internal/service/codestarconnections/sweep.go | 5 ++-- .../service/ec2/vpc_default_subnet_test.go | 13 +++++----- internal/service/ec2/vpc_default_vpc_test.go | 15 ++++++------ .../hosted_zone_data_source.go | 2 +- .../service/elb/hosted_zone_id_data_source.go | 2 +- .../elb/service_account_data_source.go | 2 +- .../elbv2/hosted_zone_id_data_source.go | 4 ++-- .../service/meta/service_data_source_test.go | 6 ++--- .../redshift/service_account_data_source.go | 2 +- internal/service/route53/service_package.go | 6 ++--- internal/service/route53/sweep.go | 4 ++-- internal/service/s3/bucket_test.go | 4 ++-- internal/service/s3/hosted_zones.go | 2 +- internal/service/s3control/sweep.go | 2 +- .../prebuilt_ecr_image_data_source.go | 24 +++++++++---------- .../cloudformation_stack_test.go | 2 +- names/names.go | 3 --- 19 files changed, 50 insertions(+), 52 deletions(-) diff --git a/internal/provider/provider_acc_test.go b/internal/provider/provider_acc_test.go index 2d749e43aea..7c027ff84f8 100644 --- a/internal/provider/provider_acc_test.go +++ b/internal/provider/provider_acc_test.go @@ -587,7 +587,7 @@ func TestAccProvider_Region_govCloud(t *testing.T) { CheckDestroy: nil, Steps: []resource.TestStep{ { - Config: testAccProviderConfig_region(names.USGovWest1RegionID), + Config: testAccProviderConfig_region(endpoints.UsGovWest1RegionID), Check: resource.ComposeTestCheckFunc( testAccCheckDNSSuffix(ctx, t, &provider, "amazonaws.com"), testAccCheckPartition(ctx, t, &provider, endpoints.AwsUsGovPartitionID), diff --git a/internal/service/cloudtrail/service_account_data_source.go b/internal/service/cloudtrail/service_account_data_source.go index 0f55fa6462c..012409f2952 100644 --- a/internal/service/cloudtrail/service_account_data_source.go +++ b/internal/service/cloudtrail/service_account_data_source.go @@ -49,7 +49,7 @@ var serviceAccountPerRegionMap = map[string]string{ names.USEast1RegionID: "086441151436", names.USEast2RegionID: "475085895292", endpoints.UsGovEast1RegionID: "608710470296", - names.USGovWest1RegionID: "608710470296", + endpoints.UsGovWest1RegionID: "608710470296", names.USWest1RegionID: "388731089494", names.USWest2RegionID: "113285607260", } diff --git a/internal/service/codestarconnections/sweep.go b/internal/service/codestarconnections/sweep.go index 976844146b7..4b37be4e63c 100644 --- a/internal/service/codestarconnections/sweep.go +++ b/internal/service/codestarconnections/sweep.go @@ -13,7 +13,6 @@ import ( "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-aws/internal/sweep" "github.com/hashicorp/terraform-provider-aws/internal/sweep/awsv2" - "github.com/hashicorp/terraform-provider-aws/names" ) func RegisterSweepers() { @@ -33,7 +32,7 @@ func RegisterSweepers() { func sweepConnections(region string) error { ctx := sweep.Context(region) - if region == endpoints.UsGovEast1RegionID || region == names.USGovWest1RegionID { + if region == endpoints.UsGovEast1RegionID || region == endpoints.UsGovWest1RegionID { log.Printf("[WARN] Skipping CodeStar Connections Connection sweep for region: %s", region) return nil } @@ -78,7 +77,7 @@ func sweepConnections(region string) error { func sweepHosts(region string) error { ctx := sweep.Context(region) - if region == endpoints.UsGovEast1RegionID || region == names.USGovWest1RegionID { + if region == endpoints.UsGovEast1RegionID || region == endpoints.UsGovWest1RegionID { log.Printf("[WARN] Skipping CodeStar Connections Host sweep for region: %s", region) return nil } diff --git a/internal/service/ec2/vpc_default_subnet_test.go b/internal/service/ec2/vpc_default_subnet_test.go index 0620343c77f..739c57c5ee8 100644 --- a/internal/service/ec2/vpc_default_subnet_test.go +++ b/internal/service/ec2/vpc_default_subnet_test.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/ec2" awstypes "github.com/aws/aws-sdk-go-v2/service/ec2/types" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/aws-sdk-go-base/v2/tfawserr" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" @@ -86,7 +87,7 @@ func testAccDefaultSubnet_Existing_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegionNot(t, names.USWest2RegionID, names.USGovWest1RegionID) + acctest.PreCheckRegionNot(t, names.USWest2RegionID, endpoints.UsGovWest1RegionID) testAccPreCheckDefaultSubnetExists(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), @@ -132,7 +133,7 @@ func testAccDefaultSubnet_Existing_forceDestroy(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegionNot(t, names.USWest2RegionID, names.USGovWest1RegionID) + acctest.PreCheckRegionNot(t, names.USWest2RegionID, endpoints.UsGovWest1RegionID) testAccPreCheckDefaultSubnetExists(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), @@ -159,7 +160,7 @@ func testAccDefaultSubnet_Existing_ipv6(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegionNot(t, names.USWest2RegionID, names.USGovWest1RegionID) + acctest.PreCheckRegionNot(t, names.USWest2RegionID, endpoints.UsGovWest1RegionID) testAccPreCheckDefaultSubnetExists(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), @@ -206,7 +207,7 @@ func testAccDefaultSubnet_Existing_privateDNSNameOptionsOnLaunch(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegionNot(t, names.USWest2RegionID, names.USGovWest1RegionID) + acctest.PreCheckRegionNot(t, names.USWest2RegionID, endpoints.UsGovWest1RegionID) testAccPreCheckDefaultSubnetExists(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), @@ -253,7 +254,7 @@ func testAccDefaultSubnet_NotFound_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegionNot(t, names.USWest2RegionID, names.USGovWest1RegionID) + acctest.PreCheckRegionNot(t, names.USWest2RegionID, endpoints.UsGovWest1RegionID) testAccPreCheckDefaultSubnetNotFound(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), @@ -299,7 +300,7 @@ func testAccDefaultSubnet_NotFound_ipv6Native(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegionNot(t, names.USWest2RegionID, names.USGovWest1RegionID) + acctest.PreCheckRegionNot(t, names.USWest2RegionID, endpoints.UsGovWest1RegionID) testAccPreCheckDefaultSubnetNotFound(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), diff --git a/internal/service/ec2/vpc_default_vpc_test.go b/internal/service/ec2/vpc_default_vpc_test.go index e1ecac7e648..6c0497070d5 100644 --- a/internal/service/ec2/vpc_default_vpc_test.go +++ b/internal/service/ec2/vpc_default_vpc_test.go @@ -12,6 +12,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/ec2" awstypes "github.com/aws/aws-sdk-go-v2/service/ec2/types" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -84,7 +85,7 @@ func testAccDefaultVPC_Existing_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegionNot(t, names.USWest2RegionID, names.USGovWest1RegionID) + acctest.PreCheckRegionNot(t, names.USWest2RegionID, endpoints.UsGovWest1RegionID) testAccPreCheckDefaultVPCExists(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), @@ -131,7 +132,7 @@ func testAccDefaultVPC_Existing_assignGeneratedIPv6CIDRBlock(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegionNot(t, names.USWest2RegionID, names.USGovWest1RegionID) + acctest.PreCheckRegionNot(t, names.USWest2RegionID, endpoints.UsGovWest1RegionID) testAccPreCheckDefaultVPCExists(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), @@ -178,7 +179,7 @@ func testAccDefaultVPC_Existing_forceDestroy(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegionNot(t, names.USWest2RegionID, names.USGovWest1RegionID) + acctest.PreCheckRegionNot(t, names.USWest2RegionID, endpoints.UsGovWest1RegionID) testAccPreCheckDefaultVPCExists(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), @@ -206,7 +207,7 @@ func testAccDefaultVPC_NotFound_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegionNot(t, names.USWest2RegionID, names.USGovWest1RegionID) + acctest.PreCheckRegionNot(t, names.USWest2RegionID, endpoints.UsGovWest1RegionID) testAccPreCheckDefaultVPCNotFound(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), @@ -253,7 +254,7 @@ func testAccDefaultVPC_NotFound_assignGeneratedIPv6CIDRBlock(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegionNot(t, names.USWest2RegionID, names.USGovWest1RegionID) + acctest.PreCheckRegionNot(t, names.USWest2RegionID, endpoints.UsGovWest1RegionID) testAccPreCheckDefaultVPCNotFound(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), @@ -300,7 +301,7 @@ func testAccDefaultVPC_NotFound_forceDestroy(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegionNot(t, names.USWest2RegionID, names.USGovWest1RegionID) + acctest.PreCheckRegionNot(t, names.USWest2RegionID, endpoints.UsGovWest1RegionID) testAccPreCheckDefaultVPCNotFound(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), @@ -329,7 +330,7 @@ func testAccDefaultVPC_NotFound_assignGeneratedIPv6CIDRBlockAdoption(t *testing. resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegionNot(t, names.USWest2RegionID, names.USGovWest1RegionID) + acctest.PreCheckRegionNot(t, names.USWest2RegionID, endpoints.UsGovWest1RegionID) testAccPreCheckDefaultVPCNotFound(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), diff --git a/internal/service/elasticbeanstalk/hosted_zone_data_source.go b/internal/service/elasticbeanstalk/hosted_zone_data_source.go index 7db70dca031..3fdf5242f90 100644 --- a/internal/service/elasticbeanstalk/hosted_zone_data_source.go +++ b/internal/service/elasticbeanstalk/hosted_zone_data_source.go @@ -42,7 +42,7 @@ var hostedZoneIDs = map[string]string{ names.USWest1RegionID: "Z1LQECGX5PH1X", names.USWest2RegionID: "Z38NKT9BP95V3O", endpoints.UsGovEast1RegionID: "Z35TSARG0EJ4VU", - names.USGovWest1RegionID: "Z4KAURWC4UUUG", + endpoints.UsGovWest1RegionID: "Z4KAURWC4UUUG", } // @SDKDataSource("aws_elastic_beanstalk_hosted_zone") diff --git a/internal/service/elb/hosted_zone_id_data_source.go b/internal/service/elb/hosted_zone_id_data_source.go index 28d8074825c..7d407369127 100644 --- a/internal/service/elb/hosted_zone_id_data_source.go +++ b/internal/service/elb/hosted_zone_id_data_source.go @@ -47,7 +47,7 @@ var hostedZoneIDPerRegionMap = map[string]string{ names.USEast1RegionID: "Z35SXDOTRQ7X7K", names.USEast2RegionID: "Z3AADJGX6KTTL2", endpoints.UsGovEast1RegionID: "Z166TLBEWOO7G0", - names.USGovWest1RegionID: "Z33AYJ8TM3BH4J", + endpoints.UsGovWest1RegionID: "Z33AYJ8TM3BH4J", names.USWest1RegionID: "Z368ELLRRE2KJ0", names.USWest2RegionID: "Z1H1FL5HABSF5", } diff --git a/internal/service/elb/service_account_data_source.go b/internal/service/elb/service_account_data_source.go index b41447cd90f..bc8d2478997 100644 --- a/internal/service/elb/service_account_data_source.go +++ b/internal/service/elb/service_account_data_source.go @@ -42,7 +42,7 @@ var accountIDPerRegionMap = map[string]string{ names.USEast1RegionID: "127311923021", names.USEast2RegionID: "033677994240", endpoints.UsGovEast1RegionID: "190560391635", - names.USGovWest1RegionID: "048591011584", + endpoints.UsGovWest1RegionID: "048591011584", names.USWest1RegionID: "027434742980", names.USWest2RegionID: "797873946194", } diff --git a/internal/service/elbv2/hosted_zone_id_data_source.go b/internal/service/elbv2/hosted_zone_id_data_source.go index ac1bdc133b9..c5fc8f50bc9 100644 --- a/internal/service/elbv2/hosted_zone_id_data_source.go +++ b/internal/service/elbv2/hosted_zone_id_data_source.go @@ -51,7 +51,7 @@ var hostedZoneIDPerRegionALBMap = map[string]string{ names.USEast1RegionID: "Z35SXDOTRQ7X7K", names.USEast2RegionID: "Z3AADJGX6KTTL2", endpoints.UsGovEast1RegionID: "Z166TLBEWOO7G0", - names.USGovWest1RegionID: "Z33AYJ8TM3BH4J", + endpoints.UsGovWest1RegionID: "Z33AYJ8TM3BH4J", names.USWest1RegionID: "Z368ELLRRE2KJ0", names.USWest2RegionID: "Z1H1FL5HABSF5", } @@ -89,7 +89,7 @@ var hostedZoneIDPerRegionNLBMap = map[string]string{ names.USEast1RegionID: "Z26RNL4JYFTOTI", names.USEast2RegionID: "ZLMOA37VPKANP", endpoints.UsGovEast1RegionID: "Z1ZSMQQ6Q24QQ8", - names.USGovWest1RegionID: "ZMG1MZ2THAWF1", + endpoints.UsGovWest1RegionID: "ZMG1MZ2THAWF1", names.USWest1RegionID: "Z24FKFUX50B4VW", names.USWest2RegionID: "Z18D5FSROUN65G", } diff --git a/internal/service/meta/service_data_source_test.go b/internal/service/meta/service_data_source_test.go index 630346034d2..f5c93e91eb7 100644 --- a/internal/service/meta/service_data_source_test.go +++ b/internal/service/meta/service_data_source_test.go @@ -170,11 +170,11 @@ func TestAccMetaServiceDataSource_unsupported(t *testing.T) { { Config: testAccServiceDataSourceConfig_unsupported(), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr(dataSourceName, names.AttrDNSName, fmt.Sprintf("%s.%s.%s", names.WAFEndpointID, names.USGovWest1RegionID, "amazonaws.com")), + resource.TestCheckResourceAttr(dataSourceName, names.AttrDNSName, fmt.Sprintf("%s.%s.%s", names.WAFEndpointID, endpoints.UsGovWest1RegionID, "amazonaws.com")), resource.TestCheckResourceAttr(dataSourceName, "partition", endpoints.AwsUsGovPartitionID), resource.TestCheckResourceAttr(dataSourceName, "reverse_dns_prefix", "com.amazonaws"), - resource.TestCheckResourceAttr(dataSourceName, names.AttrRegion, names.USGovWest1RegionID), - resource.TestCheckResourceAttr(dataSourceName, "reverse_dns_name", fmt.Sprintf("%s.%s.%s", "com.amazonaws", names.USGovWest1RegionID, names.WAFEndpointID)), + resource.TestCheckResourceAttr(dataSourceName, names.AttrRegion, endpoints.UsGovWest1RegionID), + resource.TestCheckResourceAttr(dataSourceName, "reverse_dns_name", fmt.Sprintf("%s.%s.%s", "com.amazonaws", endpoints.UsGovWest1RegionID, names.WAFEndpointID)), resource.TestCheckResourceAttr(dataSourceName, "service_id", names.WAFEndpointID), resource.TestCheckResourceAttr(dataSourceName, "supported", acctest.CtFalse), ), diff --git a/internal/service/redshift/service_account_data_source.go b/internal/service/redshift/service_account_data_source.go index ac728ec80bc..e623ea8ed8e 100644 --- a/internal/service/redshift/service_account_data_source.go +++ b/internal/service/redshift/service_account_data_source.go @@ -43,7 +43,7 @@ var ServiceAccountPerRegionMap = map[string]string{ names.USEast1RegionID: "193672423079", names.USEast2RegionID: "391106570357", endpoints.UsGovEast1RegionID: "665727464434", - names.USGovWest1RegionID: "665727464434", + endpoints.UsGovWest1RegionID: "665727464434", names.USWest1RegionID: "262260360010", names.USWest2RegionID: "902366379725", } diff --git a/internal/service/route53/service_package.go b/internal/service/route53/service_package.go index 892e724f39a..efab65d443e 100644 --- a/internal/service/route53/service_package.go +++ b/internal/service/route53/service_package.go @@ -40,13 +40,13 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( } o.Region = endpoints.CnNorthwest1RegionID case endpoints.AwsUsGovPartitionID: - if cfg.Region != names.USGovWest1RegionID { + if cfg.Region != endpoints.UsGovWest1RegionID { tflog.Info(ctx, "overriding region", map[string]any{ "original_region": cfg.Region, - "override_region": names.USGovWest1RegionID, + "override_region": endpoints.UsGovWest1RegionID, }) } - o.Region = names.USGovWest1RegionID + o.Region = endpoints.UsGovWest1RegionID } }, ), nil diff --git a/internal/service/route53/sweep.go b/internal/service/route53/sweep.go index 560477e4c84..96ac1e38f20 100644 --- a/internal/service/route53/sweep.go +++ b/internal/service/route53/sweep.go @@ -218,7 +218,7 @@ func sweepQueryLogs(region string) error { func sweepTrafficPolicies(region string) error { ctx := sweep.Context(region) - if region == endpoints.UsGovEast1RegionID || region == names.USGovWest1RegionID { + if region == endpoints.UsGovEast1RegionID || region == endpoints.UsGovWest1RegionID { log.Printf("[WARN] Skipping Route 53 Traffic Policy sweep for region: %s", region) return nil } @@ -266,7 +266,7 @@ func sweepTrafficPolicies(region string) error { func sweepTrafficPolicyInstances(region string) error { ctx := sweep.Context(region) - if region == endpoints.UsGovEast1RegionID || region == names.USGovWest1RegionID { + if region == endpoints.UsGovEast1RegionID || region == endpoints.UsGovWest1RegionID { log.Printf("[WARN] Skipping Route 53 Traffic Policy Instance sweep for region: %s", region) return nil } diff --git a/internal/service/s3/bucket_test.go b/internal/service/s3/bucket_test.go index af6a83b48e6..4f25e78315f 100644 --- a/internal/service/s3/bucket_test.go +++ b/internal/service/s3/bucket_test.go @@ -2379,9 +2379,9 @@ func TestBucketRegionalDomainName(t *testing.T) { ExpectedOutput: bucket + fmt.Sprintf(".s3.%s.%s", names.USWest2RegionID, acctest.PartitionDNSSuffix()), }, { - Region: names.USGovWest1RegionID, + Region: endpoints.UsGovWest1RegionID, ExpectedErrCount: 0, - ExpectedOutput: bucket + fmt.Sprintf(".s3.%s.%s", names.USGovWest1RegionID, acctest.PartitionDNSSuffix()), + ExpectedOutput: bucket + fmt.Sprintf(".s3.%s.%s", endpoints.UsGovWest1RegionID, acctest.PartitionDNSSuffix()), }, { Region: endpoints.CnNorth1RegionID, diff --git a/internal/service/s3/hosted_zones.go b/internal/service/s3/hosted_zones.go index 378bf991350..4da4e8940b5 100644 --- a/internal/service/s3/hosted_zones.go +++ b/internal/service/s3/hosted_zones.go @@ -43,7 +43,7 @@ var hostedZoneIDsMap = map[string]string{ names.USEast1RegionID: "Z3AQBSTGFYJSTF", names.USEast2RegionID: "Z2O1EMRO9K5GLX", endpoints.UsGovEast1RegionID: "Z2NIFVYYW2VKV1", - names.USGovWest1RegionID: "Z31GFT0UA1I2HV", + endpoints.UsGovWest1RegionID: "Z31GFT0UA1I2HV", names.USWest1RegionID: "Z2F56UZL2M1ACD", names.USWest2RegionID: "Z3BJ6K6RIION7M", } diff --git a/internal/service/s3control/sweep.go b/internal/service/s3control/sweep.go index 8d7ee22ce81..133b7e1c254 100644 --- a/internal/service/s3control/sweep.go +++ b/internal/service/s3control/sweep.go @@ -335,7 +335,7 @@ func sweepObjectLambdaAccessPoints(region string) error { func sweepStorageLensConfigurations(region string) error { ctx := sweep.Context(region) - if region == endpoints.UsGovEast1RegionID || region == names.USGovWest1RegionID { + if region == endpoints.UsGovEast1RegionID || region == endpoints.UsGovWest1RegionID { log.Printf("[WARN] Skipping S3 Storage Lens Configuration sweep for region: %s", region) return nil } diff --git a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go index a0c2ec7c8af..02269cbba02 100644 --- a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go +++ b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go @@ -219,7 +219,7 @@ var prebuiltECRImageIDByRegion_blazing = map[string]string{ names.USEast1RegionID: "811284229777", names.USEast2RegionID: "825641698319", endpoints.UsGovEast1RegionID: "237065988967", - names.USGovWest1RegionID: "226302683700", + endpoints.UsGovWest1RegionID: "226302683700", names.USISOEast1RegionID: "490574956308", names.USISOBEast1RegionID: "765400339828", names.USWest1RegionID: "632365934929", @@ -251,7 +251,7 @@ var prebuiltECRImageIDByRegion_clarify = map[string]string{ endpoints.SaEast1RegionID: "520018980103", names.USEast1RegionID: "205585389593", names.USEast2RegionID: "211330385671", - names.USGovWest1RegionID: "598674086554", + endpoints.UsGovWest1RegionID: "598674086554", names.USWest1RegionID: "740489534195", names.USWest2RegionID: "306415355426", } @@ -309,7 +309,7 @@ var prebuiltECRImageIDByRegion_debugger = map[string]string{ endpoints.SaEast1RegionID: "818342061345", names.USEast1RegionID: "503895931360", names.USEast2RegionID: "915447279597", - names.USGovWest1RegionID: "515509971035", + endpoints.UsGovWest1RegionID: "515509971035", names.USWest1RegionID: "685455198987", names.USWest2RegionID: "895741380848", } @@ -345,7 +345,7 @@ var prebuiltECRImageIDByRegion_inferentiaNeo = map[string]string{ endpoints.SaEast1RegionID: "756306329178", names.USEast1RegionID: "785573368785", names.USEast2RegionID: "007439368137", - names.USGovWest1RegionID: "263933020539", + endpoints.UsGovWest1RegionID: "263933020539", names.USISOEast1RegionID: "167761179201", names.USISOBEast1RegionID: "406031935815", names.USWest1RegionID: "710691900526", @@ -380,7 +380,7 @@ var prebuiltECRImageIDByRegion_SageMakerCustom = map[string]string{ // nosemgrep endpoints.SaEast1RegionID: "520713654638", names.USEast1RegionID: "520713654638", names.USEast2RegionID: "520713654638", - names.USGovWest1RegionID: "246785580436", + endpoints.UsGovWest1RegionID: "246785580436", names.USISOEast1RegionID: "744548109606", names.USISOBEast1RegionID: "453391408702", names.USWest1RegionID: "520713654638", @@ -440,7 +440,7 @@ var prebuiltECRImageIDByRegion_spark = map[string]string{ names.USEast1RegionID: "173754725891", names.USEast2RegionID: "314815235551", endpoints.UsGovEast1RegionID: "260923028637", - names.USGovWest1RegionID: "271483468897", + endpoints.UsGovWest1RegionID: "271483468897", names.USWest1RegionID: "667973535471", names.USWest2RegionID: "153931337802", } @@ -474,7 +474,7 @@ var prebuiltECRImageIDByRegion_SageMakerBasePython = map[string]string{ // nosem names.USEast1RegionID: "081325390199", names.USEast2RegionID: "429704687514", endpoints.UsGovEast1RegionID: "107072934176", - names.USGovWest1RegionID: "107173498710", + endpoints.UsGovWest1RegionID: "107173498710", names.USWest1RegionID: "742091327244", names.USWest2RegionID: "236514542706", } @@ -518,7 +518,7 @@ var prebuiltECRImageIDByRegion_deepAR = map[string]string{ names.USEast1RegionID: "522234722520", names.USEast2RegionID: "566113047672", endpoints.UsGovEast1RegionID: "237065988967", - names.USGovWest1RegionID: "226302683700", + endpoints.UsGovWest1RegionID: "226302683700", names.USISOEast1RegionID: "490574956308", names.USISOBEast1RegionID: "765400339828", names.USWest1RegionID: "632365934929", @@ -563,7 +563,7 @@ var prebuiltECRImageIDByRegion_factorMachines = map[string]string{ names.USEast1RegionID: "382416733822", names.USEast2RegionID: "404615174143", endpoints.UsGovEast1RegionID: "237065988967", - names.USGovWest1RegionID: "226302683700", + endpoints.UsGovWest1RegionID: "226302683700", names.USISOEast1RegionID: "490574956308", names.USISOBEast1RegionID: "765400339828", names.USWest1RegionID: "632365934929", @@ -584,7 +584,7 @@ var prebuiltECRImageIDByRegion_lda = map[string]string{ endpoints.EuWest2RegionID: "644912444149", names.USEast1RegionID: "766337827248", names.USEast2RegionID: "999911452149", - names.USGovWest1RegionID: "226302683700", + endpoints.UsGovWest1RegionID: "226302683700", names.USISOEast1RegionID: "490574956308", names.USISOBEast1RegionID: "765400339828", names.USWest1RegionID: "632365934929", @@ -628,7 +628,7 @@ var prebuiltECRImageIDByRegion_XGBoost = map[string]string{ names.USEast1RegionID: "683313688378", names.USEast2RegionID: "257758044811", endpoints.UsGovEast1RegionID: "237065988967", - names.USGovWest1RegionID: "414596584902", + endpoints.UsGovWest1RegionID: "414596584902", names.USISOEast1RegionID: "833128469047", names.USISOBEast1RegionID: "281123927165", names.USWest1RegionID: "746614075791", @@ -682,7 +682,7 @@ var prebuiltECRImageIDByRegion_deepLearning = map[string]string{ names.USWest1RegionID: "763104351884", names.USWest2RegionID: "763104351884", endpoints.UsGovEast1RegionID: "446045086412", - names.USGovWest1RegionID: "442386744353", + endpoints.UsGovWest1RegionID: "442386744353", names.USISOEast1RegionID: "886529160074", names.USISOBEast1RegionID: "094389454867", } diff --git a/internal/service/serverlessrepo/cloudformation_stack_test.go b/internal/service/serverlessrepo/cloudformation_stack_test.go index db024f0f35b..6af314ed902 100644 --- a/internal/service/serverlessrepo/cloudformation_stack_test.go +++ b/internal/service/serverlessrepo/cloudformation_stack_test.go @@ -318,7 +318,7 @@ func testAccCloudFormationApplicationID() string { arnRegion := names.USEast1RegionID arnAccountID := "297356227824" if acctest.Partition() == endpoints.AwsUsGovPartitionID { - arnRegion = names.USGovWest1RegionID + arnRegion = endpoints.UsGovWest1RegionID arnAccountID = "023102451235" } diff --git a/names/names.go b/names/names.go index b15cc0e24d7..d6b4027bb1f 100644 --- a/names/names.go +++ b/names/names.go @@ -154,9 +154,6 @@ const ( USWest1RegionID = "us-west-1" // US West (N. California). USWest2RegionID = "us-west-2" // US West (Oregon). - // AWS GovCloud (US) partition's regions. - USGovWest1RegionID = "us-gov-west-1" // AWS GovCloud (US-West). - // AWS ISO (US) partition's regions. USISOEast1RegionID = "us-iso-east-1" // US ISO East. USISOWest1RegionID = "us-iso-west-1" // US ISO WEST. From 9ded4c0c4f22f67d0882a8adc0cee86bf471e33a Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 15:44:19 -0500 Subject: [PATCH 296/304] 'names.USISOEast1RegionID' -> 'endpoints.UsIsoEast1RegionID'. --- internal/acctest/partition_test.go | 4 ++-- internal/provider/provider_acc_test.go | 2 +- internal/service/s3/bucket_test.go | 4 ++-- .../sagemaker/prebuilt_ecr_image_data_source.go | 16 ++++++++-------- names/names.go | 1 - 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/internal/acctest/partition_test.go b/internal/acctest/partition_test.go index 874b6c581dd..dc2e6c1108e 100644 --- a/internal/acctest/partition_test.go +++ b/internal/acctest/partition_test.go @@ -79,7 +79,7 @@ func TestIsIsolatedRegion(t *testing.T) { expected: false, }, { - input: names.USISOEast1RegionID, + input: endpoints.UsIsoEast1RegionID, expected: true, }, { @@ -171,7 +171,7 @@ func TestIsStandardRegion(t *testing.T) { expected: false, }, { - input: names.USISOEast1RegionID, + input: endpoints.UsIsoEast1RegionID, expected: false, }, { diff --git a/internal/provider/provider_acc_test.go b/internal/provider/provider_acc_test.go index 7c027ff84f8..6ff41303915 100644 --- a/internal/provider/provider_acc_test.go +++ b/internal/provider/provider_acc_test.go @@ -518,7 +518,7 @@ func TestAccProvider_Region_c2s(t *testing.T) { CheckDestroy: nil, Steps: []resource.TestStep{ { - Config: testAccProviderConfig_region(names.USISOEast1RegionID), + Config: testAccProviderConfig_region(endpoints.UsIsoEast1RegionID), Check: resource.ComposeTestCheckFunc( testAccCheckDNSSuffix(ctx, t, &provider, "c2s.ic.gov"), testAccCheckPartition(ctx, t, &provider, endpoints.AwsIsoPartitionID), diff --git a/internal/service/s3/bucket_test.go b/internal/service/s3/bucket_test.go index 4f25e78315f..b2a7a7efa8e 100644 --- a/internal/service/s3/bucket_test.go +++ b/internal/service/s3/bucket_test.go @@ -2420,8 +2420,8 @@ func TestWebsiteEndpoint(t *testing.T) { Expected: fmt.Sprintf("bucket-name.s3-website.%s.%s", endpoints.UsGovEast1RegionID, acctest.PartitionDNSSuffix()), }, { - LocationConstraint: names.USISOEast1RegionID, - Expected: fmt.Sprintf("bucket-name.s3-website.%s.c2s.ic.gov", names.USISOEast1RegionID), + LocationConstraint: endpoints.UsIsoEast1RegionID, + Expected: fmt.Sprintf("bucket-name.s3-website.%s.c2s.ic.gov", endpoints.UsIsoEast1RegionID), }, { LocationConstraint: names.USISOBEast1RegionID, diff --git a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go index 02269cbba02..17ec649b38b 100644 --- a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go +++ b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go @@ -220,7 +220,7 @@ var prebuiltECRImageIDByRegion_blazing = map[string]string{ names.USEast2RegionID: "825641698319", endpoints.UsGovEast1RegionID: "237065988967", endpoints.UsGovWest1RegionID: "226302683700", - names.USISOEast1RegionID: "490574956308", + endpoints.UsIsoEast1RegionID: "490574956308", names.USISOBEast1RegionID: "765400339828", names.USWest1RegionID: "632365934929", names.USWest2RegionID: "433757028032", @@ -346,7 +346,7 @@ var prebuiltECRImageIDByRegion_inferentiaNeo = map[string]string{ names.USEast1RegionID: "785573368785", names.USEast2RegionID: "007439368137", endpoints.UsGovWest1RegionID: "263933020539", - names.USISOEast1RegionID: "167761179201", + endpoints.UsIsoEast1RegionID: "167761179201", names.USISOBEast1RegionID: "406031935815", names.USWest1RegionID: "710691900526", names.USWest2RegionID: "301217895009", @@ -381,7 +381,7 @@ var prebuiltECRImageIDByRegion_SageMakerCustom = map[string]string{ // nosemgrep names.USEast1RegionID: "520713654638", names.USEast2RegionID: "520713654638", endpoints.UsGovWest1RegionID: "246785580436", - names.USISOEast1RegionID: "744548109606", + endpoints.UsIsoEast1RegionID: "744548109606", names.USISOBEast1RegionID: "453391408702", names.USWest1RegionID: "520713654638", names.USWest2RegionID: "520713654638", @@ -519,7 +519,7 @@ var prebuiltECRImageIDByRegion_deepAR = map[string]string{ names.USEast2RegionID: "566113047672", endpoints.UsGovEast1RegionID: "237065988967", endpoints.UsGovWest1RegionID: "226302683700", - names.USISOEast1RegionID: "490574956308", + endpoints.UsIsoEast1RegionID: "490574956308", names.USISOBEast1RegionID: "765400339828", names.USWest1RegionID: "632365934929", names.USWest2RegionID: "156387875391", @@ -564,7 +564,7 @@ var prebuiltECRImageIDByRegion_factorMachines = map[string]string{ names.USEast2RegionID: "404615174143", endpoints.UsGovEast1RegionID: "237065988967", endpoints.UsGovWest1RegionID: "226302683700", - names.USISOEast1RegionID: "490574956308", + endpoints.UsIsoEast1RegionID: "490574956308", names.USISOBEast1RegionID: "765400339828", names.USWest1RegionID: "632365934929", names.USWest2RegionID: "174872318107", @@ -585,7 +585,7 @@ var prebuiltECRImageIDByRegion_lda = map[string]string{ names.USEast1RegionID: "766337827248", names.USEast2RegionID: "999911452149", endpoints.UsGovWest1RegionID: "226302683700", - names.USISOEast1RegionID: "490574956308", + endpoints.UsIsoEast1RegionID: "490574956308", names.USISOBEast1RegionID: "765400339828", names.USWest1RegionID: "632365934929", names.USWest2RegionID: "266724342769", @@ -629,7 +629,7 @@ var prebuiltECRImageIDByRegion_XGBoost = map[string]string{ names.USEast2RegionID: "257758044811", endpoints.UsGovEast1RegionID: "237065988967", endpoints.UsGovWest1RegionID: "414596584902", - names.USISOEast1RegionID: "833128469047", + endpoints.UsIsoEast1RegionID: "833128469047", names.USISOBEast1RegionID: "281123927165", names.USWest1RegionID: "746614075791", names.USWest2RegionID: "246618743249", @@ -683,7 +683,7 @@ var prebuiltECRImageIDByRegion_deepLearning = map[string]string{ names.USWest2RegionID: "763104351884", endpoints.UsGovEast1RegionID: "446045086412", endpoints.UsGovWest1RegionID: "442386744353", - names.USISOEast1RegionID: "886529160074", + endpoints.UsIsoEast1RegionID: "886529160074", names.USISOBEast1RegionID: "094389454867", } diff --git a/names/names.go b/names/names.go index d6b4027bb1f..867655b8e9a 100644 --- a/names/names.go +++ b/names/names.go @@ -155,7 +155,6 @@ const ( USWest2RegionID = "us-west-2" // US West (Oregon). // AWS ISO (US) partition's regions. - USISOEast1RegionID = "us-iso-east-1" // US ISO East. USISOWest1RegionID = "us-iso-west-1" // US ISO WEST. // AWS ISOB (US) partition's regions. From dbdc1506b411be0156736491c9043b79d7477239 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 15:45:12 -0500 Subject: [PATCH 297/304] 'names.USISOWest1RegionID' -> 'endpoints.UsIsoWest1RegionID'. --- names/names.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/names/names.go b/names/names.go index 867655b8e9a..29bd38663e6 100644 --- a/names/names.go +++ b/names/names.go @@ -154,9 +154,6 @@ const ( USWest1RegionID = "us-west-1" // US West (N. California). USWest2RegionID = "us-west-2" // US West (Oregon). - // AWS ISO (US) partition's regions. - USISOWest1RegionID = "us-iso-west-1" // US ISO WEST. - // AWS ISOB (US) partition's regions. USISOBEast1RegionID = "us-isob-east-1" // US ISOB East (Ohio). From 9eebd6f6a7c261b32aadf664e6026bad7fc3b961 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 15:45:57 -0500 Subject: [PATCH 298/304] 'names.USISOBEast1RegionID' -> 'endpoints.UsIsobEast1RegionID'. --- internal/acctest/partition_test.go | 4 ++-- internal/provider/provider_acc_test.go | 2 +- internal/service/s3/bucket_test.go | 4 ++-- .../sagemaker/prebuilt_ecr_image_data_source.go | 16 ++++++++-------- names/names.go | 3 --- 5 files changed, 13 insertions(+), 16 deletions(-) diff --git a/internal/acctest/partition_test.go b/internal/acctest/partition_test.go index dc2e6c1108e..1a6061a4db3 100644 --- a/internal/acctest/partition_test.go +++ b/internal/acctest/partition_test.go @@ -83,7 +83,7 @@ func TestIsIsolatedRegion(t *testing.T) { expected: true, }, { - input: names.USISOBEast1RegionID, + input: endpoints.UsIsobEast1RegionID, expected: true, }, { @@ -175,7 +175,7 @@ func TestIsStandardRegion(t *testing.T) { expected: false, }, { - input: names.USISOBEast1RegionID, + input: endpoints.UsIsobEast1RegionID, expected: false, }, { diff --git a/internal/provider/provider_acc_test.go b/internal/provider/provider_acc_test.go index 6ff41303915..ecd753ce505 100644 --- a/internal/provider/provider_acc_test.go +++ b/internal/provider/provider_acc_test.go @@ -610,7 +610,7 @@ func TestAccProvider_Region_sc2s(t *testing.T) { CheckDestroy: nil, Steps: []resource.TestStep{ { - Config: testAccProviderConfig_region(names.USISOBEast1RegionID), + Config: testAccProviderConfig_region(endpoints.UsIsobEast1RegionID), Check: resource.ComposeTestCheckFunc( testAccCheckDNSSuffix(ctx, t, &provider, "sc2s.sgov.gov"), testAccCheckPartition(ctx, t, &provider, endpoints.AwsIsoBPartitionID), diff --git a/internal/service/s3/bucket_test.go b/internal/service/s3/bucket_test.go index b2a7a7efa8e..0c0cd1e23d4 100644 --- a/internal/service/s3/bucket_test.go +++ b/internal/service/s3/bucket_test.go @@ -2424,8 +2424,8 @@ func TestWebsiteEndpoint(t *testing.T) { Expected: fmt.Sprintf("bucket-name.s3-website.%s.c2s.ic.gov", endpoints.UsIsoEast1RegionID), }, { - LocationConstraint: names.USISOBEast1RegionID, - Expected: fmt.Sprintf("bucket-name.s3-website.%s.sc2s.sgov.gov", names.USISOBEast1RegionID), + LocationConstraint: endpoints.UsIsobEast1RegionID, + Expected: fmt.Sprintf("bucket-name.s3-website.%s.sc2s.sgov.gov", endpoints.UsIsobEast1RegionID), }, { LocationConstraint: endpoints.CnNorth1RegionID, diff --git a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go index 17ec649b38b..a669d852828 100644 --- a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go +++ b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go @@ -221,7 +221,7 @@ var prebuiltECRImageIDByRegion_blazing = map[string]string{ endpoints.UsGovEast1RegionID: "237065988967", endpoints.UsGovWest1RegionID: "226302683700", endpoints.UsIsoEast1RegionID: "490574956308", - names.USISOBEast1RegionID: "765400339828", + endpoints.UsIsobEast1RegionID: "765400339828", names.USWest1RegionID: "632365934929", names.USWest2RegionID: "433757028032", } @@ -347,7 +347,7 @@ var prebuiltECRImageIDByRegion_inferentiaNeo = map[string]string{ names.USEast2RegionID: "007439368137", endpoints.UsGovWest1RegionID: "263933020539", endpoints.UsIsoEast1RegionID: "167761179201", - names.USISOBEast1RegionID: "406031935815", + endpoints.UsIsobEast1RegionID: "406031935815", names.USWest1RegionID: "710691900526", names.USWest2RegionID: "301217895009", } @@ -382,7 +382,7 @@ var prebuiltECRImageIDByRegion_SageMakerCustom = map[string]string{ // nosemgrep names.USEast2RegionID: "520713654638", endpoints.UsGovWest1RegionID: "246785580436", endpoints.UsIsoEast1RegionID: "744548109606", - names.USISOBEast1RegionID: "453391408702", + endpoints.UsIsobEast1RegionID: "453391408702", names.USWest1RegionID: "520713654638", names.USWest2RegionID: "520713654638", } @@ -520,7 +520,7 @@ var prebuiltECRImageIDByRegion_deepAR = map[string]string{ endpoints.UsGovEast1RegionID: "237065988967", endpoints.UsGovWest1RegionID: "226302683700", endpoints.UsIsoEast1RegionID: "490574956308", - names.USISOBEast1RegionID: "765400339828", + endpoints.UsIsobEast1RegionID: "765400339828", names.USWest1RegionID: "632365934929", names.USWest2RegionID: "156387875391", } @@ -565,7 +565,7 @@ var prebuiltECRImageIDByRegion_factorMachines = map[string]string{ endpoints.UsGovEast1RegionID: "237065988967", endpoints.UsGovWest1RegionID: "226302683700", endpoints.UsIsoEast1RegionID: "490574956308", - names.USISOBEast1RegionID: "765400339828", + endpoints.UsIsobEast1RegionID: "765400339828", names.USWest1RegionID: "632365934929", names.USWest2RegionID: "174872318107", } @@ -586,7 +586,7 @@ var prebuiltECRImageIDByRegion_lda = map[string]string{ names.USEast2RegionID: "999911452149", endpoints.UsGovWest1RegionID: "226302683700", endpoints.UsIsoEast1RegionID: "490574956308", - names.USISOBEast1RegionID: "765400339828", + endpoints.UsIsobEast1RegionID: "765400339828", names.USWest1RegionID: "632365934929", names.USWest2RegionID: "266724342769", } @@ -630,7 +630,7 @@ var prebuiltECRImageIDByRegion_XGBoost = map[string]string{ endpoints.UsGovEast1RegionID: "237065988967", endpoints.UsGovWest1RegionID: "414596584902", endpoints.UsIsoEast1RegionID: "833128469047", - names.USISOBEast1RegionID: "281123927165", + endpoints.UsIsobEast1RegionID: "281123927165", names.USWest1RegionID: "746614075791", names.USWest2RegionID: "246618743249", } @@ -684,7 +684,7 @@ var prebuiltECRImageIDByRegion_deepLearning = map[string]string{ endpoints.UsGovEast1RegionID: "446045086412", endpoints.UsGovWest1RegionID: "442386744353", endpoints.UsIsoEast1RegionID: "886529160074", - names.USISOBEast1RegionID: "094389454867", + endpoints.UsIsobEast1RegionID: "094389454867", } // https://github.com/aws/sagemaker-python-sdk/blob/master/src/sagemaker/image_uri_config/model-monitor.json diff --git a/names/names.go b/names/names.go index 29bd38663e6..dab863b82dd 100644 --- a/names/names.go +++ b/names/names.go @@ -154,9 +154,6 @@ const ( USWest1RegionID = "us-west-1" // US West (N. California). USWest2RegionID = "us-west-2" // US West (Oregon). - // AWS ISOB (US) partition's regions. - USISOBEast1RegionID = "us-isob-east-1" // US ISOB East (Ohio). - // AWS ISOF partition's regions. EUISOEWest1RegionID = "eu-isoe-west-1" // EU ISOE West. ) From 431c2ade244f4aacd5b4b842fccb51d6dc6d779f Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 15:46:41 -0500 Subject: [PATCH 299/304] 'names.EUISOEWest1RegionID' -> 'endpoints.EuIsoeWest1RegionID'. --- internal/acctest/partition_test.go | 4 ++-- names/names.go | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/internal/acctest/partition_test.go b/internal/acctest/partition_test.go index 1a6061a4db3..dffba589a47 100644 --- a/internal/acctest/partition_test.go +++ b/internal/acctest/partition_test.go @@ -87,7 +87,7 @@ func TestIsIsolatedRegion(t *testing.T) { expected: true, }, { - input: names.EUISOEWest1RegionID, + input: endpoints.EuIsoeWest1RegionID, expected: true, }, } @@ -179,7 +179,7 @@ func TestIsStandardRegion(t *testing.T) { expected: false, }, { - input: names.EUISOEWest1RegionID, + input: endpoints.EuIsoeWest1RegionID, expected: false, }, } diff --git a/names/names.go b/names/names.go index dab863b82dd..3cee61dad81 100644 --- a/names/names.go +++ b/names/names.go @@ -153,9 +153,6 @@ const ( USEast2RegionID = "us-east-2" // US East (Ohio). USWest1RegionID = "us-west-1" // US West (N. California). USWest2RegionID = "us-west-2" // US West (Oregon). - - // AWS ISOF partition's regions. - EUISOEWest1RegionID = "eu-isoe-west-1" // EU ISOE West. ) // PartitionForRegion returns the partition for the given Region. From 40b5eec1588c1bd0480cf6f7b26923b097632111 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 15:49:34 -0500 Subject: [PATCH 300/304] 'names.USEast2RegionID' -> 'endpoints.UsEast2RegionID'. --- internal/acctest/acctest.go | 2 +- .../apprunner/hosted_zone_id_data_source.go | 2 +- internal/service/chatbot/service_package.go | 2 +- .../cloudtrail/service_account_data_source.go | 2 +- .../service/dynamodb/global_table_test.go | 2 +- internal/service/ec2/ec2_instance_test.go | 11 +++---- .../hosted_zone_data_source.go | 2 +- .../service/elb/hosted_zone_id_data_source.go | 2 +- .../elb/service_account_data_source.go | 2 +- .../elbv2/hosted_zone_id_data_source.go | 4 +-- internal/service/gamelift/gamelift_test.go | 2 +- internal/service/lambda/function.go | 2 +- .../redshift/service_account_data_source.go | 2 +- internal/service/s3/bucket_test.go | 4 +-- internal/service/s3/hosted_zones.go | 2 +- .../prebuilt_ecr_image_data_source.go | 30 +++++++++---------- names/names.go | 1 - 17 files changed, 37 insertions(+), 37 deletions(-) diff --git a/internal/acctest/acctest.go b/internal/acctest/acctest.go index 575c1385c77..6900c59d19d 100644 --- a/internal/acctest/acctest.go +++ b/internal/acctest/acctest.go @@ -905,7 +905,7 @@ func AlternateRegion() string { } func ThirdRegion() string { - return envvar.GetWithDefault(envvar.ThirdRegion, names.USEast2RegionID) + return envvar.GetWithDefault(envvar.ThirdRegion, endpoints.UsEast2RegionID) } func Partition() string { diff --git a/internal/service/apprunner/hosted_zone_id_data_source.go b/internal/service/apprunner/hosted_zone_id_data_source.go index 15f0349af6b..243eafcf1eb 100644 --- a/internal/service/apprunner/hosted_zone_id_data_source.go +++ b/internal/service/apprunner/hosted_zone_id_data_source.go @@ -18,7 +18,7 @@ import ( // See https://docs.aws.amazon.com/general/latest/gr/apprunner.html var hostedZoneIDPerRegionMap = map[string]string{ - names.USEast2RegionID: "Z0224347AD7KVHMLOX31", + endpoints.UsEast2RegionID: "Z0224347AD7KVHMLOX31", names.USEast1RegionID: "Z01915732ZBZKC8D32TPT", names.USWest2RegionID: "Z02243383FTQ64HJ5772Q", endpoints.ApSouth1RegionID: "Z00855883LBHKTIC4ODF2", diff --git a/internal/service/chatbot/service_package.go b/internal/service/chatbot/service_package.go index 60bc0bf1421..8e0fc921969 100644 --- a/internal/service/chatbot/service_package.go +++ b/internal/service/chatbot/service_package.go @@ -25,7 +25,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( if config["partition"].(string) == endpoints.AwsPartitionID { // Chatbot endpoint is available only in the 4 regions us-east-2, us-west-2, eu-west-1, and ap-southeast-1. // If the region from the context is one of those four, then use that region. If not default to us-west-2 - if slices.Contains([]string{names.USEast2RegionID, names.USWest2RegionID, endpoints.EuWest1RegionID, endpoints.ApSoutheast1RegionID}, cfg.Region) { + if slices.Contains([]string{endpoints.UsEast2RegionID, names.USWest2RegionID, endpoints.EuWest1RegionID, endpoints.ApSoutheast1RegionID}, cfg.Region) { o.Region = cfg.Region } else { tflog.Info(ctx, "overriding region", map[string]any{ diff --git a/internal/service/cloudtrail/service_account_data_source.go b/internal/service/cloudtrail/service_account_data_source.go index 012409f2952..5ea0220ab4a 100644 --- a/internal/service/cloudtrail/service_account_data_source.go +++ b/internal/service/cloudtrail/service_account_data_source.go @@ -47,7 +47,7 @@ var serviceAccountPerRegionMap = map[string]string{ endpoints.MeSouth1RegionID: "034638983726", endpoints.SaEast1RegionID: "814480443879", names.USEast1RegionID: "086441151436", - names.USEast2RegionID: "475085895292", + endpoints.UsEast2RegionID: "475085895292", endpoints.UsGovEast1RegionID: "608710470296", endpoints.UsGovWest1RegionID: "608710470296", names.USWest1RegionID: "388731089494", diff --git a/internal/service/dynamodb/global_table_test.go b/internal/service/dynamodb/global_table_test.go index 6a6cd35069b..4e0b574dad1 100644 --- a/internal/service/dynamodb/global_table_test.go +++ b/internal/service/dynamodb/global_table_test.go @@ -165,7 +165,7 @@ func testAccPreCheckGlobalTable(ctx context.Context, t *testing.T) { endpoints.EuWest1RegionID, endpoints.EuWest2RegionID, names.USEast1RegionID, - names.USEast2RegionID, + endpoints.UsEast2RegionID, names.USWest1RegionID, names.USWest2RegionID, } diff --git a/internal/service/ec2/ec2_instance_test.go b/internal/service/ec2/ec2_instance_test.go index 03dd3da5420..2740afb15fb 100644 --- a/internal/service/ec2/ec2_instance_test.go +++ b/internal/service/ec2/ec2_instance_test.go @@ -19,6 +19,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/ec2" awstypes "github.com/aws/aws-sdk-go-v2/service/ec2/types" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" @@ -3905,7 +3906,7 @@ func TestAccEC2Instance_cpuOptionsAmdSevSnpUnspecifiedToDisabledToEnabledToUnspe acctest.PreCheck(ctx, t) // AMD SEV-SNP currently only supported in us-east-2 // Ref: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/snp-requirements.html - acctest.PreCheckRegion(t, names.USEast2RegionID) + acctest.PreCheckRegion(t, endpoints.UsEast2RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -3972,7 +3973,7 @@ func TestAccEC2Instance_cpuOptionsAmdSevSnpUnspecifiedToEnabledToDisabledToUnspe acctest.PreCheck(ctx, t) // AMD SEV-SNP currently only supported in us-east-2 // Ref: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/snp-requirements.html - acctest.PreCheckRegion(t, names.USEast2RegionID) + acctest.PreCheckRegion(t, endpoints.UsEast2RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -4038,7 +4039,7 @@ func TestAccEC2Instance_cpuOptionsAmdSevSnpEnabledToDisabled(t *testing.T) { acctest.PreCheck(ctx, t) // AMD SEV-SNP currently only supported in us-east-2 // Ref: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/snp-requirements.html - acctest.PreCheckRegion(t, names.USEast2RegionID) + acctest.PreCheckRegion(t, endpoints.UsEast2RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -4082,7 +4083,7 @@ func TestAccEC2Instance_cpuOptionsAmdSevSnpDisabledToEnabled(t *testing.T) { acctest.PreCheck(ctx, t) // AMD SEV-SNP currently only supported in us-east-2 // Ref: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/snp-requirements.html - acctest.PreCheckRegion(t, names.USEast2RegionID) + acctest.PreCheckRegion(t, endpoints.UsEast2RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -4131,7 +4132,7 @@ func TestAccEC2Instance_cpuOptionsAmdSevSnpCoreThreads(t *testing.T) { acctest.PreCheck(ctx, t) // AMD SEV-SNP currently only supported in us-east-2 // Ref: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/snp-requirements.html - acctest.PreCheckRegion(t, names.USEast2RegionID) + acctest.PreCheckRegion(t, endpoints.UsEast2RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, diff --git a/internal/service/elasticbeanstalk/hosted_zone_data_source.go b/internal/service/elasticbeanstalk/hosted_zone_data_source.go index 3fdf5242f90..9f76cf8a150 100644 --- a/internal/service/elasticbeanstalk/hosted_zone_data_source.go +++ b/internal/service/elasticbeanstalk/hosted_zone_data_source.go @@ -38,7 +38,7 @@ var hostedZoneIDs = map[string]string{ endpoints.MeSouth1RegionID: "Z2BBTEKR2I36N2", endpoints.SaEast1RegionID: "Z10X7K2B4QSOFV", names.USEast1RegionID: "Z117KPS5GTRQ2G", - names.USEast2RegionID: "Z14LCN19Q5QHIC", + endpoints.UsEast2RegionID: "Z14LCN19Q5QHIC", names.USWest1RegionID: "Z1LQECGX5PH1X", names.USWest2RegionID: "Z38NKT9BP95V3O", endpoints.UsGovEast1RegionID: "Z35TSARG0EJ4VU", diff --git a/internal/service/elb/hosted_zone_id_data_source.go b/internal/service/elb/hosted_zone_id_data_source.go index 7d407369127..222dcef8a98 100644 --- a/internal/service/elb/hosted_zone_id_data_source.go +++ b/internal/service/elb/hosted_zone_id_data_source.go @@ -45,7 +45,7 @@ var hostedZoneIDPerRegionMap = map[string]string{ endpoints.MeSouth1RegionID: "ZS929ML54UICD", endpoints.SaEast1RegionID: "Z2P70J7HTTTPLU", names.USEast1RegionID: "Z35SXDOTRQ7X7K", - names.USEast2RegionID: "Z3AADJGX6KTTL2", + endpoints.UsEast2RegionID: "Z3AADJGX6KTTL2", endpoints.UsGovEast1RegionID: "Z166TLBEWOO7G0", endpoints.UsGovWest1RegionID: "Z33AYJ8TM3BH4J", names.USWest1RegionID: "Z368ELLRRE2KJ0", diff --git a/internal/service/elb/service_account_data_source.go b/internal/service/elb/service_account_data_source.go index bc8d2478997..02246112ab7 100644 --- a/internal/service/elb/service_account_data_source.go +++ b/internal/service/elb/service_account_data_source.go @@ -40,7 +40,7 @@ var accountIDPerRegionMap = map[string]string{ endpoints.MeSouth1RegionID: "076674570225", endpoints.SaEast1RegionID: "507241528517", names.USEast1RegionID: "127311923021", - names.USEast2RegionID: "033677994240", + endpoints.UsEast2RegionID: "033677994240", endpoints.UsGovEast1RegionID: "190560391635", endpoints.UsGovWest1RegionID: "048591011584", names.USWest1RegionID: "027434742980", diff --git a/internal/service/elbv2/hosted_zone_id_data_source.go b/internal/service/elbv2/hosted_zone_id_data_source.go index c5fc8f50bc9..30c18070e47 100644 --- a/internal/service/elbv2/hosted_zone_id_data_source.go +++ b/internal/service/elbv2/hosted_zone_id_data_source.go @@ -49,7 +49,7 @@ var hostedZoneIDPerRegionALBMap = map[string]string{ endpoints.MeSouth1RegionID: "ZS929ML54UICD", endpoints.SaEast1RegionID: "Z2P70J7HTTTPLU", names.USEast1RegionID: "Z35SXDOTRQ7X7K", - names.USEast2RegionID: "Z3AADJGX6KTTL2", + endpoints.UsEast2RegionID: "Z3AADJGX6KTTL2", endpoints.UsGovEast1RegionID: "Z166TLBEWOO7G0", endpoints.UsGovWest1RegionID: "Z33AYJ8TM3BH4J", names.USWest1RegionID: "Z368ELLRRE2KJ0", @@ -87,7 +87,7 @@ var hostedZoneIDPerRegionNLBMap = map[string]string{ endpoints.MeSouth1RegionID: "Z3QSRYVP46NYYV", endpoints.SaEast1RegionID: "ZTK26PT1VY4CU", names.USEast1RegionID: "Z26RNL4JYFTOTI", - names.USEast2RegionID: "ZLMOA37VPKANP", + endpoints.UsEast2RegionID: "ZLMOA37VPKANP", endpoints.UsGovEast1RegionID: "Z1ZSMQQ6Q24QQ8", endpoints.UsGovWest1RegionID: "ZMG1MZ2THAWF1", names.USWest1RegionID: "Z24FKFUX50B4VW", diff --git a/internal/service/gamelift/gamelift_test.go b/internal/service/gamelift/gamelift_test.go index 6b486400110..5179d866511 100644 --- a/internal/service/gamelift/gamelift_test.go +++ b/internal/service/gamelift/gamelift_test.go @@ -62,7 +62,7 @@ func testAccAccountIdByRegion(region string) (string, error) { endpoints.EuWest2RegionID: "937342764187", endpoints.SaEast1RegionID: "028872612690", names.USEast1RegionID: "783764748367", - names.USEast2RegionID: "415729564621", + endpoints.UsEast2RegionID: "415729564621", names.USWest1RegionID: "715879310420", names.USWest2RegionID: "741061592171", } diff --git a/internal/service/lambda/function.go b/internal/service/lambda/function.go index 1a05a6f8070..7d46572b031 100644 --- a/internal/service/lambda/function.go +++ b/internal/service/lambda/function.go @@ -1400,7 +1400,7 @@ func invokeARN(ctx context.Context, c *conns.AWSClient, functionOrAliasARN strin func signerServiceIsAvailable(region string) bool { availableRegions := map[string]struct{}{ names.USEast1RegionID: {}, - names.USEast2RegionID: {}, + endpoints.UsEast2RegionID: {}, names.USWest1RegionID: {}, names.USWest2RegionID: {}, endpoints.AfSouth1RegionID: {}, diff --git a/internal/service/redshift/service_account_data_source.go b/internal/service/redshift/service_account_data_source.go index e623ea8ed8e..8ec6ed02d37 100644 --- a/internal/service/redshift/service_account_data_source.go +++ b/internal/service/redshift/service_account_data_source.go @@ -41,7 +41,7 @@ var ServiceAccountPerRegionMap = map[string]string{ endpoints.MeSouth1RegionID: "013126148197", endpoints.SaEast1RegionID: "075028567923", names.USEast1RegionID: "193672423079", - names.USEast2RegionID: "391106570357", + endpoints.UsEast2RegionID: "391106570357", endpoints.UsGovEast1RegionID: "665727464434", endpoints.UsGovWest1RegionID: "665727464434", names.USWest1RegionID: "262260360010", diff --git a/internal/service/s3/bucket_test.go b/internal/service/s3/bucket_test.go index 0c0cd1e23d4..6b0085c1796 100644 --- a/internal/service/s3/bucket_test.go +++ b/internal/service/s3/bucket_test.go @@ -2412,8 +2412,8 @@ func TestWebsiteEndpoint(t *testing.T) { Expected: fmt.Sprintf("bucket-name.s3-website-%s.%s", names.USEast1RegionID, acctest.PartitionDNSSuffix()), }, { - LocationConstraint: names.USEast2RegionID, - Expected: fmt.Sprintf("bucket-name.s3-website.%s.%s", names.USEast2RegionID, acctest.PartitionDNSSuffix()), + LocationConstraint: endpoints.UsEast2RegionID, + Expected: fmt.Sprintf("bucket-name.s3-website.%s.%s", endpoints.UsEast2RegionID, acctest.PartitionDNSSuffix()), }, { LocationConstraint: endpoints.UsGovEast1RegionID, diff --git a/internal/service/s3/hosted_zones.go b/internal/service/s3/hosted_zones.go index 4da4e8940b5..7ddc6a909bd 100644 --- a/internal/service/s3/hosted_zones.go +++ b/internal/service/s3/hosted_zones.go @@ -41,7 +41,7 @@ var hostedZoneIDsMap = map[string]string{ endpoints.MeSouth1RegionID: "Z1MPMWCPA7YB62", endpoints.SaEast1RegionID: "Z7KQH4QJS55SO", names.USEast1RegionID: "Z3AQBSTGFYJSTF", - names.USEast2RegionID: "Z2O1EMRO9K5GLX", + endpoints.UsEast2RegionID: "Z2O1EMRO9K5GLX", endpoints.UsGovEast1RegionID: "Z2NIFVYYW2VKV1", endpoints.UsGovWest1RegionID: "Z31GFT0UA1I2HV", names.USWest1RegionID: "Z2F56UZL2M1ACD", diff --git a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go index a669d852828..539a32105c4 100644 --- a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go +++ b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go @@ -217,7 +217,7 @@ var prebuiltECRImageIDByRegion_blazing = map[string]string{ endpoints.MeSouth1RegionID: "249704162688", endpoints.SaEast1RegionID: "855470959533", names.USEast1RegionID: "811284229777", - names.USEast2RegionID: "825641698319", + endpoints.UsEast2RegionID: "825641698319", endpoints.UsGovEast1RegionID: "237065988967", endpoints.UsGovWest1RegionID: "226302683700", endpoints.UsIsoEast1RegionID: "490574956308", @@ -250,7 +250,7 @@ var prebuiltECRImageIDByRegion_clarify = map[string]string{ endpoints.MeSouth1RegionID: "835444307964", endpoints.SaEast1RegionID: "520018980103", names.USEast1RegionID: "205585389593", - names.USEast2RegionID: "211330385671", + endpoints.UsEast2RegionID: "211330385671", endpoints.UsGovWest1RegionID: "598674086554", names.USWest1RegionID: "740489534195", names.USWest2RegionID: "306415355426", @@ -280,7 +280,7 @@ var prebuiltECRImageIDByRegion_dataWrangler = map[string]string{ endpoints.MeSouth1RegionID: "376037874950", endpoints.SaEast1RegionID: "424196993095", names.USEast1RegionID: "663277389841", - names.USEast2RegionID: "415577184552", + endpoints.UsEast2RegionID: "415577184552", names.USWest1RegionID: "926135532090", names.USWest2RegionID: "174368400705", } @@ -308,7 +308,7 @@ var prebuiltECRImageIDByRegion_debugger = map[string]string{ endpoints.MeSouth1RegionID: "986000313247", endpoints.SaEast1RegionID: "818342061345", names.USEast1RegionID: "503895931360", - names.USEast2RegionID: "915447279597", + endpoints.UsEast2RegionID: "915447279597", endpoints.UsGovWest1RegionID: "515509971035", names.USWest1RegionID: "685455198987", names.USWest2RegionID: "895741380848", @@ -344,7 +344,7 @@ var prebuiltECRImageIDByRegion_inferentiaNeo = map[string]string{ endpoints.MeSouth1RegionID: "836785723513", endpoints.SaEast1RegionID: "756306329178", names.USEast1RegionID: "785573368785", - names.USEast2RegionID: "007439368137", + endpoints.UsEast2RegionID: "007439368137", endpoints.UsGovWest1RegionID: "263933020539", endpoints.UsIsoEast1RegionID: "167761179201", endpoints.UsIsobEast1RegionID: "406031935815", @@ -379,7 +379,7 @@ var prebuiltECRImageIDByRegion_SageMakerCustom = map[string]string{ // nosemgrep endpoints.MeSouth1RegionID: "724002660598", endpoints.SaEast1RegionID: "520713654638", names.USEast1RegionID: "520713654638", - names.USEast2RegionID: "520713654638", + endpoints.UsEast2RegionID: "520713654638", endpoints.UsGovWest1RegionID: "246785580436", endpoints.UsIsoEast1RegionID: "744548109606", endpoints.UsIsobEast1RegionID: "453391408702", @@ -402,7 +402,7 @@ var prebuiltECRImageIDByRegion_SageMakerRL = map[string]string{ // nosemgrep:ci. endpoints.EuWest1RegionID: "462105765813", endpoints.EuWest2RegionID: "462105765813", names.USEast1RegionID: "462105765813", - names.USEast2RegionID: "462105765813", + endpoints.UsEast2RegionID: "462105765813", names.USWest1RegionID: "462105765813", names.USWest2RegionID: "462105765813", } @@ -438,7 +438,7 @@ var prebuiltECRImageIDByRegion_spark = map[string]string{ endpoints.MeSouth1RegionID: "750251592176", endpoints.SaEast1RegionID: "737130764395", names.USEast1RegionID: "173754725891", - names.USEast2RegionID: "314815235551", + endpoints.UsEast2RegionID: "314815235551", endpoints.UsGovEast1RegionID: "260923028637", endpoints.UsGovWest1RegionID: "271483468897", names.USWest1RegionID: "667973535471", @@ -472,7 +472,7 @@ var prebuiltECRImageIDByRegion_SageMakerBasePython = map[string]string{ // nosem endpoints.MeSouth1RegionID: "117516905037", endpoints.SaEast1RegionID: "782484402741", names.USEast1RegionID: "081325390199", - names.USEast2RegionID: "429704687514", + endpoints.UsEast2RegionID: "429704687514", endpoints.UsGovEast1RegionID: "107072934176", endpoints.UsGovWest1RegionID: "107173498710", names.USWest1RegionID: "742091327244", @@ -516,7 +516,7 @@ var prebuiltECRImageIDByRegion_deepAR = map[string]string{ endpoints.MeSouth1RegionID: "249704162688", endpoints.SaEast1RegionID: "855470959533", names.USEast1RegionID: "522234722520", - names.USEast2RegionID: "566113047672", + endpoints.UsEast2RegionID: "566113047672", endpoints.UsGovEast1RegionID: "237065988967", endpoints.UsGovWest1RegionID: "226302683700", endpoints.UsIsoEast1RegionID: "490574956308", @@ -561,7 +561,7 @@ var prebuiltECRImageIDByRegion_factorMachines = map[string]string{ endpoints.MeSouth1RegionID: "249704162688", endpoints.SaEast1RegionID: "855470959533", names.USEast1RegionID: "382416733822", - names.USEast2RegionID: "404615174143", + endpoints.UsEast2RegionID: "404615174143", endpoints.UsGovEast1RegionID: "237065988967", endpoints.UsGovWest1RegionID: "226302683700", endpoints.UsIsoEast1RegionID: "490574956308", @@ -583,7 +583,7 @@ var prebuiltECRImageIDByRegion_lda = map[string]string{ endpoints.EuWest1RegionID: "999678624901", endpoints.EuWest2RegionID: "644912444149", names.USEast1RegionID: "766337827248", - names.USEast2RegionID: "999911452149", + endpoints.UsEast2RegionID: "999911452149", endpoints.UsGovWest1RegionID: "226302683700", endpoints.UsIsoEast1RegionID: "490574956308", endpoints.UsIsobEast1RegionID: "765400339828", @@ -626,7 +626,7 @@ var prebuiltECRImageIDByRegion_XGBoost = map[string]string{ endpoints.MeSouth1RegionID: "801668240914", endpoints.SaEast1RegionID: "737474898029", names.USEast1RegionID: "683313688378", - names.USEast2RegionID: "257758044811", + endpoints.UsEast2RegionID: "257758044811", endpoints.UsGovEast1RegionID: "237065988967", endpoints.UsGovWest1RegionID: "414596584902", endpoints.UsIsoEast1RegionID: "833128469047", @@ -678,7 +678,7 @@ var prebuiltECRImageIDByRegion_deepLearning = map[string]string{ endpoints.MeSouth1RegionID: "217643126080", endpoints.SaEast1RegionID: "763104351884", names.USEast1RegionID: "763104351884", - names.USEast2RegionID: "763104351884", + endpoints.UsEast2RegionID: "763104351884", names.USWest1RegionID: "763104351884", names.USWest2RegionID: "763104351884", endpoints.UsGovEast1RegionID: "446045086412", @@ -714,7 +714,7 @@ var prebuiltECRImageIDByRegion_modelMonitor = map[string]string{ endpoints.MeSouth1RegionID: "607024016150", endpoints.SaEast1RegionID: "539772159869", names.USEast1RegionID: "156813124566", - names.USEast2RegionID: "777275614652", + endpoints.UsEast2RegionID: "777275614652", names.USWest1RegionID: "890145073186", names.USWest2RegionID: "159807026194", } diff --git a/names/names.go b/names/names.go index 3cee61dad81..dfeca35b67a 100644 --- a/names/names.go +++ b/names/names.go @@ -150,7 +150,6 @@ const ( GlobalRegionID = "aws-global" // AWS Standard global region. USEast1RegionID = "us-east-1" // US East (N. Virginia). - USEast2RegionID = "us-east-2" // US East (Ohio). USWest1RegionID = "us-west-1" // US West (N. California). USWest2RegionID = "us-west-2" // US West (Oregon). ) From b5f6176013414a0fedfa8bc14001563ae667027c Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 15:56:32 -0500 Subject: [PATCH 301/304] 'names.USWest1RegionID' -> 'endpoints.UsWest1RegionID'. --- internal/service/appstream/sweep.go | 10 +++---- .../cloudtrail/service_account_data_source.go | 2 +- internal/service/docdbelastic/sweep.go | 3 +- .../service/dynamodb/global_table_test.go | 2 +- .../hosted_zone_data_source.go | 2 +- .../service/elb/hosted_zone_id_data_source.go | 2 +- .../elb/service_account_data_source.go | 2 +- .../elbv2/hosted_zone_id_data_source.go | 4 +-- internal/service/gamelift/gamelift_test.go | 2 +- internal/service/iam/access_key_test.go | 4 +-- internal/service/lambda/function.go | 2 +- .../service/opensearchserverless/sweep.go | 10 +++---- .../service/opsworks/rails_app_layer_test.go | 3 +- internal/service/opsworks/stack_test.go | 3 +- .../redshift/service_account_data_source.go | 2 +- internal/service/s3/hosted_zones.go | 2 +- .../prebuilt_ecr_image_data_source.go | 30 +++++++++---------- internal/service/ssmincidents/sweep.go | 4 +-- names/names.go | 1 - 19 files changed, 46 insertions(+), 44 deletions(-) diff --git a/internal/service/appstream/sweep.go b/internal/service/appstream/sweep.go index d3b67b1a57d..97a946bb256 100644 --- a/internal/service/appstream/sweep.go +++ b/internal/service/appstream/sweep.go @@ -9,10 +9,10 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/appstream" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-aws/internal/sweep" "github.com/hashicorp/terraform-provider-aws/internal/sweep/awsv2" - "github.com/hashicorp/terraform-provider-aws/names" ) func RegisterSweepers() { @@ -39,7 +39,7 @@ func RegisterSweepers() { func sweepDirectoryConfigs(region string) error { ctx := sweep.Context(region) - if region == names.USWest1RegionID { + if region == endpoints.UsWest1RegionID { log.Printf("[WARN] Skipping AppStream Directory Config sweep for region: %s", region) return nil } @@ -87,7 +87,7 @@ func sweepDirectoryConfigs(region string) error { func sweepFleets(region string) error { ctx := sweep.Context(region) - if region == names.USWest1RegionID { + if region == endpoints.UsWest1RegionID { log.Printf("[WARN] Skipping AppStream Fleet sweep for region: %s", region) return nil } @@ -135,7 +135,7 @@ func sweepFleets(region string) error { func sweepImageBuilders(region string) error { ctx := sweep.Context(region) - if region == names.USWest1RegionID { + if region == endpoints.UsWest1RegionID { log.Printf("[WARN] Skipping AppStream Image Builder sweep for region: %s", region) return nil } @@ -183,7 +183,7 @@ func sweepImageBuilders(region string) error { func sweepStacks(region string) error { ctx := sweep.Context(region) - if region == names.USWest1RegionID { + if region == endpoints.UsWest1RegionID { log.Printf("[WARN] Skipping AppStream Stack sweep for region: %s", region) return nil } diff --git a/internal/service/cloudtrail/service_account_data_source.go b/internal/service/cloudtrail/service_account_data_source.go index 5ea0220ab4a..d68ef8e52a3 100644 --- a/internal/service/cloudtrail/service_account_data_source.go +++ b/internal/service/cloudtrail/service_account_data_source.go @@ -50,7 +50,7 @@ var serviceAccountPerRegionMap = map[string]string{ endpoints.UsEast2RegionID: "475085895292", endpoints.UsGovEast1RegionID: "608710470296", endpoints.UsGovWest1RegionID: "608710470296", - names.USWest1RegionID: "388731089494", + endpoints.UsWest1RegionID: "388731089494", names.USWest2RegionID: "113285607260", } diff --git a/internal/service/docdbelastic/sweep.go b/internal/service/docdbelastic/sweep.go index ca3cda98727..427d84fbfa1 100644 --- a/internal/service/docdbelastic/sweep.go +++ b/internal/service/docdbelastic/sweep.go @@ -9,6 +9,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/docdbelastic" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-aws/internal/sweep" "github.com/hashicorp/terraform-provider-aws/internal/sweep/awsv2" @@ -25,7 +26,7 @@ func RegisterSweepers() { func sweepClusters(region string) error { ctx := sweep.Context(region) - if region == names.USWest1RegionID { + if region == endpoints.UsWest1RegionID { log.Printf("[WARN] Skipping DocDB Elastic Cluster sweep for region: %s", region) return nil } diff --git a/internal/service/dynamodb/global_table_test.go b/internal/service/dynamodb/global_table_test.go index 4e0b574dad1..a2fb5a0db27 100644 --- a/internal/service/dynamodb/global_table_test.go +++ b/internal/service/dynamodb/global_table_test.go @@ -166,7 +166,7 @@ func testAccPreCheckGlobalTable(ctx context.Context, t *testing.T) { endpoints.EuWest2RegionID, names.USEast1RegionID, endpoints.UsEast2RegionID, - names.USWest1RegionID, + endpoints.UsWest1RegionID, names.USWest2RegionID, } acctest.PreCheckRegion(t, supportedRegions...) diff --git a/internal/service/elasticbeanstalk/hosted_zone_data_source.go b/internal/service/elasticbeanstalk/hosted_zone_data_source.go index 9f76cf8a150..31109d06ada 100644 --- a/internal/service/elasticbeanstalk/hosted_zone_data_source.go +++ b/internal/service/elasticbeanstalk/hosted_zone_data_source.go @@ -39,7 +39,7 @@ var hostedZoneIDs = map[string]string{ endpoints.SaEast1RegionID: "Z10X7K2B4QSOFV", names.USEast1RegionID: "Z117KPS5GTRQ2G", endpoints.UsEast2RegionID: "Z14LCN19Q5QHIC", - names.USWest1RegionID: "Z1LQECGX5PH1X", + endpoints.UsWest1RegionID: "Z1LQECGX5PH1X", names.USWest2RegionID: "Z38NKT9BP95V3O", endpoints.UsGovEast1RegionID: "Z35TSARG0EJ4VU", endpoints.UsGovWest1RegionID: "Z4KAURWC4UUUG", diff --git a/internal/service/elb/hosted_zone_id_data_source.go b/internal/service/elb/hosted_zone_id_data_source.go index 222dcef8a98..a788dada688 100644 --- a/internal/service/elb/hosted_zone_id_data_source.go +++ b/internal/service/elb/hosted_zone_id_data_source.go @@ -48,7 +48,7 @@ var hostedZoneIDPerRegionMap = map[string]string{ endpoints.UsEast2RegionID: "Z3AADJGX6KTTL2", endpoints.UsGovEast1RegionID: "Z166TLBEWOO7G0", endpoints.UsGovWest1RegionID: "Z33AYJ8TM3BH4J", - names.USWest1RegionID: "Z368ELLRRE2KJ0", + endpoints.UsWest1RegionID: "Z368ELLRRE2KJ0", names.USWest2RegionID: "Z1H1FL5HABSF5", } diff --git a/internal/service/elb/service_account_data_source.go b/internal/service/elb/service_account_data_source.go index 02246112ab7..c4ad7790e53 100644 --- a/internal/service/elb/service_account_data_source.go +++ b/internal/service/elb/service_account_data_source.go @@ -43,7 +43,7 @@ var accountIDPerRegionMap = map[string]string{ endpoints.UsEast2RegionID: "033677994240", endpoints.UsGovEast1RegionID: "190560391635", endpoints.UsGovWest1RegionID: "048591011584", - names.USWest1RegionID: "027434742980", + endpoints.UsWest1RegionID: "027434742980", names.USWest2RegionID: "797873946194", } diff --git a/internal/service/elbv2/hosted_zone_id_data_source.go b/internal/service/elbv2/hosted_zone_id_data_source.go index 30c18070e47..2792dd88201 100644 --- a/internal/service/elbv2/hosted_zone_id_data_source.go +++ b/internal/service/elbv2/hosted_zone_id_data_source.go @@ -52,7 +52,7 @@ var hostedZoneIDPerRegionALBMap = map[string]string{ endpoints.UsEast2RegionID: "Z3AADJGX6KTTL2", endpoints.UsGovEast1RegionID: "Z166TLBEWOO7G0", endpoints.UsGovWest1RegionID: "Z33AYJ8TM3BH4J", - names.USWest1RegionID: "Z368ELLRRE2KJ0", + endpoints.UsWest1RegionID: "Z368ELLRRE2KJ0", names.USWest2RegionID: "Z1H1FL5HABSF5", } @@ -90,7 +90,7 @@ var hostedZoneIDPerRegionNLBMap = map[string]string{ endpoints.UsEast2RegionID: "ZLMOA37VPKANP", endpoints.UsGovEast1RegionID: "Z1ZSMQQ6Q24QQ8", endpoints.UsGovWest1RegionID: "ZMG1MZ2THAWF1", - names.USWest1RegionID: "Z24FKFUX50B4VW", + endpoints.UsWest1RegionID: "Z24FKFUX50B4VW", names.USWest2RegionID: "Z18D5FSROUN65G", } diff --git a/internal/service/gamelift/gamelift_test.go b/internal/service/gamelift/gamelift_test.go index 5179d866511..0f3b2254083 100644 --- a/internal/service/gamelift/gamelift_test.go +++ b/internal/service/gamelift/gamelift_test.go @@ -63,7 +63,7 @@ func testAccAccountIdByRegion(region string) (string, error) { endpoints.SaEast1RegionID: "028872612690", names.USEast1RegionID: "783764748367", endpoints.UsEast2RegionID: "415729564621", - names.USWest1RegionID: "715879310420", + endpoints.UsWest1RegionID: "715879310420", names.USWest2RegionID: "741061592171", } diff --git a/internal/service/iam/access_key_test.go b/internal/service/iam/access_key_test.go index 1974579b379..c44c5bda98e 100644 --- a/internal/service/iam/access_key_test.go +++ b/internal/service/iam/access_key_test.go @@ -304,8 +304,8 @@ func TestSESSMTPPasswordFromSecretKeySigV4(t *testing.T) { }{ {endpoints.EuCentral1RegionID, "some+secret+key", "BMXhUYlu5Z3gSXVQORxlVa7XPaz91aGWdfHxvkOZdWZ2"}, {endpoints.EuCentral1RegionID, "another+secret+key", "BBbphbrQmrKMx42d1N6+C7VINYEBGI5v9VsZeTxwskfh"}, - {names.USWest1RegionID, "some+secret+key", "BH+jbMzper5WwlwUar9E1ySBqHa9whi0GPo+sJ0mVYJj"}, - {names.USWest1RegionID, "another+secret+key", "BKVmjjMDFk/qqw8EROW99bjCS65PF8WKvK5bSr4Y6EqF"}, + {endpoints.UsWest1RegionID, "some+secret+key", "BH+jbMzper5WwlwUar9E1ySBqHa9whi0GPo+sJ0mVYJj"}, + {endpoints.UsWest1RegionID, "another+secret+key", "BKVmjjMDFk/qqw8EROW99bjCS65PF8WKvK5bSr4Y6EqF"}, } for _, tc := range cases { diff --git a/internal/service/lambda/function.go b/internal/service/lambda/function.go index 7d46572b031..17c5f175c15 100644 --- a/internal/service/lambda/function.go +++ b/internal/service/lambda/function.go @@ -1401,7 +1401,7 @@ func signerServiceIsAvailable(region string) bool { availableRegions := map[string]struct{}{ names.USEast1RegionID: {}, endpoints.UsEast2RegionID: {}, - names.USWest1RegionID: {}, + endpoints.UsWest1RegionID: {}, names.USWest2RegionID: {}, endpoints.AfSouth1RegionID: {}, endpoints.ApEast1RegionID: {}, diff --git a/internal/service/opensearchserverless/sweep.go b/internal/service/opensearchserverless/sweep.go index 75cd0f51d69..2ecf027e227 100644 --- a/internal/service/opensearchserverless/sweep.go +++ b/internal/service/opensearchserverless/sweep.go @@ -44,7 +44,7 @@ func RegisterSweepers() { func sweepAccessPolicies(region string) error { ctx := sweep.Context(region) - if region == names.USWest1RegionID || region == endpoints.UsGovEast1RegionID { + if region == endpoints.UsWest1RegionID || region == endpoints.UsGovEast1RegionID { log.Printf("[WARN] Skipping OpenSearch Serverless Access Policy sweep for region: %s", region) return nil } @@ -91,7 +91,7 @@ func sweepAccessPolicies(region string) error { func sweepCollections(region string) error { ctx := sweep.Context(region) - if region == names.USWest1RegionID || region == endpoints.UsGovEast1RegionID { + if region == endpoints.UsWest1RegionID || region == endpoints.UsGovEast1RegionID { log.Printf("[WARN] Skipping OpenSearch Serverless Collection sweep for region: %s", region) return nil } @@ -134,7 +134,7 @@ func sweepCollections(region string) error { func sweepSecurityConfigs(region string) error { ctx := sweep.Context(region) - if region == names.USWest1RegionID || region == endpoints.UsGovEast1RegionID { + if region == endpoints.UsWest1RegionID || region == endpoints.UsGovEast1RegionID { log.Printf("[WARN] Skipping OpenSearch Serverless Security Config sweep for region: %s", region) return nil } @@ -179,7 +179,7 @@ func sweepSecurityConfigs(region string) error { func sweepSecurityPolicies(region string) error { ctx := sweep.Context(region) - if region == names.USWest1RegionID || region == endpoints.UsGovEast1RegionID { + if region == endpoints.UsWest1RegionID || region == endpoints.UsGovEast1RegionID { log.Printf("[WARN] Skipping OpenSearch Serverless Security Policy sweep for region: %s", region) return nil } @@ -253,7 +253,7 @@ func sweepSecurityPolicies(region string) error { func sweepVPCEndpoints(region string) error { ctx := sweep.Context(region) - if region == names.USWest1RegionID || region == endpoints.UsGovEast1RegionID { + if region == endpoints.UsWest1RegionID || region == endpoints.UsGovEast1RegionID { log.Printf("[WARN] Skipping OpenSearch Serverless Security Policy sweep for region: %s", region) return nil } diff --git a/internal/service/opsworks/rails_app_layer_test.go b/internal/service/opsworks/rails_app_layer_test.go index 2e8bd19b393..402c444db00 100644 --- a/internal/service/opsworks/rails_app_layer_test.go +++ b/internal/service/opsworks/rails_app_layer_test.go @@ -10,6 +10,7 @@ import ( "github.com/YakDriver/regexache" awstypes "github.com/aws/aws-sdk-go-v2/service/opsworks/types" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -161,7 +162,7 @@ func TestAccOpsWorksRailsAppLayer_tagsAlternateRegion(t *testing.T) { // in order to exercise the OpsWorks classic endpoint functionality. acctest.PreCheckMultipleRegion(t, 2) acctest.PreCheckRegion(t, names.USEast1RegionID) - acctest.PreCheckAlternateRegionIs(t, names.USWest1RegionID) + acctest.PreCheckAlternateRegionIs(t, endpoints.UsWest1RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.OpsWorksServiceID), ProtoV5ProviderFactories: acctest.ProtoV5FactoriesMultipleRegions(ctx, t, 2), diff --git a/internal/service/opsworks/stack_test.go b/internal/service/opsworks/stack_test.go index 247528f358a..301e6bc4902 100644 --- a/internal/service/opsworks/stack_test.go +++ b/internal/service/opsworks/stack_test.go @@ -12,6 +12,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/arn" "github.com/aws/aws-sdk-go-v2/service/opsworks" awstypes "github.com/aws/aws-sdk-go-v2/service/opsworks/types" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -258,7 +259,7 @@ func TestAccOpsWorksStack_tagsAlternateRegion(t *testing.T) { // in order to exercise the OpsWorks classic endpoint functionality. acctest.PreCheckMultipleRegion(t, 2) acctest.PreCheckRegion(t, names.USEast1RegionID) - acctest.PreCheckAlternateRegionIs(t, names.USWest1RegionID) + acctest.PreCheckAlternateRegionIs(t, endpoints.UsWest1RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.OpsWorksServiceID), ProtoV5ProviderFactories: acctest.ProtoV5FactoriesMultipleRegions(ctx, t, 2), diff --git a/internal/service/redshift/service_account_data_source.go b/internal/service/redshift/service_account_data_source.go index 8ec6ed02d37..4d844d7684b 100644 --- a/internal/service/redshift/service_account_data_source.go +++ b/internal/service/redshift/service_account_data_source.go @@ -44,7 +44,7 @@ var ServiceAccountPerRegionMap = map[string]string{ endpoints.UsEast2RegionID: "391106570357", endpoints.UsGovEast1RegionID: "665727464434", endpoints.UsGovWest1RegionID: "665727464434", - names.USWest1RegionID: "262260360010", + endpoints.UsWest1RegionID: "262260360010", names.USWest2RegionID: "902366379725", } diff --git a/internal/service/s3/hosted_zones.go b/internal/service/s3/hosted_zones.go index 7ddc6a909bd..3b034c7b7b4 100644 --- a/internal/service/s3/hosted_zones.go +++ b/internal/service/s3/hosted_zones.go @@ -44,7 +44,7 @@ var hostedZoneIDsMap = map[string]string{ endpoints.UsEast2RegionID: "Z2O1EMRO9K5GLX", endpoints.UsGovEast1RegionID: "Z2NIFVYYW2VKV1", endpoints.UsGovWest1RegionID: "Z31GFT0UA1I2HV", - names.USWest1RegionID: "Z2F56UZL2M1ACD", + endpoints.UsWest1RegionID: "Z2F56UZL2M1ACD", names.USWest2RegionID: "Z3BJ6K6RIION7M", } diff --git a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go index 539a32105c4..081a85ddb4a 100644 --- a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go +++ b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go @@ -222,7 +222,7 @@ var prebuiltECRImageIDByRegion_blazing = map[string]string{ endpoints.UsGovWest1RegionID: "226302683700", endpoints.UsIsoEast1RegionID: "490574956308", endpoints.UsIsobEast1RegionID: "765400339828", - names.USWest1RegionID: "632365934929", + endpoints.UsWest1RegionID: "632365934929", names.USWest2RegionID: "433757028032", } @@ -252,7 +252,7 @@ var prebuiltECRImageIDByRegion_clarify = map[string]string{ names.USEast1RegionID: "205585389593", endpoints.UsEast2RegionID: "211330385671", endpoints.UsGovWest1RegionID: "598674086554", - names.USWest1RegionID: "740489534195", + endpoints.UsWest1RegionID: "740489534195", names.USWest2RegionID: "306415355426", } @@ -281,7 +281,7 @@ var prebuiltECRImageIDByRegion_dataWrangler = map[string]string{ endpoints.SaEast1RegionID: "424196993095", names.USEast1RegionID: "663277389841", endpoints.UsEast2RegionID: "415577184552", - names.USWest1RegionID: "926135532090", + endpoints.UsWest1RegionID: "926135532090", names.USWest2RegionID: "174368400705", } @@ -310,7 +310,7 @@ var prebuiltECRImageIDByRegion_debugger = map[string]string{ names.USEast1RegionID: "503895931360", endpoints.UsEast2RegionID: "915447279597", endpoints.UsGovWest1RegionID: "515509971035", - names.USWest1RegionID: "685455198987", + endpoints.UsWest1RegionID: "685455198987", names.USWest2RegionID: "895741380848", } @@ -348,7 +348,7 @@ var prebuiltECRImageIDByRegion_inferentiaNeo = map[string]string{ endpoints.UsGovWest1RegionID: "263933020539", endpoints.UsIsoEast1RegionID: "167761179201", endpoints.UsIsobEast1RegionID: "406031935815", - names.USWest1RegionID: "710691900526", + endpoints.UsWest1RegionID: "710691900526", names.USWest2RegionID: "301217895009", } @@ -383,7 +383,7 @@ var prebuiltECRImageIDByRegion_SageMakerCustom = map[string]string{ // nosemgrep endpoints.UsGovWest1RegionID: "246785580436", endpoints.UsIsoEast1RegionID: "744548109606", endpoints.UsIsobEast1RegionID: "453391408702", - names.USWest1RegionID: "520713654638", + endpoints.UsWest1RegionID: "520713654638", names.USWest2RegionID: "520713654638", } @@ -403,7 +403,7 @@ var prebuiltECRImageIDByRegion_SageMakerRL = map[string]string{ // nosemgrep:ci. endpoints.EuWest2RegionID: "462105765813", names.USEast1RegionID: "462105765813", endpoints.UsEast2RegionID: "462105765813", - names.USWest1RegionID: "462105765813", + endpoints.UsWest1RegionID: "462105765813", names.USWest2RegionID: "462105765813", } @@ -441,7 +441,7 @@ var prebuiltECRImageIDByRegion_spark = map[string]string{ endpoints.UsEast2RegionID: "314815235551", endpoints.UsGovEast1RegionID: "260923028637", endpoints.UsGovWest1RegionID: "271483468897", - names.USWest1RegionID: "667973535471", + endpoints.UsWest1RegionID: "667973535471", names.USWest2RegionID: "153931337802", } @@ -475,7 +475,7 @@ var prebuiltECRImageIDByRegion_SageMakerBasePython = map[string]string{ // nosem endpoints.UsEast2RegionID: "429704687514", endpoints.UsGovEast1RegionID: "107072934176", endpoints.UsGovWest1RegionID: "107173498710", - names.USWest1RegionID: "742091327244", + endpoints.UsWest1RegionID: "742091327244", names.USWest2RegionID: "236514542706", } @@ -521,7 +521,7 @@ var prebuiltECRImageIDByRegion_deepAR = map[string]string{ endpoints.UsGovWest1RegionID: "226302683700", endpoints.UsIsoEast1RegionID: "490574956308", endpoints.UsIsobEast1RegionID: "765400339828", - names.USWest1RegionID: "632365934929", + endpoints.UsWest1RegionID: "632365934929", names.USWest2RegionID: "156387875391", } @@ -566,7 +566,7 @@ var prebuiltECRImageIDByRegion_factorMachines = map[string]string{ endpoints.UsGovWest1RegionID: "226302683700", endpoints.UsIsoEast1RegionID: "490574956308", endpoints.UsIsobEast1RegionID: "765400339828", - names.USWest1RegionID: "632365934929", + endpoints.UsWest1RegionID: "632365934929", names.USWest2RegionID: "174872318107", } @@ -587,7 +587,7 @@ var prebuiltECRImageIDByRegion_lda = map[string]string{ endpoints.UsGovWest1RegionID: "226302683700", endpoints.UsIsoEast1RegionID: "490574956308", endpoints.UsIsobEast1RegionID: "765400339828", - names.USWest1RegionID: "632365934929", + endpoints.UsWest1RegionID: "632365934929", names.USWest2RegionID: "266724342769", } @@ -631,7 +631,7 @@ var prebuiltECRImageIDByRegion_XGBoost = map[string]string{ endpoints.UsGovWest1RegionID: "414596584902", endpoints.UsIsoEast1RegionID: "833128469047", endpoints.UsIsobEast1RegionID: "281123927165", - names.USWest1RegionID: "746614075791", + endpoints.UsWest1RegionID: "746614075791", names.USWest2RegionID: "246618743249", } @@ -679,7 +679,7 @@ var prebuiltECRImageIDByRegion_deepLearning = map[string]string{ endpoints.SaEast1RegionID: "763104351884", names.USEast1RegionID: "763104351884", endpoints.UsEast2RegionID: "763104351884", - names.USWest1RegionID: "763104351884", + endpoints.UsWest1RegionID: "763104351884", names.USWest2RegionID: "763104351884", endpoints.UsGovEast1RegionID: "446045086412", endpoints.UsGovWest1RegionID: "442386744353", @@ -715,7 +715,7 @@ var prebuiltECRImageIDByRegion_modelMonitor = map[string]string{ endpoints.SaEast1RegionID: "539772159869", names.USEast1RegionID: "156813124566", endpoints.UsEast2RegionID: "777275614652", - names.USWest1RegionID: "890145073186", + endpoints.UsWest1RegionID: "890145073186", names.USWest2RegionID: "159807026194", } diff --git a/internal/service/ssmincidents/sweep.go b/internal/service/ssmincidents/sweep.go index 2d576700d28..80f3759fc80 100644 --- a/internal/service/ssmincidents/sweep.go +++ b/internal/service/ssmincidents/sweep.go @@ -8,10 +8,10 @@ import ( "log" "github.com/aws/aws-sdk-go-v2/service/ssmincidents" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-aws/internal/sweep" "github.com/hashicorp/terraform-provider-aws/internal/sweep/awsv2" - "github.com/hashicorp/terraform-provider-aws/names" ) func RegisterSweepers() { @@ -23,7 +23,7 @@ func RegisterSweepers() { func sweepReplicationSets(region string) error { ctx := sweep.Context(region) - if region == names.USWest1RegionID { + if region == endpoints.UsWest1RegionID { log.Printf("[WARN] Skipping SSMIncidents Replication Sets sweep for region: %s", region) return nil } diff --git a/names/names.go b/names/names.go index dfeca35b67a..b41883f06c3 100644 --- a/names/names.go +++ b/names/names.go @@ -150,7 +150,6 @@ const ( GlobalRegionID = "aws-global" // AWS Standard global region. USEast1RegionID = "us-east-1" // US East (N. Virginia). - USWest1RegionID = "us-west-1" // US West (N. California). USWest2RegionID = "us-west-2" // US West (Oregon). ) From b4ca358e833ce7f9020c907ab77c0326c5fac062 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 16:02:23 -0500 Subject: [PATCH 302/304] 'names.USEast1RegionID' -> 'endpoints.UsEast1RegionID'. --- internal/acctest/acctest.go | 4 +-- internal/acctest/partition_test.go | 5 ++-- internal/provider/provider_acc_test.go | 4 +-- .../service/apigateway/domain_name_test.go | 3 +- .../app_authorization_connection_test.go | 4 +-- .../appfabric/app_authorization_test.go | 8 ++--- internal/service/appfabric/app_bundle_test.go | 6 ++-- .../appfabric/ingestion_destination_test.go | 10 +++---- internal/service/appfabric/ingestion_test.go | 6 ++-- .../apprunner/hosted_zone_id_data_source.go | 2 +- .../chimesdkvoice/global_settings_test.go | 3 +- .../service/cloudfront/distribution_test.go | 2 +- .../cloudtrail/service_account_data_source.go | 2 +- .../cognitoidp/user_pool_domain_test.go | 5 ++-- .../costoptimizationhub/service_package.go | 6 ++-- internal/service/cur/service_package.go | 6 ++-- internal/service/cur/sweep.go | 4 +-- ...nvironment_blueprint_configuration_test.go | 4 +-- .../service/dynamodb/global_table_test.go | 2 +- .../service/ec2/vpc_network_interface_test.go | 3 +- .../authorization_token_data_source_test.go | 3 +- .../ecrpublic/repository_policy_test.go | 9 +++--- internal/service/ecrpublic/repository_test.go | 21 ++++++------- internal/service/ecrpublic/sweep.go | 3 +- .../hosted_zone_data_source.go | 2 +- .../service/elb/hosted_zone_id_data_source.go | 2 +- .../elb/service_account_data_source.go | 2 +- .../elbv2/hosted_zone_id_data_source.go | 4 +-- internal/service/fms/admin_account_test.go | 5 ++-- internal/service/fms/policy_test.go | 19 ++++++------ internal/service/fms/resource_set_test.go | 5 ++-- internal/service/gamelift/gamelift_test.go | 2 +- internal/service/lambda/function.go | 2 +- .../service/meta/service_data_source_test.go | 4 +-- .../service/opsworks/rails_app_layer_test.go | 2 +- internal/service/opsworks/stack.go | 3 +- internal/service/opsworks/stack_test.go | 4 +-- .../pricing/product_data_source_test.go | 4 +-- .../redshift/service_account_data_source.go | 2 +- internal/service/route53/health_check_test.go | 2 +- .../route53/hosted_zone_dnssec_test.go | 7 +++-- .../service/route53/key_signing_key_test.go | 7 +++-- internal/service/route53/query_log_test.go | 7 +++-- internal/service/route53/record_test.go | 16 +++++----- internal/service/route53/service_package.go | 6 ++-- .../service/route53domains/service_package.go | 6 ++-- internal/service/s3/bucket_metric_test.go | 13 ++++---- internal/service/s3/bucket_test.go | 16 +++++----- internal/service/s3/hosted_zones.go | 2 +- internal/service/s3/service_package.go | 3 +- .../prebuilt_ecr_image_data_source.go | 30 +++++++++---------- .../securityhub/finding_aggregator_test.go | 2 +- .../cloudformation_stack_test.go | 2 +- .../template_association_test.go | 7 +++-- .../service/servicequotas/template_test.go | 7 +++-- .../templates_data_source_test.go | 3 +- internal/service/shield/service_package.go | 6 ++-- internal/service/waf/web_acl_test.go | 3 +- names/names.go | 1 - 59 files changed, 176 insertions(+), 157 deletions(-) diff --git a/internal/acctest/acctest.go b/internal/acctest/acctest.go index 6900c59d19d..88e50f183bb 100644 --- a/internal/acctest/acctest.go +++ b/internal/acctest/acctest.go @@ -901,7 +901,7 @@ func Region() string { } func AlternateRegion() string { - return envvar.GetWithDefault(envvar.AlternateRegion, names.USEast1RegionID) + return envvar.GetWithDefault(envvar.AlternateRegion, endpoints.UsEast1RegionID) } func ThirdRegion() string { @@ -1374,7 +1374,7 @@ func PreCheckWAFV2CloudFrontScope(ctx context.Context, t *testing.T) { switch Partition() { case endpoints.AwsPartitionID: - PreCheckRegion(t, names.USEast1RegionID) + PreCheckRegion(t, endpoints.UsEast1RegionID) case endpoints.AwsCnPartitionID: PreCheckRegion(t, endpoints.CnNorthwest1RegionID) } diff --git a/internal/acctest/partition_test.go b/internal/acctest/partition_test.go index dffba589a47..0d4de43ed9c 100644 --- a/internal/acctest/partition_test.go +++ b/internal/acctest/partition_test.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/terraform-provider-aws/internal/acctest" - "github.com/hashicorp/terraform-provider-aws/names" ) func TestIsIsolatedPartition(t *testing.T) { @@ -67,7 +66,7 @@ func TestIsIsolatedRegion(t *testing.T) { expected bool }{ { - input: names.USEast1RegionID, + input: endpoints.UsEast1RegionID, expected: false, }, { @@ -159,7 +158,7 @@ func TestIsStandardRegion(t *testing.T) { expected bool }{ { - input: names.USEast1RegionID, + input: endpoints.UsEast1RegionID, expected: true, }, { diff --git a/internal/provider/provider_acc_test.go b/internal/provider/provider_acc_test.go index ecd753ce505..3fde0da6546 100644 --- a/internal/provider/provider_acc_test.go +++ b/internal/provider/provider_acc_test.go @@ -633,9 +633,9 @@ func TestAccProvider_Region_stsRegion(t *testing.T) { CheckDestroy: nil, Steps: []resource.TestStep{ { - Config: testAccProviderConfig_stsRegion(names.USEast1RegionID, names.USWest2RegionID), + Config: testAccProviderConfig_stsRegion(endpoints.UsEast1RegionID, names.USWest2RegionID), Check: resource.ComposeTestCheckFunc( - testAccCheckRegion(ctx, t, &provider, names.USEast1RegionID), + testAccCheckRegion(ctx, t, &provider, endpoints.UsEast1RegionID), testAccCheckSTSRegion(ctx, t, &provider, names.USWest2RegionID), ), PlanOnly: true, diff --git a/internal/service/apigateway/domain_name_test.go b/internal/service/apigateway/domain_name_test.go index d90b3a369ba..eefc9073fd3 100644 --- a/internal/service/apigateway/domain_name_test.go +++ b/internal/service/apigateway/domain_name_test.go @@ -13,6 +13,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/arn" "github.com/aws/aws-sdk-go-v2/service/apigateway" "github.com/aws/aws-sdk-go-v2/service/apigateway/types" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -32,7 +33,7 @@ func TestAccAPIGatewayDomainName_certificateARN(t *testing.T) { resourceName := "aws_api_gateway_domain_name.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, names.USEast1RegionID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.APIGatewayServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckDomainNameDestroy(ctx), diff --git a/internal/service/appfabric/app_authorization_connection_test.go b/internal/service/appfabric/app_authorization_connection_test.go index 63fb64610a9..b6e9e2aeff0 100644 --- a/internal/service/appfabric/app_authorization_connection_test.go +++ b/internal/service/appfabric/app_authorization_connection_test.go @@ -31,7 +31,7 @@ func testAccAppAuthorizationConnection_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) + acctest.PreCheckRegion(t, endpoints.UsEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), @@ -66,7 +66,7 @@ func testAccAppAuthorizationConnection_OAuth2(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) + acctest.PreCheckRegion(t, endpoints.UsEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), diff --git a/internal/service/appfabric/app_authorization_test.go b/internal/service/appfabric/app_authorization_test.go index 896d6d77c41..f926e3cbe6d 100644 --- a/internal/service/appfabric/app_authorization_test.go +++ b/internal/service/appfabric/app_authorization_test.go @@ -29,7 +29,7 @@ func testAccAppAuthorization_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) + acctest.PreCheckRegion(t, endpoints.UsEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), @@ -69,7 +69,7 @@ func testAccAppAuthorization_disappears(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) + acctest.PreCheckRegion(t, endpoints.UsEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), @@ -105,7 +105,7 @@ func testAccAppAuthorization_apiKeyUpdate(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) + acctest.PreCheckRegion(t, endpoints.UsEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), @@ -165,7 +165,7 @@ func testAccAppAuthorization_oath2Update(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) + acctest.PreCheckRegion(t, endpoints.UsEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), diff --git a/internal/service/appfabric/app_bundle_test.go b/internal/service/appfabric/app_bundle_test.go index 99cb0bc6293..c0956928182 100644 --- a/internal/service/appfabric/app_bundle_test.go +++ b/internal/service/appfabric/app_bundle_test.go @@ -28,7 +28,7 @@ func testAccAppBundle_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) + acctest.PreCheckRegion(t, endpoints.UsEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), @@ -60,7 +60,7 @@ func testAccAppBundle_disappears(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) + acctest.PreCheckRegion(t, endpoints.UsEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), @@ -88,7 +88,7 @@ func testAccAppBundle_cmk(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) + acctest.PreCheckRegion(t, endpoints.UsEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), diff --git a/internal/service/appfabric/ingestion_destination_test.go b/internal/service/appfabric/ingestion_destination_test.go index d4d931886eb..1b0e998e387 100644 --- a/internal/service/appfabric/ingestion_destination_test.go +++ b/internal/service/appfabric/ingestion_destination_test.go @@ -32,7 +32,7 @@ func testAccIngestionDestination_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) + acctest.PreCheckRegion(t, endpoints.UsEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), @@ -81,7 +81,7 @@ func testAccIngestionDestination_disappears(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) + acctest.PreCheckRegion(t, endpoints.UsEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), @@ -112,7 +112,7 @@ func testAccIngestionDestination_tags(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) + acctest.PreCheckRegion(t, endpoints.UsEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), @@ -165,7 +165,7 @@ func testAccIngestionDestination_update(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) + acctest.PreCheckRegion(t, endpoints.UsEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), @@ -219,7 +219,7 @@ func testAccIngestionDestination_firehose(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) + acctest.PreCheckRegion(t, endpoints.UsEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), diff --git a/internal/service/appfabric/ingestion_test.go b/internal/service/appfabric/ingestion_test.go index bcfc5b17096..7f8686e78f0 100644 --- a/internal/service/appfabric/ingestion_test.go +++ b/internal/service/appfabric/ingestion_test.go @@ -32,7 +32,7 @@ func testAccIngestion_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) + acctest.PreCheckRegion(t, endpoints.UsEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), @@ -70,7 +70,7 @@ func testAccIngestion_disappears(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) + acctest.PreCheckRegion(t, endpoints.UsEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), @@ -101,7 +101,7 @@ func testAccIngestion_tags(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) + acctest.PreCheckRegion(t, endpoints.UsEast1RegionID, endpoints.ApNortheast1RegionID, endpoints.EuWest1RegionID) testAccPreCheck(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.AppFabricServiceID), diff --git a/internal/service/apprunner/hosted_zone_id_data_source.go b/internal/service/apprunner/hosted_zone_id_data_source.go index 243eafcf1eb..f98a0899ef3 100644 --- a/internal/service/apprunner/hosted_zone_id_data_source.go +++ b/internal/service/apprunner/hosted_zone_id_data_source.go @@ -19,7 +19,7 @@ import ( var hostedZoneIDPerRegionMap = map[string]string{ endpoints.UsEast2RegionID: "Z0224347AD7KVHMLOX31", - names.USEast1RegionID: "Z01915732ZBZKC8D32TPT", + endpoints.UsEast1RegionID: "Z01915732ZBZKC8D32TPT", names.USWest2RegionID: "Z02243383FTQ64HJ5772Q", endpoints.ApSouth1RegionID: "Z00855883LBHKTIC4ODF2", endpoints.ApSoutheast1RegionID: "Z09819469CZ3KQ8PWMCL", diff --git a/internal/service/chimesdkvoice/global_settings_test.go b/internal/service/chimesdkvoice/global_settings_test.go index ec905173bd0..c4f3e1edbb9 100644 --- a/internal/service/chimesdkvoice/global_settings_test.go +++ b/internal/service/chimesdkvoice/global_settings_test.go @@ -11,6 +11,7 @@ import ( "time" "github.com/aws/aws-sdk-go-v2/service/chimesdkvoice" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-testing/helper/resource" @@ -93,7 +94,7 @@ func testAccGlobalSettings_update(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID) // run test in us-east-1 only since eventual consistency causes intermittent failures in other regions. + acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) // run test in us-east-1 only since eventual consistency causes intermittent failures in other regions. }, ErrorCheck: acctest.ErrorCheck(t, names.ChimeSDKVoiceServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, diff --git a/internal/service/cloudfront/distribution_test.go b/internal/service/cloudfront/distribution_test.go index d4f8c7940d7..1870ec1b320 100644 --- a/internal/service/cloudfront/distribution_test.go +++ b/internal/service/cloudfront/distribution_test.go @@ -1559,7 +1559,7 @@ func testAccDistributionRetainConfig() string { func testAccRegionProviderConfig() string { switch acctest.Partition() { case endpoints.AwsPartitionID: - return acctest.ConfigRegionalProvider(names.USEast1RegionID) + return acctest.ConfigRegionalProvider(endpoints.UsEast1RegionID) case endpoints.AwsCnPartitionID: return acctest.ConfigRegionalProvider(endpoints.CnNorthwest1RegionID) default: diff --git a/internal/service/cloudtrail/service_account_data_source.go b/internal/service/cloudtrail/service_account_data_source.go index d68ef8e52a3..33f2a6e2326 100644 --- a/internal/service/cloudtrail/service_account_data_source.go +++ b/internal/service/cloudtrail/service_account_data_source.go @@ -46,7 +46,7 @@ var serviceAccountPerRegionMap = map[string]string{ endpoints.MeCentral1RegionID: "585772288577", endpoints.MeSouth1RegionID: "034638983726", endpoints.SaEast1RegionID: "814480443879", - names.USEast1RegionID: "086441151436", + endpoints.UsEast1RegionID: "086441151436", endpoints.UsEast2RegionID: "475085895292", endpoints.UsGovEast1RegionID: "608710470296", endpoints.UsGovWest1RegionID: "608710470296", diff --git a/internal/service/cognitoidp/user_pool_domain_test.go b/internal/service/cognitoidp/user_pool_domain_test.go index adec2cdf07b..0b9cf779e52 100644 --- a/internal/service/cognitoidp/user_pool_domain_test.go +++ b/internal/service/cognitoidp/user_pool_domain_test.go @@ -9,6 +9,7 @@ import ( "testing" "github.com/aws/aws-sdk-go-v2/aws" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -84,7 +85,7 @@ func TestAccCognitoIDPUserPoolDomain_custom(t *testing.T) { resourceName := "aws_cognito_user_pool_domain.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, names.USEast1RegionID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.CognitoIDPServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckUserPoolDomainDestroy(ctx), @@ -123,7 +124,7 @@ func TestAccCognitoIDPUserPoolDomain_customCertUpdate(t *testing.T) { cognitoPoolResourceName := "aws_cognito_user_pool_domain.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, names.USEast1RegionID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.CognitoIDPServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckUserPoolDomainDestroy(ctx), diff --git a/internal/service/costoptimizationhub/service_package.go b/internal/service/costoptimizationhub/service_package.go index 3b8eaf3b396..75e8b375fda 100644 --- a/internal/service/costoptimizationhub/service_package.go +++ b/internal/service/costoptimizationhub/service_package.go @@ -23,12 +23,12 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *costoptimizationhub.Options) { if config["partition"].(string) == endpoints.AwsPartitionID { // Cost Optimization Hub endpoint is available only in us-east-1 Region. - if cfg.Region != names.USEast1RegionID { + if cfg.Region != endpoints.UsEast1RegionID { tflog.Info(ctx, "overriding region", map[string]any{ "original_region": cfg.Region, - "override_region": names.USEast1RegionID, + "override_region": endpoints.UsEast1RegionID, }) - o.Region = names.USEast1RegionID + o.Region = endpoints.UsEast1RegionID } } }, diff --git a/internal/service/cur/service_package.go b/internal/service/cur/service_package.go index 9bf53fd0f4f..6563a6a8c47 100644 --- a/internal/service/cur/service_package.go +++ b/internal/service/cur/service_package.go @@ -24,12 +24,12 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( if config["partition"].(string) == endpoints.AwsPartitionID { // AWS Cost and Usage Reports is only available in AWS Commercial us-east-1 Region. // https://docs.aws.amazon.com/general/latest/gr/billing.html. - if cfg.Region != names.USEast1RegionID { + if cfg.Region != endpoints.UsEast1RegionID { tflog.Info(ctx, "overriding region", map[string]any{ "original_region": cfg.Region, - "override_region": names.USEast1RegionID, + "override_region": endpoints.UsEast1RegionID, }) - o.Region = names.USEast1RegionID + o.Region = endpoints.UsEast1RegionID } } }, diff --git a/internal/service/cur/sweep.go b/internal/service/cur/sweep.go index 92c6a88af79..40f0b5e688e 100644 --- a/internal/service/cur/sweep.go +++ b/internal/service/cur/sweep.go @@ -9,10 +9,10 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" cur "github.com/aws/aws-sdk-go-v2/service/costandusagereportservice" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-aws/internal/sweep" "github.com/hashicorp/terraform-provider-aws/internal/sweep/awsv2" - "github.com/hashicorp/terraform-provider-aws/names" ) func RegisterSweepers() { @@ -24,7 +24,7 @@ func RegisterSweepers() { func sweepReportDefinitions(region string) error { ctx := sweep.Context(region) - if region != names.USEast1RegionID { + if region != endpoints.UsEast1RegionID { log.Printf("[WARN] Skipping Cost And Usage Report Definition sweep for region: %s", region) return nil } diff --git a/internal/service/datazone/environment_blueprint_configuration_test.go b/internal/service/datazone/environment_blueprint_configuration_test.go index 6b535f4abec..226b637bc15 100644 --- a/internal/service/datazone/environment_blueprint_configuration_test.go +++ b/internal/service/datazone/environment_blueprint_configuration_test.go @@ -102,12 +102,12 @@ func TestAccDataZoneEnvironmentBlueprintConfiguration_enabled_regions(t *testing CheckDestroy: testAccCheckEnvironmentBlueprintConfigurationDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccEnvironmentBlueprintConfigurationConfig_enabled_regions(domainName, names.USEast1RegionID), + Config: testAccEnvironmentBlueprintConfigurationConfig_enabled_regions(domainName, endpoints.UsEast1RegionID), Check: resource.ComposeTestCheckFunc( testAccCheckEnvironmentBlueprintConfigurationExists(ctx, resourceName, &environmentblueprintconfiguration), resource.TestCheckResourceAttrSet(resourceName, "environment_blueprint_id"), resource.TestCheckResourceAttr(resourceName, "enabled_regions.#", "1"), - resource.TestCheckResourceAttr(resourceName, "enabled_regions.0", names.USEast1RegionID), + resource.TestCheckResourceAttr(resourceName, "enabled_regions.0", endpoints.UsEast1RegionID), ), }, { diff --git a/internal/service/dynamodb/global_table_test.go b/internal/service/dynamodb/global_table_test.go index a2fb5a0db27..7aa2e46071a 100644 --- a/internal/service/dynamodb/global_table_test.go +++ b/internal/service/dynamodb/global_table_test.go @@ -164,7 +164,7 @@ func testAccPreCheckGlobalTable(ctx context.Context, t *testing.T) { endpoints.EuCentral1RegionID, endpoints.EuWest1RegionID, endpoints.EuWest2RegionID, - names.USEast1RegionID, + endpoints.UsEast1RegionID, endpoints.UsEast2RegionID, endpoints.UsWest1RegionID, names.USWest2RegionID, diff --git a/internal/service/ec2/vpc_network_interface_test.go b/internal/service/ec2/vpc_network_interface_test.go index 69842021b5f..f3a3af2c9fd 100644 --- a/internal/service/ec2/vpc_network_interface_test.go +++ b/internal/service/ec2/vpc_network_interface_test.go @@ -15,6 +15,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/ec2" "github.com/aws/aws-sdk-go-v2/service/ec2/types" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -977,7 +978,7 @@ func convertIPToDashIP(ip string) string { } func regionalPrivateDNSSuffix(region string) string { - if region == names.USEast1RegionID { + if region == endpoints.UsEast1RegionID { return "ec2.internal" } diff --git a/internal/service/ecrpublic/authorization_token_data_source_test.go b/internal/service/ecrpublic/authorization_token_data_source_test.go index caf56ca71a3..523d0218556 100644 --- a/internal/service/ecrpublic/authorization_token_data_source_test.go +++ b/internal/service/ecrpublic/authorization_token_data_source_test.go @@ -7,6 +7,7 @@ import ( "testing" "github.com/YakDriver/regexache" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-aws/internal/acctest" "github.com/hashicorp/terraform-provider-aws/names" @@ -17,7 +18,7 @@ func TestAccECRPublicAuthorizationTokenDataSource_basic(t *testing.T) { dataSourceName := "data.aws_ecrpublic_authorization_token.repo" resource.Test(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, names.USEast1RegionID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.ECRServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, Steps: []resource.TestStep{ diff --git a/internal/service/ecrpublic/repository_policy_test.go b/internal/service/ecrpublic/repository_policy_test.go index 41103b0da2e..baab9e98f7c 100644 --- a/internal/service/ecrpublic/repository_policy_test.go +++ b/internal/service/ecrpublic/repository_policy_test.go @@ -8,6 +8,7 @@ import ( "fmt" "testing" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -24,7 +25,7 @@ func TestAccECRPublicRepositoryPolicy_basic(t *testing.T) { resourceName := "aws_ecrpublic_repository_policy.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, names.USEast1RegionID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.ECRPublicServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckRepositoryPolicyDestroy(ctx), @@ -58,7 +59,7 @@ func TestAccECRPublicRepositoryPolicy_disappears(t *testing.T) { resourceName := "aws_ecrpublic_repository_policy.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, names.USEast1RegionID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.ECRPublicServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckRepositoryPolicyDestroy(ctx), @@ -83,7 +84,7 @@ func TestAccECRPublicRepositoryPolicy_Disappears_repository(t *testing.T) { repositoryResourceName := "aws_ecrpublic_repository.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, names.USEast1RegionID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.ECRPublicServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckRepositoryPolicyDestroy(ctx), @@ -107,7 +108,7 @@ func TestAccECRPublicRepositoryPolicy_iam(t *testing.T) { resourceName := "aws_ecrpublic_repository_policy.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, names.USEast1RegionID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.ECRPublicServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckRepositoryPolicyDestroy(ctx), diff --git a/internal/service/ecrpublic/repository_test.go b/internal/service/ecrpublic/repository_test.go index ef457eb2de7..01b0de9c0b2 100644 --- a/internal/service/ecrpublic/repository_test.go +++ b/internal/service/ecrpublic/repository_test.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/ecrpublic" awstypes "github.com/aws/aws-sdk-go-v2/service/ecrpublic/types" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -28,7 +29,7 @@ func TestAccECRPublicRepository_basic(t *testing.T) { resourceName := "aws_ecrpublic_repository.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, names.USEast1RegionID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.ECRPublicServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckRepositoryDestroy(ctx), @@ -58,7 +59,7 @@ func TestAccECRPublicRepository_tags(t *testing.T) { resourceName := "aws_ecrpublic_repository.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, names.USEast1RegionID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.ECRPublicServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckRepositoryDestroy(ctx), @@ -104,7 +105,7 @@ func TestAccECRPublicRepository_CatalogData_aboutText(t *testing.T) { resourceName := "aws_ecrpublic_repository.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, names.USEast1RegionID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.ECRPublicServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckRepositoryDestroy(ctx), @@ -141,7 +142,7 @@ func TestAccECRPublicRepository_CatalogData_architectures(t *testing.T) { resourceName := "aws_ecrpublic_repository.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, names.USEast1RegionID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.ECRPublicServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckRepositoryDestroy(ctx), @@ -178,7 +179,7 @@ func TestAccECRPublicRepository_CatalogData_description(t *testing.T) { resourceName := "aws_ecrpublic_repository.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, names.USEast1RegionID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.ECRPublicServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckRepositoryDestroy(ctx), @@ -215,7 +216,7 @@ func TestAccECRPublicRepository_CatalogData_operatingSystems(t *testing.T) { resourceName := "aws_ecrpublic_repository.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, names.USEast1RegionID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.ECRPublicServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckRepositoryDestroy(ctx), @@ -252,7 +253,7 @@ func TestAccECRPublicRepository_CatalogData_usageText(t *testing.T) { resourceName := "aws_ecrpublic_repository.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, names.USEast1RegionID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.ECRPublicServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckRepositoryDestroy(ctx), @@ -289,7 +290,7 @@ func TestAccECRPublicRepository_CatalogData_logoImageBlob(t *testing.T) { resourceName := "aws_ecrpublic_repository.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, names.USEast1RegionID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.ECRPublicServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckRepositoryDestroy(ctx), @@ -319,7 +320,7 @@ func TestAccECRPublicRepository_Basic_forceDestroy(t *testing.T) { resourceName := "aws_ecrpublic_repository.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, names.USEast1RegionID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.ECRPublicServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckRepositoryDestroy(ctx), @@ -350,7 +351,7 @@ func TestAccECRPublicRepository_disappears(t *testing.T) { resourceName := "aws_ecrpublic_repository.test" resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, names.USEast1RegionID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.ECRPublicServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckRepositoryDestroy(ctx), diff --git a/internal/service/ecrpublic/sweep.go b/internal/service/ecrpublic/sweep.go index f1fd856f2b7..3dfd5978bf2 100644 --- a/internal/service/ecrpublic/sweep.go +++ b/internal/service/ecrpublic/sweep.go @@ -9,6 +9,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/ecrpublic" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-aws/internal/sweep" "github.com/hashicorp/terraform-provider-aws/internal/sweep/awsv2" @@ -25,7 +26,7 @@ func RegisterSweepers() { func sweepRepositories(region string) error { ctx := sweep.Context(region) // "UnsupportedCommandException: DescribeRepositories command is only supported in us-east-1". - if region != names.USEast1RegionID { + if region != endpoints.UsEast1RegionID { log.Printf("[WARN] Skipping ECR Public Repository sweep for region: %s", region) return nil } diff --git a/internal/service/elasticbeanstalk/hosted_zone_data_source.go b/internal/service/elasticbeanstalk/hosted_zone_data_source.go index 31109d06ada..4e352754f9b 100644 --- a/internal/service/elasticbeanstalk/hosted_zone_data_source.go +++ b/internal/service/elasticbeanstalk/hosted_zone_data_source.go @@ -37,7 +37,7 @@ var hostedZoneIDs = map[string]string{ // endpoints.MeCentral1RegionID: "", endpoints.MeSouth1RegionID: "Z2BBTEKR2I36N2", endpoints.SaEast1RegionID: "Z10X7K2B4QSOFV", - names.USEast1RegionID: "Z117KPS5GTRQ2G", + endpoints.UsEast1RegionID: "Z117KPS5GTRQ2G", endpoints.UsEast2RegionID: "Z14LCN19Q5QHIC", endpoints.UsWest1RegionID: "Z1LQECGX5PH1X", names.USWest2RegionID: "Z38NKT9BP95V3O", diff --git a/internal/service/elb/hosted_zone_id_data_source.go b/internal/service/elb/hosted_zone_id_data_source.go index a788dada688..fa16127e915 100644 --- a/internal/service/elb/hosted_zone_id_data_source.go +++ b/internal/service/elb/hosted_zone_id_data_source.go @@ -44,7 +44,7 @@ var hostedZoneIDPerRegionMap = map[string]string{ endpoints.MeCentral1RegionID: "Z08230872XQRWHG2XF6I", endpoints.MeSouth1RegionID: "ZS929ML54UICD", endpoints.SaEast1RegionID: "Z2P70J7HTTTPLU", - names.USEast1RegionID: "Z35SXDOTRQ7X7K", + endpoints.UsEast1RegionID: "Z35SXDOTRQ7X7K", endpoints.UsEast2RegionID: "Z3AADJGX6KTTL2", endpoints.UsGovEast1RegionID: "Z166TLBEWOO7G0", endpoints.UsGovWest1RegionID: "Z33AYJ8TM3BH4J", diff --git a/internal/service/elb/service_account_data_source.go b/internal/service/elb/service_account_data_source.go index c4ad7790e53..4c84f86d341 100644 --- a/internal/service/elb/service_account_data_source.go +++ b/internal/service/elb/service_account_data_source.go @@ -39,7 +39,7 @@ var accountIDPerRegionMap = map[string]string{ // endpoints.MeCentral1RegionID: "", endpoints.MeSouth1RegionID: "076674570225", endpoints.SaEast1RegionID: "507241528517", - names.USEast1RegionID: "127311923021", + endpoints.UsEast1RegionID: "127311923021", endpoints.UsEast2RegionID: "033677994240", endpoints.UsGovEast1RegionID: "190560391635", endpoints.UsGovWest1RegionID: "048591011584", diff --git a/internal/service/elbv2/hosted_zone_id_data_source.go b/internal/service/elbv2/hosted_zone_id_data_source.go index 2792dd88201..aec6f8f42a8 100644 --- a/internal/service/elbv2/hosted_zone_id_data_source.go +++ b/internal/service/elbv2/hosted_zone_id_data_source.go @@ -48,7 +48,7 @@ var hostedZoneIDPerRegionALBMap = map[string]string{ endpoints.MeCentral1RegionID: "Z08230872XQRWHG2XF6I", endpoints.MeSouth1RegionID: "ZS929ML54UICD", endpoints.SaEast1RegionID: "Z2P70J7HTTTPLU", - names.USEast1RegionID: "Z35SXDOTRQ7X7K", + endpoints.UsEast1RegionID: "Z35SXDOTRQ7X7K", endpoints.UsEast2RegionID: "Z3AADJGX6KTTL2", endpoints.UsGovEast1RegionID: "Z166TLBEWOO7G0", endpoints.UsGovWest1RegionID: "Z33AYJ8TM3BH4J", @@ -86,7 +86,7 @@ var hostedZoneIDPerRegionNLBMap = map[string]string{ endpoints.MeCentral1RegionID: "Z00282643NTTLPANJJG2P", endpoints.MeSouth1RegionID: "Z3QSRYVP46NYYV", endpoints.SaEast1RegionID: "ZTK26PT1VY4CU", - names.USEast1RegionID: "Z26RNL4JYFTOTI", + endpoints.UsEast1RegionID: "Z26RNL4JYFTOTI", endpoints.UsEast2RegionID: "ZLMOA37VPKANP", endpoints.UsGovEast1RegionID: "Z1ZSMQQ6Q24QQ8", endpoints.UsGovWest1RegionID: "ZMG1MZ2THAWF1", diff --git a/internal/service/fms/admin_account_test.go b/internal/service/fms/admin_account_test.go index 595cd2f1679..bd873685746 100644 --- a/internal/service/fms/admin_account_test.go +++ b/internal/service/fms/admin_account_test.go @@ -8,6 +8,7 @@ import ( "fmt" "testing" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-aws/internal/acctest" @@ -24,7 +25,7 @@ func testAccAdminAccount_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID) + acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) acctest.PreCheckOrganizationsEnabled(ctx, t) acctest.PreCheckOrganizationManagementAccount(ctx, t) }, @@ -50,7 +51,7 @@ func testAccAdminAccount_disappears(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID) + acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) acctest.PreCheckOrganizationsEnabled(ctx, t) acctest.PreCheckOrganizationManagementAccount(ctx, t) }, diff --git a/internal/service/fms/policy_test.go b/internal/service/fms/policy_test.go index e3ff3355823..24ec131e2ad 100644 --- a/internal/service/fms/policy_test.go +++ b/internal/service/fms/policy_test.go @@ -8,6 +8,7 @@ import ( "fmt" "testing" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -26,7 +27,7 @@ func testAccPolicy_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID) + acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) acctest.PreCheckOrganizationsEnabled(ctx, t) acctest.PreCheckOrganizationManagementAccount(ctx, t) }, @@ -64,7 +65,7 @@ func testAccPolicy_disappears(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID) + acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) acctest.PreCheckOrganizationsEnabled(ctx, t) acctest.PreCheckOrganizationManagementAccount(ctx, t) }, @@ -92,7 +93,7 @@ func testAccPolicy_cloudFrontDistribution(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID) + acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) acctest.PreCheckOrganizationsEnabled(ctx, t) acctest.PreCheckOrganizationManagementAccount(ctx, t) }, @@ -126,7 +127,7 @@ func testAccPolicy_includeMap(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID) + acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) acctest.PreCheckOrganizationsEnabled(ctx, t) acctest.PreCheckOrganizationManagementAccount(ctx, t) }, @@ -161,7 +162,7 @@ func testAccPolicy_update(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID) + acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) acctest.PreCheckOrganizationsEnabled(ctx, t) acctest.PreCheckOrganizationManagementAccount(ctx, t) }, @@ -235,7 +236,7 @@ func testAccPolicy_resourceTags(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID) + acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) acctest.PreCheckOrganizationsEnabled(ctx, t) acctest.PreCheckOrganizationManagementAccount(ctx, t) }, @@ -271,7 +272,7 @@ func testAccPolicy_alb(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID) + acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) acctest.PreCheckOrganizationsEnabled(ctx, t) acctest.PreCheckOrganizationManagementAccount(ctx, t) }, @@ -305,7 +306,7 @@ func testAccPolicy_securityGroup(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID) + acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) acctest.PreCheckOrganizationsEnabled(ctx, t) acctest.PreCheckOrganizationManagementAccount(ctx, t) }, @@ -337,7 +338,7 @@ func testAccPolicy_rscSet(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID) + acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) acctest.PreCheckOrganizationsEnabled(ctx, t) acctest.PreCheckOrganizationManagementAccount(ctx, t) }, diff --git a/internal/service/fms/resource_set_test.go b/internal/service/fms/resource_set_test.go index a87266c473d..c6d650d662b 100644 --- a/internal/service/fms/resource_set_test.go +++ b/internal/service/fms/resource_set_test.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/service/fms" "github.com/aws/aws-sdk-go-v2/service/fms/types" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -32,7 +33,7 @@ func testAccFMSResourceSet_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID) + acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) acctest.PreCheckOrganizationsEnabled(ctx, t) acctest.PreCheckOrganizationManagementAccount(ctx, t) }, @@ -66,7 +67,7 @@ func testAccFMSResourceSet_disappears(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID) + acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) acctest.PreCheckOrganizationsEnabled(ctx, t) acctest.PreCheckOrganizationManagementAccount(ctx, t) }, diff --git a/internal/service/gamelift/gamelift_test.go b/internal/service/gamelift/gamelift_test.go index 0f3b2254083..25021ff075b 100644 --- a/internal/service/gamelift/gamelift_test.go +++ b/internal/service/gamelift/gamelift_test.go @@ -61,7 +61,7 @@ func testAccAccountIdByRegion(region string) (string, error) { endpoints.EuWest1RegionID: "319803218673", endpoints.EuWest2RegionID: "937342764187", endpoints.SaEast1RegionID: "028872612690", - names.USEast1RegionID: "783764748367", + endpoints.UsEast1RegionID: "783764748367", endpoints.UsEast2RegionID: "415729564621", endpoints.UsWest1RegionID: "715879310420", names.USWest2RegionID: "741061592171", diff --git a/internal/service/lambda/function.go b/internal/service/lambda/function.go index 17c5f175c15..f232439932e 100644 --- a/internal/service/lambda/function.go +++ b/internal/service/lambda/function.go @@ -1399,7 +1399,7 @@ func invokeARN(ctx context.Context, c *conns.AWSClient, functionOrAliasARN strin // See https://docs.aws.amazon.com/general/latest/gr/signer.html#signer_lambda_region. func signerServiceIsAvailable(region string) bool { availableRegions := map[string]struct{}{ - names.USEast1RegionID: {}, + endpoints.UsEast1RegionID: {}, endpoints.UsEast2RegionID: {}, endpoints.UsWest1RegionID: {}, names.USWest2RegionID: {}, diff --git a/internal/service/meta/service_data_source_test.go b/internal/service/meta/service_data_source_test.go index f5c93e91eb7..17db090190f 100644 --- a/internal/service/meta/service_data_source_test.go +++ b/internal/service/meta/service_data_source_test.go @@ -126,8 +126,8 @@ func TestAccMetaServiceDataSource_byDNSName(t *testing.T) { { Config: testAccServiceDataSourceConfig_byDNSName(), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr(dataSourceName, names.AttrRegion, names.USEast1RegionID), - resource.TestCheckResourceAttr(dataSourceName, "reverse_dns_name", fmt.Sprintf("%s.%s.%s", "com.amazonaws", names.USEast1RegionID, names.RDS)), + resource.TestCheckResourceAttr(dataSourceName, names.AttrRegion, endpoints.UsEast1RegionID), + resource.TestCheckResourceAttr(dataSourceName, "reverse_dns_name", fmt.Sprintf("%s.%s.%s", "com.amazonaws", endpoints.UsEast1RegionID, names.RDS)), resource.TestCheckResourceAttr(dataSourceName, "reverse_dns_prefix", "com.amazonaws"), resource.TestCheckResourceAttr(dataSourceName, "service_id", names.RDS), resource.TestCheckResourceAttr(dataSourceName, "supported", acctest.CtTrue), diff --git a/internal/service/opsworks/rails_app_layer_test.go b/internal/service/opsworks/rails_app_layer_test.go index 402c444db00..979000c7048 100644 --- a/internal/service/opsworks/rails_app_layer_test.go +++ b/internal/service/opsworks/rails_app_layer_test.go @@ -161,7 +161,7 @@ func TestAccOpsWorksRailsAppLayer_tagsAlternateRegion(t *testing.T) { // This test requires a very particular AWS Region configuration // in order to exercise the OpsWorks classic endpoint functionality. acctest.PreCheckMultipleRegion(t, 2) - acctest.PreCheckRegion(t, names.USEast1RegionID) + acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) acctest.PreCheckAlternateRegionIs(t, endpoints.UsWest1RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.OpsWorksServiceID), diff --git a/internal/service/opsworks/stack.go b/internal/service/opsworks/stack.go index 7e417ac7a18..eed24ff07ce 100644 --- a/internal/service/opsworks/stack.go +++ b/internal/service/opsworks/stack.go @@ -13,6 +13,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/arn" "github.com/aws/aws-sdk-go-v2/service/opsworks" awstypes "github.com/aws/aws-sdk-go-v2/service/opsworks/types" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" @@ -335,7 +336,7 @@ func resourceStackRead(ctx context.Context, d *schema.ResourceData, meta interfa // If it's not found in the default region we're in, we check us-east-1 // in the event this stack was created with Terraform before version 0.9. // See https://github.com/hashicorp/terraform/issues/12842. - region = names.USEast1RegionID + region = endpoints.UsEast1RegionID stack, err = findStackByID(ctx, conn, d.Id(), func(o *opsworks.Options) { o.Region = region diff --git a/internal/service/opsworks/stack_test.go b/internal/service/opsworks/stack_test.go index 301e6bc4902..ace03c67d95 100644 --- a/internal/service/opsworks/stack_test.go +++ b/internal/service/opsworks/stack_test.go @@ -258,7 +258,7 @@ func TestAccOpsWorksStack_tagsAlternateRegion(t *testing.T) { // This test requires a very particular AWS Region configuration // in order to exercise the OpsWorks classic endpoint functionality. acctest.PreCheckMultipleRegion(t, 2) - acctest.PreCheckRegion(t, names.USEast1RegionID) + acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) acctest.PreCheckAlternateRegionIs(t, endpoints.UsWest1RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.OpsWorksServiceID), @@ -284,7 +284,7 @@ func TestAccOpsWorksStack_tagsAlternateRegion(t *testing.T) { }), resource.TestCheckResourceAttr(resourceName, names.AttrRegion, acctest.AlternateRegion()), // "In this case, the actual API endpoint of the stack is in us-east-1." - resource.TestCheckResourceAttr(resourceName, "stack_endpoint", names.USEast1RegionID), + resource.TestCheckResourceAttr(resourceName, "stack_endpoint", endpoints.UsEast1RegionID), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsPercent, "1"), resource.TestCheckResourceAttr(resourceName, acctest.CtTagsKey1, acctest.CtValue1), ), diff --git a/internal/service/pricing/product_data_source_test.go b/internal/service/pricing/product_data_source_test.go index 568f7e4186b..5ae6a314f3c 100644 --- a/internal/service/pricing/product_data_source_test.go +++ b/internal/service/pricing/product_data_source_test.go @@ -19,7 +19,7 @@ func TestAccPricingProductDataSource_ec2(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApSouth1RegionID) + acctest.PreCheckRegion(t, endpoints.UsEast1RegionID, endpoints.ApSouth1RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.PricingServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -41,7 +41,7 @@ func TestAccPricingProductDataSource_redshift(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID, endpoints.ApSouth1RegionID) + acctest.PreCheckRegion(t, endpoints.UsEast1RegionID, endpoints.ApSouth1RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.PricingServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, diff --git a/internal/service/redshift/service_account_data_source.go b/internal/service/redshift/service_account_data_source.go index 4d844d7684b..5ea0635a251 100644 --- a/internal/service/redshift/service_account_data_source.go +++ b/internal/service/redshift/service_account_data_source.go @@ -40,7 +40,7 @@ var ServiceAccountPerRegionMap = map[string]string{ // endpoints.MeCentral1RegionID: "", endpoints.MeSouth1RegionID: "013126148197", endpoints.SaEast1RegionID: "075028567923", - names.USEast1RegionID: "193672423079", + endpoints.UsEast1RegionID: "193672423079", endpoints.UsEast2RegionID: "391106570357", endpoints.UsGovEast1RegionID: "665727464434", endpoints.UsGovWest1RegionID: "665727464434", diff --git a/internal/service/route53/health_check_test.go b/internal/service/route53/health_check_test.go index 3fb68f4a71c..d6ee276af7b 100644 --- a/internal/service/route53/health_check_test.go +++ b/internal/service/route53/health_check_test.go @@ -181,7 +181,7 @@ func TestAccRoute53HealthCheck_withHealthCheckRegions(t *testing.T) { CheckDestroy: testAccCheckHealthCheckDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccHealthCheckConfig_regions(names.USWest2RegionID, names.USEast1RegionID, endpoints.EuWest1RegionID), + Config: testAccHealthCheckConfig_regions(names.USWest2RegionID, endpoints.UsEast1RegionID, endpoints.EuWest1RegionID), Check: resource.ComposeTestCheckFunc( testAccCheckHealthCheckExists(ctx, resourceName, &check), resource.TestCheckResourceAttr(resourceName, "regions.#", "3"), diff --git a/internal/service/route53/hosted_zone_dnssec_test.go b/internal/service/route53/hosted_zone_dnssec_test.go index 383a7a0db22..6bed3a7539f 100644 --- a/internal/service/route53/hosted_zone_dnssec_test.go +++ b/internal/service/route53/hosted_zone_dnssec_test.go @@ -8,6 +8,7 @@ import ( "fmt" "testing" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -26,7 +27,7 @@ func TestAccRoute53HostedZoneDNSSEC_basic(t *testing.T) { domainName := acctest.RandomDomainName() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, names.USEast1RegionID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.Route53ServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckHostedZoneDNSSECDestroy(ctx), @@ -55,7 +56,7 @@ func TestAccRoute53HostedZoneDNSSEC_disappears(t *testing.T) { domainName := acctest.RandomDomainName() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, names.USEast1RegionID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.Route53ServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckHostedZoneDNSSECDestroy(ctx), @@ -79,7 +80,7 @@ func TestAccRoute53HostedZoneDNSSEC_signingStatus(t *testing.T) { domainName := acctest.RandomDomainName() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, names.USEast1RegionID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.Route53ServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckHostedZoneDNSSECDestroy(ctx), diff --git a/internal/service/route53/key_signing_key_test.go b/internal/service/route53/key_signing_key_test.go index 4b58a5358db..b5a697d9fba 100644 --- a/internal/service/route53/key_signing_key_test.go +++ b/internal/service/route53/key_signing_key_test.go @@ -9,6 +9,7 @@ import ( "testing" "github.com/YakDriver/regexache" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -28,7 +29,7 @@ func TestAccRoute53KeySigningKey_basic(t *testing.T) { domainName := acctest.RandomDomainName() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, names.USEast1RegionID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.Route53ServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckKeySigningKeyDestroy(ctx), @@ -69,7 +70,7 @@ func TestAccRoute53KeySigningKey_disappears(t *testing.T) { domainName := acctest.RandomDomainName() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, names.USEast1RegionID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.Route53ServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckKeySigningKeyDestroy(ctx), @@ -93,7 +94,7 @@ func TestAccRoute53KeySigningKey_status(t *testing.T) { domainName := acctest.RandomDomainName() resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, names.USEast1RegionID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.Route53ServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckKeySigningKeyDestroy(ctx), diff --git a/internal/service/route53/query_log_test.go b/internal/service/route53/query_log_test.go index 37d3fda92d5..4fb25de18ae 100644 --- a/internal/service/route53/query_log_test.go +++ b/internal/service/route53/query_log_test.go @@ -10,6 +10,7 @@ import ( "github.com/YakDriver/regexache" awstypes "github.com/aws/aws-sdk-go-v2/service/route53/types" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -35,7 +36,7 @@ func TestAccRoute53QueryLog_basic(t *testing.T) { // AWS Commercial: https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/query-logs.html // AWS GovCloud (US) - only private DNS: https://docs.aws.amazon.com/govcloud-us/latest/UserGuide/govcloud-r53.html // AWS China - not available yet: https://docs.amazonaws.cn/en_us/aws/latest/userguide/route53.html - acctest.PreCheckRegion(t, names.USEast1RegionID) + acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.Route53ServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -67,7 +68,7 @@ func TestAccRoute53QueryLog_disappears(t *testing.T) { var v awstypes.QueryLoggingConfig resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, names.USEast1RegionID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.Route53ServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckQueryLogDestroy(ctx), @@ -93,7 +94,7 @@ func TestAccRoute53QueryLog_Disappears_hostedZone(t *testing.T) { var v awstypes.QueryLoggingConfig resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, names.USEast1RegionID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.Route53ServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: testAccCheckQueryLogDestroy(ctx), diff --git a/internal/service/route53/record_test.go b/internal/service/route53/record_test.go index 0c33c7700ab..3e6d86c185c 100644 --- a/internal/service/route53/record_test.go +++ b/internal/service/route53/record_test.go @@ -755,7 +755,7 @@ func TestAccRoute53Record_Geoproximity_basic(t *testing.T) { CheckDestroy: testAccCheckRecordDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccRecordConfig_geoproximityCNAME(names.USEast1RegionID, fmt.Sprintf("%s-atl-1", names.USEast1RegionID)), + Config: testAccRecordConfig_geoproximityCNAME(endpoints.UsEast1RegionID, fmt.Sprintf("%s-atl-1", endpoints.UsEast1RegionID)), Check: resource.ComposeTestCheckFunc( testAccCheckRecordExists(ctx, "aws_route53_record.awsregion", &record1), testAccCheckRecordExists(ctx, "aws_route53_record.localzonegroup", &record2), @@ -850,7 +850,7 @@ func TestAccRoute53Record_Latency_basic(t *testing.T) { CheckDestroy: testAccCheckRecordDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccRecordConfig_latencyCNAME(names.USEast1RegionID, endpoints.EuWest1RegionID, endpoints.ApNortheast1RegionID), + Config: testAccRecordConfig_latencyCNAME(endpoints.UsEast1RegionID, endpoints.EuWest1RegionID, endpoints.ApNortheast1RegionID), Check: resource.ComposeTestCheckFunc( testAccCheckRecordExists(ctx, resourceName, &record1), testAccCheckRecordExists(ctx, "aws_route53_record.second_region", &record2), @@ -1116,7 +1116,7 @@ func TestAccRoute53Record_SetIdentifierRename_geoproximityRegion(t *testing.T) { CheckDestroy: testAccCheckRecordDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccRecordConfig_setIdentifierRenameGeoproximityRegion(names.USEast1RegionID, "before"), + Config: testAccRecordConfig_setIdentifierRenameGeoproximityRegion(endpoints.UsEast1RegionID, "before"), Check: resource.ComposeTestCheckFunc( testAccCheckRecordExists(ctx, resourceName, &record1), ), @@ -1128,7 +1128,7 @@ func TestAccRoute53Record_SetIdentifierRename_geoproximityRegion(t *testing.T) { ImportStateVerifyIgnore: []string{"allow_overwrite"}, }, { - Config: testAccRecordConfig_setIdentifierRenameGeoproximityRegion(names.USEast1RegionID, "after"), + Config: testAccRecordConfig_setIdentifierRenameGeoproximityRegion(endpoints.UsEast1RegionID, "after"), Check: resource.ComposeTestCheckFunc( testAccCheckRecordExists(ctx, resourceName, &record2), ), @@ -1149,7 +1149,7 @@ func TestAccRoute53Record_SetIdentifierRename_geoproximityLocalZoneGroup(t *test CheckDestroy: testAccCheckRecordDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccRecordConfig_setIdentifierRenameGeoproximityLocalZoneGroup(fmt.Sprintf("%s-atl-1", names.USEast1RegionID), "before"), + Config: testAccRecordConfig_setIdentifierRenameGeoproximityLocalZoneGroup(fmt.Sprintf("%s-atl-1", endpoints.UsEast1RegionID), "before"), Check: resource.ComposeTestCheckFunc( testAccCheckRecordExists(ctx, resourceName, &record1), ), @@ -1161,7 +1161,7 @@ func TestAccRoute53Record_SetIdentifierRename_geoproximityLocalZoneGroup(t *test ImportStateVerifyIgnore: []string{"allow_overwrite"}, }, { - Config: testAccRecordConfig_setIdentifierRenameGeoproximityLocalZoneGroup(fmt.Sprintf("%s-atl-1", names.USEast1RegionID), "after"), + Config: testAccRecordConfig_setIdentifierRenameGeoproximityLocalZoneGroup(fmt.Sprintf("%s-atl-1", endpoints.UsEast1RegionID), "after"), Check: resource.ComposeTestCheckFunc( testAccCheckRecordExists(ctx, resourceName, &record2), ), @@ -1248,7 +1248,7 @@ func TestAccRoute53Record_SetIdentifierRename_latency(t *testing.T) { CheckDestroy: testAccCheckRecordDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccRecordConfig_setIdentifierRenameLatency(names.USEast1RegionID, "before"), + Config: testAccRecordConfig_setIdentifierRenameLatency(endpoints.UsEast1RegionID, "before"), Check: resource.ComposeTestCheckFunc( testAccCheckRecordExists(ctx, resourceName, &record1), ), @@ -1260,7 +1260,7 @@ func TestAccRoute53Record_SetIdentifierRename_latency(t *testing.T) { ImportStateVerifyIgnore: []string{"allow_overwrite"}, }, { - Config: testAccRecordConfig_setIdentifierRenameLatency(names.USEast1RegionID, "after"), + Config: testAccRecordConfig_setIdentifierRenameLatency(endpoints.UsEast1RegionID, "after"), Check: resource.ComposeTestCheckFunc( testAccCheckRecordExists(ctx, resourceName, &record2), ), diff --git a/internal/service/route53/service_package.go b/internal/service/route53/service_package.go index efab65d443e..1c041ceaba8 100644 --- a/internal/service/route53/service_package.go +++ b/internal/service/route53/service_package.go @@ -25,13 +25,13 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( switch config["partition"].(string) { case endpoints.AwsPartitionID: // https://docs.aws.amazon.com/general/latest/gr/r53.html Setting default to us-east-1. - if cfg.Region != names.USEast1RegionID { + if cfg.Region != endpoints.UsEast1RegionID { tflog.Info(ctx, "overriding region", map[string]any{ "original_region": cfg.Region, - "override_region": names.USEast1RegionID, + "override_region": endpoints.UsEast1RegionID, }) } - o.Region = names.USEast1RegionID + o.Region = endpoints.UsEast1RegionID case endpoints.AwsCnPartitionID: // The AWS Go SDK is missing endpoint information for Route 53 in the AWS China partition. // This can likely be removed in the future. diff --git a/internal/service/route53domains/service_package.go b/internal/service/route53domains/service_package.go index 374fb73efb6..4f641b83e38 100644 --- a/internal/service/route53domains/service_package.go +++ b/internal/service/route53domains/service_package.go @@ -23,13 +23,13 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *route53domains.Options) { if config["partition"].(string) == endpoints.AwsPartitionID { // Route 53 Domains is only available in AWS Commercial us-east-1 Region. - if cfg.Region != names.USEast1RegionID { + if cfg.Region != endpoints.UsEast1RegionID { tflog.Info(ctx, "overriding region", map[string]any{ "original_region": cfg.Region, - "override_region": names.USEast1RegionID, + "override_region": endpoints.UsEast1RegionID, }) } - o.Region = names.USEast1RegionID + o.Region = endpoints.UsEast1RegionID } }, ), nil diff --git a/internal/service/s3/bucket_metric_test.go b/internal/service/s3/bucket_metric_test.go index 02a7ac07fdb..d01e671c5b8 100644 --- a/internal/service/s3/bucket_metric_test.go +++ b/internal/service/s3/bucket_metric_test.go @@ -11,6 +11,7 @@ import ( "github.com/YakDriver/regexache" "github.com/aws/aws-sdk-go-v2/service/s3/types" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -85,7 +86,7 @@ func TestAccS3BucketMetric_withFilterAccessPoint(t *testing.T) { resourceName := "aws_s3_bucket_metric.test" bucketName := fmt.Sprintf("tf-acc-%d", rInt) metricName := t.Name() - baseAccessPointArn := generateARN("aws:s3", names.USEast1RegionID, "accesspoint") + baseAccessPointArn := generateARN("aws:s3", endpoints.UsEast1RegionID, "accesspoint") accessPoint := fmt.Sprintf("%s/ap-%d", baseAccessPointArn, rInt) accessPointUpdate := fmt.Sprintf("%s/ap-update-%d", baseAccessPointArn, rInt) @@ -129,7 +130,7 @@ func TestAccS3BucketMetric_withFilterAccessPointAndPrefixAndMultiTags(t *testing resourceName := "aws_s3_bucket_metric.test" bucketName := fmt.Sprintf("tf-acc-%d", rInt) metricName := t.Name() - baseAccessPointArn := generateARN("aws:s3", names.USEast1RegionID, "accesspoint") + baseAccessPointArn := generateARN("aws:s3", endpoints.UsEast1RegionID, "accesspoint") accessPoint := fmt.Sprintf("%s/ap-%d", baseAccessPointArn, rInt) accessPointUpdate := fmt.Sprintf("%s/ap-update-%d", baseAccessPointArn, rInt) prefix := fmt.Sprintf("prefix-%d/", rInt) @@ -185,7 +186,7 @@ func TestAccS3BucketMetric_withFilterAccessPointAndPrefixAndSingleTag(t *testing resourceName := "aws_s3_bucket_metric.test" bucketName := fmt.Sprintf("tf-acc-%d", rInt) metricName := t.Name() - baseAccessPointArn := generateARN("aws:s3", names.USEast1RegionID, "accesspoint") + baseAccessPointArn := generateARN("aws:s3", endpoints.UsEast1RegionID, "accesspoint") accessPoint := fmt.Sprintf("%s/ap-%d", baseAccessPointArn, rInt) accessPointUpdate := fmt.Sprintf("%s/ap-update-%d", baseAccessPointArn, rInt) prefix := fmt.Sprintf("prefix-%d/", rInt) @@ -237,7 +238,7 @@ func TestAccS3BucketMetric_withFilterAccessPointAndPrefix(t *testing.T) { resourceName := "aws_s3_bucket_metric.test" bucketName := fmt.Sprintf("tf-acc-%d", rInt) metricName := t.Name() - baseAccessPointArn := generateARN("aws:s3", names.USEast1RegionID, "accesspoint") + baseAccessPointArn := generateARN("aws:s3", endpoints.UsEast1RegionID, "accesspoint") accessPoint := fmt.Sprintf("%s/ap-%d", baseAccessPointArn, rInt) accessPointUpdate := fmt.Sprintf("%s/ap-update-%d", baseAccessPointArn, rInt) prefix := fmt.Sprintf("prefix-%d/", rInt) @@ -285,7 +286,7 @@ func TestAccS3BucketMetric_withFilterAccessPointAndMultipleTags(t *testing.T) { resourceName := "aws_s3_bucket_metric.test" bucketName := fmt.Sprintf("tf-acc-%d", rInt) metricName := t.Name() - baseAccessPointArn := generateARN("aws:s3", names.USEast1RegionID, "accesspoint") + baseAccessPointArn := generateARN("aws:s3", endpoints.UsEast1RegionID, "accesspoint") accessPoint := fmt.Sprintf("%s/ap-%d", baseAccessPointArn, rInt) accessPointUpdate := fmt.Sprintf("%s/ap-update-%d", baseAccessPointArn, rInt) tag1 := fmt.Sprintf("tag1-%d", rInt) @@ -337,7 +338,7 @@ func TestAccS3BucketMetric_withFilterAccessPointAndSingleTag(t *testing.T) { resourceName := "aws_s3_bucket_metric.test" bucketName := fmt.Sprintf("tf-acc-%d", rInt) metricName := t.Name() - baseAccessPointArn := generateARN("aws:s3", names.USEast1RegionID, "accesspoint") + baseAccessPointArn := generateARN("aws:s3", endpoints.UsEast1RegionID, "accesspoint") accessPoint := fmt.Sprintf("%s/ap-%d", baseAccessPointArn, rInt) accessPointUpdate := fmt.Sprintf("%s/ap-update-%d", baseAccessPointArn, rInt) tag1 := fmt.Sprintf("tag-%d", rInt) diff --git a/internal/service/s3/bucket_test.go b/internal/service/s3/bucket_test.go index 6b0085c1796..ee01b88ef1a 100644 --- a/internal/service/s3/bucket_test.go +++ b/internal/service/s3/bucket_test.go @@ -434,7 +434,7 @@ func TestAccS3Bucket_Duplicate_basic(t *testing.T) { resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegionNot(t, names.USEast1RegionID) + acctest.PreCheckRegionNot(t, endpoints.UsEast1RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.S3ServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -461,7 +461,7 @@ func TestAccS3Bucket_Duplicate_UsEast1(t *testing.T) { CheckDestroy: testAccCheckBucketDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccBucketConfig_duplicate(names.USEast1RegionID, bucketName), + Config: testAccBucketConfig_duplicate(endpoints.UsEast1RegionID, bucketName), ExpectError: regexache.MustCompile(tfs3.ErrCodeBucketAlreadyExists), }, }, @@ -482,7 +482,7 @@ func TestAccS3Bucket_Duplicate_UsEast1AltAccount(t *testing.T) { CheckDestroy: testAccCheckBucketDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccBucketConfig_duplicateAltAccount(names.USEast1RegionID, bucketName), + Config: testAccBucketConfig_duplicateAltAccount(endpoints.UsEast1RegionID, bucketName), ExpectError: regexache.MustCompile(tfs3.ErrCodeBucketAlreadyExists), }, }, @@ -2331,7 +2331,7 @@ func TestBucketName(t *testing.T) { } for _, v := range validEastNames { - if err := tfs3.ValidBucketName(v, names.USEast1RegionID); err != nil { + if err := tfs3.ValidBucketName(v, endpoints.UsEast1RegionID); err != nil { t.Fatalf("%q should be a valid S3 bucket name", v) } } @@ -2342,7 +2342,7 @@ func TestBucketName(t *testing.T) { } for _, v := range invalidEastNames { - if err := tfs3.ValidBucketName(v, names.USEast1RegionID); err == nil { + if err := tfs3.ValidBucketName(v, endpoints.UsEast1RegionID); err == nil { t.Fatalf("%q should not be a valid S3 bucket name", v) } } @@ -2369,9 +2369,9 @@ func TestBucketRegionalDomainName(t *testing.T) { ExpectedOutput: bucket + ".s3.custom.amazonaws.com", }, { - Region: names.USEast1RegionID, + Region: endpoints.UsEast1RegionID, ExpectedErrCount: 0, - ExpectedOutput: bucket + fmt.Sprintf(".s3.%s.%s", names.USEast1RegionID, acctest.PartitionDNSSuffix()), + ExpectedOutput: bucket + fmt.Sprintf(".s3.%s.%s", endpoints.UsEast1RegionID, acctest.PartitionDNSSuffix()), }, { Region: names.USWest2RegionID, @@ -2409,7 +2409,7 @@ func TestWebsiteEndpoint(t *testing.T) { }{ { LocationConstraint: "", - Expected: fmt.Sprintf("bucket-name.s3-website-%s.%s", names.USEast1RegionID, acctest.PartitionDNSSuffix()), + Expected: fmt.Sprintf("bucket-name.s3-website-%s.%s", endpoints.UsEast1RegionID, acctest.PartitionDNSSuffix()), }, { LocationConstraint: endpoints.UsEast2RegionID, diff --git a/internal/service/s3/hosted_zones.go b/internal/service/s3/hosted_zones.go index 3b034c7b7b4..8322312e6a2 100644 --- a/internal/service/s3/hosted_zones.go +++ b/internal/service/s3/hosted_zones.go @@ -40,7 +40,7 @@ var hostedZoneIDsMap = map[string]string{ endpoints.MeCentral1RegionID: "Z06143092I8HRXZRUZROF", endpoints.MeSouth1RegionID: "Z1MPMWCPA7YB62", endpoints.SaEast1RegionID: "Z7KQH4QJS55SO", - names.USEast1RegionID: "Z3AQBSTGFYJSTF", + endpoints.UsEast1RegionID: "Z3AQBSTGFYJSTF", endpoints.UsEast2RegionID: "Z2O1EMRO9K5GLX", endpoints.UsGovEast1RegionID: "Z2NIFVYYW2VKV1", endpoints.UsGovWest1RegionID: "Z31GFT0UA1I2HV", diff --git a/internal/service/s3/service_package.go b/internal/service/s3/service_package.go index 3f95940d0c3..29c612e6f92 100644 --- a/internal/service/s3/service_package.go +++ b/internal/service/s3/service_package.go @@ -9,6 +9,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/aws/retry" "github.com/aws/aws-sdk-go-v2/service/s3" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/aws-sdk-go-base/v2/tfawserr" "github.com/hashicorp/terraform-plugin-log/tflog" "github.com/hashicorp/terraform-provider-aws/internal/conns" @@ -23,7 +24,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( s3.WithEndpointResolverV2(newEndpointResolverV2()), withBaseEndpoint(config[names.AttrEndpoint].(string)), func(o *s3.Options) { - if o.Region == names.USEast1RegionID && config["s3_us_east_1_regional_endpoint"].(string) != "regional" { + if o.Region == endpoints.UsEast1RegionID && config["s3_us_east_1_regional_endpoint"].(string) != "regional" { // Maintain the AWS SDK for Go v1 default of using the global endpoint in us-east-1. // See https://github.com/hashicorp/terraform-provider-aws/issues/33028. tflog.Info(ctx, "overriding region", map[string]any{ diff --git a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go index 081a85ddb4a..f27c673254e 100644 --- a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go +++ b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go @@ -216,7 +216,7 @@ var prebuiltECRImageIDByRegion_blazing = map[string]string{ endpoints.MeCentral1RegionID: "272398656194", endpoints.MeSouth1RegionID: "249704162688", endpoints.SaEast1RegionID: "855470959533", - names.USEast1RegionID: "811284229777", + endpoints.UsEast1RegionID: "811284229777", endpoints.UsEast2RegionID: "825641698319", endpoints.UsGovEast1RegionID: "237065988967", endpoints.UsGovWest1RegionID: "226302683700", @@ -249,7 +249,7 @@ var prebuiltECRImageIDByRegion_clarify = map[string]string{ endpoints.EuWest3RegionID: "341593696636", endpoints.MeSouth1RegionID: "835444307964", endpoints.SaEast1RegionID: "520018980103", - names.USEast1RegionID: "205585389593", + endpoints.UsEast1RegionID: "205585389593", endpoints.UsEast2RegionID: "211330385671", endpoints.UsGovWest1RegionID: "598674086554", endpoints.UsWest1RegionID: "740489534195", @@ -279,7 +279,7 @@ var prebuiltECRImageIDByRegion_dataWrangler = map[string]string{ endpoints.IlCentral1RegionID: "406833011540", endpoints.MeSouth1RegionID: "376037874950", endpoints.SaEast1RegionID: "424196993095", - names.USEast1RegionID: "663277389841", + endpoints.UsEast1RegionID: "663277389841", endpoints.UsEast2RegionID: "415577184552", endpoints.UsWest1RegionID: "926135532090", names.USWest2RegionID: "174368400705", @@ -307,7 +307,7 @@ var prebuiltECRImageIDByRegion_debugger = map[string]string{ endpoints.EuWest3RegionID: "447278800020", endpoints.MeSouth1RegionID: "986000313247", endpoints.SaEast1RegionID: "818342061345", - names.USEast1RegionID: "503895931360", + endpoints.UsEast1RegionID: "503895931360", endpoints.UsEast2RegionID: "915447279597", endpoints.UsGovWest1RegionID: "515509971035", endpoints.UsWest1RegionID: "685455198987", @@ -343,7 +343,7 @@ var prebuiltECRImageIDByRegion_inferentiaNeo = map[string]string{ endpoints.IlCentral1RegionID: "275950707576", endpoints.MeSouth1RegionID: "836785723513", endpoints.SaEast1RegionID: "756306329178", - names.USEast1RegionID: "785573368785", + endpoints.UsEast1RegionID: "785573368785", endpoints.UsEast2RegionID: "007439368137", endpoints.UsGovWest1RegionID: "263933020539", endpoints.UsIsoEast1RegionID: "167761179201", @@ -378,7 +378,7 @@ var prebuiltECRImageIDByRegion_SageMakerCustom = map[string]string{ // nosemgrep endpoints.EuWest3RegionID: "520713654638", endpoints.MeSouth1RegionID: "724002660598", endpoints.SaEast1RegionID: "520713654638", - names.USEast1RegionID: "520713654638", + endpoints.UsEast1RegionID: "520713654638", endpoints.UsEast2RegionID: "520713654638", endpoints.UsGovWest1RegionID: "246785580436", endpoints.UsIsoEast1RegionID: "744548109606", @@ -401,7 +401,7 @@ var prebuiltECRImageIDByRegion_SageMakerRL = map[string]string{ // nosemgrep:ci. endpoints.EuCentral1RegionID: "462105765813", endpoints.EuWest1RegionID: "462105765813", endpoints.EuWest2RegionID: "462105765813", - names.USEast1RegionID: "462105765813", + endpoints.UsEast1RegionID: "462105765813", endpoints.UsEast2RegionID: "462105765813", endpoints.UsWest1RegionID: "462105765813", names.USWest2RegionID: "462105765813", @@ -437,7 +437,7 @@ var prebuiltECRImageIDByRegion_spark = map[string]string{ endpoints.MeCentral1RegionID: "395420993607", endpoints.MeSouth1RegionID: "750251592176", endpoints.SaEast1RegionID: "737130764395", - names.USEast1RegionID: "173754725891", + endpoints.UsEast1RegionID: "173754725891", endpoints.UsEast2RegionID: "314815235551", endpoints.UsGovEast1RegionID: "260923028637", endpoints.UsGovWest1RegionID: "271483468897", @@ -471,7 +471,7 @@ var prebuiltECRImageIDByRegion_SageMakerBasePython = map[string]string{ // nosem endpoints.MeCentral1RegionID: "103105715889", endpoints.MeSouth1RegionID: "117516905037", endpoints.SaEast1RegionID: "782484402741", - names.USEast1RegionID: "081325390199", + endpoints.UsEast1RegionID: "081325390199", endpoints.UsEast2RegionID: "429704687514", endpoints.UsGovEast1RegionID: "107072934176", endpoints.UsGovWest1RegionID: "107173498710", @@ -515,7 +515,7 @@ var prebuiltECRImageIDByRegion_deepAR = map[string]string{ endpoints.MeCentral1RegionID: "272398656194", endpoints.MeSouth1RegionID: "249704162688", endpoints.SaEast1RegionID: "855470959533", - names.USEast1RegionID: "522234722520", + endpoints.UsEast1RegionID: "522234722520", endpoints.UsEast2RegionID: "566113047672", endpoints.UsGovEast1RegionID: "237065988967", endpoints.UsGovWest1RegionID: "226302683700", @@ -560,7 +560,7 @@ var prebuiltECRImageIDByRegion_factorMachines = map[string]string{ endpoints.MeCentral1RegionID: "272398656194", endpoints.MeSouth1RegionID: "249704162688", endpoints.SaEast1RegionID: "855470959533", - names.USEast1RegionID: "382416733822", + endpoints.UsEast1RegionID: "382416733822", endpoints.UsEast2RegionID: "404615174143", endpoints.UsGovEast1RegionID: "237065988967", endpoints.UsGovWest1RegionID: "226302683700", @@ -582,7 +582,7 @@ var prebuiltECRImageIDByRegion_lda = map[string]string{ endpoints.EuCentral1RegionID: "353608530281", endpoints.EuWest1RegionID: "999678624901", endpoints.EuWest2RegionID: "644912444149", - names.USEast1RegionID: "766337827248", + endpoints.UsEast1RegionID: "766337827248", endpoints.UsEast2RegionID: "999911452149", endpoints.UsGovWest1RegionID: "226302683700", endpoints.UsIsoEast1RegionID: "490574956308", @@ -625,7 +625,7 @@ var prebuiltECRImageIDByRegion_XGBoost = map[string]string{ endpoints.MeCentral1RegionID: "272398656194", endpoints.MeSouth1RegionID: "801668240914", endpoints.SaEast1RegionID: "737474898029", - names.USEast1RegionID: "683313688378", + endpoints.UsEast1RegionID: "683313688378", endpoints.UsEast2RegionID: "257758044811", endpoints.UsGovEast1RegionID: "237065988967", endpoints.UsGovWest1RegionID: "414596584902", @@ -677,7 +677,7 @@ var prebuiltECRImageIDByRegion_deepLearning = map[string]string{ endpoints.MeCentral1RegionID: "914824155844", endpoints.MeSouth1RegionID: "217643126080", endpoints.SaEast1RegionID: "763104351884", - names.USEast1RegionID: "763104351884", + endpoints.UsEast1RegionID: "763104351884", endpoints.UsEast2RegionID: "763104351884", endpoints.UsWest1RegionID: "763104351884", names.USWest2RegionID: "763104351884", @@ -713,7 +713,7 @@ var prebuiltECRImageIDByRegion_modelMonitor = map[string]string{ endpoints.MeCentral1RegionID: "588750061953", endpoints.MeSouth1RegionID: "607024016150", endpoints.SaEast1RegionID: "539772159869", - names.USEast1RegionID: "156813124566", + endpoints.UsEast1RegionID: "156813124566", endpoints.UsEast2RegionID: "777275614652", endpoints.UsWest1RegionID: "890145073186", names.USWest2RegionID: "159807026194", diff --git a/internal/service/securityhub/finding_aggregator_test.go b/internal/service/securityhub/finding_aggregator_test.go index fcc036e5c72..e6e3d91e731 100644 --- a/internal/service/securityhub/finding_aggregator_test.go +++ b/internal/service/securityhub/finding_aggregator_test.go @@ -146,7 +146,7 @@ resource "aws_securityhub_finding_aggregator" "test_aggregator" { depends_on = [aws_securityhub_account.example] } -`, endpoints.EuWest1RegionID, endpoints.EuWest2RegionID, names.USEast1RegionID) +`, endpoints.EuWest1RegionID, endpoints.EuWest2RegionID, endpoints.UsEast1RegionID) } func testAccFindingAggregatorConfig_allRegionsExceptSpecified() string { diff --git a/internal/service/serverlessrepo/cloudformation_stack_test.go b/internal/service/serverlessrepo/cloudformation_stack_test.go index 6af314ed902..efb401d572d 100644 --- a/internal/service/serverlessrepo/cloudformation_stack_test.go +++ b/internal/service/serverlessrepo/cloudformation_stack_test.go @@ -315,7 +315,7 @@ func testAccCloudFormationStackNameImportStateIdFunc(resourceName string) resour } func testAccCloudFormationApplicationID() string { - arnRegion := names.USEast1RegionID + arnRegion := endpoints.UsEast1RegionID arnAccountID := "297356227824" if acctest.Partition() == endpoints.AwsUsGovPartitionID { arnRegion = endpoints.UsGovWest1RegionID diff --git a/internal/service/servicequotas/template_association_test.go b/internal/service/servicequotas/template_association_test.go index d003b713a04..7180b780533 100644 --- a/internal/service/servicequotas/template_association_test.go +++ b/internal/service/servicequotas/template_association_test.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/service/servicequotas" "github.com/aws/aws-sdk-go-v2/service/servicequotas/types" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-aws/internal/acctest" @@ -27,7 +28,7 @@ func testAccTemplateAssociation_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID) + acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) acctest.PreCheckPartitionHasService(t, names.ServiceQuotasEndpointID) testAccPreCheckTemplate(ctx, t) }, @@ -58,7 +59,7 @@ func testAccTemplateAssociation_disappears(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID) + acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) acctest.PreCheckPartitionHasService(t, names.ServiceQuotasEndpointID) testAccPreCheckTemplate(ctx, t) }, @@ -85,7 +86,7 @@ func testAccTemplateAssociation_skipDestroy(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID) + acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) acctest.PreCheckPartitionHasService(t, names.ServiceQuotasEndpointID) testAccPreCheckTemplate(ctx, t) }, diff --git a/internal/service/servicequotas/template_test.go b/internal/service/servicequotas/template_test.go index 2f6a9c409b8..dce3ea59873 100644 --- a/internal/service/servicequotas/template_test.go +++ b/internal/service/servicequotas/template_test.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/service/servicequotas" "github.com/aws/aws-sdk-go-v2/service/servicequotas/types" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" "github.com/hashicorp/terraform-provider-aws/internal/acctest" @@ -44,7 +45,7 @@ func testAccTemplate_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID) + acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) acctest.PreCheckPartitionHasService(t, names.ServiceQuotasEndpointID) testAccPreCheckTemplate(ctx, t) }, @@ -79,7 +80,7 @@ func testAccTemplate_disappears(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID) + acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) acctest.PreCheckPartitionHasService(t, names.ServiceQuotasEndpointID) testAccPreCheckTemplate(ctx, t) }, @@ -108,7 +109,7 @@ func testAccTemplate_value(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID) + acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) acctest.PreCheckPartitionHasService(t, names.ServiceQuotasEndpointID) testAccPreCheckTemplate(ctx, t) }, diff --git a/internal/service/servicequotas/templates_data_source_test.go b/internal/service/servicequotas/templates_data_source_test.go index d2cbe36c8ba..f8c9c7f9652 100644 --- a/internal/service/servicequotas/templates_data_source_test.go +++ b/internal/service/servicequotas/templates_data_source_test.go @@ -6,6 +6,7 @@ package servicequotas_test import ( "testing" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-aws/internal/acctest" "github.com/hashicorp/terraform-provider-aws/names" @@ -19,7 +20,7 @@ func testAccTemplatesDataSource_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID) + acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) acctest.PreCheckPartitionHasService(t, names.ServiceQuotasEndpointID) testAccPreCheckTemplate(ctx, t) }, diff --git a/internal/service/shield/service_package.go b/internal/service/shield/service_package.go index 8b57023f53a..ec470a9ec7b 100644 --- a/internal/service/shield/service_package.go +++ b/internal/service/shield/service_package.go @@ -23,12 +23,12 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *shield.Options) { // Force "global" services to correct Regions. if config["partition"].(string) == endpoints.AwsPartitionID { - if cfg.Region != names.USEast1RegionID { + if cfg.Region != endpoints.UsEast1RegionID { tflog.Info(ctx, "overriding region", map[string]any{ "original_region": cfg.Region, - "override_region": names.USEast1RegionID, + "override_region": endpoints.UsEast1RegionID, }) - o.Region = names.USEast1RegionID + o.Region = endpoints.UsEast1RegionID } } }, diff --git a/internal/service/waf/web_acl_test.go b/internal/service/waf/web_acl_test.go index 0a9bbeb6797..5dda7c01ad2 100644 --- a/internal/service/waf/web_acl_test.go +++ b/internal/service/waf/web_acl_test.go @@ -10,6 +10,7 @@ import ( "github.com/YakDriver/regexache" awstypes "github.com/aws/aws-sdk-go-v2/service/waf/types" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -193,7 +194,7 @@ func TestAccWAFWebACL_logging(t *testing.T) { PreCheck: func() { acctest.PreCheck(ctx, t) testAccPreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USEast1RegionID) + acctest.PreCheckRegion(t, endpoints.UsEast1RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.WAFServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, diff --git a/names/names.go b/names/names.go index b41883f06c3..1f3c99907da 100644 --- a/names/names.go +++ b/names/names.go @@ -149,7 +149,6 @@ const ( // AWS Standard partition's regions. GlobalRegionID = "aws-global" // AWS Standard global region. - USEast1RegionID = "us-east-1" // US East (N. Virginia). USWest2RegionID = "us-west-2" // US West (Oregon). ) From 1b5c15ffdd10be9be8ae8671c6f3a358096e49b2 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 16:06:53 -0500 Subject: [PATCH 303/304] 'names.USWest2RegionID' -> 'endpoints.UsWest2RegionID'. --- internal/acctest/acctest.go | 2 +- internal/provider/provider_acc_test.go | 6 ++-- .../apprunner/hosted_zone_id_data_source.go | 2 +- internal/service/chatbot/service_package.go | 6 ++-- ...very_canonical_user_id_data_source_test.go | 2 +- .../cloudtrail/service_account_data_source.go | 2 +- ...nvironment_blueprint_configuration_test.go | 12 +++---- .../service/devicefarm/device_pool_test.go | 9 +++--- .../devicefarm/instance_profile_test.go | 7 ++-- .../devicefarm/network_profile_test.go | 9 +++--- internal/service/devicefarm/project_test.go | 9 +++--- .../devicefarm/test_grid_project_test.go | 9 +++--- internal/service/devicefarm/upload_test.go | 7 ++-- .../service/dynamodb/global_table_test.go | 2 +- .../ec2/ec2_availability_zone_group_test.go | 3 +- .../service/ec2/vpc_default_subnet_test.go | 12 +++---- internal/service/ec2/vpc_default_vpc_test.go | 14 ++++---- internal/service/ec2/vpc_test.go | 2 +- .../hosted_zone_data_source.go | 2 +- .../service/elb/hosted_zone_id_data_source.go | 2 +- .../elb/service_account_data_source.go | 2 +- .../elbv2/hosted_zone_id_data_source.go | 4 +-- internal/service/gamelift/gamelift_test.go | 27 ++++++++-------- .../globalaccelerator/service_package.go | 6 ++-- internal/service/inspector2/enabler_test.go | 3 +- internal/service/lambda/function.go | 2 +- .../lambda/runtime_management_config_test.go | 2 +- .../redshift/service_account_data_source.go | 2 +- internal/service/route53/health_check_test.go | 2 +- .../service_package.go | 6 ++-- .../service_package.go | 6 ++-- internal/service/s3/bucket_test.go | 8 ++--- internal/service/s3/hosted_zones.go | 5 ++- .../s3control/multi_region_access_point.go | 9 +++--- .../multi_region_access_point_policy.go | 7 ++-- internal/service/s3control/sweep.go | 2 +- .../prebuilt_ecr_image_data_source.go | 32 +++++++++---------- names/names.go | 3 -- 38 files changed, 126 insertions(+), 121 deletions(-) diff --git a/internal/acctest/acctest.go b/internal/acctest/acctest.go index 88e50f183bb..e62ac97f3d4 100644 --- a/internal/acctest/acctest.go +++ b/internal/acctest/acctest.go @@ -897,7 +897,7 @@ func AccountID(ctx context.Context) string { } func Region() string { - return envvar.GetWithDefault(envvar.DefaultRegion, names.USWest2RegionID) + return envvar.GetWithDefault(envvar.DefaultRegion, endpoints.UsWest2RegionID) } func AlternateRegion() string { diff --git a/internal/provider/provider_acc_test.go b/internal/provider/provider_acc_test.go index 3fde0da6546..fd0e8e9b169 100644 --- a/internal/provider/provider_acc_test.go +++ b/internal/provider/provider_acc_test.go @@ -564,7 +564,7 @@ func TestAccProvider_Region_commercial(t *testing.T) { CheckDestroy: nil, Steps: []resource.TestStep{ { - Config: testAccProviderConfig_region(names.USWest2RegionID), + Config: testAccProviderConfig_region(endpoints.UsWest2RegionID), Check: resource.ComposeTestCheckFunc( testAccCheckDNSSuffix(ctx, t, &provider, "amazonaws.com"), testAccCheckPartition(ctx, t, &provider, endpoints.AwsPartitionID), @@ -633,10 +633,10 @@ func TestAccProvider_Region_stsRegion(t *testing.T) { CheckDestroy: nil, Steps: []resource.TestStep{ { - Config: testAccProviderConfig_stsRegion(endpoints.UsEast1RegionID, names.USWest2RegionID), + Config: testAccProviderConfig_stsRegion(endpoints.UsEast1RegionID, endpoints.UsWest2RegionID), Check: resource.ComposeTestCheckFunc( testAccCheckRegion(ctx, t, &provider, endpoints.UsEast1RegionID), - testAccCheckSTSRegion(ctx, t, &provider, names.USWest2RegionID), + testAccCheckSTSRegion(ctx, t, &provider, endpoints.UsWest2RegionID), ), PlanOnly: true, }, diff --git a/internal/service/apprunner/hosted_zone_id_data_source.go b/internal/service/apprunner/hosted_zone_id_data_source.go index f98a0899ef3..0b8a0db3078 100644 --- a/internal/service/apprunner/hosted_zone_id_data_source.go +++ b/internal/service/apprunner/hosted_zone_id_data_source.go @@ -20,7 +20,7 @@ import ( var hostedZoneIDPerRegionMap = map[string]string{ endpoints.UsEast2RegionID: "Z0224347AD7KVHMLOX31", endpoints.UsEast1RegionID: "Z01915732ZBZKC8D32TPT", - names.USWest2RegionID: "Z02243383FTQ64HJ5772Q", + endpoints.UsWest2RegionID: "Z02243383FTQ64HJ5772Q", endpoints.ApSouth1RegionID: "Z00855883LBHKTIC4ODF2", endpoints.ApSoutheast1RegionID: "Z09819469CZ3KQ8PWMCL", endpoints.ApSoutheast2RegionID: "Z03657752RA8799S0TI5I", diff --git a/internal/service/chatbot/service_package.go b/internal/service/chatbot/service_package.go index 8e0fc921969..d21f488ecec 100644 --- a/internal/service/chatbot/service_package.go +++ b/internal/service/chatbot/service_package.go @@ -25,14 +25,14 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( if config["partition"].(string) == endpoints.AwsPartitionID { // Chatbot endpoint is available only in the 4 regions us-east-2, us-west-2, eu-west-1, and ap-southeast-1. // If the region from the context is one of those four, then use that region. If not default to us-west-2 - if slices.Contains([]string{endpoints.UsEast2RegionID, names.USWest2RegionID, endpoints.EuWest1RegionID, endpoints.ApSoutheast1RegionID}, cfg.Region) { + if slices.Contains([]string{endpoints.UsEast2RegionID, endpoints.UsWest2RegionID, endpoints.EuWest1RegionID, endpoints.ApSoutheast1RegionID}, cfg.Region) { o.Region = cfg.Region } else { tflog.Info(ctx, "overriding region", map[string]any{ "original_region": cfg.Region, - "override_region": names.USWest2RegionID, + "override_region": endpoints.UsWest2RegionID, }) - o.Region = names.USWest2RegionID + o.Region = endpoints.UsWest2RegionID } } }, diff --git a/internal/service/cloudfront/log_delivery_canonical_user_id_data_source_test.go b/internal/service/cloudfront/log_delivery_canonical_user_id_data_source_test.go index 53735a3555a..692f7fc1e1c 100644 --- a/internal/service/cloudfront/log_delivery_canonical_user_id_data_source_test.go +++ b/internal/service/cloudfront/log_delivery_canonical_user_id_data_source_test.go @@ -42,7 +42,7 @@ func TestAccCloudFrontLogDeliveryCanonicalUserIDDataSource_default(t *testing.T) ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, Steps: []resource.TestStep{ { - Config: testAccLogDeliveryCanonicalUserIdDataSourceConfig_basic(names.USWest2RegionID), + Config: testAccLogDeliveryCanonicalUserIdDataSourceConfig_basic(endpoints.UsWest2RegionID), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr(dataSourceName, names.AttrID, "c4c1ede66af53448b93c283ce9448c4ba468c9432aa01d700d3878632f77d2d0"), ), diff --git a/internal/service/cloudtrail/service_account_data_source.go b/internal/service/cloudtrail/service_account_data_source.go index 33f2a6e2326..1e8fa988a1f 100644 --- a/internal/service/cloudtrail/service_account_data_source.go +++ b/internal/service/cloudtrail/service_account_data_source.go @@ -51,7 +51,7 @@ var serviceAccountPerRegionMap = map[string]string{ endpoints.UsGovEast1RegionID: "608710470296", endpoints.UsGovWest1RegionID: "608710470296", endpoints.UsWest1RegionID: "388731089494", - names.USWest2RegionID: "113285607260", + endpoints.UsWest2RegionID: "113285607260", } // @SDKDataSource("aws_cloudtrail_service_account", name="Service Account") diff --git a/internal/service/datazone/environment_blueprint_configuration_test.go b/internal/service/datazone/environment_blueprint_configuration_test.go index 226b637bc15..d49c7b3930b 100644 --- a/internal/service/datazone/environment_blueprint_configuration_test.go +++ b/internal/service/datazone/environment_blueprint_configuration_test.go @@ -244,13 +244,13 @@ func TestAccDataZoneEnvironmentBlueprintConfiguration_regional_parameters(t *tes CheckDestroy: testAccCheckEnvironmentBlueprintConfigurationDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccEnvironmentBlueprintConfigurationConfig_regional_parameters(domainName, names.USWest2RegionID, acctest.CtKey1, acctest.CtValue1), + Config: testAccEnvironmentBlueprintConfigurationConfig_regional_parameters(domainName, endpoints.UsWest2RegionID, acctest.CtKey1, acctest.CtValue1), Check: resource.ComposeTestCheckFunc( testAccCheckEnvironmentBlueprintConfigurationExists(ctx, resourceName, &environmentblueprintconfiguration), resource.TestCheckResourceAttrSet(resourceName, "environment_blueprint_id"), resource.TestCheckResourceAttr(resourceName, "regional_parameters.%", "1"), - resource.TestCheckResourceAttr(resourceName, fmt.Sprintf("regional_parameters.%s.%%", names.USWest2RegionID), "1"), - resource.TestCheckResourceAttr(resourceName, fmt.Sprintf("regional_parameters.%s.key1", names.USWest2RegionID), acctest.CtValue1), + resource.TestCheckResourceAttr(resourceName, fmt.Sprintf("regional_parameters.%s.%%", endpoints.UsWest2RegionID), "1"), + resource.TestCheckResourceAttr(resourceName, fmt.Sprintf("regional_parameters.%s.key1", endpoints.UsWest2RegionID), acctest.CtValue1), ), }, { @@ -261,13 +261,13 @@ func TestAccDataZoneEnvironmentBlueprintConfiguration_regional_parameters(t *tes ImportStateVerifyIdentifierAttribute: "environment_blueprint_id", }, { - Config: testAccEnvironmentBlueprintConfigurationConfig_regional_parameters(domainName, names.USWest2RegionID, acctest.CtKey2, acctest.CtValue2), + Config: testAccEnvironmentBlueprintConfigurationConfig_regional_parameters(domainName, endpoints.UsWest2RegionID, acctest.CtKey2, acctest.CtValue2), Check: resource.ComposeTestCheckFunc( testAccCheckEnvironmentBlueprintConfigurationExists(ctx, resourceName, &environmentblueprintconfiguration), resource.TestCheckResourceAttrSet(resourceName, "environment_blueprint_id"), resource.TestCheckResourceAttr(resourceName, "regional_parameters.%", "1"), - resource.TestCheckResourceAttr(resourceName, fmt.Sprintf("regional_parameters.%s.%%", names.USWest2RegionID), "1"), - resource.TestCheckResourceAttr(resourceName, fmt.Sprintf("regional_parameters.%s.key2", names.USWest2RegionID), acctest.CtValue2), + resource.TestCheckResourceAttr(resourceName, fmt.Sprintf("regional_parameters.%s.%%", endpoints.UsWest2RegionID), "1"), + resource.TestCheckResourceAttr(resourceName, fmt.Sprintf("regional_parameters.%s.key2", endpoints.UsWest2RegionID), acctest.CtValue2), ), }, }, diff --git a/internal/service/devicefarm/device_pool_test.go b/internal/service/devicefarm/device_pool_test.go index f94a4b29f51..290af7356fb 100644 --- a/internal/service/devicefarm/device_pool_test.go +++ b/internal/service/devicefarm/device_pool_test.go @@ -10,6 +10,7 @@ import ( "github.com/YakDriver/regexache" awstypes "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -33,7 +34,7 @@ func TestAccDeviceFarmDevicePool_basic(t *testing.T) { acctest.PreCheckPartitionHasService(t, names.DeviceFarmEndpointID) // Currently, DeviceFarm is only supported in us-west-2 // https://docs.aws.amazon.com/general/latest/gr/devicefarm.html - acctest.PreCheckRegion(t, names.USWest2RegionID) + acctest.PreCheckRegion(t, endpoints.UsWest2RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.DeviceFarmServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -79,7 +80,7 @@ func TestAccDeviceFarmDevicePool_tags(t *testing.T) { acctest.PreCheckPartitionHasService(t, names.DeviceFarmEndpointID) // Currently, DeviceFarm is only supported in us-west-2 // https://docs.aws.amazon.com/general/latest/gr/devicefarm.html - acctest.PreCheckRegion(t, names.USWest2RegionID) + acctest.PreCheckRegion(t, endpoints.UsWest2RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.DeviceFarmServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -131,7 +132,7 @@ func TestAccDeviceFarmDevicePool_disappears(t *testing.T) { acctest.PreCheckPartitionHasService(t, names.DeviceFarmEndpointID) // Currently, DeviceFarm is only supported in us-west-2 // https://docs.aws.amazon.com/general/latest/gr/devicefarm.html - acctest.PreCheckRegion(t, names.USWest2RegionID) + acctest.PreCheckRegion(t, endpoints.UsWest2RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.DeviceFarmServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -162,7 +163,7 @@ func TestAccDeviceFarmDevicePool_disappears_project(t *testing.T) { acctest.PreCheckPartitionHasService(t, names.DeviceFarmEndpointID) // Currently, DeviceFarm is only supported in us-west-2 // https://docs.aws.amazon.com/general/latest/gr/devicefarm.html - acctest.PreCheckRegion(t, names.USWest2RegionID) + acctest.PreCheckRegion(t, endpoints.UsWest2RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.DeviceFarmServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, diff --git a/internal/service/devicefarm/instance_profile_test.go b/internal/service/devicefarm/instance_profile_test.go index cea337a0011..25a800ef8e9 100644 --- a/internal/service/devicefarm/instance_profile_test.go +++ b/internal/service/devicefarm/instance_profile_test.go @@ -10,6 +10,7 @@ import ( "github.com/YakDriver/regexache" awstypes "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -33,7 +34,7 @@ func TestAccDeviceFarmInstanceProfile_basic(t *testing.T) { acctest.PreCheckPartitionHasService(t, names.DeviceFarmEndpointID) // Currently, DeviceFarm is only supported in us-west-2 // https://docs.aws.amazon.com/general/latest/gr/devicefarm.html - acctest.PreCheckRegion(t, names.USWest2RegionID) + acctest.PreCheckRegion(t, endpoints.UsWest2RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.DeviceFarmServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -80,7 +81,7 @@ func TestAccDeviceFarmInstanceProfile_tags(t *testing.T) { acctest.PreCheckPartitionHasService(t, names.DeviceFarmEndpointID) // Currently, DeviceFarm is only supported in us-west-2 // https://docs.aws.amazon.com/general/latest/gr/devicefarm.html - acctest.PreCheckRegion(t, names.USWest2RegionID) + acctest.PreCheckRegion(t, endpoints.UsWest2RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.DeviceFarmServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -132,7 +133,7 @@ func TestAccDeviceFarmInstanceProfile_disappears(t *testing.T) { acctest.PreCheckPartitionHasService(t, names.DeviceFarmEndpointID) // Currently, DeviceFarm is only supported in us-west-2 // https://docs.aws.amazon.com/general/latest/gr/devicefarm.html - acctest.PreCheckRegion(t, names.USWest2RegionID) + acctest.PreCheckRegion(t, endpoints.UsWest2RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.DeviceFarmServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, diff --git a/internal/service/devicefarm/network_profile_test.go b/internal/service/devicefarm/network_profile_test.go index bc951ea155e..34172306b2d 100644 --- a/internal/service/devicefarm/network_profile_test.go +++ b/internal/service/devicefarm/network_profile_test.go @@ -10,6 +10,7 @@ import ( "github.com/YakDriver/regexache" awstypes "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -33,7 +34,7 @@ func TestAccDeviceFarmNetworkProfile_basic(t *testing.T) { acctest.PreCheckPartitionHasService(t, names.DeviceFarmEndpointID) // Currently, DeviceFarm is only supported in us-west-2 // https://docs.aws.amazon.com/general/latest/gr/devicefarm.html - acctest.PreCheckRegion(t, names.USWest2RegionID) + acctest.PreCheckRegion(t, endpoints.UsWest2RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.DeviceFarmServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -86,7 +87,7 @@ func TestAccDeviceFarmNetworkProfile_tags(t *testing.T) { acctest.PreCheckPartitionHasService(t, names.DeviceFarmEndpointID) // Currently, DeviceFarm is only supported in us-west-2 // https://docs.aws.amazon.com/general/latest/gr/devicefarm.html - acctest.PreCheckRegion(t, names.USWest2RegionID) + acctest.PreCheckRegion(t, endpoints.UsWest2RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.DeviceFarmServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -138,7 +139,7 @@ func TestAccDeviceFarmNetworkProfile_disappears(t *testing.T) { acctest.PreCheckPartitionHasService(t, names.DeviceFarmEndpointID) // Currently, DeviceFarm is only supported in us-west-2 // https://docs.aws.amazon.com/general/latest/gr/devicefarm.html - acctest.PreCheckRegion(t, names.USWest2RegionID) + acctest.PreCheckRegion(t, endpoints.UsWest2RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.DeviceFarmServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -169,7 +170,7 @@ func TestAccDeviceFarmNetworkProfile_disappears_project(t *testing.T) { acctest.PreCheckPartitionHasService(t, names.DeviceFarmEndpointID) // Currently, DeviceFarm is only supported in us-west-2 // https://docs.aws.amazon.com/general/latest/gr/devicefarm.html - acctest.PreCheckRegion(t, names.USWest2RegionID) + acctest.PreCheckRegion(t, endpoints.UsWest2RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.DeviceFarmServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, diff --git a/internal/service/devicefarm/project_test.go b/internal/service/devicefarm/project_test.go index 44094eb84f9..963e604dec3 100644 --- a/internal/service/devicefarm/project_test.go +++ b/internal/service/devicefarm/project_test.go @@ -10,6 +10,7 @@ import ( "github.com/YakDriver/regexache" awstypes "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -33,7 +34,7 @@ func TestAccDeviceFarmProject_basic(t *testing.T) { acctest.PreCheckPartitionHasService(t, names.DeviceFarmEndpointID) // Currently, DeviceFarm is only supported in us-west-2 // https://docs.aws.amazon.com/general/latest/gr/devicefarm.html - acctest.PreCheckRegion(t, names.USWest2RegionID) + acctest.PreCheckRegion(t, endpoints.UsWest2RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.DeviceFarmServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -77,7 +78,7 @@ func TestAccDeviceFarmProject_timeout(t *testing.T) { acctest.PreCheckPartitionHasService(t, names.DeviceFarmEndpointID) // Currently, DeviceFarm is only supported in us-west-2 // https://docs.aws.amazon.com/general/latest/gr/devicefarm.html - acctest.PreCheckRegion(t, names.USWest2RegionID) + acctest.PreCheckRegion(t, endpoints.UsWest2RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.DeviceFarmServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -120,7 +121,7 @@ func TestAccDeviceFarmProject_tags(t *testing.T) { acctest.PreCheckPartitionHasService(t, names.DeviceFarmEndpointID) // Currently, DeviceFarm is only supported in us-west-2 // https://docs.aws.amazon.com/general/latest/gr/devicefarm.html - acctest.PreCheckRegion(t, names.USWest2RegionID) + acctest.PreCheckRegion(t, endpoints.UsWest2RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.DeviceFarmServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -172,7 +173,7 @@ func TestAccDeviceFarmProject_disappears(t *testing.T) { acctest.PreCheckPartitionHasService(t, names.DeviceFarmEndpointID) // Currently, DeviceFarm is only supported in us-west-2 // https://docs.aws.amazon.com/general/latest/gr/devicefarm.html - acctest.PreCheckRegion(t, names.USWest2RegionID) + acctest.PreCheckRegion(t, endpoints.UsWest2RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.DeviceFarmServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, diff --git a/internal/service/devicefarm/test_grid_project_test.go b/internal/service/devicefarm/test_grid_project_test.go index 8c5b2e5f843..cacf48c8484 100644 --- a/internal/service/devicefarm/test_grid_project_test.go +++ b/internal/service/devicefarm/test_grid_project_test.go @@ -10,6 +10,7 @@ import ( "github.com/YakDriver/regexache" awstypes "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -33,7 +34,7 @@ func TestAccDeviceFarmTestGridProject_basic(t *testing.T) { acctest.PreCheckPartitionHasService(t, names.DeviceFarmEndpointID) // Currently, DeviceFarm is only supported in us-west-2 // https://docs.aws.amazon.com/general/latest/gr/devicefarm.html - acctest.PreCheckRegion(t, names.USWest2RegionID) + acctest.PreCheckRegion(t, endpoints.UsWest2RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.DeviceFarmServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -78,7 +79,7 @@ func TestAccDeviceFarmTestGridProject_vpc(t *testing.T) { acctest.PreCheckPartitionHasService(t, names.DeviceFarmEndpointID) // Currently, DeviceFarm is only supported in us-west-2 // https://docs.aws.amazon.com/general/latest/gr/devicefarm.html - acctest.PreCheckRegion(t, names.USWest2RegionID) + acctest.PreCheckRegion(t, endpoints.UsWest2RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.DeviceFarmServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -114,7 +115,7 @@ func TestAccDeviceFarmTestGridProject_tags(t *testing.T) { acctest.PreCheckPartitionHasService(t, names.DeviceFarmEndpointID) // Currently, DeviceFarm is only supported in us-west-2 // https://docs.aws.amazon.com/general/latest/gr/devicefarm.html - acctest.PreCheckRegion(t, names.USWest2RegionID) + acctest.PreCheckRegion(t, endpoints.UsWest2RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.DeviceFarmServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -166,7 +167,7 @@ func TestAccDeviceFarmTestGridProject_disappears(t *testing.T) { acctest.PreCheckPartitionHasService(t, names.DeviceFarmEndpointID) // Currently, DeviceFarm is only supported in us-west-2 // https://docs.aws.amazon.com/general/latest/gr/devicefarm.html - acctest.PreCheckRegion(t, names.USWest2RegionID) + acctest.PreCheckRegion(t, endpoints.UsWest2RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.DeviceFarmServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, diff --git a/internal/service/devicefarm/upload_test.go b/internal/service/devicefarm/upload_test.go index d5003fb4fc0..4b64fa9305c 100644 --- a/internal/service/devicefarm/upload_test.go +++ b/internal/service/devicefarm/upload_test.go @@ -10,6 +10,7 @@ import ( "github.com/YakDriver/regexache" awstypes "github.com/aws/aws-sdk-go-v2/service/devicefarm/types" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" sdkacctest "github.com/hashicorp/terraform-plugin-testing/helper/acctest" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -33,7 +34,7 @@ func TestAccDeviceFarmUpload_basic(t *testing.T) { acctest.PreCheckPartitionHasService(t, names.DeviceFarmEndpointID) // Currently, DeviceFarm is only supported in us-west-2 // https://docs.aws.amazon.com/general/latest/gr/devicefarm.html - acctest.PreCheckRegion(t, names.USWest2RegionID) + acctest.PreCheckRegion(t, endpoints.UsWest2RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.DeviceFarmServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -83,7 +84,7 @@ func TestAccDeviceFarmUpload_disappears(t *testing.T) { acctest.PreCheckPartitionHasService(t, names.DeviceFarmEndpointID) // Currently, DeviceFarm is only supported in us-west-2 // https://docs.aws.amazon.com/general/latest/gr/devicefarm.html - acctest.PreCheckRegion(t, names.USWest2RegionID) + acctest.PreCheckRegion(t, endpoints.UsWest2RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.DeviceFarmServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, @@ -114,7 +115,7 @@ func TestAccDeviceFarmUpload_disappears_project(t *testing.T) { acctest.PreCheckPartitionHasService(t, names.DeviceFarmEndpointID) // Currently, DeviceFarm is only supported in us-west-2 // https://docs.aws.amazon.com/general/latest/gr/devicefarm.html - acctest.PreCheckRegion(t, names.USWest2RegionID) + acctest.PreCheckRegion(t, endpoints.UsWest2RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.DeviceFarmServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, diff --git a/internal/service/dynamodb/global_table_test.go b/internal/service/dynamodb/global_table_test.go index 7aa2e46071a..0673f1bea15 100644 --- a/internal/service/dynamodb/global_table_test.go +++ b/internal/service/dynamodb/global_table_test.go @@ -167,7 +167,7 @@ func testAccPreCheckGlobalTable(ctx context.Context, t *testing.T) { endpoints.UsEast1RegionID, endpoints.UsEast2RegionID, endpoints.UsWest1RegionID, - names.USWest2RegionID, + endpoints.UsWest2RegionID, } acctest.PreCheckRegion(t, supportedRegions...) diff --git a/internal/service/ec2/ec2_availability_zone_group_test.go b/internal/service/ec2/ec2_availability_zone_group_test.go index ff1a8a8b56b..673a111658f 100644 --- a/internal/service/ec2/ec2_availability_zone_group_test.go +++ b/internal/service/ec2/ec2_availability_zone_group_test.go @@ -8,6 +8,7 @@ import ( "testing" awstypes "github.com/aws/aws-sdk-go-v2/service/ec2/types" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-provider-aws/internal/acctest" "github.com/hashicorp/terraform-provider-aws/names" @@ -23,7 +24,7 @@ func TestAccEC2AvailabilityZoneGroup_optInStatus(t *testing.T) { localZone := "us-west-2-lax-1" // lintignore:AWSAT003 resource.ParallelTest(t, resource.TestCase{ - PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, names.USWest2RegionID) }, + PreCheck: func() { acctest.PreCheck(ctx, t); acctest.PreCheckRegion(t, endpoints.UsWest2RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, CheckDestroy: nil, diff --git a/internal/service/ec2/vpc_default_subnet_test.go b/internal/service/ec2/vpc_default_subnet_test.go index 739c57c5ee8..c0b2b676952 100644 --- a/internal/service/ec2/vpc_default_subnet_test.go +++ b/internal/service/ec2/vpc_default_subnet_test.go @@ -87,7 +87,7 @@ func testAccDefaultSubnet_Existing_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegionNot(t, names.USWest2RegionID, endpoints.UsGovWest1RegionID) + acctest.PreCheckRegionNot(t, endpoints.UsWest2RegionID, endpoints.UsGovWest1RegionID) testAccPreCheckDefaultSubnetExists(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), @@ -133,7 +133,7 @@ func testAccDefaultSubnet_Existing_forceDestroy(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegionNot(t, names.USWest2RegionID, endpoints.UsGovWest1RegionID) + acctest.PreCheckRegionNot(t, endpoints.UsWest2RegionID, endpoints.UsGovWest1RegionID) testAccPreCheckDefaultSubnetExists(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), @@ -160,7 +160,7 @@ func testAccDefaultSubnet_Existing_ipv6(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegionNot(t, names.USWest2RegionID, endpoints.UsGovWest1RegionID) + acctest.PreCheckRegionNot(t, endpoints.UsWest2RegionID, endpoints.UsGovWest1RegionID) testAccPreCheckDefaultSubnetExists(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), @@ -207,7 +207,7 @@ func testAccDefaultSubnet_Existing_privateDNSNameOptionsOnLaunch(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegionNot(t, names.USWest2RegionID, endpoints.UsGovWest1RegionID) + acctest.PreCheckRegionNot(t, endpoints.UsWest2RegionID, endpoints.UsGovWest1RegionID) testAccPreCheckDefaultSubnetExists(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), @@ -254,7 +254,7 @@ func testAccDefaultSubnet_NotFound_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegionNot(t, names.USWest2RegionID, endpoints.UsGovWest1RegionID) + acctest.PreCheckRegionNot(t, endpoints.UsWest2RegionID, endpoints.UsGovWest1RegionID) testAccPreCheckDefaultSubnetNotFound(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), @@ -300,7 +300,7 @@ func testAccDefaultSubnet_NotFound_ipv6Native(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegionNot(t, names.USWest2RegionID, endpoints.UsGovWest1RegionID) + acctest.PreCheckRegionNot(t, endpoints.UsWest2RegionID, endpoints.UsGovWest1RegionID) testAccPreCheckDefaultSubnetNotFound(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), diff --git a/internal/service/ec2/vpc_default_vpc_test.go b/internal/service/ec2/vpc_default_vpc_test.go index 6c0497070d5..496d3686516 100644 --- a/internal/service/ec2/vpc_default_vpc_test.go +++ b/internal/service/ec2/vpc_default_vpc_test.go @@ -85,7 +85,7 @@ func testAccDefaultVPC_Existing_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegionNot(t, names.USWest2RegionID, endpoints.UsGovWest1RegionID) + acctest.PreCheckRegionNot(t, endpoints.UsWest2RegionID, endpoints.UsGovWest1RegionID) testAccPreCheckDefaultVPCExists(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), @@ -132,7 +132,7 @@ func testAccDefaultVPC_Existing_assignGeneratedIPv6CIDRBlock(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegionNot(t, names.USWest2RegionID, endpoints.UsGovWest1RegionID) + acctest.PreCheckRegionNot(t, endpoints.UsWest2RegionID, endpoints.UsGovWest1RegionID) testAccPreCheckDefaultVPCExists(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), @@ -179,7 +179,7 @@ func testAccDefaultVPC_Existing_forceDestroy(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegionNot(t, names.USWest2RegionID, endpoints.UsGovWest1RegionID) + acctest.PreCheckRegionNot(t, endpoints.UsWest2RegionID, endpoints.UsGovWest1RegionID) testAccPreCheckDefaultVPCExists(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), @@ -207,7 +207,7 @@ func testAccDefaultVPC_NotFound_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegionNot(t, names.USWest2RegionID, endpoints.UsGovWest1RegionID) + acctest.PreCheckRegionNot(t, endpoints.UsWest2RegionID, endpoints.UsGovWest1RegionID) testAccPreCheckDefaultVPCNotFound(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), @@ -254,7 +254,7 @@ func testAccDefaultVPC_NotFound_assignGeneratedIPv6CIDRBlock(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegionNot(t, names.USWest2RegionID, endpoints.UsGovWest1RegionID) + acctest.PreCheckRegionNot(t, endpoints.UsWest2RegionID, endpoints.UsGovWest1RegionID) testAccPreCheckDefaultVPCNotFound(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), @@ -301,7 +301,7 @@ func testAccDefaultVPC_NotFound_forceDestroy(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegionNot(t, names.USWest2RegionID, endpoints.UsGovWest1RegionID) + acctest.PreCheckRegionNot(t, endpoints.UsWest2RegionID, endpoints.UsGovWest1RegionID) testAccPreCheckDefaultVPCNotFound(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), @@ -330,7 +330,7 @@ func testAccDefaultVPC_NotFound_assignGeneratedIPv6CIDRBlockAdoption(t *testing. resource.Test(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegionNot(t, names.USWest2RegionID, endpoints.UsGovWest1RegionID) + acctest.PreCheckRegionNot(t, endpoints.UsWest2RegionID, endpoints.UsGovWest1RegionID) testAccPreCheckDefaultVPCNotFound(ctx, t) }, ErrorCheck: acctest.ErrorCheck(t, names.EC2ServiceID), diff --git a/internal/service/ec2/vpc_test.go b/internal/service/ec2/vpc_test.go index 7ced27a1a0b..335f14582d3 100644 --- a/internal/service/ec2/vpc_test.go +++ b/internal/service/ec2/vpc_test.go @@ -490,7 +490,7 @@ func TestAccVPC_assignGeneratedIPv6CIDRBlockWithNetworkBorderGroup(t *testing.T) resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acctest.PreCheck(ctx, t) - acctest.PreCheckRegion(t, names.USWest2RegionID) + acctest.PreCheckRegion(t, endpoints.UsWest2RegionID) // https://docs.aws.amazon.com/vpc/latest/userguide/Extend_VPCs.html#local-zone: // "You can request the IPv6 Amazon-provided IP addresses and associate them with the network border group // for a new or existing VPCs only for us-west-2-lax-1a and use-west-2-lax-1b. All other Local Zones don't support IPv6." diff --git a/internal/service/elasticbeanstalk/hosted_zone_data_source.go b/internal/service/elasticbeanstalk/hosted_zone_data_source.go index 4e352754f9b..7c0951a57e2 100644 --- a/internal/service/elasticbeanstalk/hosted_zone_data_source.go +++ b/internal/service/elasticbeanstalk/hosted_zone_data_source.go @@ -40,7 +40,7 @@ var hostedZoneIDs = map[string]string{ endpoints.UsEast1RegionID: "Z117KPS5GTRQ2G", endpoints.UsEast2RegionID: "Z14LCN19Q5QHIC", endpoints.UsWest1RegionID: "Z1LQECGX5PH1X", - names.USWest2RegionID: "Z38NKT9BP95V3O", + endpoints.UsWest2RegionID: "Z38NKT9BP95V3O", endpoints.UsGovEast1RegionID: "Z35TSARG0EJ4VU", endpoints.UsGovWest1RegionID: "Z4KAURWC4UUUG", } diff --git a/internal/service/elb/hosted_zone_id_data_source.go b/internal/service/elb/hosted_zone_id_data_source.go index fa16127e915..fe5d1c01d5f 100644 --- a/internal/service/elb/hosted_zone_id_data_source.go +++ b/internal/service/elb/hosted_zone_id_data_source.go @@ -49,7 +49,7 @@ var hostedZoneIDPerRegionMap = map[string]string{ endpoints.UsGovEast1RegionID: "Z166TLBEWOO7G0", endpoints.UsGovWest1RegionID: "Z33AYJ8TM3BH4J", endpoints.UsWest1RegionID: "Z368ELLRRE2KJ0", - names.USWest2RegionID: "Z1H1FL5HABSF5", + endpoints.UsWest2RegionID: "Z1H1FL5HABSF5", } // @SDKDataSource("aws_elb_hosted_zone_id", name="Hosted Zone ID") diff --git a/internal/service/elb/service_account_data_source.go b/internal/service/elb/service_account_data_source.go index 4c84f86d341..1fc13eee845 100644 --- a/internal/service/elb/service_account_data_source.go +++ b/internal/service/elb/service_account_data_source.go @@ -44,7 +44,7 @@ var accountIDPerRegionMap = map[string]string{ endpoints.UsGovEast1RegionID: "190560391635", endpoints.UsGovWest1RegionID: "048591011584", endpoints.UsWest1RegionID: "027434742980", - names.USWest2RegionID: "797873946194", + endpoints.UsWest2RegionID: "797873946194", } // @SDKDataSource("aws_elb_service_account", name="Service Account") diff --git a/internal/service/elbv2/hosted_zone_id_data_source.go b/internal/service/elbv2/hosted_zone_id_data_source.go index aec6f8f42a8..e0f024329fe 100644 --- a/internal/service/elbv2/hosted_zone_id_data_source.go +++ b/internal/service/elbv2/hosted_zone_id_data_source.go @@ -53,7 +53,7 @@ var hostedZoneIDPerRegionALBMap = map[string]string{ endpoints.UsGovEast1RegionID: "Z166TLBEWOO7G0", endpoints.UsGovWest1RegionID: "Z33AYJ8TM3BH4J", endpoints.UsWest1RegionID: "Z368ELLRRE2KJ0", - names.USWest2RegionID: "Z1H1FL5HABSF5", + endpoints.UsWest2RegionID: "Z1H1FL5HABSF5", } // See https://docs.aws.amazon.com/general/latest/gr/elb.html#elb_region @@ -91,7 +91,7 @@ var hostedZoneIDPerRegionNLBMap = map[string]string{ endpoints.UsGovEast1RegionID: "Z1ZSMQQ6Q24QQ8", endpoints.UsGovWest1RegionID: "ZMG1MZ2THAWF1", endpoints.UsWest1RegionID: "Z24FKFUX50B4VW", - names.USWest2RegionID: "Z18D5FSROUN65G", + endpoints.UsWest2RegionID: "Z18D5FSROUN65G", } // @SDKDataSource("aws_lb_hosted_zone_id", name="Hosted Zone ID") diff --git a/internal/service/gamelift/gamelift_test.go b/internal/service/gamelift/gamelift_test.go index 25021ff075b..5013e2c1b17 100644 --- a/internal/service/gamelift/gamelift_test.go +++ b/internal/service/gamelift/gamelift_test.go @@ -11,7 +11,6 @@ import ( "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" "github.com/hashicorp/terraform-provider-aws/internal/acctest" - "github.com/hashicorp/terraform-provider-aws/names" ) type testAccGame struct { @@ -52,19 +51,19 @@ func testAccSampleGame(region string) (*testAccGame, error) { func testAccAccountIdByRegion(region string) (string, error) { m := map[string]string{ endpoints.ApNortheast1RegionID: "120069834884", - endpoints.ApNortheast2RegionID: "805673136642", - endpoints.ApSouth1RegionID: "134975661615", - endpoints.ApSoutheast1RegionID: "077577004113", - endpoints.ApSoutheast2RegionID: "112188327105", - endpoints.CaCentral1RegionID: "800535022691", - endpoints.EuCentral1RegionID: "797584052317", - endpoints.EuWest1RegionID: "319803218673", - endpoints.EuWest2RegionID: "937342764187", - endpoints.SaEast1RegionID: "028872612690", - endpoints.UsEast1RegionID: "783764748367", - endpoints.UsEast2RegionID: "415729564621", - endpoints.UsWest1RegionID: "715879310420", - names.USWest2RegionID: "741061592171", + endpoints.ApNortheast2RegionID: "805673136642", + endpoints.ApSouth1RegionID: "134975661615", + endpoints.ApSoutheast1RegionID: "077577004113", + endpoints.ApSoutheast2RegionID: "112188327105", + endpoints.CaCentral1RegionID: "800535022691", + endpoints.EuCentral1RegionID: "797584052317", + endpoints.EuWest1RegionID: "319803218673", + endpoints.EuWest2RegionID: "937342764187", + endpoints.SaEast1RegionID: "028872612690", + endpoints.UsEast1RegionID: "783764748367", + endpoints.UsEast2RegionID: "415729564621", + endpoints.UsWest1RegionID: "715879310420", + endpoints.UsWest2RegionID: "741061592171", } if accId, ok := m[region]; ok { diff --git a/internal/service/globalaccelerator/service_package.go b/internal/service/globalaccelerator/service_package.go index 3a1fa076461..8b7359a6edf 100644 --- a/internal/service/globalaccelerator/service_package.go +++ b/internal/service/globalaccelerator/service_package.go @@ -23,12 +23,12 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( func(o *globalaccelerator.Options) { if config["partition"].(string) == endpoints.AwsPartitionID { // Global Accelerator endpoint is only available in AWS Commercial us-west-2 Region. - if cfg.Region != names.USWest2RegionID { + if cfg.Region != endpoints.UsWest2RegionID { tflog.Info(ctx, "overriding region", map[string]any{ "original_region": cfg.Region, - "override_region": names.USWest2RegionID, + "override_region": endpoints.UsWest2RegionID, }) - o.Region = names.USWest2RegionID + o.Region = endpoints.UsWest2RegionID } } }, diff --git a/internal/service/inspector2/enabler_test.go b/internal/service/inspector2/enabler_test.go index 9af7d12e67e..02278f5594d 100644 --- a/internal/service/inspector2/enabler_test.go +++ b/internal/service/inspector2/enabler_test.go @@ -11,6 +11,7 @@ import ( "testing" "github.com/aws/aws-sdk-go-v2/service/inspector2/types" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-testing/helper/resource" "github.com/hashicorp/terraform-plugin-testing/terraform" @@ -264,7 +265,7 @@ func testAccEnabler_lambdaCode(t *testing.T) { acctest.PreCheckInspector2(ctx, t) acctest.PreCheckOrganizationManagementAccount(ctx, t) // https://docs.aws.amazon.com/inspector/latest/user/inspector_regions.html#ins-regional-feature-availability. - acctest.PreCheckRegion(t, names.USWest2RegionID) + acctest.PreCheckRegion(t, endpoints.UsWest2RegionID) }, ErrorCheck: acctest.ErrorCheck(t, names.Inspector2ServiceID), ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, diff --git a/internal/service/lambda/function.go b/internal/service/lambda/function.go index f232439932e..5126ae9dd51 100644 --- a/internal/service/lambda/function.go +++ b/internal/service/lambda/function.go @@ -1402,7 +1402,7 @@ func signerServiceIsAvailable(region string) bool { endpoints.UsEast1RegionID: {}, endpoints.UsEast2RegionID: {}, endpoints.UsWest1RegionID: {}, - names.USWest2RegionID: {}, + endpoints.UsWest2RegionID: {}, endpoints.AfSouth1RegionID: {}, endpoints.ApEast1RegionID: {}, endpoints.ApSouth1RegionID: {}, diff --git a/internal/service/lambda/runtime_management_config_test.go b/internal/service/lambda/runtime_management_config_test.go index bce061e3afd..9f15c7ae761 100644 --- a/internal/service/lambda/runtime_management_config_test.go +++ b/internal/service/lambda/runtime_management_config_test.go @@ -111,7 +111,7 @@ func TestAccLambdaRuntimeManagementConfig_runtimeVersionARN(t *testing.T) { // the value and restrict this test to us-west-2 in the standard commercial // partition. acctest.PreCheckPartition(t, endpoints.AwsPartitionID) - acctest.PreCheckRegion(t, names.USWest2RegionID) + acctest.PreCheckRegion(t, endpoints.UsWest2RegionID) acctest.PreCheckPartitionHasService(t, names.LambdaEndpointID) }, ErrorCheck: acctest.ErrorCheck(t, names.LambdaServiceID), diff --git a/internal/service/redshift/service_account_data_source.go b/internal/service/redshift/service_account_data_source.go index 5ea0635a251..0d11bfce04c 100644 --- a/internal/service/redshift/service_account_data_source.go +++ b/internal/service/redshift/service_account_data_source.go @@ -45,7 +45,7 @@ var ServiceAccountPerRegionMap = map[string]string{ endpoints.UsGovEast1RegionID: "665727464434", endpoints.UsGovWest1RegionID: "665727464434", endpoints.UsWest1RegionID: "262260360010", - names.USWest2RegionID: "902366379725", + endpoints.UsWest2RegionID: "902366379725", } // @SDKDataSource("aws_redshift_service_account", name="Service Account") diff --git a/internal/service/route53/health_check_test.go b/internal/service/route53/health_check_test.go index d6ee276af7b..b1b1624f6dc 100644 --- a/internal/service/route53/health_check_test.go +++ b/internal/service/route53/health_check_test.go @@ -181,7 +181,7 @@ func TestAccRoute53HealthCheck_withHealthCheckRegions(t *testing.T) { CheckDestroy: testAccCheckHealthCheckDestroy(ctx), Steps: []resource.TestStep{ { - Config: testAccHealthCheckConfig_regions(names.USWest2RegionID, endpoints.UsEast1RegionID, endpoints.EuWest1RegionID), + Config: testAccHealthCheckConfig_regions(endpoints.UsWest2RegionID, endpoints.UsEast1RegionID, endpoints.EuWest1RegionID), Check: resource.ComposeTestCheckFunc( testAccCheckHealthCheckExists(ctx, resourceName, &check), resource.TestCheckResourceAttr(resourceName, "regions.#", "3"), diff --git a/internal/service/route53recoverycontrolconfig/service_package.go b/internal/service/route53recoverycontrolconfig/service_package.go index 2f80dd5fa3d..a32d5ef6114 100644 --- a/internal/service/route53recoverycontrolconfig/service_package.go +++ b/internal/service/route53recoverycontrolconfig/service_package.go @@ -25,13 +25,13 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( switch config["partition"].(string) { case endpoints.AwsPartitionID: // https://docs.aws.amazon.com/general/latest/gr/r53arc.html Setting default to us-west-2. - if cfg.Region != names.USWest2RegionID { + if cfg.Region != endpoints.UsWest2RegionID { tflog.Info(ctx, "overriding region", map[string]any{ "original_region": cfg.Region, - "override_region": names.USWest2RegionID, + "override_region": endpoints.UsWest2RegionID, }) } - o.Region = names.USWest2RegionID + o.Region = endpoints.UsWest2RegionID } }, ), nil diff --git a/internal/service/route53recoveryreadiness/service_package.go b/internal/service/route53recoveryreadiness/service_package.go index a520f0cdf88..33de9841e92 100644 --- a/internal/service/route53recoveryreadiness/service_package.go +++ b/internal/service/route53recoveryreadiness/service_package.go @@ -25,13 +25,13 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) ( switch config["partition"].(string) { case endpoints.AwsPartitionID: // https://docs.aws.amazon.com/general/latest/gr/r53arc.html Setting default to us-west-2. - if cfg.Region != names.USWest2RegionID { + if cfg.Region != endpoints.UsWest2RegionID { tflog.Info(ctx, "overriding region", map[string]any{ "original_region": cfg.Region, - "override_region": names.USWest2RegionID, + "override_region": endpoints.UsWest2RegionID, }) } - o.Region = names.USWest2RegionID + o.Region = endpoints.UsWest2RegionID } }, ), nil diff --git a/internal/service/s3/bucket_test.go b/internal/service/s3/bucket_test.go index ee01b88ef1a..7b035055fd9 100644 --- a/internal/service/s3/bucket_test.go +++ b/internal/service/s3/bucket_test.go @@ -2297,7 +2297,7 @@ func TestBucketName(t *testing.T) { } for _, v := range validDnsNames { - if err := tfs3.ValidBucketName(v, names.USWest2RegionID); err != nil { + if err := tfs3.ValidBucketName(v, endpoints.UsWest2RegionID); err != nil { t.Fatalf("%q should be a valid S3 bucket name", v) } } @@ -2314,7 +2314,7 @@ func TestBucketName(t *testing.T) { } for _, v := range invalidDnsNames { - if err := tfs3.ValidBucketName(v, names.USWest2RegionID); err == nil { + if err := tfs3.ValidBucketName(v, endpoints.UsWest2RegionID); err == nil { t.Fatalf("%q should not be a valid S3 bucket name", v) } } @@ -2374,9 +2374,9 @@ func TestBucketRegionalDomainName(t *testing.T) { ExpectedOutput: bucket + fmt.Sprintf(".s3.%s.%s", endpoints.UsEast1RegionID, acctest.PartitionDNSSuffix()), }, { - Region: names.USWest2RegionID, + Region: endpoints.UsWest2RegionID, ExpectedErrCount: 0, - ExpectedOutput: bucket + fmt.Sprintf(".s3.%s.%s", names.USWest2RegionID, acctest.PartitionDNSSuffix()), + ExpectedOutput: bucket + fmt.Sprintf(".s3.%s.%s", endpoints.UsWest2RegionID, acctest.PartitionDNSSuffix()), }, { Region: endpoints.UsGovWest1RegionID, diff --git a/internal/service/s3/hosted_zones.go b/internal/service/s3/hosted_zones.go index 8322312e6a2..20fa84b70ba 100644 --- a/internal/service/s3/hosted_zones.go +++ b/internal/service/s3/hosted_zones.go @@ -7,12 +7,11 @@ import ( "fmt" "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" - "github.com/hashicorp/terraform-provider-aws/names" ) // See https://docs.aws.amazon.com/general/latest/gr/s3.html#s3_website_region_endpoints. var hostedZoneIDsMap = map[string]string{ - endpoints.AfSouth1RegionID: "Z83WF9RJE8B12", + endpoints.AfSouth1RegionID: "Z83WF9RJE8B12", endpoints.ApEast1RegionID: "ZNB98KWMFR0R6", endpoints.ApNortheast1RegionID: "Z2M4EHUR26P7ZW", endpoints.ApNortheast2RegionID: "Z3W03O7B5YMIYP", @@ -45,7 +44,7 @@ var hostedZoneIDsMap = map[string]string{ endpoints.UsGovEast1RegionID: "Z2NIFVYYW2VKV1", endpoints.UsGovWest1RegionID: "Z31GFT0UA1I2HV", endpoints.UsWest1RegionID: "Z2F56UZL2M1ACD", - names.USWest2RegionID: "Z3BJ6K6RIION7M", + endpoints.UsWest2RegionID: "Z3BJ6K6RIION7M", } // hostedZoneIDForRegion returns the Route 53 hosted zone ID for an S3 website endpoint Region. diff --git a/internal/service/s3control/multi_region_access_point.go b/internal/service/s3control/multi_region_access_point.go index 3adad262e91..e3b79f652d0 100644 --- a/internal/service/s3control/multi_region_access_point.go +++ b/internal/service/s3control/multi_region_access_point.go @@ -14,6 +14,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws/arn" "github.com/aws/aws-sdk-go-v2/service/s3control" "github.com/aws/aws-sdk-go-v2/service/s3control/types" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/aws-sdk-go-base/v2/tfawserr" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" @@ -171,7 +172,7 @@ func resourceMultiRegionAccessPointCreate(ctx context.Context, d *schema.Resourc output, err := conn.CreateMultiRegionAccessPoint(ctx, input, func(o *s3control.Options) { // All Multi-Region Access Point actions are routed to the US West (Oregon) Region. - o.Region = names.USWest2RegionID + o.Region = endpoints.UsWest2RegionID }) if err != nil { @@ -247,7 +248,7 @@ func resourceMultiRegionAccessPointDelete(ctx context.Context, d *schema.Resourc log.Printf("[DEBUG] Deleting S3 Multi-Region Access Point: %s", d.Id()) output, err := conn.DeleteMultiRegionAccessPoint(ctx, input, func(o *s3control.Options) { // All Multi-Region Access Point actions are routed to the US West (Oregon) Region. - o.Region = names.USWest2RegionID + o.Region = endpoints.UsWest2RegionID }) if tfawserr.ErrCodeEquals(err, errCodeNoSuchMultiRegionAccessPoint) { @@ -273,7 +274,7 @@ func findMultiRegionAccessPointByTwoPartKey(ctx context.Context, conn *s3control output, err := conn.GetMultiRegionAccessPoint(ctx, input, func(o *s3control.Options) { // All Multi-Region Access Point actions are routed to the US West (Oregon) Region. - o.Region = names.USWest2RegionID + o.Region = endpoints.UsWest2RegionID }) if tfawserr.ErrCodeEquals(err, errCodeNoSuchMultiRegionAccessPoint) { @@ -302,7 +303,7 @@ func findMultiRegionAccessPointOperationByTwoPartKey(ctx context.Context, conn * output, err := conn.DescribeMultiRegionAccessPointOperation(ctx, input, func(o *s3control.Options) { // All Multi-Region Access Point actions are routed to the US West (Oregon) Region. - o.Region = names.USWest2RegionID + o.Region = endpoints.UsWest2RegionID }) if tfawserr.ErrCodeEquals(err, errCodeNoSuchAsyncRequest) { diff --git a/internal/service/s3control/multi_region_access_point_policy.go b/internal/service/s3control/multi_region_access_point_policy.go index 4b1071554c4..5baf860c2cf 100644 --- a/internal/service/s3control/multi_region_access_point_policy.go +++ b/internal/service/s3control/multi_region_access_point_policy.go @@ -11,6 +11,7 @@ import ( "github.com/aws/aws-sdk-go-v2/aws" "github.com/aws/aws-sdk-go-v2/service/s3control" "github.com/aws/aws-sdk-go-v2/service/s3control/types" + "github.com/hashicorp/aws-sdk-go-base/v2/endpoints" "github.com/hashicorp/aws-sdk-go-base/v2/tfawserr" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" @@ -108,7 +109,7 @@ func resourceMultiRegionAccessPointPolicyCreate(ctx context.Context, d *schema.R output, err := conn.PutMultiRegionAccessPointPolicy(ctx, input, func(o *s3control.Options) { // All Multi-Region Access Point actions are routed to the US West (Oregon) Region. - o.Region = names.USWest2RegionID + o.Region = endpoints.UsWest2RegionID }) if err != nil { @@ -191,7 +192,7 @@ func resourceMultiRegionAccessPointPolicyUpdate(ctx context.Context, d *schema.R output, err := conn.PutMultiRegionAccessPointPolicy(ctx, input, func(o *s3control.Options) { // All Multi-Region Access Point actions are routed to the US West (Oregon) Region. - o.Region = names.USWest2RegionID + o.Region = endpoints.UsWest2RegionID }) if err != nil { @@ -213,7 +214,7 @@ func findMultiRegionAccessPointPolicyDocumentByTwoPartKey(ctx context.Context, c output, err := conn.GetMultiRegionAccessPointPolicy(ctx, input, func(o *s3control.Options) { // All Multi-Region Access Point actions are routed to the US West (Oregon) Region. - o.Region = names.USWest2RegionID + o.Region = endpoints.UsWest2RegionID }) if tfawserr.ErrCodeEquals(err, errCodeNoSuchMultiRegionAccessPoint) { diff --git a/internal/service/s3control/sweep.go b/internal/service/s3control/sweep.go index 133b7e1c254..d90419509dd 100644 --- a/internal/service/s3control/sweep.go +++ b/internal/service/s3control/sweep.go @@ -243,7 +243,7 @@ func sweepAccessPoints(region string) error { func sweepMultiRegionAccessPoints(region string) error { ctx := sweep.Context(region) - if region != names.USWest2RegionID { + if region != endpoints.UsWest2RegionID { log.Printf("[WARN] Skipping S3 Multi-Region Access Point sweep for region: %s", region) return nil } diff --git a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go index f27c673254e..a05dbb04086 100644 --- a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go +++ b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go @@ -223,7 +223,7 @@ var prebuiltECRImageIDByRegion_blazing = map[string]string{ endpoints.UsIsoEast1RegionID: "490574956308", endpoints.UsIsobEast1RegionID: "765400339828", endpoints.UsWest1RegionID: "632365934929", - names.USWest2RegionID: "433757028032", + endpoints.UsWest2RegionID: "433757028032", } // https://github.com/aws/sagemaker-python-sdk/blob/master/src/sagemaker/image_uri_config/clarify.json @@ -253,7 +253,7 @@ var prebuiltECRImageIDByRegion_clarify = map[string]string{ endpoints.UsEast2RegionID: "211330385671", endpoints.UsGovWest1RegionID: "598674086554", endpoints.UsWest1RegionID: "740489534195", - names.USWest2RegionID: "306415355426", + endpoints.UsWest2RegionID: "306415355426", } // https://github.com/aws/sagemaker-python-sdk/blob/master/src/sagemaker/image_uri_config/data-wrangler.json @@ -282,7 +282,7 @@ var prebuiltECRImageIDByRegion_dataWrangler = map[string]string{ endpoints.UsEast1RegionID: "663277389841", endpoints.UsEast2RegionID: "415577184552", endpoints.UsWest1RegionID: "926135532090", - names.USWest2RegionID: "174368400705", + endpoints.UsWest2RegionID: "174368400705", } // https://github.com/aws/sagemaker-python-sdk/blob/master/src/sagemaker/image_uri_config/debugger.json @@ -311,7 +311,7 @@ var prebuiltECRImageIDByRegion_debugger = map[string]string{ endpoints.UsEast2RegionID: "915447279597", endpoints.UsGovWest1RegionID: "515509971035", endpoints.UsWest1RegionID: "685455198987", - names.USWest2RegionID: "895741380848", + endpoints.UsWest2RegionID: "895741380848", } // https://github.com/aws/sagemaker-python-sdk/blob/master/src/sagemaker/image_uri_config/inferentia-mxnet.json @@ -349,7 +349,7 @@ var prebuiltECRImageIDByRegion_inferentiaNeo = map[string]string{ endpoints.UsIsoEast1RegionID: "167761179201", endpoints.UsIsobEast1RegionID: "406031935815", endpoints.UsWest1RegionID: "710691900526", - names.USWest2RegionID: "301217895009", + endpoints.UsWest2RegionID: "301217895009", } // https://github.com/aws/sagemaker-python-sdk/blob/master/src/sagemaker/image_uri_config/chainer.json @@ -384,7 +384,7 @@ var prebuiltECRImageIDByRegion_SageMakerCustom = map[string]string{ // nosemgrep endpoints.UsIsoEast1RegionID: "744548109606", endpoints.UsIsobEast1RegionID: "453391408702", endpoints.UsWest1RegionID: "520713654638", - names.USWest2RegionID: "520713654638", + endpoints.UsWest2RegionID: "520713654638", } // https://github.com/aws/sagemaker-python-sdk/blob/master/src/sagemaker/image_uri_config/ray-pytorch.json @@ -404,7 +404,7 @@ var prebuiltECRImageIDByRegion_SageMakerRL = map[string]string{ // nosemgrep:ci. endpoints.UsEast1RegionID: "462105765813", endpoints.UsEast2RegionID: "462105765813", endpoints.UsWest1RegionID: "462105765813", - names.USWest2RegionID: "462105765813", + endpoints.UsWest2RegionID: "462105765813", } // https://github.com/aws/sagemaker-python-sdk/blob/master/src/sagemaker/image_uri_config/spark.json @@ -442,7 +442,7 @@ var prebuiltECRImageIDByRegion_spark = map[string]string{ endpoints.UsGovEast1RegionID: "260923028637", endpoints.UsGovWest1RegionID: "271483468897", endpoints.UsWest1RegionID: "667973535471", - names.USWest2RegionID: "153931337802", + endpoints.UsWest2RegionID: "153931337802", } // https://github.com/aws/sagemaker-python-sdk/blob/master/src/sagemaker/image_uri_config/sagemaker-base-python.json @@ -476,13 +476,13 @@ var prebuiltECRImageIDByRegion_SageMakerBasePython = map[string]string{ // nosem endpoints.UsGovEast1RegionID: "107072934176", endpoints.UsGovWest1RegionID: "107173498710", endpoints.UsWest1RegionID: "742091327244", - names.USWest2RegionID: "236514542706", + endpoints.UsWest2RegionID: "236514542706", } // https://github.com/aws/sagemaker-python-sdk/blob/master/src/sagemaker/image_uri_config/sagemaker-geospatial.json var prebuiltECRImageIDByRegion_SageMakerGeospatial = map[string]string{ // nosemgrep:ci.sagemaker-in-var-name - names.USWest2RegionID: "081189585635", + endpoints.UsWest2RegionID: "081189585635", } // https://github.com/aws/sagemaker-python-sdk/blob/master/src/sagemaker/image_uri_config/forecasting-deepar.json @@ -522,7 +522,7 @@ var prebuiltECRImageIDByRegion_deepAR = map[string]string{ endpoints.UsIsoEast1RegionID: "490574956308", endpoints.UsIsobEast1RegionID: "765400339828", endpoints.UsWest1RegionID: "632365934929", - names.USWest2RegionID: "156387875391", + endpoints.UsWest2RegionID: "156387875391", } // https://github.com/aws/sagemaker-python-sdk/blob/master/src/sagemaker/image_uri_config/factorization-machines.json @@ -567,7 +567,7 @@ var prebuiltECRImageIDByRegion_factorMachines = map[string]string{ endpoints.UsIsoEast1RegionID: "490574956308", endpoints.UsIsobEast1RegionID: "765400339828", endpoints.UsWest1RegionID: "632365934929", - names.USWest2RegionID: "174872318107", + endpoints.UsWest2RegionID: "174872318107", } // https://github.com/aws/sagemaker-python-sdk/blob/master/src/sagemaker/image_uri_config/lda.json @@ -588,7 +588,7 @@ var prebuiltECRImageIDByRegion_lda = map[string]string{ endpoints.UsIsoEast1RegionID: "490574956308", endpoints.UsIsobEast1RegionID: "765400339828", endpoints.UsWest1RegionID: "632365934929", - names.USWest2RegionID: "266724342769", + endpoints.UsWest2RegionID: "266724342769", } // https://github.com/aws/sagemaker-python-sdk/blob/master/src/sagemaker/image_uri_config/xgboost.json @@ -632,7 +632,7 @@ var prebuiltECRImageIDByRegion_XGBoost = map[string]string{ endpoints.UsIsoEast1RegionID: "833128469047", endpoints.UsIsobEast1RegionID: "281123927165", endpoints.UsWest1RegionID: "746614075791", - names.USWest2RegionID: "246618743249", + endpoints.UsWest2RegionID: "246618743249", } // https://github.com/aws/deep-learning-containers/blob/master/available_images.md @@ -680,7 +680,7 @@ var prebuiltECRImageIDByRegion_deepLearning = map[string]string{ endpoints.UsEast1RegionID: "763104351884", endpoints.UsEast2RegionID: "763104351884", endpoints.UsWest1RegionID: "763104351884", - names.USWest2RegionID: "763104351884", + endpoints.UsWest2RegionID: "763104351884", endpoints.UsGovEast1RegionID: "446045086412", endpoints.UsGovWest1RegionID: "442386744353", endpoints.UsIsoEast1RegionID: "886529160074", @@ -716,7 +716,7 @@ var prebuiltECRImageIDByRegion_modelMonitor = map[string]string{ endpoints.UsEast1RegionID: "156813124566", endpoints.UsEast2RegionID: "777275614652", endpoints.UsWest1RegionID: "890145073186", - names.USWest2RegionID: "159807026194", + endpoints.UsWest2RegionID: "159807026194", } // @SDKDataSource("aws_sagemaker_prebuilt_ecr_image", name="Prebuilt ECR Image") diff --git a/names/names.go b/names/names.go index 1f3c99907da..aadcbd7c6d8 100644 --- a/names/names.go +++ b/names/names.go @@ -146,10 +146,7 @@ const ( ) const ( - // AWS Standard partition's regions. GlobalRegionID = "aws-global" // AWS Standard global region. - - USWest2RegionID = "us-west-2" // US West (Oregon). ) // PartitionForRegion returns the partition for the given Region. From 878bb949c0f6b8c8c765f895df1875206ed55777 Mon Sep 17 00:00:00 2001 From: Kit Ewbank Date: Wed, 27 Nov 2024 16:21:24 -0500 Subject: [PATCH 304/304] Run 'make fmt'. --- .../apprunner/hosted_zone_id_data_source.go | 20 +++++++------- .../cloudtrail/service_account_data_source.go | 2 +- .../hosted_zone_data_source.go | 2 +- .../service/elb/hosted_zone_id_data_source.go | 2 +- .../elb/service_account_data_source.go | 2 +- .../elbv2/hosted_zone_id_data_source.go | 4 +-- .../redshift/service_account_data_source.go | 2 +- .../prebuilt_ecr_image_data_source.go | 26 +++++++++---------- .../service/servicecatalog/product_test.go | 2 +- internal/service/ssmcontacts/plan_test.go | 14 +++++----- 10 files changed, 38 insertions(+), 38 deletions(-) diff --git a/internal/service/apprunner/hosted_zone_id_data_source.go b/internal/service/apprunner/hosted_zone_id_data_source.go index 0b8a0db3078..8f7225f2534 100644 --- a/internal/service/apprunner/hosted_zone_id_data_source.go +++ b/internal/service/apprunner/hosted_zone_id_data_source.go @@ -18,17 +18,17 @@ import ( // See https://docs.aws.amazon.com/general/latest/gr/apprunner.html var hostedZoneIDPerRegionMap = map[string]string{ - endpoints.UsEast2RegionID: "Z0224347AD7KVHMLOX31", - endpoints.UsEast1RegionID: "Z01915732ZBZKC8D32TPT", - endpoints.UsWest2RegionID: "Z02243383FTQ64HJ5772Q", - endpoints.ApSouth1RegionID: "Z00855883LBHKTIC4ODF2", - endpoints.ApSoutheast1RegionID: "Z09819469CZ3KQ8PWMCL", - endpoints.ApSoutheast2RegionID: "Z03657752RA8799S0TI5I", + endpoints.UsEast2RegionID: "Z0224347AD7KVHMLOX31", + endpoints.UsEast1RegionID: "Z01915732ZBZKC8D32TPT", + endpoints.UsWest2RegionID: "Z02243383FTQ64HJ5772Q", + endpoints.ApSouth1RegionID: "Z00855883LBHKTIC4ODF2", + endpoints.ApSoutheast1RegionID: "Z09819469CZ3KQ8PWMCL", + endpoints.ApSoutheast2RegionID: "Z03657752RA8799S0TI5I", endpoints.ApNortheast1RegionID: "Z08491812XW6IPYLR6CCA", - endpoints.EuCentral1RegionID: "Z0334911C2FDI2Q9M4FZ", - endpoints.EuWest1RegionID: "Z087551914Z2PCAU0QHMW", - endpoints.EuWest2RegionID: "Z098228427VC6B3IX76ON", - endpoints.EuWest3RegionID: "Z087117439MBKHYM69QS6", + endpoints.EuCentral1RegionID: "Z0334911C2FDI2Q9M4FZ", + endpoints.EuWest1RegionID: "Z087551914Z2PCAU0QHMW", + endpoints.EuWest2RegionID: "Z098228427VC6B3IX76ON", + endpoints.EuWest3RegionID: "Z087117439MBKHYM69QS6", } // @FrameworkDataSource("aws_apprunner_hosted_zone_id", name="Hosted Zone ID") diff --git a/internal/service/cloudtrail/service_account_data_source.go b/internal/service/cloudtrail/service_account_data_source.go index 1e8fa988a1f..8b58ca7fea5 100644 --- a/internal/service/cloudtrail/service_account_data_source.go +++ b/internal/service/cloudtrail/service_account_data_source.go @@ -20,7 +20,7 @@ import ( // See https://docs.aws.amazon.com/govcloud-us/latest/ug-west/verifying-cloudtrail.html var serviceAccountPerRegionMap = map[string]string{ - endpoints.AfSouth1RegionID: "525921808201", + endpoints.AfSouth1RegionID: "525921808201", endpoints.ApEast1RegionID: "119688915426", endpoints.ApNortheast1RegionID: "216624486486", endpoints.ApNortheast2RegionID: "492519147666", diff --git a/internal/service/elasticbeanstalk/hosted_zone_data_source.go b/internal/service/elasticbeanstalk/hosted_zone_data_source.go index 7c0951a57e2..7f520757554 100644 --- a/internal/service/elasticbeanstalk/hosted_zone_data_source.go +++ b/internal/service/elasticbeanstalk/hosted_zone_data_source.go @@ -17,7 +17,7 @@ import ( // See https://docs.aws.amazon.com/general/latest/gr/elasticbeanstalk.html var hostedZoneIDs = map[string]string{ - endpoints.AfSouth1RegionID: "Z1EI3BVKMKK4AM", + endpoints.AfSouth1RegionID: "Z1EI3BVKMKK4AM", endpoints.ApSoutheast1RegionID: "Z16FZ9L249IFLT", endpoints.ApSoutheast2RegionID: "Z2PCDNR3VC2G1N", endpoints.ApSoutheast3RegionID: "Z05913172VM7EAZB40TA8", diff --git a/internal/service/elb/hosted_zone_id_data_source.go b/internal/service/elb/hosted_zone_id_data_source.go index fe5d1c01d5f..99c7499fc72 100644 --- a/internal/service/elb/hosted_zone_id_data_source.go +++ b/internal/service/elb/hosted_zone_id_data_source.go @@ -16,7 +16,7 @@ import ( // See https://docs.aws.amazon.com/general/latest/gr/elb.html#elb_region. var hostedZoneIDPerRegionMap = map[string]string{ - endpoints.AfSouth1RegionID: "Z268VQBMOI5EKX", + endpoints.AfSouth1RegionID: "Z268VQBMOI5EKX", endpoints.ApEast1RegionID: "Z3DQVH9N71FHZ0", endpoints.ApNortheast1RegionID: "Z14GRHDCWA56QT", endpoints.ApNortheast2RegionID: "ZWKZPGTI48KDX", diff --git a/internal/service/elb/service_account_data_source.go b/internal/service/elb/service_account_data_source.go index 1fc13eee845..dc4adae09e0 100644 --- a/internal/service/elb/service_account_data_source.go +++ b/internal/service/elb/service_account_data_source.go @@ -18,7 +18,7 @@ import ( // See http://docs.aws.amazon.com/elasticloadbalancing/latest/classic/enable-access-logs.html#attach-bucket-policy // See https://docs.aws.amazon.com/elasticloadbalancing/latest/application/load-balancer-access-logs.html#access-logging-bucket-permissions var accountIDPerRegionMap = map[string]string{ - endpoints.AfSouth1RegionID: "098369216593", + endpoints.AfSouth1RegionID: "098369216593", endpoints.ApEast1RegionID: "754344448648", endpoints.ApNortheast1RegionID: "582318560864", endpoints.ApNortheast2RegionID: "600734575887", diff --git a/internal/service/elbv2/hosted_zone_id_data_source.go b/internal/service/elbv2/hosted_zone_id_data_source.go index e0f024329fe..c928c6eacef 100644 --- a/internal/service/elbv2/hosted_zone_id_data_source.go +++ b/internal/service/elbv2/hosted_zone_id_data_source.go @@ -20,7 +20,7 @@ import ( // See https://docs.aws.amazon.com/general/latest/gr/elb.html#elb_region var hostedZoneIDPerRegionALBMap = map[string]string{ - endpoints.AfSouth1RegionID: "Z268VQBMOI5EKX", + endpoints.AfSouth1RegionID: "Z268VQBMOI5EKX", endpoints.ApEast1RegionID: "Z3DQVH9N71FHZ0", endpoints.ApNortheast1RegionID: "Z14GRHDCWA56QT", endpoints.ApNortheast2RegionID: "ZWKZPGTI48KDX", @@ -58,7 +58,7 @@ var hostedZoneIDPerRegionALBMap = map[string]string{ // See https://docs.aws.amazon.com/general/latest/gr/elb.html#elb_region var hostedZoneIDPerRegionNLBMap = map[string]string{ - endpoints.AfSouth1RegionID: "Z203XCE67M25HM", + endpoints.AfSouth1RegionID: "Z203XCE67M25HM", endpoints.ApEast1RegionID: "Z12Y7K3UBGUAD1", endpoints.ApNortheast1RegionID: "Z31USIVHYNEOWT", endpoints.ApNortheast2RegionID: "ZIBE1TIR4HY56", diff --git a/internal/service/redshift/service_account_data_source.go b/internal/service/redshift/service_account_data_source.go index 0d11bfce04c..525d0024c53 100644 --- a/internal/service/redshift/service_account_data_source.go +++ b/internal/service/redshift/service_account_data_source.go @@ -20,7 +20,7 @@ import ( // See https://docs.amazonaws.cn/en_us/redshift/latest/mgmt/db-auditing.html#db-auditing-bucket-permissions var ServiceAccountPerRegionMap = map[string]string{ - endpoints.AfSouth1RegionID: "365689465814", + endpoints.AfSouth1RegionID: "365689465814", endpoints.ApEast1RegionID: "313564881002", endpoints.ApNortheast1RegionID: "404641285394", endpoints.ApNortheast2RegionID: "760740231472", diff --git a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go index a05dbb04086..30610a317f3 100644 --- a/internal/service/sagemaker/prebuilt_ecr_image_data_source.go +++ b/internal/service/sagemaker/prebuilt_ecr_image_data_source.go @@ -189,7 +189,7 @@ const ( // https://github.com/aws/sagemaker-python-sdk/blob/master/src/sagemaker/image_uri_config/seq2seq.json var prebuiltECRImageIDByRegion_blazing = map[string]string{ - endpoints.AfSouth1RegionID: "455444449433", + endpoints.AfSouth1RegionID: "455444449433", endpoints.ApEast1RegionID: "286214385809", endpoints.ApNortheast1RegionID: "501404015308", endpoints.ApNortheast2RegionID: "306986355934", @@ -229,7 +229,7 @@ var prebuiltECRImageIDByRegion_blazing = map[string]string{ // https://github.com/aws/sagemaker-python-sdk/blob/master/src/sagemaker/image_uri_config/clarify.json var prebuiltECRImageIDByRegion_clarify = map[string]string{ - endpoints.AfSouth1RegionID: "811711786498", + endpoints.AfSouth1RegionID: "811711786498", endpoints.ApEast1RegionID: "098760798382", endpoints.ApNortheast1RegionID: "377024640650", endpoints.ApNortheast2RegionID: "263625296855", @@ -259,7 +259,7 @@ var prebuiltECRImageIDByRegion_clarify = map[string]string{ // https://github.com/aws/sagemaker-python-sdk/blob/master/src/sagemaker/image_uri_config/data-wrangler.json var prebuiltECRImageIDByRegion_dataWrangler = map[string]string{ - endpoints.AfSouth1RegionID: "143210264188", + endpoints.AfSouth1RegionID: "143210264188", endpoints.ApEast1RegionID: "707077482487", endpoints.ApNortheast1RegionID: "649008135260", endpoints.ApNortheast2RegionID: "131546521161", @@ -288,7 +288,7 @@ var prebuiltECRImageIDByRegion_dataWrangler = map[string]string{ // https://github.com/aws/sagemaker-python-sdk/blob/master/src/sagemaker/image_uri_config/debugger.json var prebuiltECRImageIDByRegion_debugger = map[string]string{ - endpoints.AfSouth1RegionID: "314341159256", + endpoints.AfSouth1RegionID: "314341159256", endpoints.ApEast1RegionID: "199566480951", endpoints.ApNortheast1RegionID: "430734990657", endpoints.ApNortheast2RegionID: "578805364391", @@ -323,7 +323,7 @@ var prebuiltECRImageIDByRegion_debugger = map[string]string{ // https://github.com/aws/sagemaker-python-sdk/blob/master/src/sagemaker/image_uri_config/xgboost-neo.json var prebuiltECRImageIDByRegion_inferentiaNeo = map[string]string{ - endpoints.AfSouth1RegionID: "774647643957", + endpoints.AfSouth1RegionID: "774647643957", endpoints.ApEast1RegionID: "110948597952", endpoints.ApNortheast1RegionID: "941853720454", endpoints.ApNortheast2RegionID: "151534178276", @@ -360,7 +360,7 @@ var prebuiltECRImageIDByRegion_inferentiaNeo = map[string]string{ // https://github.com/aws/sagemaker-python-sdk/blob/master/src/sagemaker/image_uri_config/tensorflow.json var prebuiltECRImageIDByRegion_SageMakerCustom = map[string]string{ // nosemgrep:ci.sagemaker-in-var-name - endpoints.AfSouth1RegionID: "313743910680", + endpoints.AfSouth1RegionID: "313743910680", endpoints.ApEast1RegionID: "057415533634", endpoints.ApNortheast1RegionID: "520713654638", endpoints.ApNortheast2RegionID: "520713654638", @@ -410,7 +410,7 @@ var prebuiltECRImageIDByRegion_SageMakerRL = map[string]string{ // nosemgrep:ci. // https://github.com/aws/sagemaker-python-sdk/blob/master/src/sagemaker/image_uri_config/spark.json var prebuiltECRImageIDByRegion_spark = map[string]string{ - endpoints.AfSouth1RegionID: "309385258863", + endpoints.AfSouth1RegionID: "309385258863", endpoints.ApEast1RegionID: "732049463269", endpoints.ApNortheast1RegionID: "411782140378", endpoints.ApNortheast2RegionID: "860869212795", @@ -448,7 +448,7 @@ var prebuiltECRImageIDByRegion_spark = map[string]string{ // https://github.com/aws/sagemaker-python-sdk/blob/master/src/sagemaker/image_uri_config/sagemaker-base-python.json var prebuiltECRImageIDByRegion_SageMakerBasePython = map[string]string{ // nosemgrep:ci.sagemaker-in-var-name - endpoints.AfSouth1RegionID: "559312083959", + endpoints.AfSouth1RegionID: "559312083959", endpoints.ApEast1RegionID: "493642496378", endpoints.ApNortheast1RegionID: "102112518831", endpoints.ApNortheast2RegionID: "806072073708", @@ -488,7 +488,7 @@ var prebuiltECRImageIDByRegion_SageMakerGeospatial = map[string]string{ // nosem // https://github.com/aws/sagemaker-python-sdk/blob/master/src/sagemaker/image_uri_config/forecasting-deepar.json var prebuiltECRImageIDByRegion_deepAR = map[string]string{ - endpoints.AfSouth1RegionID: "455444449433", + endpoints.AfSouth1RegionID: "455444449433", endpoints.ApEast1RegionID: "286214385809", endpoints.ApNortheast1RegionID: "633353088612", endpoints.ApNortheast2RegionID: "204372634319", @@ -533,7 +533,7 @@ var prebuiltECRImageIDByRegion_deepAR = map[string]string{ // https://github.com/aws/sagemaker-python-sdk/blob/master/src/sagemaker/image_uri_config/pca.json var prebuiltECRImageIDByRegion_factorMachines = map[string]string{ - endpoints.AfSouth1RegionID: "455444449433", + endpoints.AfSouth1RegionID: "455444449433", endpoints.ApEast1RegionID: "286214385809", endpoints.ApNortheast1RegionID: "351501993468", endpoints.ApNortheast2RegionID: "835164637446", @@ -598,7 +598,7 @@ var prebuiltECRImageIDByRegion_lda = map[string]string{ // https://github.com/aws/sagemaker-python-sdk/blob/master/src/sagemaker/image_uri_config/sklearn.json var prebuiltECRImageIDByRegion_XGBoost = map[string]string{ - endpoints.AfSouth1RegionID: "510948584623", + endpoints.AfSouth1RegionID: "510948584623", endpoints.ApEast1RegionID: "651117190479", endpoints.ApNortheast1RegionID: "354813040037", endpoints.ApNortheast2RegionID: "366743142698", @@ -650,7 +650,7 @@ var prebuiltECRImageIDByRegion_XGBoost = map[string]string{ // https://github.com/aws/sagemaker-python-sdk/blob/master/src/sagemaker/image_uri_config/huggingface-llm.json var prebuiltECRImageIDByRegion_deepLearning = map[string]string{ - endpoints.AfSouth1RegionID: "626614931356", + endpoints.AfSouth1RegionID: "626614931356", endpoints.ApEast1RegionID: "871362719292", endpoints.ApNortheast1RegionID: "763104351884", endpoints.ApNortheast2RegionID: "763104351884", @@ -690,7 +690,7 @@ var prebuiltECRImageIDByRegion_deepLearning = map[string]string{ // https://github.com/aws/sagemaker-python-sdk/blob/master/src/sagemaker/image_uri_config/model-monitor.json var prebuiltECRImageIDByRegion_modelMonitor = map[string]string{ - endpoints.AfSouth1RegionID: "875698925577", + endpoints.AfSouth1RegionID: "875698925577", endpoints.ApEast1RegionID: "001633400207", endpoints.ApNortheast1RegionID: "574779866223", endpoints.ApNortheast2RegionID: "709848358524", diff --git a/internal/service/servicecatalog/product_test.go b/internal/service/servicecatalog/product_test.go index f1031b75470..f513e1f6a6d 100644 --- a/internal/service/servicecatalog/product_test.go +++ b/internal/service/servicecatalog/product_test.go @@ -167,7 +167,7 @@ func TestAccServiceCatalogProduct_physicalID(t *testing.T) { resource.TestCheckResourceAttr(resourceName, "provisioning_artifact_parameters.0.description", "artefaktbeskrivning"), resource.TestCheckResourceAttr(resourceName, "provisioning_artifact_parameters.0.name", rName), resource.TestCheckResourceAttrSet(resourceName, "provisioning_artifact_parameters.0.template_physical_id"), - acctest.MatchResourceAttrRegionalARN(ctx, + acctest.MatchResourceAttrRegionalARN(ctx, resourceName, "provisioning_artifact_parameters.0.template_physical_id", "cloudformation", diff --git a/internal/service/ssmcontacts/plan_test.go b/internal/service/ssmcontacts/plan_test.go index 0c22af2586c..13ff41b9e55 100644 --- a/internal/service/ssmcontacts/plan_test.go +++ b/internal/service/ssmcontacts/plan_test.go @@ -49,7 +49,7 @@ func testAccPlan_basic(t *testing.T) { testAccCheckPlanExists(ctx, planResourceName), resource.TestCheckResourceAttr(planResourceName, "stage.#", "1"), resource.TestCheckResourceAttr(planResourceName, "stage.0.duration_in_minutes", "1"), - acctest.CheckResourceAttrRegionalARN(ctx, + acctest.CheckResourceAttrRegionalARN(ctx, planResourceName, "contact_id", "ssm-contacts", @@ -317,7 +317,7 @@ func testAccPlan_updateTargets(t *testing.T) { "stage.0.target.0.contact_target_info.0.is_essential", acctest.CtFalse, ), - acctest.CheckResourceAttrRegionalARN(ctx, + acctest.CheckResourceAttrRegionalARN(ctx, planResourceName, "stage.0.target.0.contact_target_info.0.contact_id", "ssm-contacts", @@ -341,7 +341,7 @@ func testAccPlan_updateTargets(t *testing.T) { "stage.0.target.0.contact_target_info.0.is_essential", acctest.CtFalse, ), - acctest.CheckResourceAttrRegionalARN(ctx, + acctest.CheckResourceAttrRegionalARN(ctx, planResourceName, "stage.0.target.0.contact_target_info.0.contact_id", "ssm-contacts", @@ -352,7 +352,7 @@ func testAccPlan_updateTargets(t *testing.T) { "stage.0.target.1.contact_target_info.0.is_essential", acctest.CtTrue, ), - acctest.CheckResourceAttrRegionalARN(ctx, + acctest.CheckResourceAttrRegionalARN(ctx, planResourceName, "stage.0.target.1.contact_target_info.0.contact_id", "ssm-contacts", @@ -376,7 +376,7 @@ func testAccPlan_updateTargets(t *testing.T) { "stage.0.target.0.contact_target_info.0.is_essential", acctest.CtFalse, ), - acctest.CheckResourceAttrRegionalARN(ctx, + acctest.CheckResourceAttrRegionalARN(ctx, planResourceName, "stage.0.target.0.contact_target_info.0.contact_id", "ssm-contacts", @@ -425,7 +425,7 @@ func testAccPlan_updateContactTargetInfo(t *testing.T) { "stage.0.target.0.contact_target_info.0.is_essential", acctest.CtFalse, ), - acctest.CheckResourceAttrRegionalARN(ctx, + acctest.CheckResourceAttrRegionalARN(ctx, planResourceName, "stage.0.target.0.contact_target_info.0.contact_id", "ssm-contacts", @@ -449,7 +449,7 @@ func testAccPlan_updateContactTargetInfo(t *testing.T) { "stage.0.target.0.contact_target_info.0.is_essential", acctest.CtTrue, ), - acctest.CheckResourceAttrRegionalARN(ctx, + acctest.CheckResourceAttrRegionalARN(ctx, planResourceName, "stage.0.target.0.contact_target_info.0.contact_id", "ssm-contacts",