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

refactor: use cli context vs creating new one

Browse Source
This commit is contained in:
Roxie Gibson
2021-09-16 11:17:56 +01:00
parent a74a8bc21b
commit 0a1c73bf00
8 changed files with 26 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cli/app/secret.go
View File

@ -1,7 +1,6 @@
package app
import (
"context"
"errors"
"fmt"
"os"
@ -144,7 +143,6 @@ var appSecretRmCommand = &cli.Command{
internal.ShowSubcommandHelpAndError(c, errors.New("no secret(s) specified?"))
}
ctx := context.Background()
cl, err := client.New(app.Server)
if err != nil {
logrus.Fatal(err)
@ -152,7 +150,7 @@ var appSecretRmCommand = &cli.Command{
filters := filters.NewArgs()
filters.Add("name", app.StackName())
secretList, err := cl.SecretList(ctx, types.SecretListOptions{Filters: filters})
secretList, err := cl.SecretList(c.Context, types.SecretListOptions{Filters: filters})
if err != nil {
logrus.Fatal(err)
}
@ -162,7 +160,7 @@ var appSecretRmCommand = &cli.Command{
secretName := cont.Spec.Annotations.Name
parsed := secret.ParseGeneratedSecretName(secretName, app)
if allSecrets {
if err := cl.SecretRemove(ctx, secretName); err != nil {
if err := cl.SecretRemove(c.Context, secretName); err != nil {
logrus.Fatal(err)
}
if internal.Pass {
@ -172,7 +170,7 @@ var appSecretRmCommand = &cli.Command{
}
} else {
if parsed == secretToRm {
if err := cl.SecretRemove(ctx, secretName); err != nil {
if err := cl.SecretRemove(c.Context, secretName); err != nil {
logrus.Fatal(err)
}
if internal.Pass {
@ -199,7 +197,6 @@ var appSecretLsCommand = &cli.Command{
tableCol := []string{"Name", "Version", "Generated Name", "Created On Server"}
table := abraFormatter.CreateTable(tableCol)
ctx := context.Background()
cl, err := client.New(app.Server)
if err != nil {
logrus.Fatal(err)
@ -207,7 +204,7 @@ var appSecretLsCommand = &cli.Command{
filters := filters.NewArgs()
filters.Add("name", app.StackName())
secretList, err := cl.SecretList(ctx, types.SecretListOptions{Filters: filters})
secretList, err := cl.SecretList(c.Context, types.SecretListOptions{Filters: filters})
if err != nil {
logrus.Fatal(err)
}