Merge branch 'main' into elasticache-add-GlobalReplicationGroup

rushmash91 · rushmash91 · commit 62ef12f7509e · 2025-08-28T13:19:19.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-08-27T23:22:35Z"
+  build_date: "2025-08-28T20:15:06Z"
   build_hash: 1045a5e99038b11b0630ca2f2f69c3bae4bedba6
   go_version: go1.25.0
   version: v0.51.0-1-g1045a5e
-api_directory_checksum: 56b9a489a72e4cc8e1d7fe3648fbfa515ab180d6
+api_directory_checksum: 3b35ee547ceda4c06e5b17cc1597356f8351cecc
 api_version: v1alpha1
 aws_sdk_go_version: v1.32.6
 generator_config_info:
-  file_checksum: 8fe61e100e579320fd6d57d443a30682011b3b8f
+  file_checksum: a42416dff5b89442587e532f853f2b3cf377b5b8
   original_file_name: generator.yaml
 last_modification:
   reason: API generation
diff --git a/apis/v1alpha1/generator.yaml b/apis/v1alpha1/generator.yaml
@@ -79,6 +79,8 @@ resources:
         template_path: hooks/cache_cluster/sdk_create_post_set_output.go.tpl
       sdk_delete_pre_build_request:
         template_path: hooks/cache_cluster/sdk_delete_pre_build_request.go.tpl
+      sdk_read_many_post_build_request:
+        template_path: hooks/cache_cluster/sdk_read_many_post_build_request.go.tpl
       sdk_read_many_post_set_output:
         template_path: hooks/cache_cluster/sdk_read_many_post_set_output.go.tpl
       sdk_update_pre_build_request:
@@ -145,8 +147,8 @@ resources:
         template_path: hooks/global_replication_group/sdk_create_post_set_output.go.tpl
       sdk_update_pre_build_request:
         template_path: hooks/global_replication_group/sdk_update_pre_build_request.go.tpl
-      sdk_read_one_post_set_output:
-        template_path: hooks/global_replication_group/sdk_read_one_post_set_output.go.tpl
+      sdk_read_many_post_set_output:
+        template_path: hooks/global_replication_group/sdk_read_many_post_set_output.go.tpl
   ReplicationGroup:
     exceptions:
       terminal_codes:
diff --git a/generator.yaml b/generator.yaml
@@ -79,6 +79,8 @@ resources:
         template_path: hooks/cache_cluster/sdk_create_post_set_output.go.tpl
       sdk_delete_pre_build_request:
         template_path: hooks/cache_cluster/sdk_delete_pre_build_request.go.tpl
+      sdk_read_many_post_build_request:
+        template_path: hooks/cache_cluster/sdk_read_many_post_build_request.go.tpl
       sdk_read_many_post_set_output:
         template_path: hooks/cache_cluster/sdk_read_many_post_set_output.go.tpl
       sdk_update_pre_build_request:
@@ -145,8 +147,8 @@ resources:
         template_path: hooks/global_replication_group/sdk_create_post_set_output.go.tpl
       sdk_update_pre_build_request:
         template_path: hooks/global_replication_group/sdk_update_pre_build_request.go.tpl
-      sdk_read_one_post_set_output:
-        template_path: hooks/global_replication_group/sdk_read_one_post_set_output.go.tpl
+      sdk_read_many_post_set_output:
+        template_path: hooks/global_replication_group/sdk_read_many_post_set_output.go.tpl
   ReplicationGroup:
     exceptions:
       terminal_codes:
