rebase

cmd/plural/api.go

@@ -4,15 +4,15 @@ import (
 	"github.com/pluralsh/plural/pkg/api"
 	"github.com/pluralsh/plural/pkg/utils"
 	"github.com/pluralsh/polly/algorithms"
-	"github.com/urfave/cli"
+	"github.com/urfave/cli/v2"
 )
 
-func (p *Plural) apiCommands() []cli.Command {
-	return []cli.Command{
+func (p *Plural) apiCommands() []*cli.Command {
+	return []*cli.Command{
 		{
 			Name:  "list",
 			Usage: "lists plural resources",
-			Subcommands: []cli.Command{
+			Subcommands: []*cli.Command{
 				{
 					Name:      "installations",
 					Usage:     "lists your installations",
@@ -62,7 +62,7 @@ func (p *Plural) apiCommands() []cli.Command {
 		{
 			Name:  "create",
 			Usage: "creates plural resources",
-			Subcommands: []cli.Command{
+			Subcommands: []*cli.Command{
 				{
 					Name:      "domain",
 					Usage:     "creates a new domain for your account",

cmd/plural/app.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	tm "github.com/buger/goterm"
-	"github.com/urfave/cli"
+	"github.com/urfave/cli/v2"
 
 	"github.com/pluralsh/plural/pkg/application"
 	"github.com/pluralsh/plural/pkg/config"

cmd/plural/bundle.go

@@ -8,11 +8,11 @@ import (
 	"github.com/pluralsh/plural/pkg/bundle"
 	"github.com/pluralsh/plural/pkg/manifest"
 	"github.com/pluralsh/plural/pkg/utils"
-	"github.com/urfave/cli"
+	"github.com/urfave/cli/v2"
 )
 
-func (p *Plural) bundleCommands() []cli.Command {
-	return []cli.Command{
+func (p *Plural) bundleCommands() []*cli.Command {
+	return []*cli.Command{
 		{
 			Name:      "list",
 			Usage:     "lists bundles for a repository",
@@ -24,7 +24,7 @@ func (p *Plural) bundleCommands() []cli.Command {
 			Usage:     "installs a bundle and writes the configuration to this installation's context",
 			ArgsUsage: "REPO NAME",
 			Flags: []cli.Flag{
-				cli.BoolFlag{
+				&cli.BoolFlag{
 					Name:  "refresh",
 					Usage: "re-enter the configuration for this bundle",
 				},
@@ -34,14 +34,14 @@ func (p *Plural) bundleCommands() []cli.Command {
 	}
 }
 
-func (p *Plural) stackCommands() []cli.Command {
-	return []cli.Command{
+func (p *Plural) stackCommands() []*cli.Command {
+	return []*cli.Command{
 		{
 			Name:      "install",
 			Usage:     "installs a plural stack for your current provider",
 			ArgsUsage: "NAME",
 			Flags: []cli.Flag{
-				cli.BoolFlag{
+				&cli.BoolFlag{
 					Name:  "refresh",
 					Usage: "re-enter the configuration for all bundles",
 				},
@@ -52,7 +52,7 @@ func (p *Plural) stackCommands() []cli.Command {
 			Name:  "list",
 			Usage: "lists stacks to potentially install",
 			Flags: []cli.Flag{
-				cli.BoolTFlag{
+				&cli.BoolFlag{
 					Name:  "account",
 					Usage: "only list stacks within your account",
 				},

cmd/plural/config.go

@@ -6,11 +6,11 @@ import (
 
 	"github.com/pluralsh/plural/pkg/config"
 	"github.com/pluralsh/plural/pkg/utils"
-	"github.com/urfave/cli"
+	"github.com/urfave/cli/v2"
 )
 
-func configCommands() []cli.Command {
-	return []cli.Command{
+func configCommands() []*cli.Command {
+	return []*cli.Command{
 		{
 			Name:      "amend",
 			Usage:     "modify config",
@@ -31,8 +31,8 @@ func configCommands() []cli.Command {
 	}
 }
 
-func profileCommands() []cli.Command {
-	return []cli.Command{
+func profileCommands() []*cli.Command {
+	return []*cli.Command{
 		{
 			Name:      "use",
 			Usage:     "moves the config in PROFILE to the current config",

cmd/plural/config_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/urfave/cli"
+	"github.com/urfave/cli/v2"
 
 	plural "github.com/pluralsh/plural/cmd/plural"
 	"github.com/pluralsh/plural/pkg/config"

cmd/plural/crypto.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/mitchellh/go-homedir"
-	"github.com/urfave/cli"
+	"github.com/urfave/cli/v2"
 
 	"github.com/pluralsh/plural/pkg/crypto"
 	"github.com/pluralsh/plural/pkg/scm"
@@ -54,8 +54,8 @@ const Gitignore = `/**/.terraform
 // IMPORTANT
 // Repo cryptography relies on git smudge and clean filters, which pipe a file into stdin and respond with a new version
 // of the file from stdout. If we write anything besides the crypto text, it will no longer be decryptable naturally.
-func (p *Plural) cryptoCommands() []cli.Command {
-	return []cli.Command{
+func (p *Plural) cryptoCommands() []*cli.Command {
+	return []*cli.Command{
 		{
 			Name:   "encrypt",
 			Usage:  "encrypts stdin and writes to stdout",
@@ -91,7 +91,7 @@ func (p *Plural) cryptoCommands() []cli.Command {
 			Usage:  "generates a random string",
 			Action: randString,
 			Flags: []cli.Flag{
-				cli.IntFlag{
+				&cli.IntFlag{
 					Name:  "len",
 					Usage: "the length of the string to generate",
 					Value: 32,
@@ -113,7 +113,7 @@ func (p *Plural) cryptoCommands() []cli.Command {
 			Usage:     "allows a list of plural users to decrypt this repository",
 			ArgsUsage: "",
 			Flags: []cli.Flag{
-				cli.StringSliceFlag{
+				&cli.StringSliceFlag{
 					Name:     "email",
 					Usage:    "a email to share with (multiple allowed)",
 					Required: true,
@@ -125,7 +125,7 @@ func (p *Plural) cryptoCommands() []cli.Command {
 			Name:  "setup-keys",
 			Usage: "creates an age keypair, and uploads the public key to plural for use in plural crypto share",
 			Flags: []cli.Flag{
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:     "name",
 					Usage:    "a name for the key",
 					Required: true,

cmd/plural/crypto_test.go

@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/pluralsh/plural/pkg/utils"
-	"github.com/urfave/cli"
+	"github.com/urfave/cli/v2"
 
 	plural "github.com/pluralsh/plural/cmd/plural"
 	"github.com/pluralsh/plural/pkg/api"

cmd/plural/dependencies.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/pluralsh/plural/pkg/wkspace"
-	"github.com/urfave/cli"
+	"github.com/urfave/cli/v2"
 )
 
 func (p *Plural) topsort(c *cli.Context) error {

cmd/plural/deploy.go

@@ -21,7 +21,7 @@ import (
 	"github.com/pluralsh/plural/pkg/wkspace"
 	"github.com/pluralsh/polly/algorithms"
 	"github.com/pluralsh/polly/containers"
-	"github.com/urfave/cli"
+	"github.com/urfave/cli/v2"
 )
 
 func (p *Plural) getSortedInstallations(repo string) ([]*api.Installation, error) {

cmd/plural/git.go

@@ -6,7 +6,7 @@ import (
 	"os/exec"
 
 	"github.com/pluralsh/plural/pkg/utils/git"
-	"github.com/urfave/cli"
+	"github.com/urfave/cli/v2"
 )
 
 func handleRepair(c *cli.Context) error {

cmd/plural/init.go

@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/pkg/browser"
-	"github.com/urfave/cli"
+	"github.com/urfave/cli/v2"
 
 	"github.com/pluralsh/plural/pkg/api"
 	"github.com/pluralsh/plural/pkg/config"

cmd/plural/link.go

@@ -2,22 +2,22 @@ package main
 
 import (
 	"github.com/pluralsh/plural/pkg/manifest"
-	"github.com/urfave/cli"
+	"github.com/urfave/cli/v2"
 )
 
-func linkCommands() []cli.Command {
-	return []cli.Command{
+func linkCommands() []*cli.Command {
+	return []*cli.Command{
 		{
 			Name:      "link",
 			Usage:     "links a local package into an installation repo",
 			ArgsUsage: "TOOL REPO",
 			Action:    handleLink,
 			Flags: []cli.Flag{
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:  "name, n",
 					Usage: "the name of the artifact to link",
 				},
-				cli.StringFlag{
+				&cli.StringFlag{
 					Name:  "path, f",
 					Usage: "local path to that artifact (can be relative)",
 				},

cmd/plural/logs.go

@@ -3,11 +3,11 @@ package main
 import (
 	"github.com/pluralsh/plural/pkg/config"
 	"github.com/pluralsh/plural/pkg/logs"
-	"github.com/urfave/cli"
+	"github.com/urfave/cli/v2"
 )
 
-func (p *Plural) logsCommands() []cli.Command {
-	return []cli.Command{
+func (p *Plural) logsCommands() []*cli.Command {
+	return []*cli.Command{
 		{
 			Name:      "list",
 			Usage:     "lists log tails for a repo",

cmd/plural/ops.go

@@ -5,12 +5,12 @@ import (
 
 	"github.com/pluralsh/plural/pkg/provider"
 	"github.com/pluralsh/plural/pkg/utils"
-	"github.com/urfave/cli"
+	"github.com/urfave/cli/v2"
 	v1 "k8s.io/api/core/v1"
 )
 
-func (p *Plural) opsCommands() []cli.Command {
-	return []cli.Command{
+func (p *Plural) opsCommands() []*cli.Command {
+	return []*cli.Command{
 		{
 			Name:      "terminate",
 			Usage:     "terminates a worker node in your cluster",

cmd/plural/output.go

@@ -6,11 +6,11 @@ import (
 	"github.com/pluralsh/plural/pkg/output"
 	"github.com/pluralsh/plural/pkg/utils"
 	"github.com/pluralsh/plural/pkg/utils/pathing"
-	"github.com/urfave/cli"
+	"github.com/urfave/cli/v2"
 )
 
-func outputCommands() []cli.Command {
-	return []cli.Command{
+func outputCommands() []*cli.Command {
+	return []*cli.Command{
 		{
 			Name:      "terraform",
 			Usage:     "generates terraform output",

cmd/plural/packages.go

@@ -8,11 +8,11 @@ import (
 	"github.com/olekukonko/tablewriter"
 	"github.com/pluralsh/plural/pkg/utils"
 	"github.com/pluralsh/plural/pkg/wkspace"
-	"github.com/urfave/cli"
+	"github.com/urfave/cli/v2"
 )
 
-func (p *Plural) packagesCommands() []cli.Command {
-	return []cli.Command{
+func (p *Plural) packagesCommands() []*cli.Command {
+	return []*cli.Command{
 		{
 			Name:      "uninstall",
 			Usage:     "uninstall a helm or terraform package",