cli: remove viper StringToString pflag workaround

Signed-off-by: Oleksandr Redko <Oleksandr_Redko@epam.com>
bank-vaults · Sep 26, 2023 · 339a3b8 · 339a3b8
1 parent 7a18f27
commit 339a3b8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 17 deletions.
diff --git a/cmd/bank-vaults/common.go b/cmd/bank-vaults/common.go
@@ -240,7 +240,7 @@ func kvStoreForConfig(cfg *viper.Viper) (kv.Service, error) {
 		k8s, err := k8s.New(
 			cfg.GetString(cfgK8SNamespace),
 			cfg.GetString(cfgK8SSecret),
-			k8sSecretLabels,
+			cfg.GetStringMapString(cfgK8SLabels),
 		)
 		if err != nil {
 			return nil, errors.Wrap(err, "error creating K8S Secret kv store")
@@ -253,7 +253,7 @@ func kvStoreForConfig(cfg *viper.Viper) (kv.Service, error) {
 		k8s, err := k8s.New(
 			cfg.GetString(cfgK8SNamespace),
 			cfg.GetString(cfgK8SSecret),
-			k8sSecretLabels,
+			cfg.GetStringMapString(cfgK8SLabels),
 		)
 		if err != nil {
 			return nil, errors.Wrap(err, "error creating K8S Secret with kv store")

diff --git a/cmd/bank-vaults/main.go b/cmd/bank-vaults/main.go
@@ -116,17 +116,6 @@ const (
 	cfgOnce         = "once"
 )
 
-// We need to pre-create a value and bind the flag to this until
-// https://github.com/spf13/viper/issues/608 gets fixed.
-var (
-	k8sSecretLabels         map[string]string
-	awsKmsEncryptionContext map[string]string
-)
-
-var defaultAwsKmsEncryptionContext = map[string]string{
-	"Tool": "bank-vaults",
-}
-
 var rootCmd = &cobra.Command{
 	Use:   "bank-vaults",
 	Short: "Automates initialization, unsealing and configuration of Hashicorp Vault.",
@@ -173,8 +162,8 @@ func configStringSliceVar(cmd *cobra.Command, key string, defaultValue []string,
 	_ = c.BindPFlag(key, cmd.PersistentFlags().Lookup(key))
 }
 
-func configStringMapVar(cmd *cobra.Command, key string, value *map[string]string, defaultValue map[string]string, description string) {
-	cmd.PersistentFlags().StringToStringVar(value, key, defaultValue, description)
+func configStringMapVar(cmd *cobra.Command, key string, defaultValue map[string]string, description string) {
+	cmd.PersistentFlags().StringToString(key, defaultValue, description)
 	_ = c.BindPFlag(key, cmd.PersistentFlags().Lookup(key))
 }
 
@@ -230,7 +219,7 @@ func init() {
 	// AWS KMS flags
 	configStringSliceVar(rootCmd, cfgAWSKMSRegion, nil, "The region of the AWS KMS key to encrypt values")
 	configStringSliceVar(rootCmd, cfgAWSKMSKeyID, nil, "The ID or ARN of the AWS KMS key to encrypt values")
-	configStringMapVar(rootCmd, cfgAWSKMSEncryptionContext, &awsKmsEncryptionContext, defaultAwsKmsEncryptionContext, "The encryption context that AWS KMS will use to encrypt values")
+	configStringMapVar(rootCmd, cfgAWSKMSEncryptionContext, map[string]string{"Tool": "bank-vaults"}, "The encryption context that AWS KMS will use to encrypt values")
 
 	// AWS S3 Object Storage flags
 	configStringSliceVar(rootCmd, cfgAWSS3Region, []string{"us-east-1"}, "The region to use for storing values in AWS S3")
@@ -265,7 +254,7 @@ func init() {
 	// K8S Secret Storage flags
 	configStringVar(rootCmd, cfgK8SNamespace, "", "The namespace of the K8S Secret to store values in")
 	configStringVar(rootCmd, cfgK8SSecret, "", "The name of the K8S Secret to store values in")
-	configStringMapVar(rootCmd, cfgK8SLabels, &k8sSecretLabels, map[string]string{}, "The labels of the K8S Secret to store values in")
+	configStringMapVar(rootCmd, cfgK8SLabels, map[string]string{}, "The labels of the K8S Secret to store values in")
 
 	// HSM flags
 	configStringVar(rootCmd, cfgHSMModulePath, "", "The library path of the HSM device")