🐛 Support protobuf string values for VaultType. (#2325)

providers-sdk/v1/vault/config.go

@@ -9,19 +9,32 @@ import (
 	"strings"
 )
 
+// supports both the protobuf string and the custom defined string
+// representations of a vault type
 func NewVaultType(name string) (VaultType, error) {
 	entry := strings.TrimSpace(strings.ToLower(name))
 	var code VaultType
-	ok := false
+	marshalMapOk := false
 	for k := range vaultMarshalNameMap {
 		if vaultMarshalNameMap[k] == entry {
-			ok = true
+			marshalMapOk = true
 			code = k
 			break
 		}
 	}
-	if !ok {
-		return VaultType_None, errors.New("unknown type value: " + string(name))
+	if !marshalMapOk {
+		// also support the auto-generated protobuf string values for all the enum values
+		protoMapOk := false
+		for k, v := range VaultType_value {
+			if k == name {
+				protoMapOk = true
+				code = VaultType(v)
+				break
+			}
+		}
+		if !protoMapOk {
+			return VaultType_None, errors.New("unknown type value: " + string(name))
+		}
 	}
 
 	return code, nil
@@ -67,21 +80,14 @@ func (t *VaultType) UnmarshalJSON(data []byte) error {
 	if err != nil {
 		var name string
 		err = json.Unmarshal(data, &name)
-		entry := strings.TrimSpace(strings.ToLower(name))
-
-		var code VaultType
-		ok := false
-		for k := range vaultMarshalNameMap {
-			if vaultMarshalNameMap[k] == entry {
-				ok = true
-				code = k
-				break
-			}
+		if err != nil {
+			return err
 		}
-		if !ok {
-			return errors.New("unknown type value: " + string(data))
+		c, err := NewVaultType(name)
+		if err != nil {
+			return err
 		}
-		*t = code
+		*t = c
 	}
 	return nil
 }

providers-sdk/v1/vault/config_test.go

@@ -22,12 +22,15 @@ func TestVaultTypeParser(t *testing.T) {
 - gcp-secret-manager
 - aws-secrets-manager
 - aws-parameter-store
+- GCPBerglas
+- AWSParameterStore
+- Memory
 `
 
 	v := []VaultType{}
 	yaml.Unmarshal([]byte(content), &v)
 
-	assert.Equal(t, 8, len(v))
+	assert.Equal(t, 11, len(v))
 	assert.Equal(t, VaultType_None, v[0])
 	assert.Equal(t, VaultType_KeyRing, v[1])
 	assert.Equal(t, VaultType_LinuxKernelKeyring, v[2])
@@ -36,6 +39,9 @@ func TestVaultTypeParser(t *testing.T) {
 	assert.Equal(t, VaultType_GCPSecretsManager, v[5])
 	assert.Equal(t, VaultType_AWSSecretsManager, v[6])
 	assert.Equal(t, VaultType_AWSParameterStore, v[7])
+	assert.Equal(t, VaultType_GCPBerglas, v[8])
+	assert.Equal(t, VaultType_AWSParameterStore, v[9])
+	assert.Equal(t, VaultType_Memory, v[10])
 }
 
 func TestVaultTypeMarshal(t *testing.T) {