fix: better prompts & matching for secret removal
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
This commit is contained in:
parent
6a50981120
commit
7f315315f0
|
@ -229,10 +229,10 @@ Example:
|
||||||
remoteSecretNames[cont.Spec.Annotations.Name] = true
|
remoteSecretNames[cont.Spec.Annotations.Name] = true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
match := false
|
||||||
secretToRm := c.Args().Get(1)
|
secretToRm := c.Args().Get(1)
|
||||||
for sec := range secrets {
|
for sec := range secrets {
|
||||||
secretName := secret.ParseSecretEnvVarName(sec)
|
secretName := secret.ParseSecretEnvVarName(sec)
|
||||||
parsed := secret.ParseGeneratedSecretName(secretName, app)
|
|
||||||
|
|
||||||
secVal, err := secret.ParseSecretEnvVarValue(secrets[sec])
|
secVal, err := secret.ParseSecretEnvVarValue(secrets[sec])
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -242,20 +242,31 @@ Example:
|
||||||
secretRemoteName := fmt.Sprintf("%s_%s_%s", app.StackName(), secretName, secVal.Version)
|
secretRemoteName := fmt.Sprintf("%s_%s_%s", app.StackName(), secretName, secVal.Version)
|
||||||
if _, ok := remoteSecretNames[secretRemoteName]; ok {
|
if _, ok := remoteSecretNames[secretRemoteName]; ok {
|
||||||
if secretToRm != "" {
|
if secretToRm != "" {
|
||||||
if parsed == secretToRm {
|
if secretName == secretToRm {
|
||||||
if err := secretRm(cl, app, secretRemoteName, parsed); err != nil {
|
if err := secretRm(cl, app, secretRemoteName, secretName); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if err := secretRm(cl, app, secretRemoteName, parsed); err != nil {
|
match = true
|
||||||
|
|
||||||
|
if err := secretRm(cl, app, secretRemoteName, secretName); err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if !match && secretToRm != "" {
|
||||||
|
logrus.Fatalf("%s doesn't exist on server?", secretToRm)
|
||||||
|
}
|
||||||
|
|
||||||
|
if !match {
|
||||||
|
logrus.Fatal("no secrets to remove?")
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue