Move flag definitions into extra files (#215)

woodpecker-ci · May 31, 2021 · 16bdc9f · 16bdc9f
1 parent 3d083ec
commit 16bdc9f
Show file tree

Hide file tree

Showing 4 changed files with 598 additions and 555 deletions.
diff --git a/cmd/drone-agent/flags.go b/cmd/drone-agent/flags.go
@@ -0,0 +1,104 @@
+// Copyright 2019 Laszlo Fogas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"time"
+
+	"github.com/urfave/cli"
+)
+
+var flags = []cli.Flag{
+	cli.StringFlag{
+		EnvVar: "DRONE_SERVER,WOODPECKER_SERVER",
+		Name:   "server",
+		Usage:  "drone server address",
+		Value:  "localhost:9000",
+	},
+	cli.StringFlag{
+		EnvVar: "DRONE_USERNAME,WOODPECKER_USERNAME",
+		Name:   "username",
+		Usage:  "drone auth username",
+		Value:  "x-oauth-basic",
+	},
+	cli.StringFlag{
+		EnvVar: "DRONE_PASSWORD,DRONE_SECRET,WOODPECKER_PASSWORD,WOODPECKER_SECRET",
+		Name:   "password",
+		Usage:  "server-agent shared password",
+	},
+	cli.BoolTFlag{
+		EnvVar: "DRONE_DEBUG,WOODPECKER_DEBUG",
+		Name:   "debug",
+		Usage:  "enable agent debug mode",
+	},
+	cli.BoolFlag{
+		EnvVar: "DRONE_DEBUG_PRETTY,WOODPECKER_DEBUG_PRETTY",
+		Name:   "pretty",
+		Usage:  "enable pretty-printed debug output",
+	},
+	cli.BoolTFlag{
+		EnvVar: "DRONE_DEBUG_NOCOLOR,WOODPECKER_DEBUG_NOCOLOR",
+		Name:   "nocolor",
+		Usage:  "disable colored debug output",
+	},
+	cli.StringFlag{
+		EnvVar: "DRONE_HOSTNAME,HOSTNAME,WOODPECKER_HOSTNAME,HOSTNAME",
+		Name:   "hostname",
+		Usage:  "agent hostname",
+	},
+	cli.StringFlag{
+		EnvVar: "DRONE_PLATFORM,WOODPECKER_PLATFORM",
+		Name:   "platform",
+		Usage:  "restrict builds by platform conditions",
+		Value:  "linux/amd64",
+	},
+	cli.StringFlag{
+		EnvVar: "DRONE_FILTER,WOODPECKER_FILTER",
+		Name:   "filter",
+		Usage:  "filter expression to restrict builds by label",
+	},
+	cli.IntFlag{
+		EnvVar: "DRONE_MAX_PROCS,WOODPECKER_MAX_PROCS",
+		Name:   "max-procs",
+		Usage:  "agent parallel builds",
+		Value:  1,
+	},
+	cli.BoolTFlag{
+		EnvVar: "DRONE_HEALTHCHECK,WOODPECKER_HEALTHCHECK",
+		Name:   "healthcheck",
+		Usage:  "enable healthcheck endpoint",
+	},
+	cli.DurationFlag{
+		EnvVar: "DRONE_KEEPALIVE_TIME,WOODPECKER_KEEPALIVE_TIME",
+		Name:   "keepalive-time",
+		Usage:  "after a duration of this time of no activity, the agent pings the server to check if the transport is still alive",
+	},
+	cli.DurationFlag{
+		EnvVar: "DRONE_KEEPALIVE_TIMEOUT,WOODPECKER_KEEPALIVE_TIMEOUT",
+		Name:   "keepalive-timeout",
+		Usage:  "after pinging for a keepalive check, the agent waits for a duration of this time before closing the connection if no activity",
+		Value:  time.Second * 20,
+	},
+	cli.BoolFlag{
+		Name:   "secure-grpc",
+		Usage:  "should the connection to DRONE_SERVER be made using a secure transport",
+		EnvVar: "DRONE_GRPC_SECURE,WOODPECKER_GRPC_SECURE",
+	},
+	cli.BoolTFlag{
+		Name:   "skip-insecure-grpc",
+		Usage:  "should the grpc server certificate be verified, only valid when DRONE_GRPC_SECURE is true",
+		EnvVar: "DRONE_GRPC_VERIFY,WOODPECKER_GRPC_VERIFY",
+	},
+}
diff --git a/cmd/drone-agent/main.go b/cmd/drone-agent/main.go
@@ -17,7 +17,6 @@ package main
 import (
 	"fmt"
 	"os"
-	"time"
 
 	"github.com/woodpecker-ci/woodpecker/version"
 
@@ -38,88 +37,7 @@ func main() {
 			Action: pinger,
 		},
 	}
