code-gen 0.44.0 update

michaelhtm · michaelhtm · commit f1c8237501f7 · 2025-04-08T13:16:40.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-14T20:31:38Z"
-  build_hash: 0ab258c51775fd52af32e649da00d57373b20869
-  go_version: go1.24.0
-  version: v0.43.2-6-g0ab258c
+  build_date: "2025-04-08T20:12:02Z"
+  build_hash: 0909e7f0adb8ffe4120a8c20d5d58b991f2539e9
+  go_version: go1.24.1
+  version: v0.44.0-3-g0909e7f
 api_directory_checksum: ada51eb492c387f770228d8880ba5402e14417d2
 api_version: v1alpha1
 aws_sdk_go_version: v1.32.6
 generator_config_info:
-  file_checksum: 9257585e2b84c5cd7801c36cec539240d1f98bd0
+  file_checksum: af3c521029374b2be321d5da57871d5a182f4d0a
   original_file_name: generator.yaml
 last_modification:
   reason: API generation
diff --git a/apis/v1alpha1/generator.yaml b/apis/v1alpha1/generator.yaml
@@ -207,8 +207,7 @@ resources:
         is_secret: true
         compare:
           is_ignored: true
-        set:
-        - ignore: all
+
       Events:
         is_read_only: true
         from:
@@ -223,10 +222,6 @@ resources:
         code: "rm.setAnnotationsFields(desired, ko)"
       sdk_update_pre_build_request:
         template_path: hooks/user/sdk_update_pre_build_request.go.tpl
-      sdk_update_post_build_request:
-        template_path: hooks/user/sdk_update_post_build_request.go.tpl
-      sdk_create_post_build_request:
-        template_path: hooks/user/sdk_create_post_build_request.go.tpl
     renames:
       operations:
         CreateUser:
diff --git a/cmd/controller/main.go b/cmd/controller/main.go
diff --git a/generator.yaml b/generator.yaml
@@ -207,8 +207,7 @@ resources:
         is_secret: true
         compare:
           is_ignored: true
-        set:
-        - ignore: all
+
       Events:
         is_read_only: true
         from:
@@ -223,10 +222,6 @@ resources:
         code: "rm.setAnnotationsFields(desired, ko)"
       sdk_update_pre_build_request:
         template_path: hooks/user/sdk_update_pre_build_request.go.tpl
-      sdk_update_post_build_request:
-        template_path: hooks/user/sdk_update_post_build_request.go.tpl
-      sdk_create_post_build_request:
-        template_path: hooks/user/sdk_create_post_build_request.go.tpl
     renames:
       operations:
         CreateUser:
diff --git a/helm/templates/deployment.yaml b/helm/templates/deployment.yaml
@@ -57,6 +57,8 @@ spec:
         - "$(ACK_RESOURCE_TAGS)"
         - --watch-namespace
         - "$(ACK_WATCH_NAMESPACE)"
+        - --watch-selectors
+        - "$(ACK_WATCH_SELECTORS)"
         - --deletion-policy
         - "$(DELETION_POLICY)"
 {{- if .Values.leaderElection.enabled }}
@@ -103,6 +105,8 @@ spec:
           value: {{ .Values.aws.endpoint_url | quote }}
         - name: ACK_WATCH_NAMESPACE
           value: {{ include "ack-memorydb-controller.watch-namespace" . }}
+        - name: ACK_WATCH_SELECTORS
+          value: {{ .Values.watchSelectors }}
         - name: DELETION_POLICY
           value: {{ .Values.deletionPolicy }}
         - name: LEADER_ELECTION_NAMESPACE
