diff --git a/cli/app/list.go b/cli/app/list.go index 0de7fa42..eb91f74e 100644 --- a/cli/app/list.go +++ b/cli/app/list.go @@ -95,6 +95,7 @@ can take some time. } table.Render() + return nil }, } diff --git a/cli/app/logs.go b/cli/app/logs.go index fc5c9bca..551361e4 100644 --- a/cli/app/logs.go +++ b/cli/app/logs.go @@ -9,6 +9,7 @@ import ( "coopcloud.tech/abra/cli/internal" "coopcloud.tech/abra/pkg/client" + "coopcloud.tech/abra/pkg/config" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" dockerClient "github.com/docker/docker/client" @@ -109,4 +110,16 @@ var appLogsCommand = &cli.Command{ return nil }, + BashComplete: func(c *cli.Context) { + appNames, err := config.GetAppsNames() + if err != nil { + return + } + if c.NArg() > 0 { + return + } + for _, a := range appNames { + fmt.Println(a) + } + }, } diff --git a/cli/app/new.go b/cli/app/new.go index d9db2601..9838fde2 100644 --- a/cli/app/new.go +++ b/cli/app/new.go @@ -78,6 +78,18 @@ var appNewCommand = &cli.Command{ }, ArgsUsage: "", Action: action, + BashComplete: func(c *cli.Context) { + catl, err := catalogue.ReadRecipeCatalogue() + if err != nil { + return + } + if c.NArg() > 0 { + return + } + for name, _ := range catl { + fmt.Println(name) + } + }, } // getRecipeMeta retrieves the recipe metadata from the recipe catalogue. diff --git a/cli/app/ps.go b/cli/app/ps.go index c1259075..1883fc11 100644 --- a/cli/app/ps.go +++ b/cli/app/ps.go @@ -2,11 +2,13 @@ package app import ( "context" + "fmt" "strings" abraFormatter "coopcloud.tech/abra/cli/formatter" "coopcloud.tech/abra/cli/internal" "coopcloud.tech/abra/pkg/client" + "coopcloud.tech/abra/pkg/config" "github.com/docker/cli/cli/command/formatter" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" @@ -54,4 +56,16 @@ var appPsCommand = &cli.Command{ table.Render() return nil }, + BashComplete: func(c *cli.Context) { + appNames, err := config.GetAppsNames() + if err != nil { + return + } + if c.NArg() > 0 { + return + } + for _, a := range appNames { + fmt.Println(a) + } + }, } diff --git a/cli/app/remove.go b/cli/app/remove.go index 613ed014..737d1402 100644 --- a/cli/app/remove.go +++ b/cli/app/remove.go @@ -155,4 +155,16 @@ var appRemoveCommand = &cli.Command{ return nil }, + BashComplete: func(c *cli.Context) { + appNames, err := config.GetAppsNames() + if err != nil { + return + } + if c.NArg() > 0 { + return + } + for _, a := range appNames { + fmt.Println(a) + } + }, } diff --git a/cli/app/undeploy.go b/cli/app/undeploy.go index 75196b09..4393ff84 100644 --- a/cli/app/undeploy.go +++ b/cli/app/undeploy.go @@ -2,10 +2,12 @@ package app import ( "context" + "fmt" "coopcloud.tech/abra/cli/internal" "coopcloud.tech/abra/pkg/client" stack "coopcloud.tech/abra/pkg/client/stack" + "coopcloud.tech/abra/pkg/config" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" ) @@ -35,4 +37,16 @@ volumes as eligiblef or pruning once undeployed. return nil }, + BashComplete: func(c *cli.Context) { + appNames, err := config.GetDeployedApps() + if err != nil { + return + } + if c.NArg() > 0 { + return + } + for _, a := range appNames { + fmt.Println(a) + } + }, } diff --git a/cli/app/volume.go b/cli/app/volume.go index 8df975b8..0128e4c0 100644 --- a/cli/app/volume.go +++ b/cli/app/volume.go @@ -2,10 +2,12 @@ package app import ( "context" + "fmt" abraFormatter "coopcloud.tech/abra/cli/formatter" "coopcloud.tech/abra/cli/internal" "coopcloud.tech/abra/pkg/client" + "coopcloud.tech/abra/pkg/config" "github.com/AlecAivazis/survey/v2" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" @@ -81,6 +83,18 @@ var appVolumeRemoveCommand = &cli.Command{ return nil }, + BashComplete: func(c *cli.Context) { + appNames, err := config.GetAppsNames() + if err != nil { + return + } + if c.NArg() > 0 { + return + } + for _, a := range appNames { + fmt.Println(a) + } + }, } var appVolumeCommand = &cli.Command{ diff --git a/pkg/config/app.go b/pkg/config/app.go index 8049b845..bead851a 100644 --- a/pkg/config/app.go +++ b/pkg/config/app.go @@ -177,6 +177,46 @@ func GetApps(appFiles AppFiles) ([]App, error) { return apps, nil } +func GetAppsNames() ([]string, error) { + appFiles, err := LoadAppFiles("") + if err != nil { + return nil, err + } + apps, err := GetApps(appFiles) + if err != nil { + return nil, err + } + + var appNames []string + for _, app := range apps { + appNames = append(appNames, app.Name) + } + + return appNames, nil +} + +func GetDeployedApps() ([]string, error) { + appFiles, err := LoadAppFiles("") + if err != nil { + return nil, err + } + apps, err := GetApps(appFiles) + if err != nil { + return nil, err + } + statuses, err := GetAppStatuses(appFiles) + + var appNames []string + for _, app := range apps { + status := statuses[app.StackName()] + if status == "deployed" { + appNames = append(appNames, app.Name) + } + } + + return appNames, nil +} + // CopyAppEnvSample copies the example env file for the app into the users env files func CopyAppEnvSample(appType, appName, server string) error { envSamplePath := path.Join(ABRA_DIR, "apps", appType, ".env.sample")