.codegen/service.go.tmpl

@@ -5,7 +5,6 @@ package {{(.TrimPrefix "account").SnakeName}}
 import (
     "github.com/databricks/cli/libs/cmdio"
     "github.com/databricks/cli/libs/flags"
-	"github.com/databricks/cli/libs/diag"
 	"github.com/databricks/cli/cmd/root"
 	"github.com/databricks/databricks-sdk-go/service/{{.Package.Name}}"
 	"github.com/spf13/cobra"
@@ -232,12 +231,9 @@ func new{{.PascalName}}() *cobra.Command {
 		{{- if .Request }}
 			{{ if .CanUseJson }}
 			if cmd.Flags().Changed("json") {
-					diags := {{.CamelName}}Json.Unmarshal(&{{.CamelName}}Req)
+					err = {{.CamelName}}Json.Unmarshal(&{{.CamelName}}Req)
-					if len(diags) > 0 {
+					if err != nil {
-						err := cmdio.RenderDiags(ctx, diags)
+						return err
-						if err != nil {
-							return err
-						}
 					}
 			}{{end}}{{ if .MustUseJson }}else {
 				return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")

bundle/render/render_text_output.go

@@ -8,7 +8,6 @@ import (
 	"text/template"
 
 	"github.com/databricks/cli/bundle"
-	"github.com/databricks/cli/libs/cmdio"
 	"github.com/databricks/cli/libs/diag"
 	"github.com/databricks/databricks-sdk-go/service/iam"
 	"github.com/fatih/color"
@@ -29,6 +28,34 @@ var renderFuncMap = template.FuncMap{
 	},
 }
 
+const errorTemplate = `{{ "Error" | red }}: {{ .Summary }}
+{{- range $index, $element := .Paths }}
+  {{ if eq $index 0 }}at {{else}}   {{ end}}{{ $element.String | green }}
+{{- end }}
+{{- range $index, $element := .Locations }}
+  {{ if eq $index 0 }}in {{else}}   {{ end}}{{ $element.String | cyan }}
+{{- end }}
+{{- if .Detail }}
+
+{{ .Detail }}
+{{- end }}
+
+`
+
+const warningTemplate = `{{ "Warning" | yellow }}: {{ .Summary }}
+{{- range $index, $element := .Paths }}
+  {{ if eq $index 0 }}at {{else}}   {{ end}}{{ $element.String | green }}
+{{- end }}
+{{- range $index, $element := .Locations }}
+  {{ if eq $index 0 }}in {{else}}   {{ end}}{{ $element.String | cyan }}
+{{- end }}
+{{- if .Detail }}
+
+{{ .Detail }}
+{{- end }}
+
+`
+
 const summaryTemplate = `{{- if .Name -}}
 Name: {{ .Name | bold }}
 {{- if .Target }}
@@ -101,7 +128,19 @@ func renderSummaryTemplate(out io.Writer, b *bundle.Bundle, diags diag.Diagnosti
 }
 
 func renderDiagnostics(out io.Writer, b *bundle.Bundle, diags diag.Diagnostics) error {
+	errorT := template.Must(template.New("error").Funcs(renderFuncMap).Parse(errorTemplate))
+	warningT := template.Must(template.New("warning").Funcs(renderFuncMap).Parse(warningTemplate))
+
+	// Print errors and warnings.
 	for _, d := range diags {
+		var t *template.Template
+		switch d.Severity {
+		case diag.Error:
+			t = errorT
+		case diag.Warning:
+			t = warningT
+		}
+
 		for i := range d.Locations {
 			if b == nil {
 				break
@@ -116,9 +155,15 @@ func renderDiagnostics(out io.Writer, b *bundle.Bundle, diags diag.Diagnostics)
 				}
 			}
 		}
+
+		// Render the diagnostic with the appropriate template.
+		err := t.Execute(out, d)
+		if err != nil {
+			return fmt.Errorf("failed to render template: %w", err)
+		}
 	}
 
-	return cmdio.RenderDiagnostics(out, diags)
+	return nil
 }
 
 // RenderOptions contains options for rendering diagnostics.

cmd/account/access-control/access-control.go

@@ -205,12 +205,9 @@ func newUpdateRuleSet() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateRuleSetJson.Unmarshal(&updateRuleSetReq)
+			err = updateRuleSetJson.Unmarshal(&updateRuleSetReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")

cmd/account/budgets/budgets.go

@@ -78,12 +78,9 @@ func newCreate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")
@@ -319,12 +316,9 @@ func newUpdate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")

cmd/account/credentials/credentials.go

@@ -90,12 +90,9 @@ func newCreate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")

cmd/account/csp-enablement-account/csp-enablement-account.go

@@ -129,12 +129,9 @@ func newUpdate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")

cmd/account/custom-app-integration/custom-app-integration.go

@@ -88,12 +88,9 @@ func newCreate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 
@@ -323,12 +320,9 @@ func newUpdate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		updateReq.IntegrationId = args[0]

cmd/account/encryption-keys/encryption-keys.go

@@ -107,12 +107,9 @@ func newCreate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")

cmd/account/esm-enablement-account/esm-enablement-account.go

@@ -127,12 +127,9 @@ func newUpdate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")

cmd/account/groups/groups.go

@@ -97,12 +97,9 @@ func newCreate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 
@@ -361,12 +358,9 @@ func newPatch() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := patchJson.Unmarshal(&patchReq)
+			err = patchJson.Unmarshal(&patchReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if len(args) == 0 {
@@ -452,12 +446,9 @@ func newUpdate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if len(args) == 0 {

cmd/account/ip-access-lists/ip-access-lists.go

@@ -132,12 +132,9 @@ func newCreate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -414,12 +411,9 @@ func newReplace() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := replaceJson.Unmarshal(&replaceReq)
+			err = replaceJson.Unmarshal(&replaceReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		replaceReq.IpAccessListId = args[0]
@@ -511,12 +505,9 @@ func newUpdate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if len(args) == 0 {

cmd/account/log-delivery/log-delivery.go

@@ -162,12 +162,9 @@ func newCreate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 
@@ -372,12 +369,9 @@ func newPatchStatus() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := patchStatusJson.Unmarshal(&patchStatusReq)
+			err = patchStatusJson.Unmarshal(&patchStatusReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		patchStatusReq.LogDeliveryConfigurationId = args[0]

cmd/account/metastore-assignments/metastore-assignments.go

@@ -85,12 +85,9 @@ func newCreate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		_, err = fmt.Sscan(args[0], &createReq.WorkspaceId)
@@ -346,12 +343,9 @@ func newUpdate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		_, err = fmt.Sscan(args[0], &updateReq.WorkspaceId)

cmd/account/metastores/metastores.go

@@ -80,12 +80,9 @@ func newCreate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 
@@ -307,12 +304,9 @@ func newUpdate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		updateReq.MetastoreId = args[0]

cmd/account/network-connectivity/network-connectivity.go

@@ -96,12 +96,9 @@ func newCreateNetworkConnectivityConfiguration() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createNetworkConnectivityConfigurationJson.Unmarshal(&createNetworkConnectivityConfigurationReq)
+			err = createNetworkConnectivityConfigurationJson.Unmarshal(&createNetworkConnectivityConfigurationReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -190,12 +187,9 @@ func newCreatePrivateEndpointRule() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createPrivateEndpointRuleJson.Unmarshal(&createPrivateEndpointRuleReq)
+			err = createPrivateEndpointRuleJson.Unmarshal(&createPrivateEndpointRuleReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		createPrivateEndpointRuleReq.NetworkConnectivityConfigId = args[0]

cmd/account/networks/networks.go

@@ -97,12 +97,9 @@ func newCreate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {

cmd/account/personal-compute/personal-compute.go

@@ -189,12 +189,9 @@ func newUpdate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")

cmd/account/private-access/private-access.go

@@ -109,12 +109,9 @@ func newCreate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -414,12 +411,9 @@ func newReplace() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := replaceJson.Unmarshal(&replaceReq)
+			err = replaceJson.Unmarshal(&replaceReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		replaceReq.PrivateAccessSettingsId = args[0]

cmd/account/published-app-integration/published-app-integration.go

@@ -85,12 +85,9 @@ func newCreate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 
@@ -318,12 +315,9 @@ func newUpdate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		updateReq.IntegrationId = args[0]

cmd/account/service-principals/service-principals.go

@@ -95,12 +95,9 @@ func newCreate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 
@@ -361,12 +358,9 @@ func newPatch() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := patchJson.Unmarshal(&patchReq)
+			err = patchJson.Unmarshal(&patchReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if len(args) == 0 {
@@ -454,12 +448,9 @@ func newUpdate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if len(args) == 0 {

cmd/account/storage-credentials/storage-credentials.go

@@ -88,12 +88,9 @@ func newCreate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		createReq.MetastoreId = args[0]
@@ -343,12 +340,9 @@ func newUpdate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		updateReq.MetastoreId = args[0]

cmd/account/storage/storage.go

@@ -87,12 +87,9 @@ func newCreate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")

cmd/account/usage-dashboards/usage-dashboards.go

@@ -80,12 +80,9 @@ func newCreate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 

cmd/account/users/users.go

@@ -103,12 +103,9 @@ func newCreate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 
@@ -377,12 +374,9 @@ func newPatch() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := patchJson.Unmarshal(&patchReq)
+			err = patchJson.Unmarshal(&patchReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if len(args) == 0 {
@@ -471,12 +465,9 @@ func newUpdate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if len(args) == 0 {

cmd/account/vpc-endpoints/vpc-endpoints.go

@@ -104,12 +104,9 @@ func newCreate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {

cmd/account/workspace-assignment/workspace-assignment.go

@@ -273,12 +273,9 @@ func newUpdate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		_, err = fmt.Sscan(args[0], &updateReq.WorkspaceId)

cmd/account/workspaces/workspaces.go

@@ -133,12 +133,9 @@ func newCreate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -554,12 +551,9 @@ func newUpdate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if len(args) == 0 {

cmd/api/api.go

@@ -42,9 +42,9 @@ func makeCommand(method string) *cobra.Command {
 			var path = args[0]
 
 			var request any
-			diags := payload.Unmarshal(&request)
+			err := payload.Unmarshal(&request)
-			if diags.HasError() {
+			if err != nil {
-				return diags.Error()
+				return err
 			}
 
 			cfg := &config.Config{}

cmd/workspace/alerts-legacy/alerts-legacy.go

@@ -93,12 +93,9 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")
@@ -360,12 +357,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")

cmd/workspace/alerts/alerts.go

@@ -85,12 +85,9 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 
@@ -357,12 +354,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		updateReq.Id = args[0]

cmd/workspace/apps/apps.go

@@ -112,12 +112,9 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -281,12 +278,9 @@ func newDeploy() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := deployJson.Unmarshal(&deployReq)
+			err = deployJson.Unmarshal(&deployReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		deployReq.AppName = args[0]
@@ -722,12 +716,9 @@ func newSetPermissions() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := setPermissionsJson.Unmarshal(&setPermissionsReq)
+			err = setPermissionsJson.Unmarshal(&setPermissionsReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		setPermissionsReq.AppName = args[0]
@@ -934,12 +925,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		updateReq.Name = args[0]
@@ -1006,12 +994,9 @@ func newUpdatePermissions() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updatePermissionsJson.Unmarshal(&updatePermissionsReq)
+			err = updatePermissionsJson.Unmarshal(&updatePermissionsReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		updatePermissionsReq.AppName = args[0]

cmd/workspace/artifact-allowlists/artifact-allowlists.go

@@ -145,12 +145,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")

cmd/workspace/automatic-cluster-update/automatic-cluster-update.go

@@ -127,12 +127,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")

cmd/workspace/catalogs/catalogs.go

@@ -105,12 +105,9 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -366,12 +363,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		updateReq.Name = args[0]

cmd/workspace/clean-rooms/clean-rooms.go

@@ -85,12 +85,9 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")
@@ -347,12 +344,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		updateReq.Name = args[0]

cmd/workspace/cluster-policies/cluster-policies.go

@@ -113,12 +113,9 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 
@@ -188,12 +185,9 @@ func newDelete() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := deleteJson.Unmarshal(&deleteReq)
+			err = deleteJson.Unmarshal(&deleteReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			if len(args) == 0 {
@@ -290,12 +284,9 @@ func newEdit() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := editJson.Unmarshal(&editReq)
+			err = editJson.Unmarshal(&editReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			if len(args) == 0 {
@@ -639,12 +630,9 @@ func newSetPermissions() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := setPermissionsJson.Unmarshal(&setPermissionsReq)
+			err = setPermissionsJson.Unmarshal(&setPermissionsReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if len(args) == 0 {
@@ -723,12 +711,9 @@ func newUpdatePermissions() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updatePermissionsJson.Unmarshal(&updatePermissionsReq)
+			err = updatePermissionsJson.Unmarshal(&updatePermissionsReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if len(args) == 0 {

cmd/workspace/clusters/clusters.go

@@ -134,12 +134,9 @@ func newChangeOwner() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := changeOwnerJson.Unmarshal(&changeOwnerReq)
+			err = changeOwnerJson.Unmarshal(&changeOwnerReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -265,12 +262,9 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -362,12 +356,9 @@ func newDelete() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := deleteJson.Unmarshal(&deleteReq)
+			err = deleteJson.Unmarshal(&deleteReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			if len(args) == 0 {
@@ -522,12 +513,9 @@ func newEdit() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := editJson.Unmarshal(&editReq)
+			err = editJson.Unmarshal(&editReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -623,12 +611,9 @@ func newEvents() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := eventsJson.Unmarshal(&eventsReq)
+			err = eventsJson.Unmarshal(&eventsReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			if len(args) == 0 {
@@ -1078,12 +1063,9 @@ func newPermanentDelete() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := permanentDeleteJson.Unmarshal(&permanentDeleteReq)
+			err = permanentDeleteJson.Unmarshal(&permanentDeleteReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			if len(args) == 0 {
@@ -1173,12 +1155,9 @@ func newPin() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := pinJson.Unmarshal(&pinReq)
+			err = pinJson.Unmarshal(&pinReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			if len(args) == 0 {
@@ -1275,12 +1254,9 @@ func newResize() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := resizeJson.Unmarshal(&resizeReq)
+			err = resizeJson.Unmarshal(&resizeReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			if len(args) == 0 {
@@ -1388,12 +1364,9 @@ func newRestart() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := restartJson.Unmarshal(&restartReq)
+			err = restartJson.Unmarshal(&restartReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			if len(args) == 0 {
@@ -1485,12 +1458,9 @@ func newSetPermissions() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := setPermissionsJson.Unmarshal(&setPermissionsReq)
+			err = setPermissionsJson.Unmarshal(&setPermissionsReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if len(args) == 0 {
@@ -1632,12 +1602,9 @@ func newStart() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := startJson.Unmarshal(&startReq)
+			err = startJson.Unmarshal(&startReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			if len(args) == 0 {
@@ -1739,12 +1706,9 @@ func newUnpin() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := unpinJson.Unmarshal(&unpinReq)
+			err = unpinJson.Unmarshal(&unpinReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			if len(args) == 0 {
@@ -1854,12 +1818,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -1938,12 +1899,9 @@ func newUpdatePermissions() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updatePermissionsJson.Unmarshal(&updatePermissionsReq)
+			err = updatePermissionsJson.Unmarshal(&updatePermissionsReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if len(args) == 0 {

cmd/workspace/compliance-security-profile/compliance-security-profile.go

@@ -130,12 +130,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")

cmd/workspace/connections/connections.go

@@ -92,12 +92,9 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")
@@ -358,12 +355,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")

cmd/workspace/consumer-installations/consumer-installations.go

@@ -86,12 +86,9 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		createReq.ListingId = args[0]
@@ -322,12 +319,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")

cmd/workspace/consumer-personalization-requests/consumer-personalization-requests.go

@@ -85,12 +85,9 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")

cmd/workspace/credentials-manager/credentials-manager.go

@@ -75,12 +75,9 @@ func newExchangeToken() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := exchangeTokenJson.Unmarshal(&exchangeTokenReq)
+			err = exchangeTokenJson.Unmarshal(&exchangeTokenReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")

cmd/workspace/dashboard-widgets/dashboard-widgets.go

@@ -75,12 +75,9 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")
@@ -199,12 +196,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")

cmd/workspace/dashboards/dashboards.go

@@ -78,12 +78,9 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")
@@ -408,12 +405,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if len(args) == 0 {

cmd/workspace/default-namespace/default-namespace.go

@@ -199,12 +199,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")

cmd/workspace/enhanced-security-monitoring/enhanced-security-monitoring.go

@@ -132,12 +132,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")

cmd/workspace/experiments/experiments.go

@@ -130,12 +130,9 @@ func newCreateExperiment() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createExperimentJson.Unmarshal(&createExperimentReq)
+			err = createExperimentJson.Unmarshal(&createExperimentReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -206,12 +203,9 @@ func newCreateRun() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createRunJson.Unmarshal(&createRunReq)
+			err = createRunJson.Unmarshal(&createRunReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 
@@ -283,12 +277,9 @@ func newDeleteExperiment() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := deleteExperimentJson.Unmarshal(&deleteExperimentReq)
+			err = deleteExperimentJson.Unmarshal(&deleteExperimentReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -361,12 +352,9 @@ func newDeleteRun() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := deleteRunJson.Unmarshal(&deleteRunReq)
+			err = deleteRunJson.Unmarshal(&deleteRunReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -447,12 +435,9 @@ func newDeleteRuns() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := deleteRunsJson.Unmarshal(&deleteRunsReq)
+			err = deleteRunsJson.Unmarshal(&deleteRunsReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -533,12 +518,9 @@ func newDeleteTag() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := deleteTagJson.Unmarshal(&deleteTagReq)
+			err = deleteTagJson.Unmarshal(&deleteTagReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -1126,12 +1108,9 @@ func newLogBatch() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := logBatchJson.Unmarshal(&logBatchReq)
+			err = logBatchJson.Unmarshal(&logBatchReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 
@@ -1195,12 +1174,9 @@ func newLogInputs() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := logInputsJson.Unmarshal(&logInputsReq)
+			err = logInputsJson.Unmarshal(&logInputsReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 
@@ -1278,12 +1254,9 @@ func newLogMetric() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := logMetricJson.Unmarshal(&logMetricReq)
+			err = logMetricJson.Unmarshal(&logMetricReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -1362,12 +1335,9 @@ func newLogModel() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := logModelJson.Unmarshal(&logModelReq)
+			err = logModelJson.Unmarshal(&logModelReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 
@@ -1444,12 +1414,9 @@ func newLogParam() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := logParamJson.Unmarshal(&logParamReq)
+			err = logParamJson.Unmarshal(&logParamReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -1530,12 +1497,9 @@ func newRestoreExperiment() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := restoreExperimentJson.Unmarshal(&restoreExperimentReq)
+			err = restoreExperimentJson.Unmarshal(&restoreExperimentReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -1608,12 +1572,9 @@ func newRestoreRun() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := restoreRunJson.Unmarshal(&restoreRunReq)
+			err = restoreRunJson.Unmarshal(&restoreRunReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -1694,12 +1655,9 @@ func newRestoreRuns() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := restoreRunsJson.Unmarshal(&restoreRunsReq)
+			err = restoreRunsJson.Unmarshal(&restoreRunsReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -1774,12 +1732,9 @@ func newSearchExperiments() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := searchExperimentsJson.Unmarshal(&searchExperimentsReq)
+			err = searchExperimentsJson.Unmarshal(&searchExperimentsReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 
@@ -1845,12 +1800,9 @@ func newSearchRuns() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := searchRunsJson.Unmarshal(&searchRunsReq)
+			err = searchRunsJson.Unmarshal(&searchRunsReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 
@@ -1922,12 +1874,9 @@ func newSetExperimentTag() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := setExperimentTagJson.Unmarshal(&setExperimentTagReq)
+			err = setExperimentTagJson.Unmarshal(&setExperimentTagReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -2002,12 +1951,9 @@ func newSetPermissions() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := setPermissionsJson.Unmarshal(&setPermissionsReq)
+			err = setPermissionsJson.Unmarshal(&setPermissionsReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		setPermissionsReq.ExperimentId = args[0]
@@ -2086,12 +2032,9 @@ func newSetTag() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := setTagJson.Unmarshal(&setTagReq)
+			err = setTagJson.Unmarshal(&setTagReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -2169,12 +2112,9 @@ func newUpdateExperiment() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateExperimentJson.Unmarshal(&updateExperimentReq)
+			err = updateExperimentJson.Unmarshal(&updateExperimentReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -2243,12 +2183,9 @@ func newUpdatePermissions() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updatePermissionsJson.Unmarshal(&updatePermissionsReq)
+			err = updatePermissionsJson.Unmarshal(&updatePermissionsReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		updatePermissionsReq.ExperimentId = args[0]
@@ -2314,12 +2251,9 @@ func newUpdateRun() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateRunJson.Unmarshal(&updateRunReq)
+			err = updateRunJson.Unmarshal(&updateRunReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 

cmd/workspace/external-locations/external-locations.go

@@ -112,12 +112,9 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -384,12 +381,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		updateReq.Name = args[0]

cmd/workspace/functions/functions.go

@@ -85,12 +85,9 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")
@@ -384,12 +381,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if len(args) == 0 {

cmd/workspace/genie/genie.go

@@ -105,12 +105,9 @@ func newCreateMessage() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createMessageJson.Unmarshal(&createMessageReq)
+			err = createMessageJson.Unmarshal(&createMessageReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		createMessageReq.SpaceId = args[0]
@@ -395,12 +392,9 @@ func newStartConversation() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := startConversationJson.Unmarshal(&startConversationReq)
+			err = startConversationJson.Unmarshal(&startConversationReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		startConversationReq.SpaceId = args[0]

cmd/workspace/git-credentials/git-credentials.go

@@ -102,12 +102,9 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -358,12 +355,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if len(args) == 0 {

cmd/workspace/global-init-scripts/global-init-scripts.go

@@ -101,12 +101,9 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -370,12 +367,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		updateReq.ScriptId = args[0]

cmd/workspace/grants/grants.go

@@ -223,12 +223,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		_, err = fmt.Sscan(args[0], &updateReq.SecurableType)

cmd/workspace/groups/groups.go

@@ -97,12 +97,9 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 
@@ -361,12 +358,9 @@ func newPatch() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := patchJson.Unmarshal(&patchReq)
+			err = patchJson.Unmarshal(&patchReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if len(args) == 0 {
@@ -452,12 +446,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if len(args) == 0 {

cmd/workspace/instance-pools/instance-pools.go

@@ -128,12 +128,9 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -209,12 +206,9 @@ func newDelete() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := deleteJson.Unmarshal(&deleteReq)
+			err = deleteJson.Unmarshal(&deleteReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			if len(args) == 0 {
@@ -315,12 +309,9 @@ func newEdit() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := editJson.Unmarshal(&editReq)
+			err = editJson.Unmarshal(&editReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -640,12 +631,9 @@ func newSetPermissions() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := setPermissionsJson.Unmarshal(&setPermissionsReq)
+			err = setPermissionsJson.Unmarshal(&setPermissionsReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if len(args) == 0 {
@@ -724,12 +712,9 @@ func newUpdatePermissions() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updatePermissionsJson.Unmarshal(&updatePermissionsReq)
+			err = updatePermissionsJson.Unmarshal(&updatePermissionsReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if len(args) == 0 {

cmd/workspace/instance-profiles/instance-profiles.go

@@ -99,12 +99,9 @@ func newAdd() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := addJson.Unmarshal(&addReq)
+			err = addJson.Unmarshal(&addReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -195,12 +192,9 @@ func newEdit() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := editJson.Unmarshal(&editReq)
+			err = editJson.Unmarshal(&editReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -317,12 +311,9 @@ func newRemove() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := removeJson.Unmarshal(&removeReq)
+			err = removeJson.Unmarshal(&removeReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {

cmd/workspace/ip-access-lists/ip-access-lists.go

@@ -133,12 +133,9 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -417,12 +414,9 @@ func newReplace() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := replaceJson.Unmarshal(&replaceReq)
+			err = replaceJson.Unmarshal(&replaceReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		replaceReq.IpAccessListId = args[0]
@@ -516,12 +510,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if len(args) == 0 {

cmd/workspace/jobs/jobs.go

@@ -116,12 +116,9 @@ func newCancelAllRuns() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := cancelAllRunsJson.Unmarshal(&cancelAllRunsReq)
+			err = cancelAllRunsJson.Unmarshal(&cancelAllRunsReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 
@@ -196,12 +193,9 @@ func newCancelRun() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := cancelRunJson.Unmarshal(&cancelRunReq)
+			err = cancelRunJson.Unmarshal(&cancelRunReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			if len(args) == 0 {
@@ -297,12 +291,9 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")
@@ -373,12 +364,9 @@ func newDelete() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := deleteJson.Unmarshal(&deleteReq)
+			err = deleteJson.Unmarshal(&deleteReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			if len(args) == 0 {
@@ -469,12 +457,9 @@ func newDeleteRun() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := deleteRunJson.Unmarshal(&deleteRunReq)
+			err = deleteRunJson.Unmarshal(&deleteRunReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			if len(args) == 0 {
@@ -1158,12 +1143,9 @@ func newRepairRun() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := repairRunJson.Unmarshal(&repairRunReq)
+			err = repairRunJson.Unmarshal(&repairRunReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			if len(args) == 0 {
@@ -1260,12 +1242,9 @@ func newReset() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := resetJson.Unmarshal(&resetReq)
+			err = resetJson.Unmarshal(&resetReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")
@@ -1353,12 +1332,9 @@ func newRunNow() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := runNowJson.Unmarshal(&runNowReq)
+			err = runNowJson.Unmarshal(&runNowReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			if len(args) == 0 {
@@ -1460,12 +1436,9 @@ func newSetPermissions() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := setPermissionsJson.Unmarshal(&setPermissionsReq)
+			err = setPermissionsJson.Unmarshal(&setPermissionsReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if len(args) == 0 {
@@ -1565,12 +1538,9 @@ func newSubmit() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := submitJson.Unmarshal(&submitReq)
+			err = submitJson.Unmarshal(&submitReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 
@@ -1662,12 +1632,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			if len(args) == 0 {
@@ -1750,12 +1717,9 @@ func newUpdatePermissions() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updatePermissionsJson.Unmarshal(&updatePermissionsReq)
+			err = updatePermissionsJson.Unmarshal(&updatePermissionsReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if len(args) == 0 {

cmd/workspace/lakeview/lakeview.go

@@ -108,12 +108,9 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -183,12 +180,9 @@ func newCreateSchedule() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createScheduleJson.Unmarshal(&createScheduleReq)
+			err = createScheduleJson.Unmarshal(&createScheduleReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")
@@ -256,12 +250,9 @@ func newCreateSubscription() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createSubscriptionJson.Unmarshal(&createSubscriptionReq)
+			err = createSubscriptionJson.Unmarshal(&createSubscriptionReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")
@@ -879,12 +870,9 @@ func newMigrate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := migrateJson.Unmarshal(&migrateReq)
+			err = migrateJson.Unmarshal(&migrateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -953,12 +941,9 @@ func newPublish() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := publishJson.Unmarshal(&publishReq)
+			err = publishJson.Unmarshal(&publishReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		publishReq.DashboardId = args[0]
@@ -1143,12 +1128,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		updateReq.DashboardId = args[0]
@@ -1218,12 +1200,9 @@ func newUpdateSchedule() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateScheduleJson.Unmarshal(&updateScheduleReq)
+			err = updateScheduleJson.Unmarshal(&updateScheduleReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")

cmd/workspace/libraries/libraries.go

@@ -190,12 +190,9 @@ func newInstall() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := installJson.Unmarshal(&installReq)
+			err = installJson.Unmarshal(&installReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")
@@ -254,12 +251,9 @@ func newUninstall() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := uninstallJson.Unmarshal(&uninstallReq)
+			err = uninstallJson.Unmarshal(&uninstallReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")

cmd/workspace/metastores/metastores.go

@@ -112,12 +112,9 @@ func newAssign() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := assignJson.Unmarshal(&assignReq)
+			err = assignJson.Unmarshal(&assignReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		_, err = fmt.Sscan(args[0], &assignReq.WorkspaceId)
@@ -204,12 +201,9 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -612,12 +606,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if len(args) == 0 {
@@ -699,12 +690,9 @@ func newUpdateAssignment() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateAssignmentJson.Unmarshal(&updateAssignmentReq)
+			err = updateAssignmentJson.Unmarshal(&updateAssignmentReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if len(args) == 0 {

cmd/workspace/model-registry/model-registry.go

@@ -141,12 +141,9 @@ func newApproveTransitionRequest() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := approveTransitionRequestJson.Unmarshal(&approveTransitionRequestReq)
+			err = approveTransitionRequestJson.Unmarshal(&approveTransitionRequestReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -238,12 +235,9 @@ func newCreateComment() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createCommentJson.Unmarshal(&createCommentReq)
+			err = createCommentJson.Unmarshal(&createCommentReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -328,12 +322,9 @@ func newCreateModel() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createModelJson.Unmarshal(&createModelReq)
+			err = createModelJson.Unmarshal(&createModelReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -412,12 +403,9 @@ func newCreateModelVersion() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createModelVersionJson.Unmarshal(&createModelVersionReq)
+			err = createModelVersionJson.Unmarshal(&createModelVersionReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -505,12 +493,9 @@ func newCreateTransitionRequest() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createTransitionRequestJson.Unmarshal(&createTransitionRequestReq)
+			err = createTransitionRequestJson.Unmarshal(&createTransitionRequestReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -585,12 +570,9 @@ func newCreateWebhook() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createWebhookJson.Unmarshal(&createWebhookReq)
+			err = createWebhookJson.Unmarshal(&createWebhookReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")
@@ -1097,12 +1079,9 @@ func newGetLatestVersions() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := getLatestVersionsJson.Unmarshal(&getLatestVersionsReq)
+			err = getLatestVersionsJson.Unmarshal(&getLatestVersionsReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -1650,12 +1629,9 @@ func newRejectTransitionRequest() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := rejectTransitionRequestJson.Unmarshal(&rejectTransitionRequestReq)
+			err = rejectTransitionRequestJson.Unmarshal(&rejectTransitionRequestReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -1739,12 +1715,9 @@ func newRenameModel() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := renameModelJson.Unmarshal(&renameModelReq)
+			err = renameModelJson.Unmarshal(&renameModelReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -1934,12 +1907,9 @@ func newSetModelTag() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := setModelTagJson.Unmarshal(&setModelTagReq)
+			err = setModelTagJson.Unmarshal(&setModelTagReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -2026,12 +1996,9 @@ func newSetModelVersionTag() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := setModelVersionTagJson.Unmarshal(&setModelVersionTagReq)
+			err = setModelVersionTagJson.Unmarshal(&setModelVersionTagReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -2109,12 +2076,9 @@ func newSetPermissions() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := setPermissionsJson.Unmarshal(&setPermissionsReq)
+			err = setPermissionsJson.Unmarshal(&setPermissionsReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		setPermissionsReq.RegisteredModelId = args[0]
@@ -2202,12 +2166,9 @@ func newTestRegistryWebhook() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := testRegistryWebhookJson.Unmarshal(&testRegistryWebhookReq)
+			err = testRegistryWebhookJson.Unmarshal(&testRegistryWebhookReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -2298,12 +2259,9 @@ func newTransitionStage() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := transitionStageJson.Unmarshal(&transitionStageReq)
+			err = transitionStageJson.Unmarshal(&transitionStageReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -2392,12 +2350,9 @@ func newUpdateComment() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateCommentJson.Unmarshal(&updateCommentReq)
+			err = updateCommentJson.Unmarshal(&updateCommentReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -2475,12 +2430,9 @@ func newUpdateModel() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateModelJson.Unmarshal(&updateModelReq)
+			err = updateModelJson.Unmarshal(&updateModelReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -2556,12 +2508,9 @@ func newUpdateModelVersion() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateModelVersionJson.Unmarshal(&updateModelVersionReq)
+			err = updateModelVersionJson.Unmarshal(&updateModelVersionReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -2633,12 +2582,9 @@ func newUpdatePermissions() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updatePermissionsJson.Unmarshal(&updatePermissionsReq)
+			err = updatePermissionsJson.Unmarshal(&updatePermissionsReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		updatePermissionsReq.RegisteredModelId = args[0]
@@ -2717,12 +2663,9 @@ func newUpdateWebhook() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateWebhookJson.Unmarshal(&updateWebhookReq)
+			err = updateWebhookJson.Unmarshal(&updateWebhookReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {

cmd/workspace/model-versions/model-versions.go

@@ -377,12 +377,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		updateReq.FullName = args[0]

cmd/workspace/notification-destinations/notification-destinations.go

@@ -84,12 +84,9 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 
@@ -316,12 +313,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		updateReq.Id = args[0]

cmd/workspace/online-tables/online-tables.go

@@ -79,12 +79,9 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 

cmd/workspace/permission-migration/permission-migration.go

@@ -92,12 +92,9 @@ func newMigratePermissions() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := migratePermissionsJson.Unmarshal(&migratePermissionsReq)
+			err = migratePermissionsJson.Unmarshal(&migratePermissionsReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {

cmd/workspace/permissions/permissions.go

@@ -265,12 +265,9 @@ func newSet() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := setJson.Unmarshal(&setReq)
+			err = setJson.Unmarshal(&setReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		setReq.RequestObjectType = args[0]
@@ -343,12 +340,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		updateReq.RequestObjectType = args[0]

cmd/workspace/pipelines/pipelines.go

@@ -98,12 +98,9 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")
@@ -702,12 +699,9 @@ func newSetPermissions() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := setPermissionsJson.Unmarshal(&setPermissionsReq)
+			err = setPermissionsJson.Unmarshal(&setPermissionsReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if len(args) == 0 {
@@ -794,12 +788,9 @@ func newStartUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := startUpdateJson.Unmarshal(&startUpdateReq)
+			err = startUpdateJson.Unmarshal(&startUpdateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if len(args) == 0 {
@@ -984,12 +975,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if len(args) == 0 {
@@ -1068,12 +1056,9 @@ func newUpdatePermissions() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updatePermissionsJson.Unmarshal(&updatePermissionsReq)
+			err = updatePermissionsJson.Unmarshal(&updatePermissionsReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if len(args) == 0 {

cmd/workspace/policy-compliance-for-clusters/policy-compliance-for-clusters.go

@@ -110,12 +110,9 @@ func newEnforceCompliance() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := enforceComplianceJson.Unmarshal(&enforceComplianceReq)
+			err = enforceComplianceJson.Unmarshal(&enforceComplianceReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {

cmd/workspace/policy-compliance-for-jobs/policy-compliance-for-jobs.go

@@ -104,12 +104,9 @@ func newEnforceCompliance() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := enforceComplianceJson.Unmarshal(&enforceComplianceReq)
+			err = enforceComplianceJson.Unmarshal(&enforceComplianceReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {

cmd/workspace/provider-exchange-filters/provider-exchange-filters.go

@@ -73,12 +73,9 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")
@@ -262,12 +259,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")

cmd/workspace/provider-exchanges/provider-exchanges.go

@@ -91,12 +91,9 @@ func newAddListingToExchange() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := addListingToExchangeJson.Unmarshal(&addListingToExchangeReq)
+			err = addListingToExchangeJson.Unmarshal(&addListingToExchangeReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -157,12 +154,9 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")
@@ -552,12 +546,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")

cmd/workspace/provider-files/provider-files.go

@@ -77,12 +77,9 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")
@@ -276,12 +273,9 @@ func newList() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := listJson.Unmarshal(&listReq)
+			err = listJson.Unmarshal(&listReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")

cmd/workspace/provider-listings/provider-listings.go

@@ -75,12 +75,9 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")
@@ -329,12 +326,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")

cmd/workspace/provider-personalization-requests/provider-personalization-requests.go

@@ -142,12 +142,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		updateReq.ListingId = args[0]

cmd/workspace/provider-provider-analytics-dashboards/provider-provider-analytics-dashboards.go

@@ -208,12 +208,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		updateReq.Id = args[0]

cmd/workspace/provider-providers/provider-providers.go

@@ -74,12 +74,9 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")
@@ -328,12 +325,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")

cmd/workspace/providers/providers.go

@@ -97,12 +97,9 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -449,12 +446,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if len(args) == 0 {

cmd/workspace/quality-monitors/quality-monitors.go

@@ -196,12 +196,9 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		createReq.TableName = args[0]
@@ -562,12 +559,9 @@ func newRegenerateDashboard() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := regenerateDashboardJson.Unmarshal(&regenerateDashboardReq)
+			err = regenerateDashboardJson.Unmarshal(&regenerateDashboardReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		regenerateDashboardReq.TableName = args[0]
@@ -730,12 +724,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		updateReq.TableName = args[0]

cmd/workspace/queries-legacy/queries-legacy.go

@@ -96,12 +96,9 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")
@@ -457,12 +454,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if len(args) == 0 {

cmd/workspace/queries/queries.go

@@ -85,12 +85,9 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 
@@ -428,12 +425,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		updateReq.Id = args[0]

cmd/workspace/query-visualizations-legacy/query-visualizations-legacy.go

@@ -87,12 +87,9 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")
@@ -225,12 +222,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")

cmd/workspace/query-visualizations/query-visualizations.go

@@ -84,12 +84,9 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 
@@ -220,12 +217,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		updateReq.Id = args[0]

cmd/workspace/recipients/recipients.go

@@ -118,12 +118,9 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -407,12 +404,9 @@ func newRotateToken() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := rotateTokenJson.Unmarshal(&rotateTokenReq)
+			err = rotateTokenJson.Unmarshal(&rotateTokenReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		rotateTokenReq.Name = args[0]
@@ -560,12 +554,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if len(args) == 0 {

cmd/workspace/registered-models/registered-models.go

@@ -135,12 +135,9 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -512,12 +509,9 @@ func newSetAlias() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := setAliasJson.Unmarshal(&setAliasReq)
+			err = setAliasJson.Unmarshal(&setAliasReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		setAliasReq.FullName = args[0]
@@ -595,12 +589,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if len(args) == 0 {

cmd/workspace/repos/overrides.go

@@ -7,7 +7,6 @@ import (
 
 	"github.com/databricks/cli/cmd/root"
 	"github.com/databricks/cli/libs/cmdio"
-	"github.com/databricks/cli/libs/diag"
 	"github.com/databricks/cli/libs/flags"
 	"github.com/databricks/databricks-sdk-go"
 	"github.com/databricks/databricks-sdk-go/service/workspace"
@@ -34,10 +33,12 @@ func createOverride(createCmd *cobra.Command, createReq *workspace.CreateRepo) {
 	createJson := createCmd.Flag("json").Value.(*flags.JsonFlag)
 	createCmd.RunE = func(cmd *cobra.Command, args []string) (err error) {
 		ctx := cmd.Context()
-		var diags diag.Diagnostics
 		w := root.WorkspaceClient(ctx)
 		if cmd.Flags().Changed("json") {
-			diags = createJson.Unmarshal(createReq)
+			err = createJson.Unmarshal(createReq)
+			if err != nil {
+				return err
+			}
 		} else {
 			createReq.Url = args[0]
 			if len(args) > 1 {
@@ -54,7 +55,7 @@ func createOverride(createCmd *cobra.Command, createReq *workspace.CreateRepo) {
 		if err != nil {
 			return err
 		}
-		return cmdio.RenderWithDiagnostics(ctx, response, diags)
+		return cmdio.Render(ctx, response)
 	}
 }
 
@@ -100,10 +101,12 @@ func updateOverride(updateCmd *cobra.Command, updateReq *workspace.UpdateRepo) {
 	updateJson := updateCmd.Flag("json").Value.(*flags.JsonFlag)
 	updateCmd.RunE = func(cmd *cobra.Command, args []string) (err error) {
 		ctx := cmd.Context()
-		var diags diag.Diagnostics
 		w := root.WorkspaceClient(ctx)
 		if cmd.Flags().Changed("json") {
-			diags = updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
+			if err != nil {
+				return err
+			}
 		} else {
 			updateReq.RepoId, err = repoArgumentToRepoID(ctx, w, args)
 			if err != nil {
@@ -115,7 +118,7 @@ func updateOverride(updateCmd *cobra.Command, updateReq *workspace.UpdateRepo) {
 		if err != nil {
 			return err
 		}
-		return diags.Error()
+		return nil
 	}
 }
 

cmd/workspace/repos/repos.go

@@ -110,12 +110,9 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -523,12 +520,9 @@ func newSetPermissions() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := setPermissionsJson.Unmarshal(&setPermissionsReq)
+			err = setPermissionsJson.Unmarshal(&setPermissionsReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if len(args) == 0 {
@@ -609,12 +603,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if len(args) == 0 {
@@ -696,12 +687,9 @@ func newUpdatePermissions() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updatePermissionsJson.Unmarshal(&updatePermissionsReq)
+			err = updatePermissionsJson.Unmarshal(&updatePermissionsReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if len(args) == 0 {

cmd/workspace/restrict-workspace-admins/restrict-workspace-admins.go

@@ -197,12 +197,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")

cmd/workspace/schemas/schemas.go

@@ -100,12 +100,9 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -389,12 +386,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if len(args) == 0 {

cmd/workspace/secrets/put_secret.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/databricks/cli/cmd/root"
 	"github.com/databricks/cli/libs/cmdio"
-	"github.com/databricks/cli/libs/diag"
 	"github.com/databricks/cli/libs/flags"
 	"github.com/databricks/databricks-sdk-go/service/workspace"
 	"github.com/spf13/cobra"
@@ -61,7 +60,6 @@ func newPutSecret() *cobra.Command {
 	cmd.PreRunE = root.MustWorkspaceClient
 	cmd.RunE = func(cmd *cobra.Command, args []string) (err error) {
 		ctx := cmd.Context()
-		var diags diag.Diagnostics
 		w := root.WorkspaceClient(ctx)
 
 		bytesValueChanged := cmd.Flags().Changed("bytes-value")
@@ -71,9 +69,9 @@ func newPutSecret() *cobra.Command {
 		}
 
 		if cmd.Flags().Changed("json") {
-			diags = putSecretJson.Unmarshal(&putSecretReq)
+			err = putSecretJson.Unmarshal(&putSecretReq)
-			if diags.HasError() {
+			if err != nil {
-				return diags.Error()
+				return err
 			}
 		} else {
 			putSecretReq.Scope = args[0]

cmd/workspace/secrets/secrets.go

@@ -110,12 +110,9 @@ func newCreateScope() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createScopeJson.Unmarshal(&createScopeReq)
+			err = createScopeJson.Unmarshal(&createScopeReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -194,12 +191,9 @@ func newDeleteAcl() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := deleteAclJson.Unmarshal(&deleteAclReq)
+			err = deleteAclJson.Unmarshal(&deleteAclReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -279,12 +273,9 @@ func newDeleteScope() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := deleteScopeJson.Unmarshal(&deleteScopeReq)
+			err = deleteScopeJson.Unmarshal(&deleteScopeReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -363,12 +354,9 @@ func newDeleteSecret() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := deleteSecretJson.Unmarshal(&deleteSecretReq)
+			err = deleteSecretJson.Unmarshal(&deleteSecretReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -771,12 +759,9 @@ func newPutAcl() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := putAclJson.Unmarshal(&putAclReq)
+			err = putAclJson.Unmarshal(&putAclReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {

cmd/workspace/service-principals/service-principals.go

@@ -95,12 +95,9 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 
@@ -361,12 +358,9 @@ func newPatch() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := patchJson.Unmarshal(&patchReq)
+			err = patchJson.Unmarshal(&patchReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if len(args) == 0 {
@@ -454,12 +448,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if len(args) == 0 {

cmd/workspace/serving-endpoints/serving-endpoints.go

@@ -167,12 +167,9 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")
@@ -707,12 +704,9 @@ func newPatch() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := patchJson.Unmarshal(&patchReq)
+			err = patchJson.Unmarshal(&patchReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		patchReq.Name = args[0]
@@ -780,12 +774,9 @@ func newPut() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := putJson.Unmarshal(&putReq)
+			err = putJson.Unmarshal(&putReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		putReq.Name = args[0]
@@ -861,12 +852,9 @@ func newQuery() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := queryJson.Unmarshal(&queryReq)
+			err = queryJson.Unmarshal(&queryReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		queryReq.Name = args[0]
@@ -933,12 +921,9 @@ func newSetPermissions() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := setPermissionsJson.Unmarshal(&setPermissionsReq)
+			err = setPermissionsJson.Unmarshal(&setPermissionsReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		setPermissionsReq.ServingEndpointId = args[0]
@@ -1015,12 +1000,9 @@ func newUpdateConfig() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateConfigJson.Unmarshal(&updateConfigReq)
+			err = updateConfigJson.Unmarshal(&updateConfigReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		updateConfigReq.Name = args[0]
@@ -1100,12 +1082,9 @@ func newUpdatePermissions() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updatePermissionsJson.Unmarshal(&updatePermissionsReq)
+			err = updatePermissionsJson.Unmarshal(&updatePermissionsReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		updatePermissionsReq.ServingEndpointId = args[0]

cmd/workspace/shares/shares.go

@@ -100,12 +100,9 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -430,12 +427,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		updateReq.Name = args[0]
@@ -507,12 +501,9 @@ func newUpdatePermissions() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updatePermissionsJson.Unmarshal(&updatePermissionsReq)
+			err = updatePermissionsJson.Unmarshal(&updatePermissionsReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		updatePermissionsReq.Name = args[0]

cmd/workspace/storage-credentials/storage-credentials.go

@@ -111,12 +111,9 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if !cmd.Flags().Changed("json") {
@@ -380,12 +377,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if len(args) == 0 {
@@ -484,12 +478,9 @@ func newValidate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := validateJson.Unmarshal(&validateReq)
+			err = validateJson.Unmarshal(&validateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 

cmd/workspace/table-constraints/table-constraints.go

@@ -92,12 +92,9 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")

cmd/workspace/tables/tables.go

@@ -476,12 +476,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if len(args) == 0 {

cmd/workspace/token-management/token-management.go

@@ -96,12 +96,9 @@ func newCreateOboToken() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createOboTokenJson.Unmarshal(&createOboTokenReq)
+			err = createOboTokenJson.Unmarshal(&createOboTokenReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			if len(args) == 0 {
@@ -461,12 +458,9 @@ func newSetPermissions() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := setPermissionsJson.Unmarshal(&setPermissionsReq)
+			err = setPermissionsJson.Unmarshal(&setPermissionsReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 
@@ -529,12 +523,9 @@ func newUpdatePermissions() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updatePermissionsJson.Unmarshal(&updatePermissionsReq)
+			err = updatePermissionsJson.Unmarshal(&updatePermissionsReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 

cmd/workspace/tokens/tokens.go

@@ -84,12 +84,9 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 
@@ -161,12 +158,9 @@ func newDelete() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := deleteJson.Unmarshal(&deleteReq)
+			err = deleteJson.Unmarshal(&deleteReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		} else {
 			if len(args) == 0 {

cmd/workspace/users/users.go

@@ -107,12 +107,9 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := createJson.Unmarshal(&createReq)
+			err = createJson.Unmarshal(&createReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 
@@ -466,12 +463,9 @@ func newPatch() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := patchJson.Unmarshal(&patchReq)
+			err = patchJson.Unmarshal(&patchReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if len(args) == 0 {
@@ -552,12 +546,9 @@ func newSetPermissions() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := setPermissionsJson.Unmarshal(&setPermissionsReq)
+			err = setPermissionsJson.Unmarshal(&setPermissionsReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 
@@ -628,12 +619,9 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updateJson.Unmarshal(&updateReq)
+			err = updateJson.Unmarshal(&updateReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}
 		if len(args) == 0 {
@@ -714,12 +702,9 @@ func newUpdatePermissions() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			diags := updatePermissionsJson.Unmarshal(&updatePermissionsReq)
+			err = updatePermissionsJson.Unmarshal(&updatePermissionsReq)
-			if len(diags) > 0 {
+			if err != nil {
-				err := cmdio.RenderDiags(ctx, diags)
+				return err
-				if err != nil {
-					return err
-				}
 			}
 		}