add tests

Author: rushmash91

apis/v1alpha1/ack-generate-metadata.yaml

@@ -1,13 +1,13 @@
 ack_generate_info:
-  build_date: "2025-03-12T23:25:20Z"
-  build_hash: 5645e51ed3c413f616e1b929f1527a5139c44198
+  build_date: "2025-03-21T05:42:15Z"
+  build_hash: 3722729cebe6d3c03c7e442655ef0846f91566a2
   go_version: go1.24.0
-  version: v0.43.2-3-g5645e51
-api_directory_checksum: 0d5b95bdbe63c6cfc495149b7a86440c4a5fb33a
+  version: v0.43.2-7-g3722729
+api_directory_checksum: a3ce13b1988591541d32ac56e55b416ff3b6bfc2
 api_version: v1alpha1
 aws_sdk_go_version: v1.32.6
 generator_config_info:
-  file_checksum: 48323d41b9cb7ade08c8a87367846cccdd1f6409
+  file_checksum: c8721c6d81ac66a3ea6c2b96b784c3da48b798b5
   original_file_name: generator.yaml
 last_modification:
   reason: API generation

apis/v1alpha1/generator.yaml

@@ -25,15 +25,11 @@ operations:
 resources:
   Table:
     fields:
-      Replicas:
+      ReplicationGroup:
         custom_field:
           list_of: CreateReplicationGroupMemberAction
         compare:
           is_ignored: true 
-      ReplicasDescriptions:
-        custom_field:
-          list_of: ReplicaDescription
-        is_read_only: true
       GlobalSecondaryIndexesDescriptions:
         custom_field:
           list_of: GlobalSecondaryIndexDescription
@@ -73,13 +69,14 @@ resources:
         references:
           service_name: kms
           resource: Key
-          path: Status.ACKResourceMetadata.ARN  
+          path: Status.ACKResourceMetadata.ARN
     exceptions:
       errors:
         404:
           code: ResourceNotFoundException
       terminal_codes:
         - InvalidParameter
+        - ValidationException
     update_operation:
       custom_method_name: customUpdateTable
     hooks:

apis/v1alpha1/table.go

@@ -322,7 +322,7 @@ spec:
                     format: int64
                     type: integer
                 type: object
-              replicas:
+              replicationGroup:
                 items:
                   description: Represents a replica to be created.
                   properties:
@@ -644,7 +644,8 @@ spec:
 
                      * StreamLabel
                 type: string
-              replicasDescriptions:
+              replicas:
+                description: Represents replicas of the table.
                 items:
                   description: Contains the details of the replica.
                   properties:

apis/v1alpha1/zz_generated.deepcopy.go

@@ -25,15 +25,11 @@ operations:
 resources:
   Table:
     fields:
-      Replicas:
+      ReplicationGroup:
         custom_field:
           list_of: CreateReplicationGroupMemberAction
         compare:
           is_ignored: true 
-      ReplicasDescriptions:
-        custom_field:
-          list_of: ReplicaDescription
-        is_read_only: true
       GlobalSecondaryIndexesDescriptions:
         custom_field:
           list_of: GlobalSecondaryIndexDescription
@@ -73,13 +69,14 @@ resources:
         references:
           service_name: kms
           resource: Key
-          path: Status.ACKResourceMetadata.ARN  
+          path: Status.ACKResourceMetadata.ARN
     exceptions:
       errors:
         404:
           code: ResourceNotFoundException
       terminal_codes:
         - InvalidParameter
+        - ValidationException
     update_operation:
       custom_method_name: customUpdateTable
     hooks:

config/crd/bases/dynamodb.services.k8s.aws_tables.yaml

@@ -326,7 +326,7 @@ spec:
                     format: int64
                     type: integer
                 type: object
-              replicas:
+              replicationGroup:
                 items:
                   description: Represents a replica to be created.
                   properties:
@@ -648,7 +648,8 @@ spec:
 
                      * StreamLabel
                 type: string
-              replicasDescriptions:
+              replicas:
+                description: Represents replicas of the table.
                 items:
                   description: Contains the details of the replica.
                   properties:

generator.yaml

@@ -15,6 +15,7 @@ package table
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"strings"
 	"time"
@@ -49,9 +50,9 @@ var (
 		"table GSIs in '%v' state, cannot be modified or deleted",
 		svcsdktypes.IndexStatusCreating,
 	)
