Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update module github.com/urfave/cli to v2 #140

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions cmd/plural/api.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion cmd/plural/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
16 changes: 8 additions & 8 deletions cmd/plural/bundle.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
},
Expand All @@ -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",
},
Expand All @@ -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",
},
Expand Down
10 changes: 5 additions & 5 deletions cmd/plural/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion cmd/plural/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
12 changes: 6 additions & 6 deletions cmd/plural/crypto.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion cmd/plural/crypto_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmd/plural/dependencies.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion cmd/plural/deploy.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion cmd/plural/git.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion cmd/plural/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
10 changes: 5 additions & 5 deletions cmd/plural/link.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)",
},
Expand Down
6 changes: 3 additions & 3 deletions cmd/plural/logs.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions cmd/plural/ops.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions cmd/plural/output.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions cmd/plural/packages.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading