|
@@ -279,12 +279,12 @@ func (v *client) GetAllSecrets(ctx context.Context, ref esv1beta1.ExternalSecret
|
|
|
return nil, err
|
|
return nil, err
|
|
|
}
|
|
}
|
|
|
if ref.Name != nil {
|
|
if ref.Name != nil {
|
|
|
- return v.findSecretsFromName(ctx, potentialSecrets, *ref.Name, searchPath)
|
|
|
|
|
|
|
+ return v.findSecretsFromName(ctx, potentialSecrets, *ref.Name)
|
|
|
}
|
|
}
|
|
|
- return v.findSecretsFromTags(ctx, potentialSecrets, ref.Tags, searchPath)
|
|
|
|
|
|
|
+ return v.findSecretsFromTags(ctx, potentialSecrets, ref.Tags)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-func (v *client) findSecretsFromTags(ctx context.Context, candidates []string, tags map[string]string, removeFromName string) (map[string][]byte, error) {
|
|
|
|
|
|
|
+func (v *client) findSecretsFromTags(ctx context.Context, candidates []string, tags map[string]string) (map[string][]byte, error) {
|
|
|
secrets := make(map[string][]byte)
|
|
secrets := make(map[string][]byte)
|
|
|
for _, name := range candidates {
|
|
for _, name := range candidates {
|
|
|
match := true
|
|
match := true
|
|
@@ -304,16 +304,13 @@ func (v *client) findSecretsFromTags(ctx context.Context, candidates []string, t
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
return nil, err
|
|
return nil, err
|
|
|
}
|
|
}
|
|
|
- if removeFromName != "" {
|
|
|
|
|
- name = strings.TrimPrefix(name, removeFromName)
|
|
|
|
|
- }
|
|
|
|
|
secrets[name] = secret
|
|
secrets[name] = secret
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
return secrets, nil
|
|
return secrets, nil
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-func (v *client) findSecretsFromName(ctx context.Context, candidates []string, ref esv1beta1.FindName, removeFromName string) (map[string][]byte, error) {
|
|
|
|
|
|
|
+func (v *client) findSecretsFromName(ctx context.Context, candidates []string, ref esv1beta1.FindName) (map[string][]byte, error) {
|
|
|
secrets := make(map[string][]byte)
|
|
secrets := make(map[string][]byte)
|
|
|
matcher, err := find.New(ref)
|
|
matcher, err := find.New(ref)
|
|
|
if err != nil {
|
|
if err != nil {
|
|
@@ -326,9 +323,6 @@ func (v *client) findSecretsFromName(ctx context.Context, candidates []string, r
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
return nil, err
|
|
return nil, err
|
|
|
}
|
|
}
|
|
|
- if removeFromName != "" {
|
|
|
|
|
- name = strings.TrimPrefix(name, removeFromName)
|
|
|
|
|
- }
|
|
|
|
|
secrets[name] = secret
|
|
secrets[name] = secret
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|