-	ErrReplicaNotActive = fmt.Errorf(
-		"table replica in NOT '%v' state, cannot be modified or deleted",
-		svcsdktypes.ReplicaStatusActive,
+	ErrTableReplicasUpdating = fmt.Errorf(
+		"table replica in '%v' state, cannot be modified or deleted",
+		svcsdktypes.ReplicaStatusUpdating,
 	)
 )
 
@@ -78,14 +79,14 @@ var (
 	)
 	requeueWaitWhileUpdating = ackrequeue.NeededAfter(
 		ErrTableUpdating,
-		5*time.Second,
+		10*time.Second,
 	)
 	requeueWaitGSIReady = ackrequeue.NeededAfter(
 		ErrTableGSIsUpdating,
 		10*time.Second,
 	)
-	requeueWaitForReplicasActive = ackrequeue.NeededAfter(
-		ErrReplicaNotActive,
+	requeueWaitReplicasActive = ackrequeue.NeededAfter(
+		ErrTableReplicasUpdating,
 		10*time.Second,
 	)
 )
@@ -232,7 +233,16 @@ func (rm *resourceManager) customUpdateTable(
 				}
 				return nil, err
 			}
-		case delta.DifferentAt("Spec.Replicas"):
+		case delta.DifferentAt("Spec.ReplicationGroup"):
+			if !hasStreamSpecificationWithNewAndOldImages(desired) {
+				msg := "table must have DynamoDB Streams enabled with StreamViewType set to NEW_AND_OLD_IMAGES for replica updates"
+				rlog.Debug(msg)
+				return nil, ackerr.NewTerminalError(errors.New(msg))
+			}
+
+			if !canUpdateTableReplicas(latest) {
+				return nil, requeueWaitReplicasActive
+			}
 			if err := rm.syncReplicaUpdates(ctx, latest, desired); err != nil {
 				return nil, err
 			}
