add tests

rushmash91 · rushmash91 · commit 9dc270f7c168 · 2025-03-14T15:43:42.000-07:00
diff --git a/apis/v1alpha1/ack-generate-metadata.yaml b/apis/v1alpha1/ack-generate-metadata.yaml
@@ -1,13 +1,13 @@
 ack_generate_info:
-  build_date: "2025-03-12T23:25:20Z"
+  build_date: "2025-03-14T22:21:35Z"
   build_hash: 5645e51ed3c413f616e1b929f1527a5139c44198
   go_version: go1.24.0
   version: v0.43.2-3-g5645e51
 api_directory_checksum: 0d5b95bdbe63c6cfc495149b7a86440c4a5fb33a
 api_version: v1alpha1
 aws_sdk_go_version: v1.32.6
 generator_config_info:
-  file_checksum: 48323d41b9cb7ade08c8a87367846cccdd1f6409
+  file_checksum: 85db04e11e016a28a99058aab04767cf8345242e
   original_file_name: generator.yaml
 last_modification:
   reason: API generation
diff --git a/apis/v1alpha1/generator.yaml b/apis/v1alpha1/generator.yaml
@@ -80,6 +80,7 @@ resources:
           code: ResourceNotFoundException
       terminal_codes:
         - InvalidParameter
+        - ValidationException
     update_operation:
       custom_method_name: customUpdateTable
     hooks:
diff --git a/generator.yaml b/generator.yaml
@@ -80,6 +80,7 @@ resources:
           code: ResourceNotFoundException
       terminal_codes:
         - InvalidParameter
+        - ValidationException
     update_operation:
       custom_method_name: customUpdateTable
     hooks:
diff --git a/pkg/resource/table/hooks.go b/pkg/resource/table/hooks.go
@@ -78,7 +78,7 @@ var (
 	)
 	requeueWaitWhileUpdating = ackrequeue.NeededAfter(
 		ErrTableUpdating,
-		5*time.Second,
+		10*time.Second,
 	)
 	requeueWaitGSIReady = ackrequeue.NeededAfter(
 		ErrTableGSIsUpdating,
diff --git a/pkg/resource/table/hooks_replica_updates.go b/pkg/resource/table/hooks_replica_updates.go
@@ -7,8 +7,8 @@ import (
 	ackerr "github.com/aws-controllers-k8s/runtime/pkg/errors"
 	ackrtlog "github.com/aws-controllers-k8s/runtime/pkg/runtime/log"
 
-	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws-controllers-k8s/dynamodb-controller/apis/v1alpha1"
+	"github.com/aws/aws-sdk-go-v2/aws"
 	svcsdk "github.com/aws/aws-sdk-go-v2/service/dynamodb"
 	svcsdktypes "github.com/aws/aws-sdk-go-v2/service/dynamodb/types"
 )
diff --git a/pkg/resource/table/sdk.go b/pkg/resource/table/sdk.go
diff --git a/templates/hooks/table/sdk_create_post_set_output.go.tpl b/templates/hooks/table/sdk_create_post_set_output.go.tpl
@@ -5,7 +5,6 @@
 	}
 	// Check if replicas were specified during creation
 	if desired.ko.Spec.Replicas != nil && len(desired.ko.Spec.Replicas) > 0 {
-		// Copy the replica configuration to the new resource
 		ko.Spec.Replicas = desired.ko.Spec.Replicas
 		
 		// Return with a requeue to process replica updates
diff --git a/templates/hooks/table/sdk_delete_pre_build_request.go.tpl b/templates/hooks/table/sdk_delete_pre_build_request.go.tpl
@@ -7,19 +7,13 @@
 
 	// If there are replicas, we need to remove them before deleting the table
 	if r.ko.Spec.Replicas != nil && len(r.ko.Spec.Replicas) > 0 {
-		// Create a desired state with no replicas
 		desired := &resource{
 			ko: r.ko.DeepCopy(),
 		}
 		desired.ko.Spec.Replicas = nil
 
-		// Call syncReplicaUpdates to remove all replicas
 		err := rm.syncReplicaUpdates(ctx, r, desired)
 		if err != nil {
-			if err == requeueWaitWhileUpdating {
-				// This is expected - we need to wait for the replica removal to complete
-				return nil, err
-			}
 			return nil, err
 		}
 	}
diff --git a/templates/hooks/table/sdk_read_one_post_set_output.go.tpl b/templates/hooks/table/sdk_read_one_post_set_output.go.tpl
@@ -80,12 +80,6 @@
 			} else {
 				f12elem.ReplicaInaccessibleDateTime = nil
 			}