diff --git a/go.mod b/go.mod
@@ -6,7 +6,7 @@ toolchain go1.24.1
 
 require (
 	github.com/aws-controllers-k8s/ec2-controller v1.0.7
-	github.com/aws-controllers-k8s/runtime v0.50.0
+	github.com/aws-controllers-k8s/runtime v0.51.0
 	github.com/aws-controllers-k8s/sns-controller v1.0.11
 	github.com/aws/aws-sdk-go v1.49.0
 	github.com/aws/aws-sdk-go-v2 v1.36.1
diff --git a/go.sum b/go.sum
@@ -1,7 +1,7 @@
 github.com/aws-controllers-k8s/ec2-controller v1.0.7 h1:7MDu2bq8NFKbgzzgHYPFRT7bf+SmTchgWuq8ixKK0Jc=
 github.com/aws-controllers-k8s/ec2-controller v1.0.7/go.mod h1:PvsQehgncHgcu9FiY13M45+GkVsKI98g7G83SrgH7vY=
-github.com/aws-controllers-k8s/runtime v0.50.0 h1:6BXOBdnb+xw6uSMEDeALhTKc4veZR9NfXIsl5QJKZ8k=
-github.com/aws-controllers-k8s/runtime v0.50.0/go.mod h1:OkUJN+Ds799JLYZsMJrO2vDJ4snxUeHK2MgrQHbU+Qc=
+github.com/aws-controllers-k8s/runtime v0.51.0 h1:ZKu1DXPG7+CsvbEPLMCGqWFdfK37kSbceLzYf9lRZbw=
+github.com/aws-controllers-k8s/runtime v0.51.0/go.mod h1:OkUJN+Ds799JLYZsMJrO2vDJ4snxUeHK2MgrQHbU+Qc=
 github.com/aws-controllers-k8s/sns-controller v1.0.11 h1:nnkywTHzO64y7RrrfoPNyYf1TOkkQHtlg+S0jEPKUZ8=
 github.com/aws-controllers-k8s/sns-controller v1.0.11/go.mod h1:ODQIDZR3hHQqcyif4UXVFQfEzTaWU1jqFtVr83K2p9M=
 github.com/aws/aws-sdk-go v1.49.0 h1:g9BkW1fo9GqKfwg2+zCD+TW/D36Ux+vtfJ8guF4AYmY=
diff --git a/pkg/resource/cache_cluster/hooks.go b/pkg/resource/cache_cluster/hooks.go
@@ -45,7 +45,6 @@ const (
 var (
 	condMsgCurrentlyDeleting      = "CacheCluster is currently being deleted"
 	condMsgNoDeleteWhileModifying = "Cannot delete CacheCluster while it is being modified"
-	condMsgCurrentlyUpdating      = "CacheCluster is currently being updated"
 )
 
 var (
diff --git a/pkg/resource/cache_cluster/sdk.go b/pkg/resource/cache_cluster/sdk.go
diff --git a/pkg/resource/global_replication_group/sdk.go b/pkg/resource/global_replication_group/sdk.go
diff --git a/pkg/resource/serverless_cache/sdk.go b/pkg/resource/serverless_cache/sdk.go
diff --git a/templates/hooks/cache_cluster/sdk_read_many_post_build_request.go.tpl b/templates/hooks/cache_cluster/sdk_read_many_post_build_request.go.tpl
@@ -0,0 +1,2 @@
+	// Include cache node info to get endpoint details for clusters
+	input.ShowCacheNodeInfo = aws.Bool(true)
diff --git a/templates/hooks/global_replication_group/sdk_read_many_post_set_output.go.tpl b/templates/hooks/global_replication_group/sdk_read_many_post_set_output.go.tpl
@@ -2,7 +2,8 @@
 if ko.Status.ACKResourceMetadata != nil && ko.Status.ACKResourceMetadata.ARN != nil {
     resourceARN := string(*ko.Status.ACKResourceMetadata.ARN)
     tags, err := rm.getTags(ctx, resourceARN)
-    if err == nil {
-        ko.Spec.Tags = tags
+    if err != nil {
+        return nil, err
     }
+    ko.Spec.Tags = tags
 }
diff --git a/templates/hooks/serverless_cache/sdk_read_many_post_set_output.go.tpl b/templates/hooks/serverless_cache/sdk_read_many_post_set_output.go.tpl
@@ -3,7 +3,8 @@ if ko.Status.ACKResourceMetadata != nil && ko.Status.ACKResourceMetadata.ARN !=
     // Retrieve the tags for the resource
     resourceARN := string(*ko.Status.ACKResourceMetadata.ARN)
     tags, err := rm.getTags(ctx, resourceARN)
-    if err == nil {
-        ko.Spec.Tags = tags
+    if err != nil {
+        return nil, err
     }
+    ko.Spec.Tags = tags
 }

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,6 @@ const (`
`45`	`45`	`var (`
`46`	`46`	`condMsgCurrentlyDeleting = "CacheCluster is currently being deleted"`
`47`	`47`	`condMsgNoDeleteWhileModifying = "Cannot delete CacheCluster while it is being modified"`
`48`		`- condMsgCurrentlyUpdating = "CacheCluster is currently being updated"`
`49`	`48`	`)`
`50`	`49`
`51`	`50`	`var (`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+ // Include cache node info to get endpoint details for clusters`
	`2`	`+ input.ShowCacheNodeInfo = aws.Bool(true)`