provisioner before issuer

dopey · dopey · commit dace1fc8654c · 2025-03-03T18:02:56.000-08:00
diff --git a/utils/cautils/token_flow.go b/utils/cautils/token_flow.go
@@ -212,7 +212,7 @@ func OfflineTokenFlow(ctx *cli.Context, typ int, subject string, sans []string,
 	}
 
 	kid := ctx.String("kid")
-	issuer := flags.FirstOf(ctx, "issuer", "provisioner")
+	issuer := flags.FirstStringOf(ctx, "provisioner", "issuer")
 
 	// Require issuer and keyFile if ca.json does not exists.
 	// kid can be passed or created using jwk.Thumbprint.
@@ -326,7 +326,7 @@ func provisionerPrompt(ctx *cli.Context, provisioners provisioner.List) (provisi
 	}
 
 	// Filter by issuer (provisioner name)
-	if issuer := flags.FirstStringOf(ctx, "issuer", "provisioner"); issuer != "" {
+	if issuer := flags.FirstStringOf(ctx, "provisioner", "issuer"); issuer != "" {
 		provisioners = provisionerFilter(provisioners, func(p provisioner.Interface) bool {
 			return p.GetName() == issuer
 		})

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ func OfflineTokenFlow(ctx *cli.Context, typ int, subject string, sans []string,`
`212`	`212`	`}`
`213`	`213`
`214`	`214`	`kid := ctx.String("kid")`
`215`		`- issuer := flags.FirstOf(ctx, "issuer", "provisioner")`
	`215`	`+ issuer := flags.FirstStringOf(ctx, "provisioner", "issuer")`
`216`	`216`
`217`	`217`	`// Require issuer and keyFile if ca.json does not exists.`
`218`	`218`	`// kid can be passed or created using jwk.Thumbprint.`
`@@ -326,7 +326,7 @@ func provisionerPrompt(ctx *cli.Context, provisioners provisioner.List) (provisi`
`326`	`326`	`}`
`327`	`327`
`328`	`328`	`// Filter by issuer (provisioner name)`
`329`		`- if issuer := flags.FirstStringOf(ctx, "issuer", "provisioner"); issuer != "" {`
	`329`	`+ if issuer := flags.FirstStringOf(ctx, "provisioner", "issuer"); issuer != "" {`
`330`	`330`	`provisioners = provisionerFilter(provisioners, func(p provisioner.Interface) bool {`
`331`	`331`	`return p.GetName() == issuer`
`332`	`332`	`})`