-			if f12iter.ReplicaTableClassSummary != nil && f12iter.ReplicaTableClassSummary.TableClass != "" {
-				f12elem.ReplicaTableClassSummary.TableClass = aws.String(string(f12iter.ReplicaTableClassSummary.TableClass))
-				f12elem.ReplicaTableClassSummary.LastUpdateDateTime = &metav1.Time{Time: *f12iter.ReplicaTableClassSummary.LastUpdateDateTime}
-			} else {
-				f12elem.ReplicaTableClassSummary.TableClass = aws.String("STANDARD")
-			}
 			f12 = append(f12, f12elem)
 		}
 		ko.Status.ReplicasDescriptions = f12
diff --git a/test/e2e/resources/table_with_replicas.yaml b/test/e2e/resources/table_with_replicas.yaml
@@ -0,0 +1,22 @@
+apiVersion: dynamodb.services.k8s.aws/v1alpha1
+kind: Table
+metadata:
+  name: $TABLE_NAME
+spec:
+  tableName: $TABLE_NAME
+  tableClass: STANDARD
+  attributeDefinitions:
+    - attributeName: PK
+      attributeType: S
+    - attributeName: SK
+      attributeType: S
+  keySchema:
+    - attributeName: PK
+      keyType: HASH
+    - attributeName: SK
+      keyType: RANGE
+  streamSpecification:
+    streamEnabled: true
+    streamViewType: "NEW_AND_OLD_IMAGES"
+  replicas:
+    - regionName: $REPLICA_REGION_1
diff --git a/test/e2e/resources/table_with_replicas_invalid.yaml b/test/e2e/resources/table_with_replicas_invalid.yaml
@@ -0,0 +1,19 @@
+apiVersion: dynamodb.services.k8s.aws/v1alpha1
+kind: Table
+metadata:
+  name: $TABLE_NAME
+spec:
+  tableName: $TABLE_NAME
+  tableClass: STANDARD
+  attributeDefinitions:
+    - attributeName: PK
+      attributeType: S
+    - attributeName: SK
+      attributeType: S
+  keySchema:
+    - attributeName: PK
+      keyType: HASH
+    - attributeName: SK
+      keyType: RANGE
+  replicas:
+    - regionName: $REPLICA_REGION_1
diff --git a/test/e2e/table.py b/test/e2e/table.py
@@ -260,3 +260,61 @@ def get_point_in_time_recovery_enabled(table_name):
         return resp['ContinuousBackupsDescription']['PointInTimeRecoveryDescription']['PointInTimeRecoveryStatus'] == 'ENABLED'
     except c.exceptions.ResourceNotFoundException:
         return None
