refactor controller hooks/tests

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}'

OWNERS_ALIASES

@@ -6,6 +6,7 @@ aliases:
     - jaypipes
     - mhausenblas
     - a-hilaly
+    - rushmash91
     - RedbackThomson
     - vijtrip2
   # TODO: Add your team members to your team controller alias

apis/v1alpha1/ack-generate-metadata.yaml

@@ -1,13 +1,13 @@
 ack_generate_info:
-  build_date: "2025-02-07T19:16:11Z"
+  build_date: "2025-02-13T22:26:33Z"
   build_hash: 3d74f13b9de7134b4c76ab7526a9c578c4857602
   go_version: go1.23.4
   version: v0.41.0-18-g3d74f13
-api_directory_checksum: eb643965cba3c68f76c1b45f100874d07d39c935
+api_directory_checksum: 237c52116a1a4d7e014ca4030f65678949b45f88
 api_version: v1alpha1
 aws_sdk_go_version: v1.32.6
 generator_config_info:
-  file_checksum: 3c359b3f45716af86c99ab2ea0f2ab50eeae5dc9
+  file_checksum: f8bc0b6a1a653d39164ae443a23f8bf03b85604e
   original_file_name: generator.yaml
 last_modification:
   reason: API generation

apis/v1alpha1/cache_subnet_group.go

@@ -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:
@@ -173,6 +173,7 @@ resources:
       PrimaryClusterId: # note: "PrimaryClusterID" will not function properly
         compare:
           is_ignored: true
+      
     hooks:
       sdk_read_many_post_set_output:
         template_path: hooks/replication_group/sdk_read_many_post_set_output.go.tpl
@@ -189,7 +190,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 +304,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 +328,7 @@ operations:
   ModifyCacheCluster:
     set_output_custom_method_name: customModifyCacheClusterSetOutput
     override_values:
-      ApplyImmediately: true
+      ApplyImmediately: aws.Bool(true)
 ignore:
   resource_names:
     - ServerlessCache
@@ -348,4 +349,27 @@ ignore:
     - CreateReplicationGroupInput.AutoMinorVersionUpgrade
     - CreateReplicationGroupInput.NumCacheClusters
     - CacheCluster.LogDeliveryConfigurations
-    - PendingModifiedValues.LogDeliveryConfigurations
+    - PendingModifiedValues.LogDeliveryConfigurations
+    - CreateUserInput.AuthenticationMode
+    - ModifyUserInput.AuthenticationMode
+    - CreateCacheSubnetGroupOutput.CacheSubnetGroup.SupportedNetworkTypes
+    - CreateCacheSubnetGroupOutput.CacheSubnetGroup.Subnets.SupportedNetworkTypes
+    - ModifyCacheSubnetGroupOutput.CacheSubnetGroup.Subnets.SupportedNetworkTypes
+    - CreateUserGroupOutput.ServerlessCaches
+    - CreateReplicationGroupOutput.ReplicationGroup.PendingModifiedValues.TransitEncryptionEnabled
+    - CreateReplicationGroupOutput.ReplicationGroup.TransitEncryptionEnabled
+    - ModifyReplicationGroupInput.TransitEncryptionEnabled
+    - CreateReplicationGroupInput.TransitEncryptionEnabled
+    - CreateReplicationGroupOutput.ReplicationGroup.PendingModifiedValues.TransitEncryptionMode
+    - CreateReplicationGroupOutput.ReplicationGroup.TransitEncryptionMode
+    - CreateReplicationGroupInput.TransitEncryptionMode
+    - ModifyReplicationGroupOutput.ReplicationGroup.PendingModifiedValues.TransitEncryptionMode
+    - CreateReplicationGroupOutput.ReplicationGroup.ClusterMode
+    - CreateReplicationGroupOutput.ReplicationGroup.PendingModifiedValues.ClusterMode
+    - CreateReplicationGroupInput.ClusterMode
+    - ModifyReplicationGroupOutput.ReplicationGroup.ClusterMode
+    - ModifyReplicationGroupOutput.ReplicationGroup.PendingModifiedValues.ClusterMode
+    - CreateReplicationGroupInput.ipDiscovery
+    - CreateReplicationGroupOutput.ReplicationGroup.IpDiscovery
+    # - ModifyReplicationGroupOutput.ReplicationGroup.ipDiscovery
+    # - ModifyReplicationGroupInput.ipDiscovery