refactor controller hooks

Author: rushmash91

Makefile

@@ -3,11 +3,6 @@ SHELL := /bin/bash # Use bash syntax
 # Set up variables
 GO111MODULE=on
 
-AWS_SDK_GO_VERSION="$(shell echo $(shell go list -m -f '{{.Version}}' github.com/aws/aws-sdk-go))"
-AWS_SDK_GO_VERSIONED_PATH="$(shell echo github.com/aws/aws-sdk-go@$(AWS_SDK_GO_VERSION))"
-ELASTICACHE_API_PATH="$(shell echo $(shell go env GOPATH))/pkg/mod/$(AWS_SDK_GO_VERSIONED_PATH)/service/elasticache/elasticacheiface"
-SERVICE_CONTROLLER_SRC_PATH="$(shell pwd)"
-
 # Build ldflags
 VERSION ?= "v0.0.0"
 GITCOMMIT=$(shell git rev-parse HEAD)
@@ -16,34 +11,22 @@ GO_LDFLAGS=-ldflags "-X main.version=$(VERSION) \
 			-X main.buildHash=$(GITCOMMIT) \
 			-X main.buildDate=$(BUILDDATE)"
 
-.PHONY: all test local-test clean-mocks mocks
+.PHONY: all test local-test
 
 all: test
 
-test: | mocks				## Run code tests
-	go test -v ./...
+local-run-controller: ## Run a controller image locally for SERVICE
+	@go run ./cmd/controller/main.go \
+		--aws-region=us-west-2 \
+		--enable-development-logging \
+		--log-level=debug
 
-test-cover: | mocks				## Run code tests with resources coverage
-	go test -coverpkg=./pkg/resource/... -covermode=count -coverprofile=coverage.out ./...
-	go tool cover -func=coverage.out
+test: 				## Run code tests
+	go test -v ./...
 
-local-test: | mocks		## Run code tests using go.local.mod file
+local-test: 		## Run code tests using go.local.mod file
 	go test -modfile=go.local.mod -v ./...
 
-clean-mocks:	## Remove mocks directory
-	rm -rf mocks
-
-install-mockery:
-	@scripts/install-mockery.sh
-
-mocks: install-mockery ## Build mocks
-	go get -d $(AWS_SDK_GO_VERSIONED_PATH)
-	@echo "building mocks for $(ELASTICACHE_API_PATH) ... "
-	@pushd $(ELASTICACHE_API_PATH) 1>/dev/null; \
-	$(SERVICE_CONTROLLER_SRC_PATH)/bin/mockery --all --dir=. --output=$(SERVICE_CONTROLLER_SRC_PATH)/mocks/aws-sdk-go/elasticache/ ; \
-	popd 1>/dev/null;
-	@echo "ok."
-
 help:           	## Show this help.
 	@grep -F -h "##" $(MAKEFILE_LIST) | grep -F -v grep | sed -e 's/\\$$//' \
-		| awk -F'[:#]' '{print $$1 = sprintf("%-30s", $$1), $$4}'
+		| awk -F'[:#]' '{print $$1 = sprintf("%-30s", $$1), $$4}'

apis/v1alpha1/ack-generate-metadata.yaml

@@ -1,13 +1,13 @@
 ack_generate_info:
-  build_date: "2025-02-07T19:16:11Z"
-  build_hash: 3d74f13b9de7134b4c76ab7526a9c578c4857602
-  go_version: go1.23.4
-  version: v0.41.0-18-g3d74f13
-api_directory_checksum: eb643965cba3c68f76c1b45f100874d07d39c935
+  build_date: "2025-02-11T03:41:28Z"
+  build_hash: 8762917215d9902b2011a2b0b1b0c776855a683e
+  go_version: go1.22.5
+  version: v0.42.0
+api_directory_checksum: f1abc2ecc0831421b484ff2a1c8744468f4a0289
 api_version: v1alpha1
 aws_sdk_go_version: v1.32.6
 generator_config_info:
-  file_checksum: 3c359b3f45716af86c99ab2ea0f2ab50eeae5dc9
+  file_checksum: 7f7cba17d34c1113ba034f4bd7c3c2e6763ecdf2
   original_file_name: generator.yaml
 last_modification:
   reason: API generation

apis/v1alpha1/generator.yaml

@@ -37,19 +37,19 @@ resources:
       add_synced_column: true
       order_by: index
       additional_columns:
-      - name: VERSION
-        json_path: .spec.engineVersion
-        type: string
-        index: 10
-      - name: STATUS
-        json_path: .status.cacheClusterStatus
-        type: string
-        index: 20
-      - name: ENDPOINT
-        json_path: .status.configurationEndpoint.address
-        type: string
-        index: 30
-        priority: 1
+        - name: VERSION
+          json_path: .spec.engineVersion
+          type: string
+          index: 10
+        - name: STATUS
+          json_path: .status.cacheClusterStatus
+          type: string
+          index: 20
+        - name: ENDPOINT
+          json_path: .status.configurationEndpoint.address
+          type: string
+          index: 30
+          priority: 1
     exceptions:
       errors:
         404:
@@ -189,7 +189,7 @@ resources:
       sdk_file_end:
         template_path: hooks/replication_group/sdk_file_end.go.tpl
       sdk_file_end_set_output_post_populate:
-        code: "rm.customSetOutput(obj, ko) // custom set output from obj"
+        template_path: hooks/replication_group/sdk_file_end_set_output_post_populate.go.tpl
     renames:
       operations:
         CreateReplicationGroup:
@@ -303,7 +303,7 @@ operations:
     custom_implementation: CustomModifyReplicationGroup
     set_output_custom_method_name: CustomModifyReplicationGroupSetOutput
     override_values:
