Remove unused flags / options (#693)

Some flags where unused and / or unnecessary as they are covered by alternatives implemented in PRs of milestone 0.15.0 and just complicated the setup.

closes #681

cmd/agent/agent.go

@@ -60,12 +60,6 @@ func loop(c *cli.Context) error {
 	}
 
 	zerolog.SetGlobalLevel(zerolog.WarnLevel)
-	if c.Bool("debug") {
-		if c.IsSet("debug") {
-			log.Warn().Msg("--debug is deprecated, use --log-level instead")
-		}
-		zerolog.SetGlobalLevel(zerolog.DebugLevel)
-	}
 	if zerolog.GlobalLevel() <= zerolog.DebugLevel {
 		log.Logger = log.With().Caller().Logger()
 	}
@@ -95,7 +89,7 @@ func loop(c *cli.Context) error {
 
 	// grpc.Dial(target, ))
 	var transport grpc.DialOption
-	if c.Bool("secure-grpc") {
+	if c.Bool("grpc-secure") {
 		transport = grpc.WithTransportCredentials(grpccredentials.NewTLS(&tls.Config{InsecureSkipVerify: c.Bool("skip-insecure-grpc")}))
 	} else {
 		transport = grpc.WithTransportCredentials(insecure.NewCredentials())
@@ -105,12 +99,12 @@ func loop(c *cli.Context) error {
 		c.String("server"),
 		transport,
 		grpc.WithPerRPCCredentials(&credentials{
-			username: c.String("username"),
-			password: c.String("password"),
+			username: c.String("grpc-username"),
+			password: c.String("grpc-password"),
 		}),
 		grpc.WithKeepaliveParams(keepalive.ClientParameters{
-			Time:    c.Duration("keepalive-time"),
-			Timeout: c.Duration("keepalive-timeout"),
+			Time:    c.Duration("grpc-keepalive-time"),
+			Timeout: c.Duration("grpc-keepalive-timeout"),
 		}),
 	)
 	if err != nil {

cmd/agent/flags.go

@@ -29,19 +29,24 @@ var flags = []cli.Flag{
 	},
 	&cli.StringFlag{
 		EnvVars: []string{"WOODPECKER_USERNAME"},
-		Name:    "username",
+		Name:    "grpc-username",
 		Usage:   "auth username",
 		Value:   "x-oauth-basic",
 	},
 	&cli.StringFlag{
 		EnvVars: []string{"WOODPECKER_AGENT_SECRET"},
-		Name:    "password",
+		Name:    "grpc-password",
 		Usage:   "server-agent shared password",
 	},
 	&cli.BoolFlag{
-		EnvVars: []string{"WOODPECKER_DEBUG"},
-		Name:    "debug",
-		Usage:   "enable agent debug mode",
+		EnvVars: []string{"WOODPECKER_GRPC_SECURE"},
+		Name:    "grpc-secure",
+		Usage:   "should the connection to WOODPECKER_SERVER be made using a secure transport",
+	},
+	&cli.BoolFlag{
+		EnvVars: []string{"WOODPECKER_GRPC_VERIFY"},
+		Name:    "grpc-skip-insecure",
+		Usage:   "should the grpc server certificate be verified, only valid when WOODPECKER_GRPC_SECURE is true",
 		Value:   true,
 	},
 	&cli.StringFlag{
@@ -93,17 +98,6 @@ var flags = []cli.Flag{
 		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{
-		EnvVars: []string{"WOODPECKER_GRPC_SECURE"},
-		Name:    "secure-grpc",
-		Usage:   "should the connection to WOODPECKER_SERVER be made using a secure transport",
-	},
-	&cli.BoolFlag{
-		EnvVars: []string{"WOODPECKER_GRPC_VERIFY"},
-		Name:    "skip-insecure-grpc",
-		Usage:   "should the grpc server certificate be verified, only valid when WOODPECKER_GRPC_SECURE is true",
-		Value:   true,
-	},
 	&cli.StringFlag{
 		EnvVars: []string{"WOODPECKER_BACKEND"},
 		Name:    "backend-engine",

cmd/server/flags.go

@@ -23,11 +23,6 @@ import (
 )
 
 var flags = []cli.Flag{
-	&cli.BoolFlag{
-		EnvVars: []string{"WOODPECKER_DEBUG"},
-		Name:    "debug",
-		Usage:   "enable server debug mode",
-	},
 	&cli.StringFlag{
 		EnvVars: []string{"WOODPECKER_LOG_LEVEL"},
 		Name:    "log-level",
@@ -76,11 +71,6 @@ var flags = []cli.Flag{
 		Name:    "lets-encrypt",
 		Usage:   "enable let's encrypt",
 	},
-	&cli.BoolFlag{
-		EnvVars: []string{"WOODPECKER_QUIC"},
-		Name:    "quic",
-		Usage:   "enable quic",
-	},
 	&cli.StringSliceFlag{
 		EnvVars: []string{"WOODPECKER_ADMIN"},
 		Name:    "admin",
@@ -207,7 +197,7 @@ var flags = []cli.Flag{
 		Usage:   "set the cpus allowed to execute containers",
 	},
 	//
-	// remote parameters
+	// Github
 	//
 	&cli.StringFlag{
 		EnvVars: []string{"WOODPECKER_STATUS_CONTEXT", "WOODPECKER_GITHUB_CONTEXT", "WOODPECKER_GITEA_CONTEXT"},
@@ -215,13 +205,6 @@ var flags = []cli.Flag{
 		Usage:   "status context prefix",
 		Value:   "ci/woodpecker",
 	},
-	&cli.BoolFlag{
-		Name:    "flat-permissions",
-		Usage:   "no remote call for permissions should be made",
-		EnvVars: []string{"WOODPECKER_FLAT_PERMISSIONS"},
-		Hidden:  true,
-		// TODO(485) temporary workaround to not hit api rate limits
-	},
 	&cli.BoolFlag{
 		EnvVars: []string{"WOODPECKER_GITHUB"},
 		Name:    "github",
@@ -243,43 +226,20 @@ var flags = []cli.Flag{
 		Name:    "github-secret",
 		Usage:   "github oauth2 client secret",
 	},
-	&cli.StringSliceFlag{
-		EnvVars: []string{"WOODPECKER_GITHUB_SCOPE"},
-		Name:    "github-scope",
-		Usage:   "github oauth scope",
-		Value: cli.NewStringSlice(
-			"repo",
-			"repo:status",
-			"user:email",
-			"read:org",
-		),
-	},
-	&cli.StringFlag{
-		EnvVars: []string{"WOODPECKER_GITHUB_GIT_USERNAME"},
-		Name:    "github-git-username",
-		Usage:   "github machine user username",
-	},
-	&cli.StringFlag{
-		EnvVars: []string{"WOODPECKER_GITHUB_GIT_PASSWORD"},
-		Name:    "github-git-password",
-		Usage:   "github machine user password",
-	},
 	&cli.BoolFlag{
 		EnvVars: []string{"WOODPECKER_GITHUB_MERGE_REF"},
 		Name:    "github-merge-ref",
 		Usage:   "github pull requests use merge ref",
 		Value:   true,
 	},
-	&cli.BoolFlag{
-		EnvVars: []string{"WOODPECKER_GITHUB_PRIVATE_MODE"},
-		Name:    "github-private-mode",
-		Usage:   "github is running in private mode",
-	},
 	&cli.BoolFlag{
 		EnvVars: []string{"WOODPECKER_GITHUB_SKIP_VERIFY"},
 		Name:    "github-skip-verify",
 		Usage:   "github skip ssl verification",
 	},
+	//
+	// Gogs
+	//
 	&cli.BoolFlag{
 		EnvVars: []string{"WOODPECKER_GOGS"},
 		Name:    "gogs",
@@ -311,6 +271,9 @@ var flags = []cli.Flag{
 		Name:    "gogs-skip-verify",
 		Usage:   "gogs skip ssl verification",
 	},
+	//
+	// Gitea
+	//
 	&cli.BoolFlag{
 		EnvVars: []string{"WOODPECKER_GITEA"},
 		Name:    "gitea",
@@ -332,26 +295,14 @@ var flags = []cli.Flag{
 		Name:    "gitea-secret",
 		Usage:   "gitea oauth2 client secret",
 	},
-	&cli.StringFlag{
-		EnvVars: []string{"WOODPECKER_GITEA_GIT_USERNAME"},
-		Name:    "gitea-git-username",
-		Usage:   "gitea service account username",
-	},
-	&cli.StringFlag{
-		EnvVars: []string{"WOODPECKER_GITEA_GIT_PASSWORD"},
-		Name:    "gitea-git-password",
-		Usage:   "gitea service account password",
-	},
-	&cli.BoolFlag{
-		EnvVars: []string{"WOODPECKER_GITEA_PRIVATE_MODE"},
-		Name:    "gitea-private-mode",
-		Usage:   "gitea private mode enabled",
-	},
 	&cli.BoolFlag{
 		EnvVars: []string{"WOODPECKER_GITEA_SKIP_VERIFY"},
 		Name:    "gitea-skip-verify",
 		Usage:   "gitea skip ssl verification",
 	},
+	//
+	// Bitbucket
+	//
 	&cli.BoolFlag{
 		EnvVars: []string{"WOODPECKER_BITBUCKET"},
 		Name:    "bitbucket",
@@ -367,6 +318,9 @@ var flags = []cli.Flag{
 		Name:    "bitbucket-secret",
 		Usage:   "bitbucket oauth2 client secret",
 	},
+	//
+	// Gitlab
+	//
 	&cli.BoolFlag{
 		EnvVars: []string{"WOODPECKER_GITLAB"},
 		Name:    "gitlab",
@@ -388,26 +342,14 @@ var flags = []cli.Flag{
 		Name:    "gitlab-secret",
 		Usage:   "gitlab oauth2 client secret",
 	},
-	&cli.StringFlag{
-		EnvVars: []string{"WOODPECKER_GITLAB_GIT_USERNAME"},
-		Name:    "gitlab-git-username",
-		Usage:   "gitlab service account username",
-	},
-	&cli.StringFlag{
-		EnvVars: []string{"WOODPECKER_GITLAB_GIT_PASSWORD"},
-		Name:    "gitlab-git-password",
-		Usage:   "gitlab service account password",
-	},
 	&cli.BoolFlag{
 		EnvVars: []string{"WOODPECKER_GITLAB_SKIP_VERIFY"},
 		Name:    "gitlab-skip-verify",
 		Usage:   "gitlab skip ssl verification",
 	},
-	&cli.BoolFlag{
-		EnvVars: []string{"WOODPECKER_GITLAB_PRIVATE_MODE"},
-		Name:    "gitlab-private-mode",
-		Usage:   "gitlab is running in private mode",
-	},
+	//
+	// Bitbucket Stash
+	//
 	&cli.BoolFlag{
 		EnvVars: []string{"WOODPECKER_STASH"},
 		Name:    "stash",
@@ -448,6 +390,9 @@ var flags = []cli.Flag{
 		Name:    "stash-skip-verify",
 		Usage:   "stash skip ssl verification",
 	},
+	//
+	// Coding
+	//
 	&cli.BoolFlag{
 		EnvVars: []string{"WOODPECKER_CODING"},
 		Name:    "coding",
@@ -505,7 +450,9 @@ var flags = []cli.Flag{
 		Name:    "keepalive-min-time",
 		Usage:   "server-side enforcement policy on the minimum amount of time a client should wait before sending a keepalive ping.",
 	},
+	//
 	// development flags
+	//
 	&cli.StringFlag{
 		EnvVars: []string{"WOODPECKER_DEV_WWW_PROXY"},
 		Name:    "www-proxy",
@@ -519,4 +466,14 @@ var flags = []cli.Flag{
 		Value:   "",
 		Hidden:  true,
 	},
+	//
+	// misc
+	//
+	&cli.BoolFlag{
+		EnvVars: []string{"WOODPECKER_FLAT_PERMISSIONS"},
+		Name:    "flat-permissions",
+		Usage:   "no remote call for permissions should be made",
+		Hidden:  true,
+		// TODO(485) temporary workaround to not hit api rate limits
+	},
 }

cmd/server/server.go

@@ -60,13 +60,8 @@ func run(c *cli.Context) error {
 		)
 	}
 
-	// debug level if requested by user
 	// TODO: format output & options to switch to json aka. option to add channels to send logs to
 	zerolog.SetGlobalLevel(zerolog.WarnLevel)
-	if c.Bool("debug") {
-		log.Warn().Msg("--debug is deprecated, use --log-level instead")
-		zerolog.SetGlobalLevel(zerolog.DebugLevel)
-	}
 	if c.IsSet("log-level") {
 		logLevelFlag := c.String("log-level")
 		lvl, err := zerolog.ParseLevel(logLevelFlag)

cmd/server/setup.go

@@ -228,13 +228,10 @@ func setupGitea(c *cli.Context) (remote.Remote, error) {
 		return nil, err
 	}
 	opts := gitea.Opts{
-		URL:         strings.TrimRight(server.String(), "/"),
-		Username:    c.String("gitea-git-username"),
-		Password:    c.String("gitea-git-password"),
-		Client:      c.String("gitea-client"),
-		Secret:      c.String("gitea-secret"),
-		PrivateMode: c.Bool("gitea-private-mode"),
-		SkipVerify:  c.Bool("gitea-skip-verify"),
+		URL:        strings.TrimRight(server.String(), "/"),
+		Client:     c.String("gitea-client"),
+		Secret:     c.String("gitea-secret"),
+		SkipVerify: c.Bool("gitea-skip-verify"),
 	}
 	if len(opts.URL) == 0 {
 		log.Fatal().Msg("WOODPECKER_GITEA_URL must be set")
@@ -264,9 +261,6 @@ func setupGitlab(c *cli.Context) (remote.Remote, error) {
 		URL:          c.String("gitlab-server"),
 		ClientID:     c.String("gitlab-client"),
 		ClientSecret: c.String("gitlab-secret"),
-		Username:     c.String("gitlab-git-username"),
-		Password:     c.String("gitlab-git-password"),
-		PrivateMode:  c.Bool("gitlab-private-mode"),
 		SkipVerify:   c.Bool("gitlab-skip-verify"),
 	})
 }
@@ -274,15 +268,11 @@ func setupGitlab(c *cli.Context) (remote.Remote, error) {
 // helper function to setup the GitHub remote from the CLI arguments.
 func setupGithub(c *cli.Context) (remote.Remote, error) {
 	opts := github.Opts{
-		URL:         c.String("github-server"),
-		Client:      c.String("github-client"),
-		Secret:      c.String("github-secret"),
-		Scopes:      c.StringSlice("github-scope"),
-		Username:    c.String("github-git-username"),
-		Password:    c.String("github-git-password"),
-		PrivateMode: c.Bool("github-private-mode"),
-		SkipVerify:  c.Bool("github-skip-verify"),
-		MergeRef:    c.Bool("github-merge-ref"),
+		URL:        c.String("github-server"),
+		Client:     c.String("github-client"),
+		Secret:     c.String("github-secret"),
+		SkipVerify: c.Bool("github-skip-verify"),
+		MergeRef:   c.Bool("github-merge-ref"),
 	}
 	log.Trace().Msgf("Remote (github) opts: %#v", opts)
 	return github.New(opts)