Skip to content

feat(cloud)!: Switch 'json' output to 'raw' #2799

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

Open
craciunoiuc wants to merge 1 commit into
base: staging
Choose a base branch
from
+9 −9
Open

feat(cloud)!: Switch 'json' output to 'raw' #2799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion internal/cli/kraft/cloud/image/list/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ func (opts *ListOptions) runControlPlane(ctx context.Context) error {
return fmt.Errorf("could not list images: %w", err)
}

if opts.Output == "raw" {
if opts.Output == "raw" || opts.Output == "json" {
fmt.Fprintln(iostreams.G(ctx).Out, string(resp.RawBody()))
return nil
}
Expand Down
16 changes: 8 additions & 8 deletions internal/cli/kraft/cloud/utils/print.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ func parseTime(dateTime, format, uuid string) (string, error) {
// PrintInstances pretty-prints the provided set of instances or returns
// an error if unable to send to stdout via the provided context.
func PrintInstances(ctx context.Context, format string, resp kcclient.ServiceResponse[kcinstances.GetResponseItem]) error {
if format == "raw" {
if format == "raw" || format == "json" {
printRaw(ctx, resp)
return nil
}
Expand Down Expand Up @@ -368,7 +368,7 @@ func PrintInstances(ctx context.Context, format string, resp kcclient.ServiceRes
// PrintVolumes pretty-prints the provided set of volumes or returns
// an error if unable to send to stdout via the provided context.
func PrintVolumes(ctx context.Context, format string, resp kcclient.ServiceResponse[kcvolumes.GetResponseItem]) error {
if format == "raw" {
if format == "raw" || format == "json" {
printRaw(ctx, resp)
return nil
}
Expand Down Expand Up @@ -465,7 +465,7 @@ func PrintVolumes(ctx context.Context, format string, resp kcclient.ServiceRespo
// PrintVolumesTemplates pretty-prints the provided set of volume templates
// or returns an error if unable to send to stdout via the provided context.
func PrintVolumesTemplates(ctx context.Context, format string, resp kcclient.ServiceResponse[kcvolumes.TemplateGetResponseItem]) error {
if format == "raw" {
if format == "raw" || format == "json" {
printRaw(ctx, resp)
return nil
}
Expand Down Expand Up @@ -550,7 +550,7 @@ func PrintVolumesTemplates(ctx context.Context, format string, resp kcclient.Ser
// PrintInstancesTemplates pretty-prints the provided set of instance templates
// or returns an error if unable to send to stdout via the provided context.
func PrintInstancesTemplates(ctx context.Context, format string, resp kcclient.ServiceResponse[kcinstances.TemplateGetResponseItem]) error {
if format == "raw" {
if format == "raw" || format == "json" {
printRaw(ctx, resp)
return nil
}
Expand Down Expand Up @@ -649,7 +649,7 @@ func PrintInstancesTemplates(ctx context.Context, format string, resp kcclient.S
// PrintAutoscaleConfiguration pretty-prints the provided autoscale configuration or returns
// an error if unable to send to stdout via the provided context.
func PrintAutoscaleConfiguration(ctx context.Context, format string, resp kcclient.ServiceResponse[kcautoscale.GetResponseItem]) error {
if format == "raw" {
if format == "raw" || format == "json" {
printRaw(ctx, resp)
return nil
}
Expand Down Expand Up @@ -757,7 +757,7 @@ func PrintAutoscaleConfiguration(ctx context.Context, format string, resp kcclie
// PrintServices pretty-prints the provided set of service or returns
// an error if unable to send to stdout via the provided context.
func PrintServices(ctx context.Context, format string, resp kcclient.ServiceResponse[kcservices.GetResponseItem]) error {
if format == "raw" {
if format == "raw" || format == "json" {
printRaw(ctx, resp)
return nil
}
Expand Down Expand Up @@ -890,7 +890,7 @@ func printBar(cs *iostreams.ColorScheme, progress, max int) string {
// PrintQuotas pretty-prints the provided set of user quotas or returns
// an error if unable to send to stdout via the provided context.
func PrintQuotas(ctx context.Context, auth config.AuthConfig, format string, resp kcclient.ServiceResponse[kcusers.QuotasResponseItem], imageResp *kcimages.QuotasResponseItem) error {
if format == "raw" {
if format == "raw" || format == "json" {
printRaw(ctx, resp)
return nil
}
Expand Down Expand Up @@ -1149,7 +1149,7 @@ func PrintQuotas(ctx context.Context, auth config.AuthConfig, format string, res
// PrintCertificates pretty-prints the provided set of certificates or returns
// an error if unable to send to stdout via the provided context.
func PrintCertificates(ctx context.Context, format string, resp kcclient.ServiceResponse[kccerts.GetResponseItem]) error {
if format == "raw" {
if format == "raw" || format == "json" {
printRaw(ctx, resp)
return nil
}
Expand Down