Upgrade urfave/cli to v2 (#483)

* migrate urfave/ci v1 -> v2 * refactor cli (format flag) * log error if agent can not listen on port 3000 close #452
2026-03-15 17:13:46 +01:00 · 2021-10-27 21:03:14 +02:00
parent d35f5158bc
commit 798c2bc8b2
121 changed files with 8407 additions and 1346 deletions
--- a/cli/exec/flags.go
+++ b/cli/exec/flags.go
@@ -17,46 +17,47 @@ package exec
 import (
 	"time"

-	"github.com/urfave/cli"
+	"github.com/urfave/cli/v2"
 )

 var flags = []cli.Flag{
-	cli.BoolTFlag{
-		EnvVar: "WOODPECKER_LOCAL",
-		Name:   "local",
-		Usage:  "build from local directory",
+	&cli.BoolFlag{
+		EnvVars: []string{"WOODPECKER_LOCAL"},
+		Name:    "local",
+		Usage:   "build from local directory",
+		Value:   true,
 	},
-	cli.DurationFlag{
-		EnvVar: "WOODPECKER_TIMEOUT",
-		Name:   "timeout",
-		Usage:  "build timeout",
-		Value:  time.Hour,
+	&cli.DurationFlag{
+		EnvVars: []string{"WOODPECKER_TIMEOUT"},
+		Name:    "timeout",
+		Usage:   "build timeout",
+		Value:   time.Hour,
 	},
-	cli.StringSliceFlag{
-		EnvVar: "WOODPECKER_VOLUMES",
-		Name:   "volumes",
-		Usage:  "build volumes",
+	&cli.StringSliceFlag{
+		EnvVars: []string{"WOODPECKER_VOLUMES"},
+		Name:    "volumes",
+		Usage:   "build volumes",
 	},
-	cli.StringSliceFlag{
-		EnvVar: "WOODPECKER_NETWORKS",
-		Name:   "network",
-		Usage:  "external networks",
+	&cli.StringSliceFlag{
+		EnvVars: []string{"WOODPECKER_NETWORKS"},
+		Name:    "network",
+		Usage:   "external networks",
 	},
-	cli.StringFlag{
-		EnvVar: "WOODPECKER_DOCKER_PREFIX",
-		Name:   "prefix",
-		Value:  "woodpecker",
-		Usage:  "prefix containers created by woodpecker",
-		Hidden: true,
+	&cli.StringFlag{
+		EnvVars: []string{"WOODPECKER_DOCKER_PREFIX"},
+		Name:    "prefix",
+		Value:   "woodpecker",
+		Usage:   "prefix containers created by woodpecker",
+		Hidden:  true,
 	},
-	cli.StringSliceFlag{
+	&cli.StringSliceFlag{
 		Name:  "privileged",
 		Usage: "privileged plugins",
-		Value: &cli.StringSlice{
+		Value: cli.NewStringSlice(
 			"plugins/docker",
 			"plugins/gcr",
 			"plugins/ecr",
-		},
+		),
 	},

 	//
@@ -67,199 +68,199 @@ var flags = []cli.Flag{
 	//
 	// workspace default
 	//
-	cli.StringFlag{
-		EnvVar: "WOODPECKER_WORKSPACE_BASE",
-		Name:   "workspace-base",
-		Value:  "/woodpecker",
+	&cli.StringFlag{
+		EnvVars: []string{"WOODPECKER_WORKSPACE_BASE"},
+		Name:    "workspace-base",
+		Value:   "/woodpecker",
 	},
-	cli.StringFlag{
-		EnvVar: "WOODPECKER_WORKSPACE_PATH",
-		Name:   "workspace-path",
-		Value:  "src",
+	&cli.StringFlag{
+		EnvVars: []string{"WOODPECKER_WORKSPACE_PATH"},
+		Name:    "workspace-path",
+		Value:   "src",
 	},
 	//
 	// netrc parameters
 	//
-	cli.StringFlag{
-		EnvVar: "WOODPECKER_NETRC_USERNAME",
-		Name:   "netrc-username",
+	&cli.StringFlag{
+		EnvVars: []string{"WOODPECKER_NETRC_USERNAME"},
+		Name:    "netrc-username",
 	},
-	cli.StringFlag{
-		EnvVar: "WOODPECKER_NETRC_PASSWORD",
-		Name:   "netrc-password",
+	&cli.StringFlag{
+		EnvVars: []string{"WOODPECKER_NETRC_PASSWORD"},
+		Name:    "netrc-password",
 	},
-	cli.StringFlag{
-		EnvVar: "WOODPECKER_NETRC_MACHINE",
-		Name:   "netrc-machine",
+	&cli.StringFlag{
+		EnvVars: []string{"WOODPECKER_NETRC_MACHINE"},
+		Name:    "netrc-machine",
 	},
 	//
 	// metadata parameters
 	//
-	cli.StringFlag{
-		EnvVar: "WOODPECKER_SYSTEM_ARCH",
-		Name:   "system-arch",
-		Value:  "linux/amd64",
+	&cli.StringFlag{
+		EnvVars: []string{"WOODPECKER_SYSTEM_ARCH"},
+		Name:    "system-arch",
+		Value:   "linux/amd64",
 	},
-	cli.StringFlag{
-		EnvVar: "WOODPECKER_SYSTEM_NAME",
-		Name:   "system-name",
-		Value:  "pipec",
+	&cli.StringFlag{
+		EnvVars: []string{"WOODPECKER_SYSTEM_NAME"},
+		Name:    "system-name",
+		Value:   "pipec",
 	},
-	cli.StringFlag{
-		EnvVar: "WOODPECKER_SYSTEM_LINK",
-		Name:   "system-link",
-		Value:  "https://github.com/cncd/pipec",
+	&cli.StringFlag{
+		EnvVars: []string{"WOODPECKER_SYSTEM_LINK"},
+		Name:    "system-link",
+		Value:   "https://github.com/cncd/pipec",
 	},
-	cli.StringFlag{
-		EnvVar: "WOODPECKER_REPO_NAME",
-		Name:   "repo-name",
+	&cli.StringFlag{
+		EnvVars: []string{"WOODPECKER_REPO_NAME"},
+		Name:    "repo-name",
 	},
-	cli.StringFlag{
-		EnvVar: "WOODPECKER_REPO_LINK",
-		Name:   "repo-link",
+	&cli.StringFlag{
+		EnvVars: []string{"WOODPECKER_REPO_LINK"},
+		Name:    "repo-link",
 	},
-	cli.StringFlag{
-		EnvVar: "WOODPECKER_REPO_REMOTE",
-		Name:   "repo-remote-url",
+	&cli.StringFlag{
+		EnvVars: []string{"WOODPECKER_REPO_REMOTE"},
+		Name:    "repo-remote-url",
 	},
-	cli.StringFlag{
-		EnvVar: "WOODPECKER_REPO_PRIVATE",
-		Name:   "repo-private",
+	&cli.StringFlag{
+		EnvVars: []string{"WOODPECKER_REPO_PRIVATE"},
+		Name:    "repo-private",
 	},
-	cli.IntFlag{
-		EnvVar: "WOODPECKER_BUILD_NUMBER",
-		Name:   "build-number",
+	&cli.IntFlag{
+		EnvVars: []string{"WOODPECKER_BUILD_NUMBER"},
+		Name:    "build-number",
 	},
-	cli.IntFlag{
-		EnvVar: "WOODPECKER_PARENT_BUILD_NUMBER",
-		Name:   "parent-build-number",
+	&cli.IntFlag{
+		EnvVars: []string{"WOODPECKER_PARENT_BUILD_NUMBER"},
+		Name:    "parent-build-number",
 	},
-	cli.Int64Flag{
-		EnvVar: "WOODPECKER_BUILD_CREATED",
-		Name:   "build-created",
+	&cli.Int64Flag{
+		EnvVars: []string{"WOODPECKER_BUILD_CREATED"},
+		Name:    "build-created",
 	},
-	cli.Int64Flag{
-		EnvVar: "WOODPECKER_BUILD_STARTED",
-		Name:   "build-started",
+	&cli.Int64Flag{
+		EnvVars: []string{"WOODPECKER_BUILD_STARTED"},
+		Name:    "build-started",
 	},
-	cli.Int64Flag{
-		EnvVar: "WOODPECKER_BUILD_FINISHED",
-		Name:   "build-finished",
+	&cli.Int64Flag{
+		EnvVars: []string{"WOODPECKER_BUILD_FINISHED"},
+		Name:    "build-finished",
 	},
-	cli.StringFlag{
-		EnvVar: "WOODPECKER_BUILD_STATUS",
-		Name:   "build-status",
+	&cli.StringFlag{
+		EnvVars: []string{"WOODPECKER_BUILD_STATUS"},
+		Name:    "build-status",
 	},
-	cli.StringFlag{
-		EnvVar: "WOODPECKER_BUILD_EVENT",
-		Name:   "build-event",
+	&cli.StringFlag{
+		EnvVars: []string{"WOODPECKER_BUILD_EVENT"},
+		Name:    "build-event",
 	},
-	cli.StringFlag{
-		EnvVar: "WOODPECKER_BUILD_LINK",
-		Name:   "build-link",
+	&cli.StringFlag{
+		EnvVars: []string{"WOODPECKER_BUILD_LINK"},
+		Name:    "build-link",
 	},
-	cli.StringFlag{
-		EnvVar: "WOODPECKER_BUILD_TARGET",
-		Name:   "build-target",
+	&cli.StringFlag{
+		EnvVars: []string{"WOODPECKER_BUILD_TARGET"},
+		Name:    "build-target",
 	},
-	cli.StringFlag{
-		EnvVar: "WOODPECKER_COMMIT_SHA",
-		Name:   "commit-sha",
+	&cli.StringFlag{
+		EnvVars: []string{"WOODPECKER_COMMIT_SHA"},
+		Name:    "commit-sha",
 	},
-	cli.StringFlag{
-		EnvVar: "WOODPECKER_COMMIT_REF",
-		Name:   "commit-ref",
+	&cli.StringFlag{
+		EnvVars: []string{"WOODPECKER_COMMIT_REF"},
+		Name:    "commit-ref",
 	},
-	cli.StringFlag{
-		EnvVar: "WOODPECKER_COMMIT_REFSPEC",
-		Name:   "commit-refspec",
+	&cli.StringFlag{
+		EnvVars: []string{"WOODPECKER_COMMIT_REFSPEC"},
+		Name:    "commit-refspec",
 	},
-	cli.StringFlag{
-		EnvVar: "WOODPECKER_COMMIT_BRANCH",
-		Name:   "commit-branch",
+	&cli.StringFlag{
+		EnvVars: []string{"WOODPECKER_COMMIT_BRANCH"},
+		Name:    "commit-branch",
 	},
-	cli.StringFlag{
-		EnvVar: "WOODPECKER_COMMIT_MESSAGE",
-		Name:   "commit-message",
+	&cli.StringFlag{
+		EnvVars: []string{"WOODPECKER_COMMIT_MESSAGE"},
+		Name:    "commit-message",
 	},
-	cli.StringFlag{
-		EnvVar: "WOODPECKER_COMMIT_AUTHOR_NAME",
-		Name:   "commit-author-name",
+	&cli.StringFlag{
+		EnvVars: []string{"WOODPECKER_COMMIT_AUTHOR_NAME"},
+		Name:    "commit-author-name",
 	},
-	cli.StringFlag{
-		EnvVar: "WOODPECKER_COMMIT_AUTHOR_AVATAR",
-		Name:   "commit-author-avatar",
+	&cli.StringFlag{
+		EnvVars: []string{"WOODPECKER_COMMIT_AUTHOR_AVATAR"},
+		Name:    "commit-author-avatar",
 	},
-	cli.StringFlag{
-		EnvVar: "WOODPECKER_COMMIT_AUTHOR_EMAIL",
-		Name:   "commit-author-email",
+	&cli.StringFlag{
+		EnvVars: []string{"WOODPECKER_COMMIT_AUTHOR_EMAIL"},
+		Name:    "commit-author-email",
 	},
-	cli.IntFlag{
-		EnvVar: "WOODPECKER_PREV_BUILD_NUMBER",
-		Name:   "prev-build-number",
+	&cli.IntFlag{
+		EnvVars: []string{"WOODPECKER_PREV_BUILD_NUMBER"},
+		Name:    "prev-build-number",
 	},
-	cli.Int64Flag{
-		EnvVar: "WOODPECKER_PREV_BUILD_CREATED",
-		Name:   "prev-build-created",
+	&cli.Int64Flag{
+		EnvVars: []string{"WOODPECKER_PREV_BUILD_CREATED"},
+		Name:    "prev-build-created",
 	},
-	cli.Int64Flag{
-		EnvVar: "WOODPECKER_PREV_BUILD_STARTED",
-		Name:   "prev-build-started",
+	&cli.Int64Flag{
+		EnvVars: []string{"WOODPECKER_PREV_BUILD_STARTED"},
+		Name:    "prev-build-started",
 	},
-	cli.Int64Flag{
-		EnvVar: "WOODPECKER_PREV_BUILD_FINISHED",
-		Name:   "prev-build-finished",
+	&cli.Int64Flag{
+		EnvVars: []string{"WOODPECKER_PREV_BUILD_FINISHED"},
+		Name:    "prev-build-finished",
 	},
-	cli.StringFlag{
-		EnvVar: "WOODPECKER_PREV_BUILD_STATUS",
-		Name:   "prev-build-status",
+	&cli.StringFlag{
+		EnvVars: []string{"WOODPECKER_PREV_BUILD_STATUS"},
+		Name:    "prev-build-status",
 	},
-	cli.StringFlag{
-		EnvVar: "WOODPECKER_PREV_BUILD_EVENT",
-		Name:   "prev-build-event",
+	&cli.StringFlag{
+		EnvVars: []string{"WOODPECKER_PREV_BUILD_EVENT"},
+		Name:    "prev-build-event",
 	},
-	cli.StringFlag{
-		EnvVar: "WOODPECKER_PREV_BUILD_LINK",
-		Name:   "prev-build-link",
+	&cli.StringFlag{
+		EnvVars: []string{"WOODPECKER_PREV_BUILD_LINK"},
+		Name:    "prev-build-link",
 	},
-	cli.StringFlag{
-		EnvVar: "WOODPECKER_PREV_COMMIT_SHA",
-		Name:   "prev-commit-sha",
+	&cli.StringFlag{
+		EnvVars: []string{"WOODPECKER_PREV_COMMIT_SHA"},
+		Name:    "prev-commit-sha",
 	},
-	cli.StringFlag{
-		EnvVar: "WOODPECKER_PREV_COMMIT_REF",
-		Name:   "prev-commit-ref",
+	&cli.StringFlag{
+		EnvVars: []string{"WOODPECKER_PREV_COMMIT_REF"},
+		Name:    "prev-commit-ref",
 	},
-	cli.StringFlag{
-		EnvVar: "WOODPECKER_PREV_COMMIT_REFSPEC",
-		Name:   "prev-commit-refspec",
+	&cli.StringFlag{
+		EnvVars: []string{"WOODPECKER_PREV_COMMIT_REFSPEC"},
+		Name:    "prev-commit-refspec",
 	},
-	cli.StringFlag{
-		EnvVar: "WOODPECKER_PREV_COMMIT_BRANCH",
-		Name:   "prev-commit-branch",
+	&cli.StringFlag{
+		EnvVars: []string{"WOODPECKER_PREV_COMMIT_BRANCH"},
+		Name:    "prev-commit-branch",
 	},
-	cli.StringFlag{
-		EnvVar: "WOODPECKER_PREV_COMMIT_MESSAGE",
-		Name:   "prev-commit-message",
+	&cli.StringFlag{
+		EnvVars: []string{"WOODPECKER_PREV_COMMIT_MESSAGE"},
+		Name:    "prev-commit-message",
 	},
-	cli.StringFlag{
-		EnvVar: "WOODPECKER_PREV_COMMIT_AUTHOR_NAME",
-		Name:   "prev-commit-author-name",
+	&cli.StringFlag{
+		EnvVars: []string{"WOODPECKER_PREV_COMMIT_AUTHOR_NAME"},
+		Name:    "prev-commit-author-name",
 	},
-	cli.StringFlag{
-		EnvVar: "WOODPECKER_PREV_COMMIT_AUTHOR_AVATAR",
-		Name:   "prev-commit-author-avatar",
+	&cli.StringFlag{
+		EnvVars: []string{"WOODPECKER_PREV_COMMIT_AUTHOR_AVATAR"},
+		Name:    "prev-commit-author-avatar",
 	},
-	cli.StringFlag{
-		EnvVar: "WOODPECKER_PREV_COMMIT_AUTHOR_EMAIL",
-		Name:   "prev-commit-author-email",
+	&cli.StringFlag{
+		EnvVars: []string{"WOODPECKER_PREV_COMMIT_AUTHOR_EMAIL"},
+		Name:    "prev-commit-author-email",
 	},
-	cli.IntFlag{
-		EnvVar: "WOODPECKER_JOB_NUMBER",
-		Name:   "job-number",
+	&cli.IntFlag{
+		EnvVars: []string{"WOODPECKER_JOB_NUMBER"},
+		Name:    "job-number",
 	},
-	cli.StringSliceFlag{
-		EnvVar: "WOODPECKER_ENV",
-		Name:   "env",
+	&cli.StringSliceFlag{
+		EnvVars: []string{"WOODPECKER_ENV"},
+		Name:    "env",
 	},
 }