Skip to content

Commit b7b8db5

Browse files
committed
refactor auth method args
use string slice flag instead Signed-off-by: Daniel Chaplin <black.danek@gmail.com>
1 parent fcfa6a4 commit b7b8db5

6 files changed

Lines changed: 12 additions & 12 deletions

File tree

internal/cli/cli.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"os"
66
"time"
77

8-
cli "github.com/urfave/cli/v2"
8+
"github.com/urfave/cli/v2"
99

1010
"github.com/mvisonneau/vac/internal/cmd"
1111
)
@@ -65,6 +65,11 @@ func NewApp(version string, start time.Time) (app *cli.App) {
6565
Usage: "method `name` (token, oidc, write)",
6666
Value: "token",
6767
},
68+
&cli.StringSliceFlag{
69+
Name: "auth-method-args",
70+
EnvVars: []string{"VAC_AUTH_METHOD_ARGS"},
71+
Usage: "method `args` `=`(equals sign) delimited (listenaddress=0.0.0.0, port=8250)",
72+
},
6873
&cli.StringFlag{
6974
Name: "auth-path",
7075
EnvVars: []string{"VAC_AUTH_PATH"},

internal/cmd/get.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"time"
77

88
log "github.com/sirupsen/logrus"
9-
cli "github.com/urfave/cli/v2"
9+
"github.com/urfave/cli/v2"
1010

1111
"github.com/mvisonneau/vac/pkg/client"
1212
"github.com/mvisonneau/vac/pkg/state"

internal/cmd/status.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"time"
99

1010
"github.com/olekukonko/tablewriter"
11-
cli "github.com/urfave/cli/v2"
11+
"github.com/urfave/cli/v2"
1212
"github.com/xeonx/timeago"
1313

1414
"github.com/mvisonneau/vac/pkg/client"

internal/cmd/switch.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package cmd
33
import (
44
"github.com/ktr0731/go-fuzzyfinder"
55
log "github.com/sirupsen/logrus"
6-
cli "github.com/urfave/cli/v2"
6+
"github.com/urfave/cli/v2"
77

88
"github.com/mvisonneau/vac/pkg/client"
99
"github.com/mvisonneau/vac/pkg/state"

internal/cmd/utils.go

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package cmd
22

33
import (
44
"fmt"
5-
"strings"
65
"time"
76

87
kvbuilder "github.com/hashicorp/go-secure-stdlib/kv-builder"
@@ -74,15 +73,11 @@ func configure(ctx *cli.Context) (*Config, error) {
7473

7574
var authMethodArgs []string
7675

77-
for _, v := range ctx.Args().Slice() {
78-
if strings.Contains(v, "=") {
79-
authMethodArgs = append(authMethodArgs, v)
80-
}
81-
}
76+
authMethodArgs = ctx.StringSlice("auth-method-args")
8277

8378
authMethodConfig, err := parseArgsDataString(authMethodArgs)
8479
if err != nil {
85-
return nil, fmt.Errorf("error parsing configuration: %s", err)
80+
return nil, fmt.Errorf("error parsing auth method args: %s", err)
8681
}
8782

8883
return &Config{

internal/cmd/utils_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"time"
88

99
"github.com/stretchr/testify/assert"
10-
cli "github.com/urfave/cli/v2"
10+
"github.com/urfave/cli/v2"
1111
)
1212

1313
func NewTestContext() (ctx *cli.Context, flags, globalFlags *flag.FlagSet) {

0 commit comments

Comments
 (0)