adds custom provision format to avoid issue STDOUT flow of provisioni…

…ng. Adds machine Identity values to STDOUT version

cmd/vcert/args.go

@@ -153,4 +153,5 @@ type commandFlags struct {
 	keystoreCertName     string
 	provisionOutputFile  string
 	provisionPickupID    string
+	provisionFormat      string
 }

cmd/vcert/cmdCloudKeystores.go

@@ -91,7 +91,7 @@ func doCommandProvisionCloudKeystore(c *cli.Context) error {
 	result.MachineIdentityId = metadata.GetMachineIdentityMetadata().GetID()
 	result.MachineIdentityActionType = metadata.GetMachineIdentityMetadata().GetActionType()
 
-	err = result.Flush(flags.format)
+	err = result.Flush(flags.provisionFormat)
 
 	if err != nil {
 		return fmt.Errorf("failed to output the results: %s", err)

cmd/vcert/flags.go

@@ -752,6 +752,12 @@ var (
 		Destination: &flags.provisionPickupID,
 	}
 
+	flagProvisionFormat = &cli.StringFlag{
+		Name:        "format",
+		Usage:       "The format of the operation output: text or JSON. Defaults to text.",
+		Destination: &flags.provisionFormat,
+	}
+
 	commonFlags              = []cli.Flag{flagInsecure, flagVerbose, flagNoPrompt}
 	keyFlags                 = []cli.Flag{flagKeyType, flagKeySize, flagKeyCurve, flagKeyFile, flagKeyPassword}
 	sansFlags                = []cli.Flag{flagDNSSans, flagEmailSans, flagIPSans, flagURISans, flagUPNSans}
@@ -900,7 +906,7 @@ var (
 		flagProviderName,
 		flagKeystoreName,
 		flagKeystoreID,
-		flagFormat,
+		flagProvisionFormat,
 		flagProvisionOutputFile, // TODO: implement this flag
 	)
 

cmd/vcert/result_writer.go

@@ -485,6 +485,10 @@ func (r *ProvisioningResult) Format(format string) (string, error) {
 			result += fmt.Sprintf("gcpId %s\n", r.GcpID)
 			result += fmt.Sprintf("gcpName %s\n", r.GcpName)
 		}
+		if r.MachineIdentityId != "" {
+			result += fmt.Sprintf("machineIdentityId %s\n", r.MachineIdentityId)
+			result += fmt.Sprintf("machineIdentityActionType %s\n", r.MachineIdentityActionType)
+		}
 	}
 	return result, nil
 }

cmd/vcert/validators.go

@@ -706,7 +706,7 @@ func validateProvisionFlags(commandName string) error {
 		return err
 	}
 
-	if flags.format != "" && flags.format != "json" {
+	if flags.provisionFormat != "" && flags.provisionFormat != "json" {
 		return fmt.Errorf("unexpected output format: %s", flags.format)
 	}