diff --git a/helm/values.schema.json b/helm/values.schema.json
@@ -210,7 +210,10 @@
     },
     "watchNamespace": {
       "type": "string"
-    },    
+    },
+    "watchSelectors": {
+      "type": "string"
+    },
     "resourceTags": {
       "type": "array",
       "items": {
diff --git a/helm/values.yaml b/helm/values.yaml
@@ -110,6 +110,10 @@ installScope: cluster
 # You can set multiple namespaces by providing a comma separated list of namespaces. e.g "namespace1,namespace2"
 watchNamespace: ""
 
+# Set the value of labelsSelectors to be used by the controller to filter the resources to watch.
+# You can set multiple labelsSelectors by providing a comma separated list of a=b arguments. e.g "label1=value1,label2=value2" 
+watchSelectors: ""
+
 resourceTags:
   # Configures the ACK service controller to always set key/value pairs tags on
   # resources that it manages.
diff --git a/pkg/resource/acl/hooks.go b/pkg/resource/acl/hooks.go
@@ -15,6 +15,7 @@ package acl
 
 import (
 	"context"
+
 	"github.com/pkg/errors"
 
 	ackcompare "github.com/aws-controllers-k8s/runtime/pkg/compare"
diff --git a/pkg/resource/cluster/hooks.go b/pkg/resource/cluster/hooks.go
@@ -195,7 +195,7 @@ func (rm *resourceManager) newMemoryDBClusterUploadPayload(
 		res.SecurityGroupIds = aws.ToStringSlice(f8)
 	}
 	if delta.DifferentAt("Spec.SnapshotRetentionLimit") && desired.ko.Spec.SnapshotRetentionLimit != nil {
-		res.SnapshotRetentionLimit = svcutil.Int32OrNil(desired.ko.Spec.SnapshotRetentionLimit)
+		res.SnapshotRetentionLimit = svcutil.ConvertOrNil[int64, int32](desired.ko.Spec.SnapshotRetentionLimit)
 	}
 	if delta.DifferentAt("Spec.SnapshotWindow") && desired.ko.Spec.SnapshotWindow != nil {
 		res.SnapshotWindow = desired.ko.Spec.SnapshotWindow
@@ -260,7 +260,7 @@ func (rm *resourceManager) newMemoryDBClusterUploadPayload(
 	if !engineUpgradeOrScaling && !reSharding &&
 		delta.DifferentAt("Spec.NumReplicasPerShard") && desired.ko.Spec.NumReplicasPerShard != nil {
 		replicaConfig := &svcsdktypes.ReplicaConfigurationRequest{}
-		replicaConfig.ReplicaCount = *svcutil.Int32OrNil(desired.ko.Spec.NumReplicasPerShard)
+		replicaConfig.ReplicaCount = aws.ToInt32(svcutil.ConvertOrNil[int64, int32](desired.ko.Spec.NumReplicasPerShard))
 		res.ReplicaConfiguration = replicaConfig
 	}
 
diff --git a/pkg/resource/user/sdk.go b/pkg/resource/user/sdk.go
diff --git a/pkg/util/convert.go b/pkg/util/convert.go
@@ -1,17 +1,26 @@
+// 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 util
 
-func Int32OrNil(val *int64) *int32 {
-	if val == nil {
-		return nil
-	}
-	ret := int32(*val)
-	return &ret
+type Number interface {
+	int | int8 | int16 | int32 | int64
 }
 
-func Int64OrNil(val *int32) *int64 {
+func ConvertOrNil[T, U Number](val *T) *U {
 	if val == nil {
 		return nil
 	}
-	ret := int64(*val)
+	ret := U(*val)
 	return &ret
 }
diff --git a/templates/hooks/user/sdk_create_post_build_request.go.tpl b/templates/hooks/user/sdk_create_post_build_request.go.tpl
diff --git a/templates/hooks/user/sdk_update_post_build_request.go.tpl b/templates/hooks/user/sdk_update_post_build_request.go.tpl

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ func (rm *resourceManager) newMemoryDBClusterUploadPayload(`
`195`	`195`	`res.SecurityGroupIds = aws.ToStringSlice(f8)`
`196`	`196`	`}`
`197`	`197`	`if delta.DifferentAt("Spec.SnapshotRetentionLimit") && desired.ko.Spec.SnapshotRetentionLimit != nil {`
`198`		`- res.SnapshotRetentionLimit = svcutil.Int32OrNil(desired.ko.Spec.SnapshotRetentionLimit)`
	`198`	`+ res.SnapshotRetentionLimit = svcutil.ConvertOrNil[int64, int32](desired.ko.Spec.SnapshotRetentionLimit)`
`199`	`199`	`}`
`200`	`200`	`if delta.DifferentAt("Spec.SnapshotWindow") && desired.ko.Spec.SnapshotWindow != nil {`
`201`	`201`	`res.SnapshotWindow = desired.ko.Spec.SnapshotWindow`
`@@ -260,7 +260,7 @@ func (rm *resourceManager) newMemoryDBClusterUploadPayload(`
`260`	`260`	`if !engineUpgradeOrScaling && !reSharding &&`
`261`	`261`	`delta.DifferentAt("Spec.NumReplicasPerShard") && desired.ko.Spec.NumReplicasPerShard != nil {`
`262`	`262`	`replicaConfig := &svcsdktypes.ReplicaConfigurationRequest{}`
`263`		`- replicaConfig.ReplicaCount = *svcutil.Int32OrNil(desired.ko.Spec.NumReplicasPerShard)`
	`263`	`+ replicaConfig.ReplicaCount = aws.ToInt32(svcutil.ConvertOrNil[int64, int32](desired.ko.Spec.NumReplicasPerShard))`
`264`	`264`	`res.ReplicaConfiguration = replicaConfig`
`265`	`265`	`}`
`266`	`266`