From 511619722f87b255f7f73c1530cd418a67754179 Mon Sep 17 00:00:00 2001 From: knoflook Date: Wed, 8 Sep 2021 13:59:55 +0200 Subject: [PATCH] feat: autocomplete recipe names for more abra commands --- cli/app/backup.go | 12 ++++++++++++ cli/app/check.go | 13 +++++++++++++ cli/app/config.go | 14 ++++++++++++++ cli/app/deploy.go | 12 ++++++++++++ cli/app/rollback.go | 19 ++++++++++++++++++- cli/app/secret.go | 13 +++++++++++++ cli/app/version.go | 12 ++++++++++++ cli/recipe/lint.go | 13 +++++++++++++ 8 files changed, 107 insertions(+), 1 deletion(-) diff --git a/cli/app/backup.go b/cli/app/backup.go index 966cde74..6b9454d7 100644 --- a/cli/app/backup.go +++ b/cli/app/backup.go @@ -75,4 +75,16 @@ var appBackupCommand = &cli.Command{ return nil }, + BashComplete: func(c *cli.Context) { + appNames, err := config.GetAppNames() + if err != nil { + return + } + if c.NArg() > 0 { + return + } + for _, a := range appNames { + fmt.Println(a) + } + }, } diff --git a/cli/app/check.go b/cli/app/check.go index 0bce858b..ba4a3457 100644 --- a/cli/app/check.go +++ b/cli/app/check.go @@ -1,6 +1,7 @@ package app import ( + "fmt" "os" "path" "strings" @@ -48,4 +49,16 @@ var appCheckCommand = &cli.Command{ return nil }, + BashComplete: func(c *cli.Context) { + appNames, err := config.GetAppNames() + if err != nil { + return + } + if c.NArg() > 0 { + return + } + for _, a := range appNames { + fmt.Println(a) + } + }, } diff --git a/cli/app/config.go b/cli/app/config.go index cdb1e1c4..a58a87d2 100644 --- a/cli/app/config.go +++ b/cli/app/config.go @@ -1,10 +1,12 @@ package app import ( + "fmt" "os" "os/exec" "coopcloud.tech/abra/cli/internal" + "coopcloud.tech/abra/pkg/config" "github.com/AlecAivazis/survey/v2" "github.com/sirupsen/logrus" "github.com/urfave/cli/v2" @@ -38,4 +40,16 @@ var appConfigCommand = &cli.Command{ return nil }, + BashComplete: func(c *cli.Context) { + appNames, err := config.GetAppNames() + if err != nil { + return + } + if c.NArg() > 0 { + return + } + for _, a := range appNames { + fmt.Println(a) + } + }, } diff --git a/cli/app/deploy.go b/cli/app/deploy.go index 5eed8c3f..4c08dea0 100644 --- a/cli/app/deploy.go +++ b/cli/app/deploy.go @@ -54,4 +54,16 @@ var appDeployCommand = &cli.Command{ return nil }, + BashComplete: func(c *cli.Context) { + appNames, err := config.GetAppNames() + if err != nil { + return + } + if c.NArg() > 0 { + return + } + for _, a := range appNames { + fmt.Println(a) + } + }, } diff --git a/cli/app/rollback.go b/cli/app/rollback.go index bd7dca09..61bb04bc 100644 --- a/cli/app/rollback.go +++ b/cli/app/rollback.go @@ -1,10 +1,27 @@ package app -import "github.com/urfave/cli/v2" +import ( + "fmt" + + "coopcloud.tech/abra/pkg/config" + "github.com/urfave/cli/v2" +) var appRollbackCommand = &cli.Command{ Name: "rollback", Usage: "Roll an app back to a previous version", Aliases: []string{"b"}, ArgsUsage: "[]", + BashComplete: func(c *cli.Context) { + appNames, err := config.GetAppNames() + if err != nil { + return + } + if c.NArg() > 0 { + return + } + for _, a := range appNames { + fmt.Println(a) + } + }, } diff --git a/cli/app/secret.go b/cli/app/secret.go index 2855befa..8200b674 100644 --- a/cli/app/secret.go +++ b/cli/app/secret.go @@ -10,6 +10,7 @@ import ( abraFormatter "coopcloud.tech/abra/cli/formatter" "coopcloud.tech/abra/cli/internal" "coopcloud.tech/abra/pkg/client" + "coopcloud.tech/abra/pkg/config" "coopcloud.tech/abra/pkg/secret" "github.com/docker/docker/api/types" "github.com/docker/docker/api/types/filters" @@ -234,6 +235,18 @@ var appSecretLsCommand = &cli.Command{ table.Render() return nil }, + BashComplete: func(c *cli.Context) { + appNames, err := config.GetAppNames() + if err != nil { + return + } + if c.NArg() > 0 { + return + } + for _, a := range appNames { + fmt.Println(a) + } + }, } var appSecretCommand = &cli.Command{ diff --git a/cli/app/version.go b/cli/app/version.go index 94354186..6c7f4a72 100644 --- a/cli/app/version.go +++ b/cli/app/version.go @@ -104,4 +104,16 @@ var appVersionCommand = &cli.Command{ table.Render() return nil }, + BashComplete: func(c *cli.Context) { + appNames, err := config.GetAppNames() + if err != nil { + return + } + if c.NArg() > 0 { + return + } + for _, a := range appNames { + fmt.Println(a) + } + }, } diff --git a/cli/recipe/lint.go b/cli/recipe/lint.go index 8a34329f..4fe0ec0a 100644 --- a/cli/recipe/lint.go +++ b/cli/recipe/lint.go @@ -7,6 +7,7 @@ import ( "coopcloud.tech/abra/cli/formatter" "coopcloud.tech/abra/cli/internal" + "coopcloud.tech/abra/pkg/catalogue" "coopcloud.tech/abra/pkg/config" "coopcloud.tech/tagcmp" "github.com/docker/distribution/reference" @@ -90,4 +91,16 @@ var recipeLintCommand = &cli.Command{ return nil }, + 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) + } + }, }