-      ApplyImmediately: true
+      ApplyImmediately: aws.Bool(true)
   CreateSnapshot:
     custom_implementation: CustomCreateSnapshot
     set_output_custom_method_name: CustomCreateSnapshotSetOutput
@@ -327,7 +327,7 @@ operations:
   ModifyCacheCluster:
     set_output_custom_method_name: customModifyCacheClusterSetOutput
     override_values:
-      ApplyImmediately: true
+      ApplyImmediately: aws.Bool(true)
 ignore:
   resource_names:
     - ServerlessCache
@@ -348,4 +348,4 @@ ignore:
     - CreateReplicationGroupInput.AutoMinorVersionUpgrade
     - CreateReplicationGroupInput.NumCacheClusters
     - CacheCluster.LogDeliveryConfigurations
-    - PendingModifiedValues.LogDeliveryConfigurations
+    - PendingModifiedValues.LogDeliveryConfigurations

config/controller/kustomization.yaml

@@ -6,4 +6,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: public.ecr.aws/aws-controllers-k8s/elasticache-controller
-  newTag: 1.6.0
+  newTag: 0.0.0-non-release-version

config/crd/bases/elasticache.services.k8s.aws_cacheclusters.yaml

@@ -195,6 +195,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               cacheSecurityGroupNames:
@@ -230,6 +232,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               engine:
@@ -319,6 +323,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               numCacheNodes:
@@ -413,6 +419,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               securityGroupIDs:
@@ -458,6 +466,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               snapshotRetentionLimit:

config/crd/bases/elasticache.services.k8s.aws_cachesubnetgroups.yaml

@@ -76,6 +76,8 @@ spec:
                       properties:
                         name:
                           type: string
+                        namespace:
+                          type: string
                       type: object
                   type: object
                 type: array

config/crd/bases/elasticache.services.k8s.aws_replicationgroups.yaml

@@ -188,6 +188,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               cacheSecurityGroupNames:
@@ -217,6 +219,8 @@ spec:
                     properties:
                       name:
                         type: string
+                      namespace:
+                        type: string
                     type: object
                 type: object
               clusterMode:
@@ -468,6 +472,8 @@ spec:
                       properties:
                         name:
                           type: string
+                        namespace:
+                          type: string
                       type: object
                   type: object
                 type: array

generator.yaml

@@ -37,19 +37,19 @@ resources:
       add_synced_column: true
       order_by: index
       additional_columns:
-      - name: VERSION
-        json_path: .spec.engineVersion
-        type: string
-        index: 10
-      - name: STATUS
-        json_path: .status.cacheClusterStatus
-        type: string
-        index: 20
-      - name: ENDPOINT
-        json_path: .status.configurationEndpoint.address
-        type: string
-        index: 30
-        priority: 1
+        - name: VERSION
+          json_path: .spec.engineVersion
+          type: string
+          index: 10
+        - name: STATUS
+          json_path: .status.cacheClusterStatus
+          type: string
+          index: 20
+        - name: ENDPOINT
+          json_path: .status.configurationEndpoint.address
+          type: string
+          index: 30
+          priority: 1
     exceptions:
       errors:
         404:
@@ -189,7 +189,7 @@ resources:
       sdk_file_end:
         template_path: hooks/replication_group/sdk_file_end.go.tpl
       sdk_file_end_set_output_post_populate:
-        code: "rm.customSetOutput(obj, ko) // custom set output from obj"
+        template_path: hooks/replication_group/sdk_file_end_set_output_post_populate.go.tpl
     renames:
       operations:
         CreateReplicationGroup:
@@ -303,7 +303,7 @@ operations:
     custom_implementation: CustomModifyReplicationGroup
     set_output_custom_method_name: CustomModifyReplicationGroupSetOutput
     override_values:
-      ApplyImmediately: true
+      ApplyImmediately: aws.Bool(true)
   CreateSnapshot:
     custom_implementation: CustomCreateSnapshot
     set_output_custom_method_name: CustomCreateSnapshotSetOutput
@@ -327,7 +327,7 @@ operations:
   ModifyCacheCluster:
     set_output_custom_method_name: customModifyCacheClusterSetOutput
     override_values:
-      ApplyImmediately: true
+      ApplyImmediately: aws.Bool(true)
 ignore:
   resource_names:
     - ServerlessCache
@@ -348,4 +348,4 @@ ignore:
     - CreateReplicationGroupInput.AutoMinorVersionUpgrade
     - CreateReplicationGroupInput.NumCacheClusters
     - CacheCluster.LogDeliveryConfigurations
-    - PendingModifiedValues.LogDeliveryConfigurations
+    - PendingModifiedValues.LogDeliveryConfigurations

helm/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v1
 name: elasticache-chart
 description: A Helm chart for the ACK service controller for Amazon ElastiCache (ElastiCache)
-version: 1.6.0
-appVersion: 1.6.0
+version: 0.0.0-non-release-version
+appVersion: 0.0.0-non-release-version
 home: https://github.com/aws-controllers-k8s/elasticache-controller
 icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
 sources:

helm/templates/NOTES.txt

@@ -1,5 +1,5 @@
 {{ .Chart.Name }} has been installed.
-This chart deploys "public.ecr.aws/aws-controllers-k8s/elasticache-controller:1.6.0".
+This chart deploys "public.ecr.aws/aws-controllers-k8s/elasticache-controller:0.0.0-non-release-version".
 
 Check its status by running:
   kubectl --namespace {{ .Release.Namespace }} get pods -l "app.kubernetes.io/instance={{ .Release.Name }}"