+
+
+class ReplicaMatcher:
+    def __init__(self, expected_regions):
+        self.expected_regions = expected_regions
+
+    def __call__(self, record: dict) -> bool:
+        if 'Replicas' not in record:
+            return False
+
+        actual_regions = set()
+        for replica in record['Replicas']:
+            if 'RegionName' in replica:
+                actual_regions.add(replica['RegionName'])
+
+        return set(self.expected_regions) == actual_regions
+
+
+def replicas_match(expected_regions) -> TableMatchFunc:
+    return ReplicaMatcher(expected_regions)
+
+
+class ReplicaStatusMatcher:
+    def __init__(self, region, status):
+        self.region = region
+        self.status = status
+
+    def __call__(self, record: dict) -> bool:
+        if 'Replicas' not in record:
+            return False
+
+        for replica in record['Replicas']:
+            if 'RegionName' in replica and replica['RegionName'] == self.region:
+                return 'ReplicaStatus' in replica and replica['ReplicaStatus'] == self.status
+
+        return False
+
+
+def replica_status_matches(region, status) -> TableMatchFunc:
+    return ReplicaStatusMatcher(region, status)
+
+
+def get_replicas(table_name):
+    """Returns the replicas for a DynamoDB table
+
+    Args:
+        table_name: the name of the DynamoDB table to get replicas for
+    Returns:
+        A list of replicas or None if the table doesn't exist
+    """
+    dynamodb = boto3.client('dynamodb')
+    try:
+        response = dynamodb.describe_table(TableName=table_name)
+        if 'Table' in response and 'Replicas' in response['Table']:
+            return response['Table']['Replicas']
+        return []
+    except dynamodb.exceptions.ResourceNotFoundException:
+        return None
diff --git a/test/e2e/tests/test_table_replicas.py b/test/e2e/tests/test_table_replicas.py

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ var (`
`78`	`78`	`)`
`79`	`79`	`requeueWaitWhileUpdating = ackrequeue.NeededAfter(`
`80`	`80`	`ErrTableUpdating,`
`81`		`- 5*time.Second,`
	`81`	`+ 10*time.Second,`
`82`	`82`	`)`
`83`	`83`	`requeueWaitGSIReady = ackrequeue.NeededAfter(`
`84`	`84`	`ErrTableGSIsUpdating,`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ import (`
`7`	`7`	`ackerr "github.com/aws-controllers-k8s/runtime/pkg/errors"`
`8`	`8`	`ackrtlog "github.com/aws-controllers-k8s/runtime/pkg/runtime/log"`
`9`	`9`
`10`		`- "github.com/aws/aws-sdk-go-v2/aws"`
`11`	`10`	`"github.com/aws-controllers-k8s/dynamodb-controller/apis/v1alpha1"`
	`11`	`+ "github.com/aws/aws-sdk-go-v2/aws"`
`12`	`12`	`svcsdk "github.com/aws/aws-sdk-go-v2/service/dynamodb"`
`13`	`13`	`svcsdktypes "github.com/aws/aws-sdk-go-v2/service/dynamodb/types"`
`14`	`14`	`)`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`	`}`
`6`	`6`	`// Check if replicas were specified during creation`
`7`	`7`	`if desired.ko.Spec.Replicas != nil && len(desired.ko.Spec.Replicas) > 0 {`
`8`		`- // Copy the replica configuration to the new resource`
`9`	`8`	`ko.Spec.Replicas = desired.ko.Spec.Replicas`
`10`	`9`
`11`	`10`	`// Return with a requeue to process replica updates`
Original file line number	Diff line number	Diff line change
`@@ -7,19 +7,13 @@`
`7`	`7`
`8`	`8`	`// If there are replicas, we need to remove them before deleting the table`
`9`	`9`	`if r.ko.Spec.Replicas != nil && len(r.ko.Spec.Replicas) > 0 {`
`10`		`- // Create a desired state with no replicas`
`11`	`10`	`desired := &resource{`
`12`	`11`	`ko: r.ko.DeepCopy(),`
`13`	`12`	`}`
`14`	`13`	`desired.ko.Spec.Replicas = nil`
`15`	`14`
`16`		`- // Call syncReplicaUpdates to remove all replicas`
`17`	`15`	`err := rm.syncReplicaUpdates(ctx, r, desired)`
`18`	`16`	`if err != nil {`
`19`		`- if err == requeueWaitWhileUpdating {`
`20`		`- // This is expected - we need to wait for the replica removal to complete`
`21`		`- return nil, err`
`22`		`- }`
`23`	`17`	`return nil, err`
`24`	`18`	`}`
`25`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,12 +80,6 @@`
`80`	`80`	`} else {`
`81`	`81`	`f12elem.ReplicaInaccessibleDateTime = nil`
`82`	`82`	`}`
`83`		`- if f12iter.ReplicaTableClassSummary != nil && f12iter.ReplicaTableClassSummary.TableClass != "" {`
`84`		`- f12elem.ReplicaTableClassSummary.TableClass = aws.String(string(f12iter.ReplicaTableClassSummary.TableClass))`
`85`		`- f12elem.ReplicaTableClassSummary.LastUpdateDateTime = &metav1.Time{Time: *f12iter.ReplicaTableClassSummary.LastUpdateDateTime}`
`86`		`- } else {`
`87`		`- f12elem.ReplicaTableClassSummary.TableClass = aws.String("STANDARD")`
`88`		`- }`
`89`	`83`	`f12 = append(f12, f12elem)`
`90`	`84`	`}`
`91`	`85`	`ko.Status.ReplicasDescriptions = f12`