Merge pull request #43236 from shawnaws/f/ddb-mrsc

feat: Add support for DynamoDB Multi-Region Strong Consistency

Author: ewbankkit

.changelog/43236.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+resource/aws_dynamodb_table: Add `replica.consistency_mode` argument in support of [multi-Region strong consistency](https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/V2globaltables_HowItWorks.html#V2globaltables_HowItWorks.choosing-consistency-mode) for Amazon DynamoDB global tables
+```

internal/acctest/acctest.go

@@ -97,6 +97,9 @@ const (
 	// Provider name for third configuration testing
 	ProviderNameThird = "awsthird"
 
+	// Provider name for fourth configuration testing
+	ProviderNameFourth = "awsfourth"
+
 	ResourcePrefix = "tf-acc-test"
 
 	CertificateIssueTimeout = 5 * time.Minute
@@ -284,6 +287,8 @@ func ProtoV5FactoriesMultipleRegions(ctx context.Context, t *testing.T, n int) m
 		return protoV5ProviderFactoriesInit(ctx, ProviderName, ProviderNameAlternate)
 	case 3:
 		return protoV5ProviderFactoriesInit(ctx, ProviderName, ProviderNameAlternate, ProviderNameThird)
+	case 4:
+		return protoV5ProviderFactoriesInit(ctx, ProviderName, ProviderNameAlternate, ProviderNameThird, ProviderNameFourth)
 	default:
 		t.Fatalf("invalid number of Region configurations: %d", n)
 	}
@@ -917,6 +922,10 @@ func ThirdRegion() string {
 	return envvar.GetWithDefault(envvar.ThirdRegion, endpoints.UsEast2RegionID)
 }
 
+func FourthRegion() string {
+	return envvar.GetWithDefault(envvar.FourthRegion, endpoints.UsWest1RegionID)
+}
+
 func Partition() string {
 	return names.PartitionForRegion(Region()).ID()
 }
@@ -941,6 +950,10 @@ func thirdRegionPartition() string {
 	return names.PartitionForRegion(ThirdRegion()).ID()
 }
 
+func fourthRegionPartition() string {
+	return names.PartitionForRegion(FourthRegion()).ID()
+}
+
 func PreCheckAlternateAccount(t *testing.T) {
 	t.Helper()
 
@@ -961,6 +974,17 @@ func PreCheckThirdAccount(t *testing.T) {
 	}
 }
 
+// add fourth region
+func PreCheckFourthAccount(t *testing.T) {
+	t.Helper()
+
+	envvar.SkipIfAllEmpty(t, []string{envvar.FourthProfile, envvar.FourthAccessKeyId}, "credentials for running acceptance testing in fourth AWS account")
+
+	if os.Getenv(envvar.FourthAccessKeyId) != "" {
+		envvar.SkipIfEmpty(t, envvar.FourthSecretAccessKey, "static credentials value when using "+envvar.FourthAccessKeyId)
+	}
+}
+
 func PreCheckPartitionHasService(t *testing.T, serviceID string) {
 	t.Helper()
 
@@ -1002,6 +1026,28 @@ func PreCheckMultipleRegion(t *testing.T, regions int) {
 		if Partition() != thirdRegionPartition() {
 			t.Fatalf("%s partition (%s) does not match %s partition (%s)", envvar.ThirdRegion, thirdRegionPartition(), envvar.DefaultRegion, Partition())
 		}
+
+		if regions == 4 {
+			if fourthRegionPartition() == endpoints.AwsUsGovPartitionID || Partition() == endpoints.AwsUsGovPartitionID {
+				t.Skipf("wanted %d regions, partition (%s) only has 2 regions", regions, Partition())
+			}
+
+			if Region() == FourthRegion() {
+				t.Fatalf("%s and %s must be set to different values for acceptance tests", envvar.DefaultRegion, envvar.FourthRegion)
+			}
+
+			if AlternateRegion() == FourthRegion() {
+				t.Fatalf("%s and %s must be set to different values for acceptance tests", envvar.AlternateRegion, envvar.FourthRegion)
+			}
+
+			if ThirdRegion() == FourthRegion() {
+				t.Fatalf("%s and %s must be set to different values for acceptance tests", envvar.ThirdRegion, envvar.FourthRegion)
+			}
+
+			if Partition() != fourthRegionPartition() {
+				t.Fatalf("%s partition (%s) does not match %s partition (%s)", envvar.FourthRegion, fourthRegionPartition(), envvar.DefaultRegion, Partition())
+			}
+		}
 	}
 
 	if partition, ok := endpoints.PartitionForRegion(endpoints.DefaultPartitions(), Region()); ok {
@@ -1047,6 +1093,15 @@ func PreCheckThirdRegion(t *testing.T, regions ...string) {
 	}
 }
 
+// PreCheckFourthRegion checks that the fourth test region is one of the specified AWS Regions.
+func PreCheckFourthRegion(t *testing.T, regions ...string) {
+	t.Helper()
+
+	if curr := FourthRegion(); !slices.Contains(regions, curr) {
+		t.Skipf("skipping tests; %s (%s) not supported. Supported: [%s]", envvar.FourthRegion, curr, strings.Join(regions, ", "))
+	}
+}
+
 // PreCheckPartition checks that the test partition is the specified partition.
 func PreCheckPartition(t *testing.T, partition string) {
 	t.Helper()

internal/acctest/configs.go

@@ -67,6 +67,16 @@ func ConfigMultipleAccountProvider(t *testing.T, accounts int) string {
 			),
 		)
 	}
+	if accounts == 4 {
+		config.WriteString(
+			ConfigNamedAccountProvider(
+				ProviderNameFourth,
+				os.Getenv(envvar.FourthAccessKeyId),
+				os.Getenv(envvar.FourthProfile),
+				os.Getenv(envvar.FourthSecretAccessKey),
+			),
+		)
+	}
 
 	return config.String()
 }
@@ -95,10 +105,14 @@ func ConfigMultipleRegionProvider(regions int) string {
 
 	config.WriteString(ConfigNamedRegionalProvider(ProviderNameAlternate, AlternateRegion()))
 
-	if regions >= 3 {
+	if regions == 3 {
 		config.WriteString(ConfigNamedRegionalProvider(ProviderNameThird, ThirdRegion()))
 	}
 
+	if regions == 4 {
+		config.WriteString(ConfigNamedRegionalProvider(ProviderNameFourth, FourthRegion()))
+	}
+
 	return config.String()
 }
 

internal/acctest/knownvalue/regional_arn_exact.go

@@ -79,3 +79,14 @@ func RegionalARNThirdRegionExact(service, resource string) knownvalue.Check {
 		resource: resource,
 	}
 }
+
+// RegionalARNExact is a known value check that ensures the value is a string
+// that matches the expected ARN for the given service and resource.
+func RegionalARNFourthExact(service, resource string) knownvalue.Check {
+	return regionalARNExact{
+		check:    "RegionalARNFourthRegionExact",
+		region:   acctest.FourthRegion(),
+		service:  service,
+		resource: resource,
+	}
+}

internal/acctest/knownvalue/regional_arn_regexp.go

@@ -86,6 +86,16 @@ func RegionalARNThirdRegionRegexp(service string, resource *regexp.Regexp) known
 	}
 }
 
+// RegionalARNFourthRegionRegexp
+func RegionalARNFourthRegionRegexp(service string, resource *regexp.Regexp) knownvalue.Check {
+	return regionalARNRegexp{
+		check:          "RegionalARNFourthRegionRegexp",
+		region:         acctest.FourthRegion(),
+		service:        service,
+		resourceRegexp: resource,
+	}
+}
+
 func RegionalARNRegexpRegion(service, region string, resource *regexp.Regexp) knownvalue.Check {
 	return regionalARNRegexp{
 		check:          "RegionalARNRegexp",

internal/envvar/envvar.go

@@ -60,6 +60,18 @@ const (
 	// For tests using a third AWS account, the equivalent of AWS_SECRET_ACCESS_KEY for that account
 	ThirdSecretAccessKey = "AWS_THIRD_SECRET_ACCESS_KEY"
 
+	// For tests using a fourth AWS account, the equivalent of AWS_ACCESS_KEY_ID for that account
+	FourthAccessKeyId = "AWS_FOURTH_ACCESS_KEY_ID"
+
+	// For tests using a fourth AWS account, the equivalent of AWS_PROFILE for that account
+	FourthProfile = "AWS_FOURTH_PROFILE"
+
+	// For tests using a fourth AWS region, the equivalent of AWS_DEFAULT_REGION for that region
+	FourthRegion = "AWS_FOURTH_REGION"
+
+	// For tests using a fourth AWS account, the equivalent of AWS_SECRET_ACCESS_KEY for that account
+	FourthSecretAccessKey = "AWS_FOURTH_SECRET_ACCESS_KEY"
+
 	// For tests requiring GitHub permissions
 	GithubToken = "GITHUB_TOKEN"