rix/abra
0
0
Fork 0
forked from toolshed/abra
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: use app getting instead of boilerplate

Browse Source
This commit is contained in:
decentral1se
2021-09-05 23:17:35 +02:00
parent 48bcc9cb36
commit d4333c2dc0
18 changed files with 111 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cli/app/remove.go
View File

@ -34,12 +34,12 @@ var appRemoveCommand = &cli.Command{
internal.ForceFlag,
},
Action: func(c *cli.Context) error {
appName := internal.ValidateAppNameArg(c)
app := internal.ValidateApp(c)
if !internal.Force {
response := false
prompt := &survey.Confirm{
Message: fmt.Sprintf("About to delete %s, are you sure", appName),
Message: fmt.Sprintf("About to delete %s, are you sure", app.Name),
}
if err := survey.AskOne(prompt, &response); err != nil {
logrus.Fatal(err)
@ -54,10 +54,8 @@ var appRemoveCommand = &cli.Command{
logrus.Fatal(err)
}
appPath := appFiles[appName].Path
server := appFiles[appName].Server
ctx := context.Background()
cl, err := client.New(server)
cl, err := client.New(app.Server)
if err != nil {
logrus.Fatal(err)
}
@ -67,13 +65,13 @@ var appRemoveCommand = &cli.Command{
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)
if statuses[app.Name] == "deployed" {
logrus.Fatalf("'%s' is still deployed. Run \"abra app %s undeploy\" or pass --force", app.Name, app.Name)
}
}
fs := filters.NewArgs()
fs.Add("name", appName)
fs.Add("name", app.Name)
secretList, err := cl.SecretList(ctx, types.SecretListOptions{Filters: fs})
if err != nil {
logrus.Fatal(err)
@ -149,11 +147,11 @@ var appRemoveCommand = &cli.Command{
logrus.Info("No volumes to remove")
}
err = os.Remove(appPath)
err = os.Remove(app.Path)
if err != nil {
logrus.Fatal(err)
}
logrus.Info(fmt.Sprintf("File: %s removed", appPath))
logrus.Info(fmt.Sprintf("File: %s removed", app.Path))
return nil
},