refactor

Co-authored-by: Pieter Noordhuis <pieter.noordhuis@databricks.com>

.codegen/service.go.tmpl

@@ -5,6 +5,7 @@ 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"
@@ -231,10 +232,13 @@ func new{{.PascalName}}() *cobra.Command {
 		{{- if .Request }}
 			{{ if .CanUseJson }}
 			if cmd.Flags().Changed("json") {
-					err = {{.CamelName}}Json.Unmarshal(&{{.CamelName}}Req)
+					diags := {{.CamelName}}Json.Unmarshal(&{{.CamelName}}Req)
+					if len(diags) > 0 {
+						err := cmdio.RenderDiags(ctx, diags)
 						if err != nil {
 							return err
 						}
+					}
 			}{{end}}{{ if .MustUseJson }}else {
 				return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")
 			}{{- end}}

bundle/render/render_text_output.go

@@ -8,6 +8,7 @@ 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"
@@ -28,34 +29,6 @@ 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 }}
@@ -128,19 +101,7 @@ 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
@@ -155,15 +116,9 @@ 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 nil
+	return cmdio.RenderDiagnostics(out, diags)
 }
 
 // RenderOptions contains options for rendering diagnostics.

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

@@ -205,10 +205,13 @@ func newUpdateRuleSet() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updateRuleSetJson.Unmarshal(&updateRuleSetReq)
+			diags := updateRuleSetJson.Unmarshal(&updateRuleSetReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				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,10 +78,13 @@ func newCreate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = createJson.Unmarshal(&createReq)
+			diags := createJson.Unmarshal(&createReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
+			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")
 		}
@@ -316,10 +319,13 @@ func newUpdate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updateJson.Unmarshal(&updateReq)
+			diags := updateJson.Unmarshal(&updateReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				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,10 +90,13 @@ func newCreate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = createJson.Unmarshal(&createReq)
+			diags := createJson.Unmarshal(&createReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				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,10 +129,13 @@ func newUpdate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updateJson.Unmarshal(&updateReq)
+			diags := updateJson.Unmarshal(&updateReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				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,11 +88,14 @@ func newCreate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = createJson.Unmarshal(&createReq)
+			diags := createJson.Unmarshal(&createReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 
 		response, err := a.CustomAppIntegration.Create(ctx, createReq)
 		if err != nil {
@@ -320,11 +323,14 @@ func newUpdate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updateJson.Unmarshal(&updateReq)
+			diags := updateJson.Unmarshal(&updateReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		updateReq.IntegrationId = args[0]
 
 		err = a.CustomAppIntegration.Update(ctx, updateReq)

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

@@ -107,10 +107,13 @@ func newCreate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = createJson.Unmarshal(&createReq)
+			diags := createJson.Unmarshal(&createReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				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,10 +127,13 @@ func newUpdate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updateJson.Unmarshal(&updateReq)
+			diags := updateJson.Unmarshal(&updateReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				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,11 +97,14 @@ func newCreate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = createJson.Unmarshal(&createReq)
+			diags := createJson.Unmarshal(&createReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 
 		response, err := a.Groups.Create(ctx, createReq)
 		if err != nil {
@@ -358,11 +361,14 @@ func newPatch() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = patchJson.Unmarshal(&patchReq)
+			diags := patchJson.Unmarshal(&patchReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if len(args) == 0 {
 			promptSpinner := cmdio.Spinner(ctx)
 			promptSpinner <- "No ID argument specified. Loading names for Account Groups drop-down."
@@ -446,11 +452,14 @@ func newUpdate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updateJson.Unmarshal(&updateReq)
+			diags := updateJson.Unmarshal(&updateReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if len(args) == 0 {
 			promptSpinner := cmdio.Spinner(ctx)
 			promptSpinner <- "No ID argument specified. Loading names for Account Groups drop-down."

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

@@ -132,11 +132,14 @@ func newCreate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = createJson.Unmarshal(&createReq)
+			diags := createJson.Unmarshal(&createReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if !cmd.Flags().Changed("json") {
 			createReq.Label = args[0]
 		}
@@ -411,11 +414,14 @@ func newReplace() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = replaceJson.Unmarshal(&replaceReq)
+			diags := replaceJson.Unmarshal(&replaceReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		replaceReq.IpAccessListId = args[0]
 		if !cmd.Flags().Changed("json") {
 			replaceReq.Label = args[1]
@@ -505,11 +511,14 @@ func newUpdate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updateJson.Unmarshal(&updateReq)
+			diags := updateJson.Unmarshal(&updateReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if len(args) == 0 {
 			promptSpinner := cmdio.Spinner(ctx)
 			promptSpinner <- "No IP_ACCESS_LIST_ID argument specified. Loading names for Account Ip Access Lists drop-down."

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

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

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

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

cmd/account/metastores/metastores.go

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

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

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

cmd/account/networks/networks.go

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

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

@@ -189,10 +189,13 @@ func newUpdate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updateJson.Unmarshal(&updateReq)
+			diags := updateJson.Unmarshal(&updateReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				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,11 +109,14 @@ func newCreate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = createJson.Unmarshal(&createReq)
+			diags := createJson.Unmarshal(&createReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if !cmd.Flags().Changed("json") {
 			createReq.PrivateAccessSettingsName = args[0]
 		}
@@ -411,11 +414,14 @@ func newReplace() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = replaceJson.Unmarshal(&replaceReq)
+			diags := replaceJson.Unmarshal(&replaceReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		replaceReq.PrivateAccessSettingsId = args[0]
 		if !cmd.Flags().Changed("json") {
 			replaceReq.PrivateAccessSettingsName = args[1]

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

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

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

@@ -95,11 +95,14 @@ func newCreate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = createJson.Unmarshal(&createReq)
+			diags := createJson.Unmarshal(&createReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 
 		response, err := a.ServicePrincipals.Create(ctx, createReq)
 		if err != nil {
@@ -358,11 +361,14 @@ func newPatch() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = patchJson.Unmarshal(&patchReq)
+			diags := patchJson.Unmarshal(&patchReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if len(args) == 0 {
 			promptSpinner := cmdio.Spinner(ctx)
 			promptSpinner <- "No ID argument specified. Loading names for Account Service Principals drop-down."
@@ -448,11 +454,14 @@ func newUpdate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updateJson.Unmarshal(&updateReq)
+			diags := updateJson.Unmarshal(&updateReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if len(args) == 0 {
 			promptSpinner := cmdio.Spinner(ctx)
 			promptSpinner <- "No ID argument specified. Loading names for Account Service Principals drop-down."

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

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

cmd/account/storage/storage.go

@@ -87,10 +87,13 @@ func newCreate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = createJson.Unmarshal(&createReq)
+			diags := createJson.Unmarshal(&createReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				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,11 +80,14 @@ func newCreate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = createJson.Unmarshal(&createReq)
+			diags := createJson.Unmarshal(&createReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 
 		response, err := a.UsageDashboards.Create(ctx, createReq)
 		if err != nil {

cmd/account/users/users.go

@@ -103,11 +103,14 @@ func newCreate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = createJson.Unmarshal(&createReq)
+			diags := createJson.Unmarshal(&createReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 
 		response, err := a.Users.Create(ctx, createReq)
 		if err != nil {
@@ -374,11 +377,14 @@ func newPatch() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = patchJson.Unmarshal(&patchReq)
+			diags := patchJson.Unmarshal(&patchReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if len(args) == 0 {
 			promptSpinner := cmdio.Spinner(ctx)
 			promptSpinner <- "No ID argument specified. Loading names for Account Users drop-down."
@@ -465,11 +471,14 @@ func newUpdate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updateJson.Unmarshal(&updateReq)
+			diags := updateJson.Unmarshal(&updateReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if len(args) == 0 {
 			promptSpinner := cmdio.Spinner(ctx)
 			promptSpinner <- "No ID argument specified. Loading names for Account Users drop-down."

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

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

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

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

cmd/account/workspaces/workspaces.go

@@ -133,11 +133,14 @@ func newCreate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = createJson.Unmarshal(&createReq)
+			diags := createJson.Unmarshal(&createReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if !cmd.Flags().Changed("json") {
 			createReq.WorkspaceName = args[0]
 		}
@@ -551,11 +554,14 @@ func newUpdate() *cobra.Command {
 		a := root.AccountClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updateJson.Unmarshal(&updateReq)
+			diags := updateJson.Unmarshal(&updateReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if len(args) == 0 {
 			promptSpinner := cmdio.Spinner(ctx)
 			promptSpinner <- "No WORKSPACE_ID argument specified. Loading names for Workspaces drop-down."

cmd/api/api.go

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

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

@@ -93,10 +93,13 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = createJson.Unmarshal(&createReq)
+			diags := createJson.Unmarshal(&createReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
+			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")
 		}
@@ -357,10 +360,13 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updateJson.Unmarshal(&updateReq)
+			diags := updateJson.Unmarshal(&updateReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				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,11 +85,14 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = createJson.Unmarshal(&createReq)
+			diags := createJson.Unmarshal(&createReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 
 		response, err := w.Alerts.Create(ctx, createReq)
 		if err != nil {
@@ -354,11 +357,14 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updateJson.Unmarshal(&updateReq)
+			diags := updateJson.Unmarshal(&updateReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		updateReq.Id = args[0]
 		if !cmd.Flags().Changed("json") {
 			updateReq.UpdateMask = args[1]

cmd/workspace/apps/apps.go

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

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

@@ -145,10 +145,13 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updateJson.Unmarshal(&updateReq)
+			diags := updateJson.Unmarshal(&updateReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				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,10 +127,13 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updateJson.Unmarshal(&updateReq)
+			diags := updateJson.Unmarshal(&updateReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				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,11 +105,14 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = createJson.Unmarshal(&createReq)
+			diags := createJson.Unmarshal(&createReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if !cmd.Flags().Changed("json") {
 			createReq.Name = args[0]
 		}
@@ -363,11 +366,14 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updateJson.Unmarshal(&updateReq)
+			diags := updateJson.Unmarshal(&updateReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		updateReq.Name = args[0]
 
 		response, err := w.Catalogs.Update(ctx, updateReq)

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

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

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

@@ -113,11 +113,14 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = createJson.Unmarshal(&createReq)
+			diags := createJson.Unmarshal(&createReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 
 		response, err := w.ClusterPolicies.Create(ctx, createReq)
 		if err != nil {
@@ -185,10 +188,13 @@ func newDelete() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = deleteJson.Unmarshal(&deleteReq)
+			diags := deleteJson.Unmarshal(&deleteReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
+			}
 		} else {
 			if len(args) == 0 {
 				promptSpinner := cmdio.Spinner(ctx)
@@ -284,10 +290,13 @@ func newEdit() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = editJson.Unmarshal(&editReq)
+			diags := editJson.Unmarshal(&editReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
+			}
 		} else {
 			if len(args) == 0 {
 				promptSpinner := cmdio.Spinner(ctx)
@@ -630,11 +639,14 @@ func newSetPermissions() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = setPermissionsJson.Unmarshal(&setPermissionsReq)
+			diags := setPermissionsJson.Unmarshal(&setPermissionsReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if len(args) == 0 {
 			promptSpinner := cmdio.Spinner(ctx)
 			promptSpinner <- "No CLUSTER_POLICY_ID argument specified. Loading names for Cluster Policies drop-down."
@@ -711,11 +723,14 @@ func newUpdatePermissions() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updatePermissionsJson.Unmarshal(&updatePermissionsReq)
+			diags := updatePermissionsJson.Unmarshal(&updatePermissionsReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if len(args) == 0 {
 			promptSpinner := cmdio.Spinner(ctx)
 			promptSpinner <- "No CLUSTER_POLICY_ID argument specified. Loading names for Cluster Policies drop-down."

cmd/workspace/clusters/clusters.go

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

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

@@ -130,10 +130,13 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updateJson.Unmarshal(&updateReq)
+			diags := updateJson.Unmarshal(&updateReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				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,10 +92,13 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = createJson.Unmarshal(&createReq)
+			diags := createJson.Unmarshal(&createReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
+			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")
 		}
@@ -355,10 +358,13 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updateJson.Unmarshal(&updateReq)
+			diags := updateJson.Unmarshal(&updateReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				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,11 +86,14 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = createJson.Unmarshal(&createReq)
+			diags := createJson.Unmarshal(&createReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		createReq.ListingId = args[0]
 
 		response, err := w.ConsumerInstallations.Create(ctx, createReq)
@@ -319,10 +322,13 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updateJson.Unmarshal(&updateReq)
+			diags := updateJson.Unmarshal(&updateReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				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,10 +85,13 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = createJson.Unmarshal(&createReq)
+			diags := createJson.Unmarshal(&createReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				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,10 +75,13 @@ func newExchangeToken() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = exchangeTokenJson.Unmarshal(&exchangeTokenReq)
+			diags := exchangeTokenJson.Unmarshal(&exchangeTokenReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				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,10 +75,13 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = createJson.Unmarshal(&createReq)
+			diags := createJson.Unmarshal(&createReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
+			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")
 		}
@@ -196,10 +199,13 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updateJson.Unmarshal(&updateReq)
+			diags := updateJson.Unmarshal(&updateReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				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,10 +78,13 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = createJson.Unmarshal(&createReq)
+			diags := createJson.Unmarshal(&createReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
+			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")
 		}
@@ -405,11 +408,14 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updateJson.Unmarshal(&updateReq)
+			diags := updateJson.Unmarshal(&updateReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if len(args) == 0 {
 			promptSpinner := cmdio.Spinner(ctx)
 			promptSpinner <- "No DASHBOARD_ID argument specified. Loading names for Dashboards drop-down."

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

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

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

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

cmd/workspace/functions/functions.go

@@ -85,10 +85,13 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = createJson.Unmarshal(&createReq)
+			diags := createJson.Unmarshal(&createReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
+			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")
 		}
@@ -381,11 +384,14 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updateJson.Unmarshal(&updateReq)
+			diags := updateJson.Unmarshal(&updateReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if len(args) == 0 {
 			promptSpinner := cmdio.Spinner(ctx)
 			promptSpinner <- "No NAME argument specified. Loading names for Functions drop-down."

cmd/workspace/genie/genie.go

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

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

@@ -102,11 +102,14 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = createJson.Unmarshal(&createReq)
+			diags := createJson.Unmarshal(&createReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if !cmd.Flags().Changed("json") {
 			createReq.GitProvider = args[0]
 		}
@@ -355,11 +358,14 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updateJson.Unmarshal(&updateReq)
+			diags := updateJson.Unmarshal(&updateReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if len(args) == 0 {
 			promptSpinner := cmdio.Spinner(ctx)
 			promptSpinner <- "No CREDENTIAL_ID argument specified. Loading names for Git Credentials drop-down."

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

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

cmd/workspace/grants/grants.go

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

cmd/workspace/groups/groups.go

@@ -97,11 +97,14 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = createJson.Unmarshal(&createReq)
+			diags := createJson.Unmarshal(&createReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 
 		response, err := w.Groups.Create(ctx, createReq)
 		if err != nil {
@@ -358,11 +361,14 @@ func newPatch() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = patchJson.Unmarshal(&patchReq)
+			diags := patchJson.Unmarshal(&patchReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if len(args) == 0 {
 			promptSpinner := cmdio.Spinner(ctx)
 			promptSpinner <- "No ID argument specified. Loading names for Groups drop-down."
@@ -446,11 +452,14 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updateJson.Unmarshal(&updateReq)
+			diags := updateJson.Unmarshal(&updateReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if len(args) == 0 {
 			promptSpinner := cmdio.Spinner(ctx)
 			promptSpinner <- "No ID argument specified. Loading names for Groups drop-down."

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

@@ -128,11 +128,14 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = createJson.Unmarshal(&createReq)
+			diags := createJson.Unmarshal(&createReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if !cmd.Flags().Changed("json") {
 			createReq.InstancePoolName = args[0]
 		}
@@ -206,10 +209,13 @@ func newDelete() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = deleteJson.Unmarshal(&deleteReq)
+			diags := deleteJson.Unmarshal(&deleteReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
+			}
 		} else {
 			if len(args) == 0 {
 				promptSpinner := cmdio.Spinner(ctx)
@@ -309,11 +315,14 @@ func newEdit() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = editJson.Unmarshal(&editReq)
+			diags := editJson.Unmarshal(&editReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if !cmd.Flags().Changed("json") {
 			editReq.InstancePoolId = args[0]
 		}
@@ -631,11 +640,14 @@ func newSetPermissions() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = setPermissionsJson.Unmarshal(&setPermissionsReq)
+			diags := setPermissionsJson.Unmarshal(&setPermissionsReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if len(args) == 0 {
 			promptSpinner := cmdio.Spinner(ctx)
 			promptSpinner <- "No INSTANCE_POOL_ID argument specified. Loading names for Instance Pools drop-down."
@@ -712,11 +724,14 @@ func newUpdatePermissions() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updatePermissionsJson.Unmarshal(&updatePermissionsReq)
+			diags := updatePermissionsJson.Unmarshal(&updatePermissionsReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if len(args) == 0 {
 			promptSpinner := cmdio.Spinner(ctx)
 			promptSpinner <- "No INSTANCE_POOL_ID argument specified. Loading names for Instance Pools drop-down."

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

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

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

@@ -133,11 +133,14 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = createJson.Unmarshal(&createReq)
+			diags := createJson.Unmarshal(&createReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if !cmd.Flags().Changed("json") {
 			createReq.Label = args[0]
 		}
@@ -414,11 +417,14 @@ func newReplace() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = replaceJson.Unmarshal(&replaceReq)
+			diags := replaceJson.Unmarshal(&replaceReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		replaceReq.IpAccessListId = args[0]
 		if !cmd.Flags().Changed("json") {
 			replaceReq.Label = args[1]
@@ -510,11 +516,14 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updateJson.Unmarshal(&updateReq)
+			diags := updateJson.Unmarshal(&updateReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if len(args) == 0 {
 			promptSpinner := cmdio.Spinner(ctx)
 			promptSpinner <- "No IP_ACCESS_LIST_ID argument specified. Loading names for Ip Access Lists drop-down."

cmd/workspace/jobs/jobs.go

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

cmd/workspace/lakeview/lakeview.go

@@ -108,11 +108,14 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = createJson.Unmarshal(&createReq)
+			diags := createJson.Unmarshal(&createReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if !cmd.Flags().Changed("json") {
 			createReq.DisplayName = args[0]
 		}
@@ -180,10 +183,13 @@ func newCreateSchedule() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = createScheduleJson.Unmarshal(&createScheduleReq)
+			diags := createScheduleJson.Unmarshal(&createScheduleReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
+			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")
 		}
@@ -250,10 +256,13 @@ func newCreateSubscription() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = createSubscriptionJson.Unmarshal(&createSubscriptionReq)
+			diags := createSubscriptionJson.Unmarshal(&createSubscriptionReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
+			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")
 		}
@@ -870,11 +879,14 @@ func newMigrate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = migrateJson.Unmarshal(&migrateReq)
+			diags := migrateJson.Unmarshal(&migrateReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if !cmd.Flags().Changed("json") {
 			migrateReq.SourceDashboardId = args[0]
 		}
@@ -941,11 +953,14 @@ func newPublish() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = publishJson.Unmarshal(&publishReq)
+			diags := publishJson.Unmarshal(&publishReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		publishReq.DashboardId = args[0]
 
 		response, err := w.Lakeview.Publish(ctx, publishReq)
@@ -1128,11 +1143,14 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updateJson.Unmarshal(&updateReq)
+			diags := updateJson.Unmarshal(&updateReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		updateReq.DashboardId = args[0]
 
 		response, err := w.Lakeview.Update(ctx, updateReq)
@@ -1200,10 +1218,13 @@ func newUpdateSchedule() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updateScheduleJson.Unmarshal(&updateScheduleReq)
+			diags := updateScheduleJson.Unmarshal(&updateScheduleReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				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,10 +190,13 @@ func newInstall() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = installJson.Unmarshal(&installReq)
+			diags := installJson.Unmarshal(&installReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
+			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")
 		}
@@ -251,10 +254,13 @@ func newUninstall() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = uninstallJson.Unmarshal(&uninstallReq)
+			diags := uninstallJson.Unmarshal(&uninstallReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				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,11 +112,14 @@ func newAssign() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = assignJson.Unmarshal(&assignReq)
+			diags := assignJson.Unmarshal(&assignReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		_, err = fmt.Sscan(args[0], &assignReq.WorkspaceId)
 		if err != nil {
 			return fmt.Errorf("invalid WORKSPACE_ID: %s", args[0])
@@ -201,11 +204,14 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = createJson.Unmarshal(&createReq)
+			diags := createJson.Unmarshal(&createReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if !cmd.Flags().Changed("json") {
 			createReq.Name = args[0]
 		}
@@ -606,11 +612,14 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updateJson.Unmarshal(&updateReq)
+			diags := updateJson.Unmarshal(&updateReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if len(args) == 0 {
 			promptSpinner := cmdio.Spinner(ctx)
 			promptSpinner <- "No ID argument specified. Loading names for Metastores drop-down."
@@ -690,11 +699,14 @@ func newUpdateAssignment() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updateAssignmentJson.Unmarshal(&updateAssignmentReq)
+			diags := updateAssignmentJson.Unmarshal(&updateAssignmentReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if len(args) == 0 {
 			promptSpinner := cmdio.Spinner(ctx)
 			promptSpinner <- "No WORKSPACE_ID argument specified. Loading names for Metastores drop-down."

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

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

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

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

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

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

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

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

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

@@ -92,11 +92,14 @@ func newMigratePermissions() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = migratePermissionsJson.Unmarshal(&migratePermissionsReq)
+			diags := migratePermissionsJson.Unmarshal(&migratePermissionsReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if !cmd.Flags().Changed("json") {
 			_, err = fmt.Sscan(args[0], &migratePermissionsReq.WorkspaceId)
 			if err != nil {

cmd/workspace/permissions/permissions.go

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

cmd/workspace/pipelines/pipelines.go

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

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

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

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

@@ -104,11 +104,14 @@ func newEnforceCompliance() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = enforceComplianceJson.Unmarshal(&enforceComplianceReq)
+			diags := enforceComplianceJson.Unmarshal(&enforceComplianceReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if !cmd.Flags().Changed("json") {
 			_, err = fmt.Sscan(args[0], &enforceComplianceReq.JobId)
 			if err != nil {

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

@@ -73,10 +73,13 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = createJson.Unmarshal(&createReq)
+			diags := createJson.Unmarshal(&createReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
+			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")
 		}
@@ -259,10 +262,13 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updateJson.Unmarshal(&updateReq)
+			diags := updateJson.Unmarshal(&updateReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				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,11 +91,14 @@ func newAddListingToExchange() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = addListingToExchangeJson.Unmarshal(&addListingToExchangeReq)
+			diags := addListingToExchangeJson.Unmarshal(&addListingToExchangeReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if !cmd.Flags().Changed("json") {
 			addListingToExchangeReq.ListingId = args[0]
 		}
@@ -154,10 +157,13 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = createJson.Unmarshal(&createReq)
+			diags := createJson.Unmarshal(&createReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
+			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")
 		}
@@ -546,10 +552,13 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updateJson.Unmarshal(&updateReq)
+			diags := updateJson.Unmarshal(&updateReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				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,10 +77,13 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = createJson.Unmarshal(&createReq)
+			diags := createJson.Unmarshal(&createReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
+			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")
 		}
@@ -273,10 +276,13 @@ func newList() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = listJson.Unmarshal(&listReq)
+			diags := listJson.Unmarshal(&listReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				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,10 +75,13 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = createJson.Unmarshal(&createReq)
+			diags := createJson.Unmarshal(&createReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
+			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")
 		}
@@ -326,10 +329,13 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updateJson.Unmarshal(&updateReq)
+			diags := updateJson.Unmarshal(&updateReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				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,11 +142,14 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updateJson.Unmarshal(&updateReq)
+			diags := updateJson.Unmarshal(&updateReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		updateReq.ListingId = args[0]
 		updateReq.RequestId = args[1]
 		if !cmd.Flags().Changed("json") {

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

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

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

@@ -74,10 +74,13 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = createJson.Unmarshal(&createReq)
+			diags := createJson.Unmarshal(&createReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
+			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")
 		}
@@ -325,10 +328,13 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updateJson.Unmarshal(&updateReq)
+			diags := updateJson.Unmarshal(&updateReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				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,11 +97,14 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = createJson.Unmarshal(&createReq)
+			diags := createJson.Unmarshal(&createReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if !cmd.Flags().Changed("json") {
 			createReq.Name = args[0]
 		}
@@ -446,11 +449,14 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updateJson.Unmarshal(&updateReq)
+			diags := updateJson.Unmarshal(&updateReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if len(args) == 0 {
 			promptSpinner := cmdio.Spinner(ctx)
 			promptSpinner <- "No NAME argument specified. Loading names for Providers drop-down."

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

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

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

@@ -96,10 +96,13 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = createJson.Unmarshal(&createReq)
+			diags := createJson.Unmarshal(&createReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
+			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")
 		}
@@ -454,11 +457,14 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updateJson.Unmarshal(&updateReq)
+			diags := updateJson.Unmarshal(&updateReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if len(args) == 0 {
 			promptSpinner := cmdio.Spinner(ctx)
 			promptSpinner <- "No QUERY_ID argument specified. Loading names for Queries Legacy drop-down."

cmd/workspace/queries/queries.go

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

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

@@ -87,10 +87,13 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = createJson.Unmarshal(&createReq)
+			diags := createJson.Unmarshal(&createReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
+			}
 		} else {
 			return fmt.Errorf("please provide command input in JSON format by specifying the --json flag")
 		}
@@ -222,10 +225,13 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updateJson.Unmarshal(&updateReq)
+			diags := updateJson.Unmarshal(&updateReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				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,11 +84,14 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = createJson.Unmarshal(&createReq)
+			diags := createJson.Unmarshal(&createReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 
 		response, err := w.QueryVisualizations.Create(ctx, createReq)
 		if err != nil {
@@ -217,11 +220,14 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updateJson.Unmarshal(&updateReq)
+			diags := updateJson.Unmarshal(&updateReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		updateReq.Id = args[0]
 		if !cmd.Flags().Changed("json") {
 			updateReq.UpdateMask = args[1]

cmd/workspace/recipients/recipients.go

@@ -118,11 +118,14 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = createJson.Unmarshal(&createReq)
+			diags := createJson.Unmarshal(&createReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if !cmd.Flags().Changed("json") {
 			createReq.Name = args[0]
 		}
@@ -404,11 +407,14 @@ func newRotateToken() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = rotateTokenJson.Unmarshal(&rotateTokenReq)
+			diags := rotateTokenJson.Unmarshal(&rotateTokenReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		rotateTokenReq.Name = args[0]
 		if !cmd.Flags().Changed("json") {
 			_, err = fmt.Sscan(args[1], &rotateTokenReq.ExistingTokenExpireInSeconds)
@@ -554,11 +560,14 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updateJson.Unmarshal(&updateReq)
+			diags := updateJson.Unmarshal(&updateReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if len(args) == 0 {
 			promptSpinner := cmdio.Spinner(ctx)
 			promptSpinner <- "No NAME argument specified. Loading names for Recipients drop-down."

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

@@ -135,11 +135,14 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = createJson.Unmarshal(&createReq)
+			diags := createJson.Unmarshal(&createReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if !cmd.Flags().Changed("json") {
 			createReq.CatalogName = args[0]
 		}
@@ -509,11 +512,14 @@ func newSetAlias() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = setAliasJson.Unmarshal(&setAliasReq)
+			diags := setAliasJson.Unmarshal(&setAliasReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		setAliasReq.FullName = args[0]
 		setAliasReq.Alias = args[1]
 		if !cmd.Flags().Changed("json") {
@@ -589,11 +595,14 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updateJson.Unmarshal(&updateReq)
+			diags := updateJson.Unmarshal(&updateReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if len(args) == 0 {
 			promptSpinner := cmdio.Spinner(ctx)
 			promptSpinner <- "No FULL_NAME argument specified. Loading names for Registered Models drop-down."

cmd/workspace/repos/overrides.go

@@ -7,6 +7,7 @@ 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"
@@ -33,12 +34,10 @@ 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") {
-			err = createJson.Unmarshal(createReq)
+			diags = createJson.Unmarshal(createReq)
-			if err != nil {
-				return err
-			}
 		} else {
 			createReq.Url = args[0]
 			if len(args) > 1 {
@@ -55,7 +54,7 @@ func createOverride(createCmd *cobra.Command, createReq *workspace.CreateRepo) {
 		if err != nil {
 			return err
 		}
-		return cmdio.Render(ctx, response)
+		return cmdio.RenderWithDiagnostics(ctx, response, diags)
 	}
 }
 
@@ -101,12 +100,10 @@ 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") {
-			err = updateJson.Unmarshal(&updateReq)
+			diags = updateJson.Unmarshal(&updateReq)
-			if err != nil {
-				return err
-			}
 		} else {
 			updateReq.RepoId, err = repoArgumentToRepoID(ctx, w, args)
 			if err != nil {
@@ -118,7 +115,7 @@ func updateOverride(updateCmd *cobra.Command, updateReq *workspace.UpdateRepo) {
 		if err != nil {
 			return err
 		}
-		return nil
+		return diags.Error()
 	}
 }
 

cmd/workspace/repos/repos.go

@@ -110,11 +110,14 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = createJson.Unmarshal(&createReq)
+			diags := createJson.Unmarshal(&createReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if !cmd.Flags().Changed("json") {
 			createReq.Url = args[0]
 		}
@@ -520,11 +523,14 @@ func newSetPermissions() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = setPermissionsJson.Unmarshal(&setPermissionsReq)
+			diags := setPermissionsJson.Unmarshal(&setPermissionsReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if len(args) == 0 {
 			promptSpinner := cmdio.Spinner(ctx)
 			promptSpinner <- "No REPO_ID argument specified. Loading names for Repos drop-down."
@@ -603,11 +609,14 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updateJson.Unmarshal(&updateReq)
+			diags := updateJson.Unmarshal(&updateReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if len(args) == 0 {
 			promptSpinner := cmdio.Spinner(ctx)
 			promptSpinner <- "No REPO_ID argument specified. Loading names for Repos drop-down."
@@ -687,11 +696,14 @@ func newUpdatePermissions() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updatePermissionsJson.Unmarshal(&updatePermissionsReq)
+			diags := updatePermissionsJson.Unmarshal(&updatePermissionsReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if len(args) == 0 {
 			promptSpinner := cmdio.Spinner(ctx)
 			promptSpinner <- "No REPO_ID argument specified. Loading names for Repos drop-down."

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

@@ -197,10 +197,13 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updateJson.Unmarshal(&updateReq)
+			diags := updateJson.Unmarshal(&updateReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				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,11 +100,14 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = createJson.Unmarshal(&createReq)
+			diags := createJson.Unmarshal(&createReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if !cmd.Flags().Changed("json") {
 			createReq.Name = args[0]
 		}
@@ -386,11 +389,14 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updateJson.Unmarshal(&updateReq)
+			diags := updateJson.Unmarshal(&updateReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if len(args) == 0 {
 			promptSpinner := cmdio.Spinner(ctx)
 			promptSpinner <- "No FULL_NAME argument specified. Loading names for Schemas drop-down."

cmd/workspace/secrets/put_secret.go

@@ -8,6 +8,7 @@ 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"
@@ -60,6 +61,7 @@ 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")
@@ -69,9 +71,9 @@ func newPutSecret() *cobra.Command {
 		}
 
 		if cmd.Flags().Changed("json") {
-			err = putSecretJson.Unmarshal(&putSecretReq)
+			diags = putSecretJson.Unmarshal(&putSecretReq)
-			if err != nil {
+			if diags.HasError() {
-				return err
+				return diags.Error()
 			}
 		} else {
 			putSecretReq.Scope = args[0]

cmd/workspace/secrets/secrets.go

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

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

@@ -95,11 +95,14 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = createJson.Unmarshal(&createReq)
+			diags := createJson.Unmarshal(&createReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 
 		response, err := w.ServicePrincipals.Create(ctx, createReq)
 		if err != nil {
@@ -358,11 +361,14 @@ func newPatch() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = patchJson.Unmarshal(&patchReq)
+			diags := patchJson.Unmarshal(&patchReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if len(args) == 0 {
 			promptSpinner := cmdio.Spinner(ctx)
 			promptSpinner <- "No ID argument specified. Loading names for Service Principals drop-down."
@@ -448,11 +454,14 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updateJson.Unmarshal(&updateReq)
+			diags := updateJson.Unmarshal(&updateReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if len(args) == 0 {
 			promptSpinner := cmdio.Spinner(ctx)
 			promptSpinner <- "No ID argument specified. Loading names for Service Principals drop-down."

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

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

cmd/workspace/shares/shares.go

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

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

@@ -111,11 +111,14 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = createJson.Unmarshal(&createReq)
+			diags := createJson.Unmarshal(&createReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if !cmd.Flags().Changed("json") {
 			createReq.Name = args[0]
 		}
@@ -377,11 +380,14 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updateJson.Unmarshal(&updateReq)
+			diags := updateJson.Unmarshal(&updateReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if len(args) == 0 {
 			promptSpinner := cmdio.Spinner(ctx)
 			promptSpinner <- "No NAME argument specified. Loading names for Storage Credentials drop-down."
@@ -478,11 +484,14 @@ func newValidate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = validateJson.Unmarshal(&validateReq)
+			diags := validateJson.Unmarshal(&validateReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 
 		response, err := w.StorageCredentials.Validate(ctx, validateReq)
 		if err != nil {

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

@@ -92,10 +92,13 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = createJson.Unmarshal(&createReq)
+			diags := createJson.Unmarshal(&createReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				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,11 +476,14 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updateJson.Unmarshal(&updateReq)
+			diags := updateJson.Unmarshal(&updateReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if len(args) == 0 {
 			promptSpinner := cmdio.Spinner(ctx)
 			promptSpinner <- "No FULL_NAME argument specified. Loading names for Tables drop-down."

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

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

cmd/workspace/tokens/tokens.go

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

cmd/workspace/users/users.go

@@ -107,11 +107,14 @@ func newCreate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = createJson.Unmarshal(&createReq)
+			diags := createJson.Unmarshal(&createReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 
 		response, err := w.Users.Create(ctx, createReq)
 		if err != nil {
@@ -463,11 +466,14 @@ func newPatch() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = patchJson.Unmarshal(&patchReq)
+			diags := patchJson.Unmarshal(&patchReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if len(args) == 0 {
 			promptSpinner := cmdio.Spinner(ctx)
 			promptSpinner <- "No ID argument specified. Loading names for Users drop-down."
@@ -546,11 +552,14 @@ func newSetPermissions() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = setPermissionsJson.Unmarshal(&setPermissionsReq)
+			diags := setPermissionsJson.Unmarshal(&setPermissionsReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 
 		response, err := w.Users.SetPermissions(ctx, setPermissionsReq)
 		if err != nil {
@@ -619,11 +628,14 @@ func newUpdate() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updateJson.Unmarshal(&updateReq)
+			diags := updateJson.Unmarshal(&updateReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 		if len(args) == 0 {
 			promptSpinner := cmdio.Spinner(ctx)
 			promptSpinner <- "No ID argument specified. Loading names for Users drop-down."
@@ -702,11 +714,14 @@ func newUpdatePermissions() *cobra.Command {
 		w := root.WorkspaceClient(ctx)
 
 		if cmd.Flags().Changed("json") {
-			err = updatePermissionsJson.Unmarshal(&updatePermissionsReq)
+			diags := updatePermissionsJson.Unmarshal(&updatePermissionsReq)
+			if len(diags) > 0 {
+				err := cmdio.RenderDiags(ctx, diags)
 				if err != nil {
 					return err
 				}
 			}
+		}
 
 		response, err := w.Users.UpdatePermissions(ctx, updatePermissionsReq)
 		if err != nil {