Skip to content

Commit 0865622

Browse files
zreigzzreigz
committed
rebase
1 parent 16230fc commit 0865622

31 files changed

Lines changed: 128 additions & 130 deletions

‎cmd/plural/api.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ import (
44
"github.com/pluralsh/plural/pkg/api"
55
"github.com/pluralsh/plural/pkg/utils"
66
"github.com/pluralsh/polly/algorithms"
7-
"github.com/urfave/cli"
7+
"github.com/urfave/cli/v2"
88
)
99

10-
func (p *Plural) apiCommands() []cli.Command {
11-
return []cli.Command{
10+
func (p *Plural) apiCommands() []*cli.Command {
11+
return []*cli.Command{
1212
{
1313
Name: "list",
1414
Usage: "lists plural resources",
15-
Subcommands: []cli.Command{
15+
Subcommands: []*cli.Command{
1616
{
1717
Name: "installations",
1818
Usage: "lists your installations",
@@ -62,7 +62,7 @@ func (p *Plural) apiCommands() []cli.Command {
6262
{
6363
Name: "create",
6464
Usage: "creates plural resources",
65-
Subcommands: []cli.Command{
65+
Subcommands: []*cli.Command{
6666
{
6767
Name: "domain",
6868
Usage: "creates a new domain for your account",

‎cmd/plural/app.go‎

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

88
tm "github.com/buger/goterm"
9-
"github.com/urfave/cli"
9+
"github.com/urfave/cli/v2"
1010

1111
"github.com/pluralsh/plural/pkg/application"
1212
"github.com/pluralsh/plural/pkg/config"

‎cmd/plural/bundle.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ import (
88
"github.com/pluralsh/plural/pkg/bundle"
99
"github.com/pluralsh/plural/pkg/manifest"
1010
"github.com/pluralsh/plural/pkg/utils"
11-
"github.com/urfave/cli"
11+
"github.com/urfave/cli/v2"
1212
)
1313

14-
func (p *Plural) bundleCommands() []cli.Command {
15-
return []cli.Command{
14+
func (p *Plural) bundleCommands() []*cli.Command {
15+
return []*cli.Command{
1616
{
1717
Name: "list",
1818
Usage: "lists bundles for a repository",
@@ -24,7 +24,7 @@ func (p *Plural) bundleCommands() []cli.Command {
2424
Usage: "installs a bundle and writes the configuration to this installation's context",
2525
ArgsUsage: "REPO NAME",
2626
Flags: []cli.Flag{
27-
cli.BoolFlag{
27+
&cli.BoolFlag{
2828
Name: "refresh",
2929
Usage: "re-enter the configuration for this bundle",
3030
},
@@ -34,14 +34,14 @@ func (p *Plural) bundleCommands() []cli.Command {
3434
}
3535
}
3636

37-
func (p *Plural) stackCommands() []cli.Command {
38-
return []cli.Command{
37+
func (p *Plural) stackCommands() []*cli.Command {
38+
return []*cli.Command{
3939
{
4040
Name: "install",
4141
Usage: "installs a plural stack for your current provider",
4242
ArgsUsage: "NAME",
4343
Flags: []cli.Flag{
44-
cli.BoolFlag{
44+
&cli.BoolFlag{
4545
Name: "refresh",
4646
Usage: "re-enter the configuration for all bundles",
4747
},
@@ -52,7 +52,7 @@ func (p *Plural) stackCommands() []cli.Command {
5252
Name: "list",
5353
Usage: "lists stacks to potentially install",
5454
Flags: []cli.Flag{
55-
cli.BoolTFlag{
55+
&cli.BoolFlag{
5656
Name: "account",
5757
Usage: "only list stacks within your account",
5858
},

‎cmd/plural/config.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import (
66

77
"github.com/pluralsh/plural/pkg/config"
88
"github.com/pluralsh/plural/pkg/utils"
9-
"github.com/urfave/cli"
9+
"github.com/urfave/cli/v2"
1010
)
1111

12-
func configCommands() []cli.Command {
13-
return []cli.Command{
12+
func configCommands() []*cli.Command {
13+
return []*cli.Command{
1414
{
1515
Name: "amend",
1616
Usage: "modify config",
@@ -31,8 +31,8 @@ func configCommands() []cli.Command {
3131
}
3232
}
3333

34-
func profileCommands() []cli.Command {
35-
return []cli.Command{
34+
func profileCommands() []*cli.Command {
35+
return []*cli.Command{
3636
{
3737
Name: "use",
3838
Usage: "moves the config in PROFILE to the current config",

‎cmd/plural/config_test.go‎

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

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

1212
plural "github.com/pluralsh/plural/cmd/plural"
1313
"github.com/pluralsh/plural/pkg/config"

‎cmd/plural/crypto.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010

1111
"github.com/AlecAivazis/survey/v2"
1212
"github.com/mitchellh/go-homedir"
13-
"github.com/urfave/cli"
13+
"github.com/urfave/cli/v2"
1414

1515
"github.com/pluralsh/plural/pkg/crypto"
1616
"github.com/pluralsh/plural/pkg/scm"
@@ -54,8 +54,8 @@ const Gitignore = `/**/.terraform
5454
// IMPORTANT
5555
// Repo cryptography relies on git smudge and clean filters, which pipe a file into stdin and respond with a new version
5656
// of the file from stdout. If we write anything besides the crypto text, it will no longer be decryptable naturally.
57-
func (p *Plural) cryptoCommands() []cli.Command {
58-
return []cli.Command{
57+
func (p *Plural) cryptoCommands() []*cli.Command {
58+
return []*cli.Command{
5959
{
6060
Name: "encrypt",
6161
Usage: "encrypts stdin and writes to stdout",
@@ -91,7 +91,7 @@ func (p *Plural) cryptoCommands() []cli.Command {
9191
Usage: "generates a random string",
9292
Action: randString,
9393
Flags: []cli.Flag{
94-
cli.IntFlag{
94+
&cli.IntFlag{
9595
Name: "len",
9696
Usage: "the length of the string to generate",
9797
Value: 32,
@@ -113,7 +113,7 @@ func (p *Plural) cryptoCommands() []cli.Command {
113113
Usage: "allows a list of plural users to decrypt this repository",
114114
ArgsUsage: "",
115115
Flags: []cli.Flag{
116-
cli.StringSliceFlag{
116+
&cli.StringSliceFlag{
117117
Name: "email",
118118
Usage: "a email to share with (multiple allowed)",
119119
Required: true,
@@ -125,7 +125,7 @@ func (p *Plural) cryptoCommands() []cli.Command {
125125
Name: "setup-keys",
126126
Usage: "creates an age keypair, and uploads the public key to plural for use in plural crypto share",
127127
Flags: []cli.Flag{
128-
cli.StringFlag{
128+
&cli.StringFlag{
129129
Name: "name",
130130
Usage: "a name for the key",
131131
Required: true,

‎cmd/plural/crypto_test.go‎

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

99
"github.com/pluralsh/plural/pkg/utils"
10-
"github.com/urfave/cli"
10+
"github.com/urfave/cli/v2"
1111

1212
plural "github.com/pluralsh/plural/cmd/plural"
1313
"github.com/pluralsh/plural/pkg/api"

‎cmd/plural/dependencies.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"fmt"
55

66
"github.com/pluralsh/plural/pkg/wkspace"
7-
"github.com/urfave/cli"
7+
"github.com/urfave/cli/v2"
88
)
99

1010
func (p *Plural) topsort(c *cli.Context) error {

‎cmd/plural/deploy.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"github.com/pluralsh/plural/pkg/wkspace"
2222
"github.com/pluralsh/polly/algorithms"
2323
"github.com/pluralsh/polly/containers"
24-
"github.com/urfave/cli"
24+
"github.com/urfave/cli/v2"
2525
)
2626

2727
func (p *Plural) getSortedInstallations(repo string) ([]*api.Installation, error) {

‎cmd/plural/git.go‎

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

88
"github.com/pluralsh/plural/pkg/utils/git"
9-
"github.com/urfave/cli"
9+
"github.com/urfave/cli/v2"
1010
)
1111

1212
func handleRepair(c *cli.Context) error {

0 commit comments

Comments
 (0)