Use Terraform client's accountID setter.

upbound/terraform-provider-aws#282

Signed-off-by: Cem Mergenci <[email protected]>

go.mod

@@ -442,4 +442,4 @@ require (
 // copied from the Terraform provider
 replace github.com/hashicorp/terraform-plugin-log => github.com/gdavison/terraform-plugin-log v0.0.0-20230928191232-6c653d8ef8fb
 
-replace github.com/hashicorp/terraform-provider-aws => github.com/upbound/terraform-provider-aws v0.0.0-20250107115553-da6ec34dc6c7
+replace github.com/hashicorp/terraform-provider-aws => github.com/upbound/terraform-provider-aws v0.0.0-20250109090836-986571bdb591

go.sum

@@ -871,8 +871,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/tmccombs/hcl2json v0.3.3 h1:+DLNYqpWE0CsOQiEZu+OZm5ZBImake3wtITYxQ8uLFQ=
 github.com/tmccombs/hcl2json v0.3.3/go.mod h1:Y2chtz2x9bAeRTvSibVRVgbLJhLJXKlUeIvjeVdnm4w=
-github.com/upbound/terraform-provider-aws v0.0.0-20250107115553-da6ec34dc6c7 h1:W9sJWctgMitEje+Q2Ut1I41y92hkGUJSJqMQMmKFw2Y=
-github.com/upbound/terraform-provider-aws v0.0.0-20250107115553-da6ec34dc6c7/go.mod h1:B7SdSRSmPRFkPECx8/XlhVDovQuzdg34iQzuLUFqgs8=
+github.com/upbound/terraform-provider-aws v0.0.0-20250109090836-986571bdb591 h1:uvvMS8OmHsLXKOVHkDKkdbxdKEspEwejdenfe8Dwl64=
+github.com/upbound/terraform-provider-aws v0.0.0-20250109090836-986571bdb591/go.mod h1:B7SdSRSmPRFkPECx8/XlhVDovQuzdg34iQzuLUFqgs8=
 github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
 github.com/vmihailenco/msgpack v4.0.4+incompatible h1:dSLoQfGFAo3F6OoNhwUmLwVgaUXK79GlxNBwueZn0xI=
 github.com/vmihailenco/msgpack v4.0.4+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=

internal/clients/aws.go

@@ -228,7 +228,7 @@ func configureNoForkAWSClient(ctx context.Context, ps *terraform.Setup, config *
 	// the resulting TF AWS Client has empty account ID.
 	// Fill with previously calculated account ID.
 	// No need for nil check on ps.ClientMetadata per golang spec.
-	tfAwsConnsClient.AccountID = ps.ClientMetadata[keyAccountID]
+	tfAwsConnsClient.SetAccountID(ps.ClientMetadata[keyAccountID])
 	ps.Meta = tfAwsConnsClient
 	fwProvider := xpprovider.GetFrameworkProviderWithMeta(&metaOnlyPrimary{meta: tfAwsConnsClient})
 	ps.FrameworkProvider = fwProvider