tweak: cli variable naming for queue keys

cmd/vela-server/queue.go

@@ -23,7 +23,7 @@ func setupQueue(c *cli.Context) (queue.Service, error) {
 		Cluster:    c.Bool("queue.cluster"),
 		Routes:     c.StringSlice("queue.routes"),
 		Timeout:    c.Duration("queue.pop.timeout"),
-		PrivateKey: c.String("queue.signing.private-key"),
+		PrivateKey: c.String("queue.private-key"),
 	}
 
 	// setup the queue

cmd/vela-server/server.go

@@ -98,7 +98,7 @@ func server(c *cli.Context) error {
 		middleware.Secret(c.String("vela-secret")),
 		middleware.Secrets(secrets),
 		middleware.Scm(scm),
-		middleware.QueueSigningPrivateKey(c.String("queue.signing.private-key")),
+		middleware.QueueSigningPrivateKey(c.String("queue.private-key")),
 		middleware.Allowlist(c.StringSlice("vela-repo-allowlist")),
 		middleware.DefaultBuildLimit(c.Int64("default-build-limit")),
 		middleware.DefaultTimeout(c.Int64("default-build-timeout")),

queue/flags.go

@@ -53,13 +53,13 @@ var Flags = []cli.Flag{
 	&cli.StringFlag{
 		EnvVars:  []string{"VELA_QUEUE_SIGNING_PRIVATE_KEY"},
 		FilePath: "/vela/signing.key",
-		Name:     "queue.signing.private-key",
+		Name:     "queue.private-key",
 		Usage:    "set value of base64 encoded queue signing private key",
 	},
 	&cli.StringFlag{
 		EnvVars:  []string{"VELA_QUEUE_SIGNING_PUBLIC_KEY"},
 		FilePath: "/vela/signing.pub",
-		Name:     "queue.signing.public-key",
+		Name:     "queue.public-key",
 		Usage:    "set value of base64 encoded queue signing public key",
 	},
 }

router/middleware/signing.go

@@ -12,7 +12,7 @@ import (
 // to sign items that are pushed to the queue.
 func QueueSigningPrivateKey(key string) gin.HandlerFunc {
 	return func(c *gin.Context) {
-		c.Set("queue.signing.private-key", key)
+		c.Set("queue.private-key", key)
 		c.Next()
 	}
 }