PR Cleanup

Author: stevencl840

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

@@ -105,7 +105,9 @@ func DeprovisionEnvironmentRun(deprovisionEnvironmentOptions *DeprovisionEnviron
 		return err
 	}
 
-	util.OutPutDeprovisionResult(deprovisionEnvironmentOptions.Name.Value, command, response.DeprovisioningRuns)
+	command.Printf("Deprovisioning ephemeral environment '%s' with id '%s'...\n", deprovisionEnvironmentOptions.Name.Value, environment.ID)
+
+	util.OutputDeprovisionResult(command, response.DeprovisioningRuns)
 
 	return nil
 }

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

@@ -72,7 +72,7 @@ func getConfiguredProjects(dependencies *cmd.Dependencies) ([]*projects.Project,
 		}
 
 		if slices.ContainsFunc(projectChannels, func(channel *channels.Channel) bool {
-			return channel.Type == "EphemeralEnvironment"
+			return channel.Type == channels.ChannelTypeEphemeral
 		}) {
 			filteredProjects = append(filteredProjects, project)
 		}
@@ -162,8 +162,13 @@ func DeprovisionEphemeralEnvironmentProject(cmd *cobra.Command, opts *Deprovisio
 	}
 
 	cmd.Printf("\nSuccessfully deprovisioned ephemeral environment for project '%s' with id '%s'.\n", opts.Project.Value, environmentId)
+	runs := []ephemeralenvironments.DeprovisioningRunbookRun{}
 
-	util.OutPutDeprovisionResult(opts.Name.Value, cmd, []ephemeralenvironments.DeprovisioningRunbookRun{deprovisionedEnv.DeprovisioningRun})
+	if deprovisionedEnv.DeprovisioningRun.RunbookRunID != "" {
+		runs = append(runs, deprovisionedEnv.DeprovisioningRun)
+	}
+
+	util.OutputDeprovisionResult(cmd, runs)
 
 	return nil
 }

pkg/cmd/ephemeralenvironment/util/util.go

@@ -40,9 +40,7 @@ func GetByName(client *client.Client, name string, spaceID string) (*ephemeralen
 	}
 }
 
-func OutPutDeprovisionResult(environmentName string, command *cobra.Command, deprovisioningRuns []ephemeralenvironments.DeprovisioningRunbookRun) {
-	command.Println("Deprovisioning environment: " + environmentName)
-
+func OutputDeprovisionResult(command *cobra.Command, deprovisioningRuns []ephemeralenvironments.DeprovisioningRunbookRun) {
 	outputFormat, err := command.Flags().GetString(constants.FlagOutputFormat)
 	if err != nil {
 		outputFormat = constants.OutputFormatTable