From 427c57cbc65f2d353ba1c814aa68c8bcdc392a26 Mon Sep 17 00:00:00 2001 From: KeisukeYamashita <19yamashita15@gmail.com> Date: Mon, 28 Jun 2021 17:55:13 +0900 Subject: [PATCH 1/4] Add secret manager and sort alphabeticatly Signed-off-by: KeisukeYamashita <19yamashita15@gmail.com> --- cli/gcp.go | 48 +++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 39 insertions(+), 9 deletions(-) diff --git a/cli/gcp.go b/cli/gcp.go index 0fed348..f436c6f 100644 --- a/cli/gcp.go +++ b/cli/gcp.go @@ -48,19 +48,20 @@ func newGCPCmd() cli.Command { Subcommands: []cli.Command{ newGCPGAECmd(), newGCPBQCmd(), - newGCPGKECmd(), - newGCPSpannerCmd(), - newGCPGCRCmd(), - newGCPFunctionsCmd(), newGCPCloudRunCmd(), + newGCPDataflowCmd(), + newGCPFunctionsCmd(), newGCPGCECmd(), - newGCPLogsCmd(), + newGCPGCRCmd(), + newGCPGKECmd(), newGCPIAMCmd(), - newGCPSQLCmd(), + newGCPLogsCmd(), + newGCPKMSCmd(), newGCPPubSubCmd(), + newGCPSecretManagerCmd(), + newGCPSpannerCmd(), newGCPStorageCmd(), - newGCPDataflowCmd(), - newGCPKMSCmd(), + newGCPSQLCmd(), }, } } @@ -137,7 +138,7 @@ func newGCPGKECmd() cli.Command { Usage: "Name of the cluter", }, cli.StringFlag{ - Name: "namespaces, ns", + Name: "namespaces, ns", Usage: "Namespaces of workload page to open (you can input multiple namespaces by comma-speparated string)", }, }, @@ -184,6 +185,35 @@ func newGCPSpannerCmd() cli.Command { } } +func newGCPSecretManagerCmd() cli.Command { + return cli.Command{ + Name: "secretManager", + Usage: "Open Secret Manager page", + Category: categoryStorage, + Flags: []cli.Flag{ + cli.StringFlag{ + Name: "project", + Usage: "Specify the project to open", + }, + cli.StringFlag{ + Name: "secret, s", + Usage: "Secret name", + }, + cli.StringFlag{ + Name: "version, v", + Usage: "Secret version", + }, + }, + Action: func(c *cli.Context) error { + gcp, err := gcp.GetProvider() + if err != nil { + return err + } + return browser.Open(c, gcp) + }, + } +} + func newGCPGCRCmd() cli.Command { return cli.Command{ Name: "gcr", From 9a44049643bf3e705493f4847c78f0ee1d26eb50 Mon Sep 17 00:00:00 2001 From: KeisukeYamashita <19yamashita15@gmail.com> Date: Mon, 28 Jun 2021 17:56:47 +0900 Subject: [PATCH 2/4] Upgrade readme Signed-off-by: KeisukeYamashita <19yamashita15@gmail.com> --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c45fce8..6a1ade2 100644 --- a/README.md +++ b/README.md @@ -331,7 +331,8 @@ $ biko gcp [product] [flag(s)] | Product | What | Command | Flags(Optional) | |:----:|:----:|:----:|:----:| -| Container Registry | Go to container registry or the container detail | `gcr` | `--name, -n` | +| Container Registry | Go to container registry or the container detail | `gcr` | `--name, -n` | +| Secret Manager | Go to secret manager's detail | `secretmanager`, `sm` | `--secret, -s`, `--version`, `-v` | **Big Data** From 8245494a19f2367ecad43558a7089e2f8a0a72ed Mon Sep 17 00:00:00 2001 From: KeisukeYamashita <19yamashita15@gmail.com> Date: Mon, 28 Jun 2021 18:02:45 +0900 Subject: [PATCH 3/4] Add GCP secret manager Signed-off-by: KeisukeYamashita <19yamashita15@gmail.com> --- README.md | 8 ++++++-- cli/gcp.go | 7 ++----- providers/gcp/gcp.go | 6 ++++++ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 6a1ade2..fa88cfc 100644 --- a/README.md +++ b/README.md @@ -331,8 +331,12 @@ $ biko gcp [product] [flag(s)] | Product | What | Command | Flags(Optional) | |:----:|:----:|:----:|:----:| -| Container Registry | Go to container registry or the container detail | `gcr` | `--name, -n` | -| Secret Manager | Go to secret manager's detail | `secretmanager`, `sm` | `--secret, -s`, `--version`, `-v` | +| Container Registry | Go to container registry or the container detail | `gcr` | `--name, -n` | + + +**Security** + +| Secret Manager | Go to secret manager's detail | `secret-manager`, `sm`, `secretmanager`, `secretManager` | `--secret, -s` | **Big Data** diff --git a/cli/gcp.go b/cli/gcp.go index f436c6f..18302d2 100644 --- a/cli/gcp.go +++ b/cli/gcp.go @@ -187,7 +187,8 @@ func newGCPSpannerCmd() cli.Command { func newGCPSecretManagerCmd() cli.Command { return cli.Command{ - Name: "secretManager", + Name: "secret-manager", + Aliases: []string{"sm", "secretmanager", "secretManager"}, Usage: "Open Secret Manager page", Category: categoryStorage, Flags: []cli.Flag{ @@ -199,10 +200,6 @@ func newGCPSecretManagerCmd() cli.Command { Name: "secret, s", Usage: "Secret name", }, - cli.StringFlag{ - Name: "version, v", - Usage: "Secret version", - }, }, Action: func(c *cli.Context) error { gcp, err := gcp.GetProvider() diff --git a/providers/gcp/gcp.go b/providers/gcp/gcp.go index 754bfbd..18991f9 100644 --- a/providers/gcp/gcp.go +++ b/providers/gcp/gcp.go @@ -158,6 +158,12 @@ func (p *Provider) addProductPath(product string) { p.join("workload") p.addGKEPageStateParam(namespaces) } + case "secret-manager": + p.join(fmt.Sprintf("security/%s", product)) + var secret string + if secret = p.GetCtxString("secret"); secret != "" { + p.join(fmt.Sprintf("secret/%s", secret)) + } case "spanner": p.join(product) var instance, db, scheme string From 099f938735f0bd59453d74189fe8bb00c62b6f27 Mon Sep 17 00:00:00 2001 From: KeisukeYamashita <19yamashita15@gmail.com> Date: Mon, 28 Jun 2021 18:03:05 +0900 Subject: [PATCH 4/4] Format table Signed-off-by: KeisukeYamashita <19yamashita15@gmail.com> --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fa88cfc..30735f8 100644 --- a/README.md +++ b/README.md @@ -331,7 +331,7 @@ $ biko gcp [product] [flag(s)] | Product | What | Command | Flags(Optional) | |:----:|:----:|:----:|:----:| -| Container Registry | Go to container registry or the container detail | `gcr` | `--name, -n` | +| Container Registry | Go to container registry or the container detail | `gcr` | `--name, -n` | **Security**