Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stevencl840 merged 3 commits into from
Nov 13, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bf6136b
Modify code to only output json if using json output
stevencl840 Nov 13, 2025
2e927fe
Added automation command generation
stevencl840 Nov 13, 2025
47bb781
Fix output
stevencl840 Nov 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions pkg/cmd/ephemeralenvironment/deprovision-environment/deprovision_environment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
12 changes: 8 additions & 4 deletions pkg/cmd/ephemeralenvironment/deprovision-project/deprovision_project.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
6 changes: 5 additions & 1 deletion pkg/cmd/ephemeralenvironment/util/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 {
Expand All @@ -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 {
Expand Down