From 8261a455a925b2c416af18a8c3bea0505ec2cb7d Mon Sep 17 00:00:00 2001
From: oliviassss <sonyingy@amazon.com>
Date: Thu, 24 Oct 2024 12:40:19 -0700
Subject: [PATCH] fix validation in resource prefix flag

---
 pkg/config/controller_config.go      | 11 -----------
 pkg/config/controller_config_test.go |  2 +-
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/pkg/config/controller_config.go b/pkg/config/controller_config.go
index da23df14f..4d24a71da 100644
--- a/pkg/config/controller_config.go
+++ b/pkg/config/controller_config.go
@@ -160,7 +160,6 @@ func (cfg *ControllerConfig) BindFlags(fs *pflag.FlagSet) {
 	fs.StringToStringVar(&cfg.ResourcePrefix, flagResourcePrefix, defaultResourcePrefix,
 		"the prefixes for resource tags, backend SG name and worker node SG rules label.")
 
-	cfg.mergeDefaultResourcePrefixVal()
 	cfg.FeatureGates.BindFlags(fs)
 	cfg.AWSConfig.BindFlags(fs)
 	cfg.RuntimeConfig.BindFlags(fs)
@@ -268,13 +267,3 @@ func (cfg *ControllerConfig) validateResourcePrefixKeys() error {
 	}
 	return nil
 }
-
-// mergeDefaultResourcePrefixVal make sure the ResourcePrefix map always has default val for unspecified key in user-passed flag
-func (cfg *ControllerConfig) mergeDefaultResourcePrefixVal() {
-	// Merge user-provided values with defaults
-	for key, defaultVal := range defaultResourcePrefix {
-		if _, exists := cfg.ResourcePrefix[key]; !exists {
-			cfg.ResourcePrefix[key] = defaultVal
-		}
-	}
-}
diff --git a/pkg/config/controller_config_test.go b/pkg/config/controller_config_test.go
index 728311897..38303c651 100644
--- a/pkg/config/controller_config_test.go
+++ b/pkg/config/controller_config_test.go
@@ -227,7 +227,7 @@ func TestControllerConfig_validateResourcePrefixKeys(t *testing.T) {
 					"backendSGNamePrefix": "k8s-traffic",
 				},
 			},
-			wantErr: errors.New("invalid number of keys. Expected 5 keys, but got 4 keys"),
+			wantErr: errors.New("invalid number of keys. Expected 5 keys, only got 4 keys"),
 		},
 	}
 	for _, tt := range tests {