@@ -274,10 +284,6 @@ func (rm *resourceManager) newUpdateTablePayload(
 	input := &svcsdk.UpdateTableInput{
 		TableName: aws.String(*r.ko.Spec.TableName),
 	}
-	// If delta is nil, we're just creating a basic payload for other operations to modify
-	if delta == nil {
-		return input, nil
-	}
 
 	if delta.DifferentAt("Spec.BillingMode") {
 		if r.ko.Spec.BillingMode != nil {
@@ -574,12 +580,12 @@ func customPreCompare(
 		}
 	}
 
-	// Handle ReplicaUpdates comparison
-	if len(a.ko.Spec.Replicas) != len(b.ko.Spec.Replicas) {
-		delta.Add("Spec.Replicas", a.ko.Spec.Replicas, b.ko.Spec.Replicas)
-	} else if a.ko.Spec.Replicas != nil && b.ko.Spec.Replicas != nil {
-		if !equalReplicaArrays(a.ko.Spec.Replicas, b.ko.Spec.Replicas) {
-			delta.Add("Spec.Replicas", a.ko.Spec.Replicas, b.ko.Spec.Replicas)
+	// Handle ReplicaUpdates API comparison
+	if len(a.ko.Spec.ReplicationGroup) != len(b.ko.Spec.ReplicationGroup) {
+		delta.Add("Spec.ReplicationGroup", a.ko.Spec.ReplicationGroup, b.ko.Spec.ReplicationGroup)
+	} else if a.ko.Spec.ReplicationGroup != nil && b.ko.Spec.ReplicationGroup != nil {
+		if !equalReplicaArrays(a.ko.Spec.ReplicationGroup, b.ko.Spec.ReplicationGroup) {
+			delta.Add("Spec.ReplicationGroup", a.ko.Spec.ReplicationGroup, b.ko.Spec.ReplicationGroup)
 		}
 	}
 

helm/crds/dynamodb.services.k8s.aws_tables.yaml

@@ -1,16 +1,27 @@
+// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License"). You may
+// not use this file except in compliance with the License. A copy of the
+// License is located at
+//
+//     http://aws.amazon.com/apache2.0/
+//
+// or in the "license" file accompanying this file. This file is distributed
+// on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+// express or implied. See the License for the specific language governing
+// permissions and limitations under the License.
+
 package table
 
 import (
 	"context"
-	"errors"
 
-	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"
 	svcsdk "github.com/aws/aws-sdk-go-v2/service/dynamodb"
 	svcsdktypes "github.com/aws/aws-sdk-go-v2/service/dynamodb/types"
+
+	"github.com/aws-controllers-k8s/dynamodb-controller/apis/v1alpha1"
 )
 
 // equalCreateReplicationGroupMemberActions compares two CreateReplicationGroupMemberAction objects
@@ -238,17 +249,11 @@ func deleteReplicaUpdate(regionName string) svcsdktypes.ReplicationGroupUpdate {
 // canUpdateTableReplicas returns true if it's possible to update table replicas.
 // We can only modify replicas when they are in ACTIVE state.
 func canUpdateTableReplicas(r *resource) bool {
-	if isTableCreating(r) || isTableDeleting(r) || isTableUpdating(r) {
-		return false
-	}
-
 	// Check if any replica is not in ACTIVE state
-	if r.ko.Status.ReplicasDescriptions != nil {
-		for _, replicaDesc := range r.ko.Status.ReplicasDescriptions {
-			if replicaDesc.RegionName != nil && replicaDesc.ReplicaStatus != nil {
-				if *replicaDesc.ReplicaStatus != string(svcsdktypes.ReplicaStatusActive) {
-					return false
-				}
+	for _, replicaDesc := range r.ko.Status.Replicas {
+		if replicaDesc.RegionName != nil && replicaDesc.ReplicaStatus != nil {
+			if *replicaDesc.ReplicaStatus != string(svcsdktypes.ReplicaStatusActive) {
+				return false
 			}
 		}
 	}
@@ -275,32 +280,15 @@ func (rm *resourceManager) syncReplicaUpdates(
 ) (err error) {
 	rlog := ackrtlog.FromContext(ctx)
 	exit := rlog.Trace("rm.syncReplicaUpdates")
-	defer exit(err)
-
-	if !hasStreamSpecificationWithNewAndOldImages(desired) {
-		msg := "table must have DynamoDB Streams enabled with StreamViewType set to NEW_AND_OLD_IMAGES for replica updates"
-		rlog.Debug(msg)
-		return ackerr.NewTerminalError(errors.New(msg))
-	}
-
-	if !canUpdateTableReplicas(latest) {
-		return requeueWaitForReplicasActive
-	}
-
-	if isTableUpdating(latest) {
-		return requeueWaitWhileUpdating
-	}
+	defer func() {
+		exit(err)
+	}()
 
 	input, replicasInQueue, err := rm.newUpdateTableReplicaUpdatesOneAtATimePayload(ctx, latest, desired)
 	if err != nil {
 		return err
 	}
 
-	// If there are no updates to make, we don't need to requeue
-	if len(input.ReplicaUpdates) == 0 {
-		return nil
-	}
-
 	// Call the UpdateTable API
 	_, err = rm.sdkapi.UpdateTable(ctx, input)
 	rm.metrics.RecordAPICall("UPDATE", "UpdateTable", err)
@@ -328,7 +316,9 @@ func (rm *resourceManager) newUpdateTableReplicaUpdatesOneAtATimePayload(
 ) (input *svcsdk.UpdateTableInput, replicasInQueue int, err error) {
 	rlog := ackrtlog.FromContext(ctx)
 	exit := rlog.Trace("rm.newUpdateTableReplicaUpdatesOneAtATimePayload")
-	defer exit(err)
+	defer func() {
+		exit(err)
+	}()
 
 	createReplicas, updateReplicas, deleteRegions := calculateReplicaUpdates(latest, desired)
 
@@ -378,17 +368,17 @@ func calculateReplicaUpdates(
 	deleteRegions []string,
 ) {
 	existingRegions := make(map[string]*v1alpha1.CreateReplicationGroupMemberAction)
-	if latest != nil && latest.ko.Spec.Replicas != nil {
-		for _, replica := range latest.ko.Spec.Replicas {
+	if latest != nil && latest.ko.Spec.ReplicationGroup != nil {
+		for _, replica := range latest.ko.Spec.ReplicationGroup {
 			if replica.RegionName != nil {
 				existingRegions[*replica.RegionName] = replica
 			}
 		}
 	}
 
 	desiredRegions := make(map[string]*v1alpha1.CreateReplicationGroupMemberAction)
-	if desired != nil && desired.ko.Spec.Replicas != nil {
-		for _, replica := range desired.ko.Spec.Replicas {
+	if desired != nil && desired.ko.Spec.ReplicationGroup != nil {
+		for _, replica := range desired.ko.Spec.ReplicationGroup {
 			if replica.RegionName != nil {
 				desiredRegions[*replica.RegionName] = replica
 			}