-	app.Flags = []cli.Flag{
-		cli.StringFlag{
-			EnvVar: "DRONE_SERVER,WOODPECKER_SERVER",
-			Name:   "server",
-			Usage:  "drone server address",
-			Value:  "localhost:9000",
-		},
-		cli.StringFlag{
-			EnvVar: "DRONE_USERNAME,WOODPECKER_USERNAME",
-			Name:   "username",
-			Usage:  "drone auth username",
-			Value:  "x-oauth-basic",
-		},
-		cli.StringFlag{
-			EnvVar: "DRONE_PASSWORD,DRONE_SECRET,WOODPECKER_PASSWORD,WOODPECKER_SECRET",
-			Name:   "password",
-			Usage:  "server-agent shared password",
-		},
-		cli.BoolTFlag{
-			EnvVar: "DRONE_DEBUG,WOODPECKER_DEBUG",
-			Name:   "debug",
-			Usage:  "enable agent debug mode",
-		},
-		cli.BoolFlag{
-			EnvVar: "DRONE_DEBUG_PRETTY,WOODPECKER_DEBUG_PRETTY",
-			Name:   "pretty",
-			Usage:  "enable pretty-printed debug output",
-		},
-		cli.BoolTFlag{
-			EnvVar: "DRONE_DEBUG_NOCOLOR,WOODPECKER_DEBUG_NOCOLOR",
-			Name:   "nocolor",
-			Usage:  "disable colored debug output",
-		},
-		cli.StringFlag{
-			EnvVar: "DRONE_HOSTNAME,HOSTNAME,WOODPECKER_HOSTNAME,HOSTNAME",
-			Name:   "hostname",
-			Usage:  "agent hostname",
-		},
-		cli.StringFlag{
-			EnvVar: "DRONE_PLATFORM,WOODPECKER_PLATFORM",
-			Name:   "platform",
-			Usage:  "restrict builds by platform conditions",
-			Value:  "linux/amd64",
-		},
-		cli.StringFlag{
-			EnvVar: "DRONE_FILTER,WOODPECKER_FILTER",
-			Name:   "filter",
-			Usage:  "filter expression to restrict builds by label",
-		},
-		cli.IntFlag{
-			EnvVar: "DRONE_MAX_PROCS,WOODPECKER_MAX_PROCS",
-			Name:   "max-procs",
-			Usage:  "agent parallel builds",
-			Value:  1,
-		},
-		cli.BoolTFlag{
-			EnvVar: "DRONE_HEALTHCHECK,WOODPECKER_HEALTHCHECK",
-			Name:   "healthcheck",
-			Usage:  "enable healthcheck endpoint",
-		},
-		cli.DurationFlag{
-			EnvVar: "DRONE_KEEPALIVE_TIME,WOODPECKER_KEEPALIVE_TIME",
-			Name:   "keepalive-time",
-			Usage:  "after a duration of this time of no activity, the agent pings the server to check if the transport is still alive",
-		},
-		cli.DurationFlag{
-			EnvVar: "DRONE_KEEPALIVE_TIMEOUT,WOODPECKER_KEEPALIVE_TIMEOUT",
-			Name:   "keepalive-timeout",
-			Usage:  "after pinging for a keepalive check, the agent waits for a duration of this time before closing the connection if no activity",
-			Value:  time.Second * 20,
-		},
-		cli.BoolFlag{
-			Name:   "secure-grpc",
-			Usage:  "should the connection to DRONE_SERVER be made using a secure transport",
-			EnvVar: "DRONE_GRPC_SECURE,WOODPECKER_GRPC_SECURE",
-		},
-		cli.BoolTFlag{
-			Name:   "skip-insecure-grpc",
-			Usage:  "should the grpc server certificate be verified, only valid when DRONE_GRPC_SECURE is true",
-			EnvVar: "DRONE_GRPC_VERIFY,WOODPECKER_GRPC_VERIFY",
-		},
-	}
+	app.Flags = flags
 
 	if err := app.Run(os.Args); err != nil {
 		fmt.Fprintln(os.Stderr, err)