Browse Source

Moving duplication validation logic to utils method

Signed-off-by: Gustavo Carvalho <gustavo.carvalho@container-solutions.com>
Gustavo Carvalho 4 years ago
parent
commit
8be3cd5a72
2 changed files with 5 additions and 7 deletions
  1. 0 6
      pkg/provider/vault/vault.go
  2. 5 1
      pkg/utils/utils.go

+ 0 - 6
pkg/provider/vault/vault.go

@@ -276,9 +276,6 @@ func (v *client) findSecretsFromTags(ctx context.Context, candidates []string, t
 			if removeFromName != "" {
 			if removeFromName != "" {
 				name = strings.TrimPrefix(name, removeFromName)
 				name = strings.TrimPrefix(name, removeFromName)
 			}
 			}
-			if _, exists := secrets[name]; exists {
-				return nil, fmt.Errorf(errDuplicateSecret, name)
-			}
 			secrets[name] = secret
 			secrets[name] = secret
 		}
 		}
 	}
 	}
@@ -300,9 +297,6 @@ func (v *client) findSecretsFromName(ctx context.Context, candidates []string, r
 			if removeFromName != "" {
 			if removeFromName != "" {
 				name = strings.TrimPrefix(name, removeFromName)
 				name = strings.TrimPrefix(name, removeFromName)
 			}
 			}
-			if _, exists := secrets[name]; exists {
-				return nil, fmt.Errorf(errDuplicateSecret, name)
-			}
 			secrets[name] = secret
 			secrets[name] = secret
 		}
 		}
 	}
 	}

+ 5 - 1
pkg/utils/utils.go

@@ -60,7 +60,11 @@ func ConvertKeys(strategy esv1beta1.ExternalSecretConversionStrategy, in map[str
 				newName[rk] = string(rv)
 				newName[rk] = string(rv)
 			}
 			}
 		}
 		}
-		out[strings.Join(newName, "")] = v
+		key := strings.Join(newName, "")
+		if _, exists := out[key]; exists {
+			return nil, fmt.Errorf("secret name collision during conversion: %s", key)
+		}
+		out[key] = v
 	}
 	}
 	return out, nil
 	return out, nil
 }
 }