normalize pki create params; fixes #3307

Author: qrkourier

ziti/cmd/pki/pki_create.go

@@ -98,6 +98,31 @@ func (o *PKICreateOptions) Run() error {
 	return o.Cmd.Help()
 }
 
+// ResolveFlagsFromViper backfills struct fields from viper (env vars) when the
+// corresponding CLI flag was not explicitly set.  This allows flags like
+// --ca-file, --curve, --intermediate-file, etc. to be set via ZITI_CA_FILE,
+// ZITI_CURVE, ZITI_INTERMEDIATE_FILE environment variables.
+func (o *PKICreateOptions) ResolveFlagsFromViper(cmd *cobra.Command) {
+	resolve := func(flagName string, target *string) {
+		if !cmd.Flags().Changed(flagName) {
+			if v := o.viper.GetString(flagName); v != "" {
+				*target = v
+			}
+		}
+	}
+	resolve("ca-file", &o.Flags.CAFile)
+	resolve("ca-name", &o.Flags.CAName)
+	resolve("curve", &o.Flags.EcCurve)
+	resolve("intermediate-file", &o.Flags.IntermediateFile)
+	resolve("intermediate-name", &o.Flags.IntermediateName)
+	resolve("server-file", &o.Flags.ServerFile)
+	resolve("server-name", &o.Flags.ServerName)
+	resolve("client-file", &o.Flags.ClientFile)
+	resolve("client-name", &o.Flags.ClientName)
+	resolve("key-file", &o.Flags.KeyFile)
+	resolve("trust-domain", &o.Flags.SpiffeID)
+}
+
 // ObtainPKIRoot returns the value for pki-root
 func (o *PKICreateOptions) ObtainPKIRoot() (string, error) {
 	pkiRoot := o.Flags.PKIRoot

ziti/cmd/pki/pki_create_ca.go

@@ -82,6 +82,7 @@ func (o *PKICreateCAOptions) addPKICreateCAFlags(cmd *cobra.Command) {
 
 // Run implements this command
 func (o *PKICreateCAOptions) Run() error {
+	o.ResolveFlagsFromViper(o.Cmd)
 	pkiRoot, err := o.ObtainPKIRoot()
 	if err != nil {
 		return err

ziti/cmd/pki/pki_create_client.go

@@ -87,6 +87,7 @@ func (o *PKICreateClientOptions) addPKICreateClientFlags(cmd *cobra.Command) {
 
 // Run implements this command
 func (o *PKICreateClientOptions) Run() error {
+	o.ResolveFlagsFromViper(o.Cmd)
 	pkiRoot, err := o.ObtainPKIRoot()
 	if err != nil {
 		return err
@@ -181,7 +182,7 @@ func (o *PKICreateClientOptions) Run() error {
 	}
 
 	// Concat the newly-created client cert with the intermediate cert to create a client.chain.pem file
-	if err := o.Flags.PKI.Chain(signer, req); err != nil {
+	if err := o.Flags.PKI.Chain(signer, req, o.Flags.AllowOverwrite); err != nil {
 		return errors.Wrap(err, "unable to generate cert chain")
 	}
 

ziti/cmd/pki/pki_create_intermediate.go

@@ -81,6 +81,7 @@ func (o *PKICreateIntermediateOptions) addPKICreateIntermediateFlags(cmd *cobra.
 
 // Run implements this command
 func (o *PKICreateIntermediateOptions) Run() error {
+	o.ResolveFlagsFromViper(o.Cmd)
 	pkiRoot, err := o.ObtainPKIRoot()
 	if err != nil {
 		return err
@@ -142,7 +143,7 @@ func (o *PKICreateIntermediateOptions) Run() error {
 	}
 
 	// Concat the newly-created intermediate cert with the signing cert to create an intermediate.chain.pem file
-	if err := o.Flags.PKI.Chain(signer, req); err != nil {
+	if err := o.Flags.PKI.Chain(signer, req, false); err != nil {
 		return errors.Wrap(err, "unable to generate cert chain")
 	}
 

ziti/cmd/pki/pki_create_key.go

@@ -76,6 +76,7 @@ func (options *PKICreateKeyOptions) addPKICreateKeyFlags(cmd *cobra.Command) {
 
 // Run implements this command
 func (options *PKICreateKeyOptions) Run() error {
+	options.ResolveFlagsFromViper(options.Cmd)
 
 	pkiRoot, err := options.ObtainPKIRoot()
 	if err != nil {

ziti/cmd/pki/pki_create_server.go

@@ -88,6 +88,7 @@ func (o *PKICreateServerOptions) addPKICreateServerFlags(cmd *cobra.Command) {
 
 // Run implements this command
 func (o *PKICreateServerOptions) Run() error {
+	o.ResolveFlagsFromViper(o.Cmd)
 	IPs, DNSNames, err := o.ObtainIPsAndDNSNames()
 	if err != nil {
 		return err
@@ -188,7 +189,7 @@ func (o *PKICreateServerOptions) Run() error {
 	}
 
 	// Concat the newly-created server cert with the intermediate cert to create a server.chain.pem file
-	if err := o.Flags.PKI.Chain(signer, req); err != nil {
+	if err := o.Flags.PKI.Chain(signer, req, o.Flags.AllowOverwrite); err != nil {
 		return errors.Wrap(err, "unable to generate cert chain")
 	}