fix: check for deployment of app before removing
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
Closes coop-cloud/go-abra#61. Fix thanks to @knoflook!
This commit is contained in:
parent
273db078b0
commit
cc249e8187
|
@ -49,7 +49,7 @@ var appRemoveCommand = &cli.Command{
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
if !response {
|
if !response {
|
||||||
return errors.New("User aborted app removal")
|
logrus.Fatal("User aborted app removal")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -65,6 +65,16 @@ var appRemoveCommand = &cli.Command{
|
||||||
if err != nil {
|
if err != nil {
|
||||||
logrus.Fatal(err)
|
logrus.Fatal(err)
|
||||||
}
|
}
|
||||||
|
if !internal.Force {
|
||||||
|
// get app status and check if it's deployed
|
||||||
|
statuses, err := config.GetAppStatuses(appFiles)
|
||||||
|
if err != nil {
|
||||||
|
logrus.Fatal(err)
|
||||||
|
}
|
||||||
|
if statuses[appName] == "deployed" {
|
||||||
|
logrus.Fatalf("'%s' is still deployed. Run \"abra app %s undeploy\" or pass --force", appName, appName)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fs := filters.NewArgs()
|
fs := filters.NewArgs()
|
||||||
fs.Add("name", appName)
|
fs.Add("name", appName)
|
||||||
|
@ -74,14 +84,14 @@ var appRemoveCommand = &cli.Command{
|
||||||
}
|
}
|
||||||
|
|
||||||
secrets := make(map[string]string)
|
secrets := make(map[string]string)
|
||||||
|
var secretNames []string
|
||||||
|
|
||||||
|
for _, cont := range secretList {
|
||||||
|
secrets[cont.Spec.Annotations.Name] = cont.ID // we have to map the names to ID's
|
||||||
|
secretNames = append(secretNames, cont.Spec.Annotations.Name)
|
||||||
|
}
|
||||||
|
|
||||||
if len(secrets) > 0 {
|
if len(secrets) > 0 {
|
||||||
var secretNames []string
|
|
||||||
|
|
||||||
for _, cont := range secretList {
|
|
||||||
secrets[cont.Spec.Annotations.Name] = cont.ID // we have to map the names to ID's
|
|
||||||
secretNames = append(secretNames, cont.Spec.Annotations.Name)
|
|
||||||
}
|
|
||||||
|
|
||||||
var secretNamesToRemove []string
|
var secretNamesToRemove []string
|
||||||
if !internal.Force {
|
if !internal.Force {
|
||||||
secretsPrompt := &survey.MultiSelect{
|
secretsPrompt := &survey.MultiSelect{
|
||||||
|
@ -112,11 +122,11 @@ var appRemoveCommand = &cli.Command{
|
||||||
}
|
}
|
||||||
|
|
||||||
var vols []string
|
var vols []string
|
||||||
if len(vols) > 0 {
|
for _, vol := range volumeList {
|
||||||
for _, vol := range volumeList {
|
vols = append(vols, vol.Name)
|
||||||
vols = append(vols, vol.Name)
|
}
|
||||||
}
|
|
||||||
|
|
||||||
|
if len(vols) > 0 {
|
||||||
if Volumes {
|
if Volumes {
|
||||||
var removeVols []string
|
var removeVols []string
|
||||||
if !internal.Force {
|
if !internal.Force {
|
||||||
|
|
Loading…
Reference in New Issue