Merge pull request #566 from OctopusDeploy/sjc/ee-deprov-json-only

Fix output only json if using json output for ephemeral environment deprovisioning commands

Author: stevencl840

pkg/cmd/ephemeralenvironment/deprovision-environment/deprovision_environment.go

@@ -105,9 +105,14 @@ func DeprovisionEnvironmentRun(deprovisionEnvironmentOptions *DeprovisionEnviron
 		return err
 	}
 
-	command.Printf("Deprovisioning ephemeral environment '%s' with id '%s'...\n", deprovisionEnvironmentOptions.Name.Value, environment.ID)
+	message := fmt.Sprintf("Deprovisioning ephemeral environment '%s' with id '%s'...\n", deprovisionEnvironmentOptions.Name.Value, environment.ID)
 
-	util.OutputDeprovisionResult(command, response.DeprovisioningRuns)
+	util.OutputDeprovisionResult(message, command, response.DeprovisioningRuns)
+
+	if !deprovisionEnvironmentOptions.NoPrompt {
+		autoCmd := flag.GenerateAutomationCmd(deprovisionEnvironmentOptions.CmdPath, deprovisionEnvironmentOptions.Name)
+		fmt.Fprintf(command.OutOrStdout(), "\nAutomation Command: %s\n", autoCmd)
+	}
 
 	return nil
 }

pkg/cmd/ephemeralenvironment/deprovision-project/deprovision_project.go

@@ -152,23 +152,27 @@ func DeprovisionEphemeralEnvironmentProject(cmd *cobra.Command, opts *Deprovisio
 
 	environmentId := environmentResource.ID
 
-	cmd.Printf("Deprovisioning ephemeral environment '%s' with id '%s' for project '%s'...\n", opts.Name.Value, environmentId, opts.Project.Value)
-
 	projectId := projectResource.GetID()
 
 	deprovisionedEnv, err := ephemeralenvironments.DeprovisionForProject(opts.Client, opts.Space.ID, environmentId, projectId)
 	if err != nil {
 		return err
 	}
 
-	cmd.Printf("\nSuccessfully deprovisioned ephemeral environment for project '%s' with id '%s'.\n", opts.Project.Value, environmentId)
 	runs := []ephemeralenvironments.DeprovisioningRunbookRun{}
 
 	if deprovisionedEnv.DeprovisioningRun.RunbookRunID != "" {
 		runs = append(runs, deprovisionedEnv.DeprovisioningRun)
 	}
 
-	util.OutputDeprovisionResult(cmd, runs)
+	message := fmt.Sprintf("Deprovisioning ephemeral environment '%s' with id '%s' for project '%s'...\n", opts.Name.Value, environmentId, opts.Project.Value)
+
+	util.OutputDeprovisionResult(message, cmd, runs)
+
+	if !opts.NoPrompt {
+		autoCmd := flag.GenerateAutomationCmd(opts.CmdPath, opts.Name, opts.Project)
+		fmt.Fprintf(cmd.OutOrStdout(), "\nAutomation Command: %s\n", autoCmd)
+	}
 
 	return nil
 }

pkg/cmd/ephemeralenvironment/util/util.go

@@ -40,7 +40,7 @@ func GetByName(client *client.Client, name string, spaceID string) (*ephemeralen
 	}
 }
 
-func OutputDeprovisionResult(command *cobra.Command, deprovisioningRuns []ephemeralenvironments.DeprovisioningRunbookRun) {
+func OutputDeprovisionResult(message string, command *cobra.Command, deprovisioningRuns []ephemeralenvironments.DeprovisioningRunbookRun) {
 	outputFormat, err := command.Flags().GetString(constants.FlagOutputFormat)
 	if err != nil {
 		outputFormat = constants.OutputFormatTable
@@ -52,6 +52,8 @@ func OutputDeprovisionResult(command *cobra.Command, deprovisioningRuns []epheme
 
 	switch outputFormat {
 	case constants.OutputFormatBasic:
+		command.Print(message)
+
 		if len(deprovisioningRuns) == 0 {
 			command.Println("Environment deprovisioned without running a runbook.")
 		} else {
@@ -68,6 +70,8 @@ func OutputDeprovisionResult(command *cobra.Command, deprovisioningRuns []epheme
 			command.Println()
 		}
 	default:
+		command.Print(message)
+
 		if len(deprovisioningRuns) == 0 {
 			command.Println("Environment deprovisioned without running a runbook.")
 		} else {