diff --git a/.codegen/service.go.tmpl b/.codegen/service.go.tmpl index da2803157..b489a0b0a 100644 --- a/.codegen/service.go.tmpl +++ b/.codegen/service.go.tmpl @@ -233,8 +233,11 @@ func new{{.PascalName}}() *cobra.Command { {{ if .CanUseJson }} if cmd.Flags().Changed("json") { diags := {{.CamelName}}Json.Unmarshal(&{{.CamelName}}Req) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/account/access-control/access-control.go b/cmd/account/access-control/access-control.go index d118468aa..07a7fce9b 100755 --- a/cmd/account/access-control/access-control.go +++ b/cmd/account/access-control/access-control.go @@ -206,8 +206,11 @@ func newUpdateRuleSet() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateRuleSetJson.Unmarshal(&updateRuleSetReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/account/budgets/budgets.go b/cmd/account/budgets/budgets.go index 2ce945a2f..87ed41d57 100755 --- a/cmd/account/budgets/budgets.go +++ b/cmd/account/budgets/budgets.go @@ -79,8 +79,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -320,8 +323,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/account/credentials/credentials.go b/cmd/account/credentials/credentials.go index 13a6f1bd9..4ab70ef00 100755 --- a/cmd/account/credentials/credentials.go +++ b/cmd/account/credentials/credentials.go @@ -91,8 +91,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/account/csp-enablement-account/csp-enablement-account.go b/cmd/account/csp-enablement-account/csp-enablement-account.go index 423543832..9fb94a616 100755 --- a/cmd/account/csp-enablement-account/csp-enablement-account.go +++ b/cmd/account/csp-enablement-account/csp-enablement-account.go @@ -130,8 +130,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/account/custom-app-integration/custom-app-integration.go b/cmd/account/custom-app-integration/custom-app-integration.go index 404d21c93..9d16a44d4 100755 --- a/cmd/account/custom-app-integration/custom-app-integration.go +++ b/cmd/account/custom-app-integration/custom-app-integration.go @@ -89,8 +89,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -324,8 +327,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/account/encryption-keys/encryption-keys.go b/cmd/account/encryption-keys/encryption-keys.go index 66d8538bb..3f7082cd7 100755 --- a/cmd/account/encryption-keys/encryption-keys.go +++ b/cmd/account/encryption-keys/encryption-keys.go @@ -108,8 +108,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/account/esm-enablement-account/esm-enablement-account.go b/cmd/account/esm-enablement-account/esm-enablement-account.go index a4708fa25..1f820e3a9 100755 --- a/cmd/account/esm-enablement-account/esm-enablement-account.go +++ b/cmd/account/esm-enablement-account/esm-enablement-account.go @@ -128,8 +128,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/account/groups/groups.go b/cmd/account/groups/groups.go index 2fa04880d..7c2e83319 100755 --- a/cmd/account/groups/groups.go +++ b/cmd/account/groups/groups.go @@ -98,8 +98,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -362,8 +365,11 @@ func newPatch() *cobra.Command { if cmd.Flags().Changed("json") { diags := patchJson.Unmarshal(&patchReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -453,8 +459,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/account/ip-access-lists/ip-access-lists.go b/cmd/account/ip-access-lists/ip-access-lists.go index 3e913af22..61fa944ab 100755 --- a/cmd/account/ip-access-lists/ip-access-lists.go +++ b/cmd/account/ip-access-lists/ip-access-lists.go @@ -133,8 +133,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -415,8 +418,11 @@ func newReplace() *cobra.Command { if cmd.Flags().Changed("json") { diags := replaceJson.Unmarshal(&replaceReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -512,8 +518,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/account/log-delivery/log-delivery.go b/cmd/account/log-delivery/log-delivery.go index efe862704..cb083f3ba 100755 --- a/cmd/account/log-delivery/log-delivery.go +++ b/cmd/account/log-delivery/log-delivery.go @@ -163,8 +163,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -373,8 +376,11 @@ func newPatchStatus() *cobra.Command { if cmd.Flags().Changed("json") { diags := patchStatusJson.Unmarshal(&patchStatusReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/account/metastore-assignments/metastore-assignments.go b/cmd/account/metastore-assignments/metastore-assignments.go index 0225c2c4b..9d2490754 100755 --- a/cmd/account/metastore-assignments/metastore-assignments.go +++ b/cmd/account/metastore-assignments/metastore-assignments.go @@ -86,8 +86,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -347,8 +350,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/account/metastores/metastores.go b/cmd/account/metastores/metastores.go index 08b897492..eb5755782 100755 --- a/cmd/account/metastores/metastores.go +++ b/cmd/account/metastores/metastores.go @@ -81,8 +81,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -308,8 +311,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/account/network-connectivity/network-connectivity.go b/cmd/account/network-connectivity/network-connectivity.go index c5d333bd7..168de9c1d 100755 --- a/cmd/account/network-connectivity/network-connectivity.go +++ b/cmd/account/network-connectivity/network-connectivity.go @@ -97,8 +97,11 @@ func newCreateNetworkConnectivityConfiguration() *cobra.Command { if cmd.Flags().Changed("json") { diags := createNetworkConnectivityConfigurationJson.Unmarshal(&createNetworkConnectivityConfigurationReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -191,8 +194,11 @@ func newCreatePrivateEndpointRule() *cobra.Command { if cmd.Flags().Changed("json") { diags := createPrivateEndpointRuleJson.Unmarshal(&createPrivateEndpointRuleReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/account/networks/networks.go b/cmd/account/networks/networks.go index 3b90055f0..086d24be8 100755 --- a/cmd/account/networks/networks.go +++ b/cmd/account/networks/networks.go @@ -98,8 +98,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/account/personal-compute/personal-compute.go b/cmd/account/personal-compute/personal-compute.go index 68eeca277..dac7e2e30 100755 --- a/cmd/account/personal-compute/personal-compute.go +++ b/cmd/account/personal-compute/personal-compute.go @@ -190,8 +190,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/account/private-access/private-access.go b/cmd/account/private-access/private-access.go index 1faffef38..312f6d023 100755 --- a/cmd/account/private-access/private-access.go +++ b/cmd/account/private-access/private-access.go @@ -110,8 +110,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -415,8 +418,11 @@ func newReplace() *cobra.Command { if cmd.Flags().Changed("json") { diags := replaceJson.Unmarshal(&replaceReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/account/published-app-integration/published-app-integration.go b/cmd/account/published-app-integration/published-app-integration.go index 0c216906c..c97bcfc61 100755 --- a/cmd/account/published-app-integration/published-app-integration.go +++ b/cmd/account/published-app-integration/published-app-integration.go @@ -86,8 +86,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -319,8 +322,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/account/service-principals/service-principals.go b/cmd/account/service-principals/service-principals.go index 2ba303db8..f6ec1fa54 100755 --- a/cmd/account/service-principals/service-principals.go +++ b/cmd/account/service-principals/service-principals.go @@ -96,8 +96,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -362,8 +365,11 @@ func newPatch() *cobra.Command { if cmd.Flags().Changed("json") { diags := patchJson.Unmarshal(&patchReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -455,8 +461,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/account/storage-credentials/storage-credentials.go b/cmd/account/storage-credentials/storage-credentials.go index 9cdc14ea0..b3b8ad367 100755 --- a/cmd/account/storage-credentials/storage-credentials.go +++ b/cmd/account/storage-credentials/storage-credentials.go @@ -89,8 +89,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -344,8 +347,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/account/storage/storage.go b/cmd/account/storage/storage.go index 1d04e6e7e..24bb6d80b 100755 --- a/cmd/account/storage/storage.go +++ b/cmd/account/storage/storage.go @@ -88,8 +88,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/account/usage-dashboards/usage-dashboards.go b/cmd/account/usage-dashboards/usage-dashboards.go index 9eb609cc0..a482b466d 100755 --- a/cmd/account/usage-dashboards/usage-dashboards.go +++ b/cmd/account/usage-dashboards/usage-dashboards.go @@ -81,8 +81,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/account/users/users.go b/cmd/account/users/users.go index da17f21f3..10990084f 100755 --- a/cmd/account/users/users.go +++ b/cmd/account/users/users.go @@ -104,8 +104,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -378,8 +381,11 @@ func newPatch() *cobra.Command { if cmd.Flags().Changed("json") { diags := patchJson.Unmarshal(&patchReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -472,8 +478,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/account/vpc-endpoints/vpc-endpoints.go b/cmd/account/vpc-endpoints/vpc-endpoints.go index 468ea05d4..c1aab0d24 100755 --- a/cmd/account/vpc-endpoints/vpc-endpoints.go +++ b/cmd/account/vpc-endpoints/vpc-endpoints.go @@ -105,8 +105,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/account/workspace-assignment/workspace-assignment.go b/cmd/account/workspace-assignment/workspace-assignment.go index 942667029..e09095d37 100755 --- a/cmd/account/workspace-assignment/workspace-assignment.go +++ b/cmd/account/workspace-assignment/workspace-assignment.go @@ -274,8 +274,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/account/workspaces/workspaces.go b/cmd/account/workspaces/workspaces.go index 99a46c710..82d3d7db9 100755 --- a/cmd/account/workspaces/workspaces.go +++ b/cmd/account/workspaces/workspaces.go @@ -134,8 +134,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -555,8 +558,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/alerts-legacy/alerts-legacy.go b/cmd/workspace/alerts-legacy/alerts-legacy.go index d484b6f0c..4f7d5f966 100755 --- a/cmd/workspace/alerts-legacy/alerts-legacy.go +++ b/cmd/workspace/alerts-legacy/alerts-legacy.go @@ -94,8 +94,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -361,8 +364,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/alerts/alerts.go b/cmd/workspace/alerts/alerts.go index 22f6f7bbb..fcf18652b 100755 --- a/cmd/workspace/alerts/alerts.go +++ b/cmd/workspace/alerts/alerts.go @@ -86,8 +86,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -358,8 +361,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/apps/apps.go b/cmd/workspace/apps/apps.go index 8bc36c254..33cce8f47 100755 --- a/cmd/workspace/apps/apps.go +++ b/cmd/workspace/apps/apps.go @@ -113,8 +113,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -282,8 +285,11 @@ func newDeploy() *cobra.Command { if cmd.Flags().Changed("json") { diags := deployJson.Unmarshal(&deployReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -723,8 +729,11 @@ func newSetPermissions() *cobra.Command { if cmd.Flags().Changed("json") { diags := setPermissionsJson.Unmarshal(&setPermissionsReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -935,8 +944,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -1007,8 +1019,11 @@ func newUpdatePermissions() *cobra.Command { if cmd.Flags().Changed("json") { diags := updatePermissionsJson.Unmarshal(&updatePermissionsReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/artifact-allowlists/artifact-allowlists.go b/cmd/workspace/artifact-allowlists/artifact-allowlists.go index 79a724276..e66833697 100755 --- a/cmd/workspace/artifact-allowlists/artifact-allowlists.go +++ b/cmd/workspace/artifact-allowlists/artifact-allowlists.go @@ -146,8 +146,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/automatic-cluster-update/automatic-cluster-update.go b/cmd/workspace/automatic-cluster-update/automatic-cluster-update.go index f33f36247..dca88f3d1 100755 --- a/cmd/workspace/automatic-cluster-update/automatic-cluster-update.go +++ b/cmd/workspace/automatic-cluster-update/automatic-cluster-update.go @@ -128,8 +128,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/catalogs/catalogs.go b/cmd/workspace/catalogs/catalogs.go index f0236d4bc..9294c192b 100755 --- a/cmd/workspace/catalogs/catalogs.go +++ b/cmd/workspace/catalogs/catalogs.go @@ -106,8 +106,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -367,8 +370,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/clean-rooms/clean-rooms.go b/cmd/workspace/clean-rooms/clean-rooms.go index 0b12647a1..72560b846 100755 --- a/cmd/workspace/clean-rooms/clean-rooms.go +++ b/cmd/workspace/clean-rooms/clean-rooms.go @@ -86,8 +86,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -348,8 +351,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/cluster-policies/cluster-policies.go b/cmd/workspace/cluster-policies/cluster-policies.go index 78c996347..b34dd53db 100755 --- a/cmd/workspace/cluster-policies/cluster-policies.go +++ b/cmd/workspace/cluster-policies/cluster-policies.go @@ -114,8 +114,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -189,8 +192,11 @@ func newDelete() *cobra.Command { if cmd.Flags().Changed("json") { diags := deleteJson.Unmarshal(&deleteReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -291,8 +297,11 @@ func newEdit() *cobra.Command { if cmd.Flags().Changed("json") { diags := editJson.Unmarshal(&editReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -640,8 +649,11 @@ func newSetPermissions() *cobra.Command { if cmd.Flags().Changed("json") { diags := setPermissionsJson.Unmarshal(&setPermissionsReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -724,8 +736,11 @@ func newUpdatePermissions() *cobra.Command { if cmd.Flags().Changed("json") { diags := updatePermissionsJson.Unmarshal(&updatePermissionsReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/clusters/clusters.go b/cmd/workspace/clusters/clusters.go index 57c6a3fa4..85cde18e9 100755 --- a/cmd/workspace/clusters/clusters.go +++ b/cmd/workspace/clusters/clusters.go @@ -135,8 +135,11 @@ func newChangeOwner() *cobra.Command { if cmd.Flags().Changed("json") { diags := changeOwnerJson.Unmarshal(&changeOwnerReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -266,8 +269,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -363,8 +369,11 @@ func newDelete() *cobra.Command { if cmd.Flags().Changed("json") { diags := deleteJson.Unmarshal(&deleteReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -523,8 +532,11 @@ func newEdit() *cobra.Command { if cmd.Flags().Changed("json") { diags := editJson.Unmarshal(&editReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -624,8 +636,11 @@ func newEvents() *cobra.Command { if cmd.Flags().Changed("json") { diags := eventsJson.Unmarshal(&eventsReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -1079,8 +1094,11 @@ func newPermanentDelete() *cobra.Command { if cmd.Flags().Changed("json") { diags := permanentDeleteJson.Unmarshal(&permanentDeleteReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -1174,8 +1192,11 @@ func newPin() *cobra.Command { if cmd.Flags().Changed("json") { diags := pinJson.Unmarshal(&pinReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -1276,8 +1297,11 @@ func newResize() *cobra.Command { if cmd.Flags().Changed("json") { diags := resizeJson.Unmarshal(&resizeReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -1389,8 +1413,11 @@ func newRestart() *cobra.Command { if cmd.Flags().Changed("json") { diags := restartJson.Unmarshal(&restartReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -1486,8 +1513,11 @@ func newSetPermissions() *cobra.Command { if cmd.Flags().Changed("json") { diags := setPermissionsJson.Unmarshal(&setPermissionsReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -1633,8 +1663,11 @@ func newStart() *cobra.Command { if cmd.Flags().Changed("json") { diags := startJson.Unmarshal(&startReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -1740,8 +1773,11 @@ func newUnpin() *cobra.Command { if cmd.Flags().Changed("json") { diags := unpinJson.Unmarshal(&unpinReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -1855,8 +1891,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -1939,8 +1978,11 @@ func newUpdatePermissions() *cobra.Command { if cmd.Flags().Changed("json") { diags := updatePermissionsJson.Unmarshal(&updatePermissionsReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/compliance-security-profile/compliance-security-profile.go b/cmd/workspace/compliance-security-profile/compliance-security-profile.go index 2e0216f6f..58f3eddad 100755 --- a/cmd/workspace/compliance-security-profile/compliance-security-profile.go +++ b/cmd/workspace/compliance-security-profile/compliance-security-profile.go @@ -131,8 +131,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/connections/connections.go b/cmd/workspace/connections/connections.go index 3b1c3e079..161f5ab41 100755 --- a/cmd/workspace/connections/connections.go +++ b/cmd/workspace/connections/connections.go @@ -93,8 +93,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -359,8 +362,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/consumer-installations/consumer-installations.go b/cmd/workspace/consumer-installations/consumer-installations.go index 80411f07f..1848cb8fc 100755 --- a/cmd/workspace/consumer-installations/consumer-installations.go +++ b/cmd/workspace/consumer-installations/consumer-installations.go @@ -87,8 +87,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -323,8 +326,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/consumer-personalization-requests/consumer-personalization-requests.go b/cmd/workspace/consumer-personalization-requests/consumer-personalization-requests.go index 52c3d1e2e..6d751c631 100755 --- a/cmd/workspace/consumer-personalization-requests/consumer-personalization-requests.go +++ b/cmd/workspace/consumer-personalization-requests/consumer-personalization-requests.go @@ -86,8 +86,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/credentials-manager/credentials-manager.go b/cmd/workspace/credentials-manager/credentials-manager.go index df9f7db5a..e29bc0bd4 100755 --- a/cmd/workspace/credentials-manager/credentials-manager.go +++ b/cmd/workspace/credentials-manager/credentials-manager.go @@ -76,8 +76,11 @@ func newExchangeToken() *cobra.Command { if cmd.Flags().Changed("json") { diags := exchangeTokenJson.Unmarshal(&exchangeTokenReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/dashboard-widgets/dashboard-widgets.go b/cmd/workspace/dashboard-widgets/dashboard-widgets.go index edf995123..e42818266 100755 --- a/cmd/workspace/dashboard-widgets/dashboard-widgets.go +++ b/cmd/workspace/dashboard-widgets/dashboard-widgets.go @@ -76,8 +76,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -200,8 +203,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/dashboards/dashboards.go b/cmd/workspace/dashboards/dashboards.go index e64a0ea15..5bdd7b137 100755 --- a/cmd/workspace/dashboards/dashboards.go +++ b/cmd/workspace/dashboards/dashboards.go @@ -79,8 +79,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -409,8 +412,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/default-namespace/default-namespace.go b/cmd/workspace/default-namespace/default-namespace.go index 1eb6bcb5d..e5039cbaf 100755 --- a/cmd/workspace/default-namespace/default-namespace.go +++ b/cmd/workspace/default-namespace/default-namespace.go @@ -200,8 +200,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/enhanced-security-monitoring/enhanced-security-monitoring.go b/cmd/workspace/enhanced-security-monitoring/enhanced-security-monitoring.go index 21245ddc1..3d99ecef8 100755 --- a/cmd/workspace/enhanced-security-monitoring/enhanced-security-monitoring.go +++ b/cmd/workspace/enhanced-security-monitoring/enhanced-security-monitoring.go @@ -133,8 +133,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/experiments/experiments.go b/cmd/workspace/experiments/experiments.go index 7f25c0231..4c6b57d18 100755 --- a/cmd/workspace/experiments/experiments.go +++ b/cmd/workspace/experiments/experiments.go @@ -131,8 +131,11 @@ func newCreateExperiment() *cobra.Command { if cmd.Flags().Changed("json") { diags := createExperimentJson.Unmarshal(&createExperimentReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -207,8 +210,11 @@ func newCreateRun() *cobra.Command { if cmd.Flags().Changed("json") { diags := createRunJson.Unmarshal(&createRunReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -284,8 +290,11 @@ func newDeleteExperiment() *cobra.Command { if cmd.Flags().Changed("json") { diags := deleteExperimentJson.Unmarshal(&deleteExperimentReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -362,8 +371,11 @@ func newDeleteRun() *cobra.Command { if cmd.Flags().Changed("json") { diags := deleteRunJson.Unmarshal(&deleteRunReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -448,8 +460,11 @@ func newDeleteRuns() *cobra.Command { if cmd.Flags().Changed("json") { diags := deleteRunsJson.Unmarshal(&deleteRunsReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -534,8 +549,11 @@ func newDeleteTag() *cobra.Command { if cmd.Flags().Changed("json") { diags := deleteTagJson.Unmarshal(&deleteTagReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -1127,8 +1145,11 @@ func newLogBatch() *cobra.Command { if cmd.Flags().Changed("json") { diags := logBatchJson.Unmarshal(&logBatchReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -1196,8 +1217,11 @@ func newLogInputs() *cobra.Command { if cmd.Flags().Changed("json") { diags := logInputsJson.Unmarshal(&logInputsReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -1279,8 +1303,11 @@ func newLogMetric() *cobra.Command { if cmd.Flags().Changed("json") { diags := logMetricJson.Unmarshal(&logMetricReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -1363,8 +1390,11 @@ func newLogModel() *cobra.Command { if cmd.Flags().Changed("json") { diags := logModelJson.Unmarshal(&logModelReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -1445,8 +1475,11 @@ func newLogParam() *cobra.Command { if cmd.Flags().Changed("json") { diags := logParamJson.Unmarshal(&logParamReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -1531,8 +1564,11 @@ func newRestoreExperiment() *cobra.Command { if cmd.Flags().Changed("json") { diags := restoreExperimentJson.Unmarshal(&restoreExperimentReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -1609,8 +1645,11 @@ func newRestoreRun() *cobra.Command { if cmd.Flags().Changed("json") { diags := restoreRunJson.Unmarshal(&restoreRunReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -1695,8 +1734,11 @@ func newRestoreRuns() *cobra.Command { if cmd.Flags().Changed("json") { diags := restoreRunsJson.Unmarshal(&restoreRunsReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -1775,8 +1817,11 @@ func newSearchExperiments() *cobra.Command { if cmd.Flags().Changed("json") { diags := searchExperimentsJson.Unmarshal(&searchExperimentsReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -1846,8 +1891,11 @@ func newSearchRuns() *cobra.Command { if cmd.Flags().Changed("json") { diags := searchRunsJson.Unmarshal(&searchRunsReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -1923,8 +1971,11 @@ func newSetExperimentTag() *cobra.Command { if cmd.Flags().Changed("json") { diags := setExperimentTagJson.Unmarshal(&setExperimentTagReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -2003,8 +2054,11 @@ func newSetPermissions() *cobra.Command { if cmd.Flags().Changed("json") { diags := setPermissionsJson.Unmarshal(&setPermissionsReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -2087,8 +2141,11 @@ func newSetTag() *cobra.Command { if cmd.Flags().Changed("json") { diags := setTagJson.Unmarshal(&setTagReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -2170,8 +2227,11 @@ func newUpdateExperiment() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateExperimentJson.Unmarshal(&updateExperimentReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -2244,8 +2304,11 @@ func newUpdatePermissions() *cobra.Command { if cmd.Flags().Changed("json") { diags := updatePermissionsJson.Unmarshal(&updatePermissionsReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -2315,8 +2378,11 @@ func newUpdateRun() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateRunJson.Unmarshal(&updateRunReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/external-locations/external-locations.go b/cmd/workspace/external-locations/external-locations.go index b4182bc07..97d34df09 100755 --- a/cmd/workspace/external-locations/external-locations.go +++ b/cmd/workspace/external-locations/external-locations.go @@ -113,8 +113,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -385,8 +388,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/functions/functions.go b/cmd/workspace/functions/functions.go index 241d0fbd7..86b292674 100755 --- a/cmd/workspace/functions/functions.go +++ b/cmd/workspace/functions/functions.go @@ -86,8 +86,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -385,8 +388,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/genie/genie.go b/cmd/workspace/genie/genie.go index 429b93f0e..287bcde63 100755 --- a/cmd/workspace/genie/genie.go +++ b/cmd/workspace/genie/genie.go @@ -106,8 +106,11 @@ func newCreateMessage() *cobra.Command { if cmd.Flags().Changed("json") { diags := createMessageJson.Unmarshal(&createMessageReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -396,8 +399,11 @@ func newStartConversation() *cobra.Command { if cmd.Flags().Changed("json") { diags := startConversationJson.Unmarshal(&startConversationReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/git-credentials/git-credentials.go b/cmd/workspace/git-credentials/git-credentials.go index 4ab116de1..1acfaa1ae 100755 --- a/cmd/workspace/git-credentials/git-credentials.go +++ b/cmd/workspace/git-credentials/git-credentials.go @@ -103,8 +103,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -359,8 +362,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/global-init-scripts/global-init-scripts.go b/cmd/workspace/global-init-scripts/global-init-scripts.go index bf9b09a5b..52adde3fb 100755 --- a/cmd/workspace/global-init-scripts/global-init-scripts.go +++ b/cmd/workspace/global-init-scripts/global-init-scripts.go @@ -102,8 +102,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -371,8 +374,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/grants/grants.go b/cmd/workspace/grants/grants.go index 7dcd7c96f..b1dd4e8cb 100755 --- a/cmd/workspace/grants/grants.go +++ b/cmd/workspace/grants/grants.go @@ -224,8 +224,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/groups/groups.go b/cmd/workspace/groups/groups.go index 465e3949c..a2d323106 100755 --- a/cmd/workspace/groups/groups.go +++ b/cmd/workspace/groups/groups.go @@ -98,8 +98,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -362,8 +365,11 @@ func newPatch() *cobra.Command { if cmd.Flags().Changed("json") { diags := patchJson.Unmarshal(&patchReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -453,8 +459,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/instance-pools/instance-pools.go b/cmd/workspace/instance-pools/instance-pools.go index 333682c28..8a84df946 100755 --- a/cmd/workspace/instance-pools/instance-pools.go +++ b/cmd/workspace/instance-pools/instance-pools.go @@ -129,8 +129,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -210,8 +213,11 @@ func newDelete() *cobra.Command { if cmd.Flags().Changed("json") { diags := deleteJson.Unmarshal(&deleteReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -316,8 +322,11 @@ func newEdit() *cobra.Command { if cmd.Flags().Changed("json") { diags := editJson.Unmarshal(&editReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -641,8 +650,11 @@ func newSetPermissions() *cobra.Command { if cmd.Flags().Changed("json") { diags := setPermissionsJson.Unmarshal(&setPermissionsReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -725,8 +737,11 @@ func newUpdatePermissions() *cobra.Command { if cmd.Flags().Changed("json") { diags := updatePermissionsJson.Unmarshal(&updatePermissionsReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/instance-profiles/instance-profiles.go b/cmd/workspace/instance-profiles/instance-profiles.go index eafd58a9e..5c4bc8d9b 100755 --- a/cmd/workspace/instance-profiles/instance-profiles.go +++ b/cmd/workspace/instance-profiles/instance-profiles.go @@ -100,8 +100,11 @@ func newAdd() *cobra.Command { if cmd.Flags().Changed("json") { diags := addJson.Unmarshal(&addReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -196,8 +199,11 @@ func newEdit() *cobra.Command { if cmd.Flags().Changed("json") { diags := editJson.Unmarshal(&editReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -318,8 +324,11 @@ func newRemove() *cobra.Command { if cmd.Flags().Changed("json") { diags := removeJson.Unmarshal(&removeReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/ip-access-lists/ip-access-lists.go b/cmd/workspace/ip-access-lists/ip-access-lists.go index 59f269d14..070f279ec 100755 --- a/cmd/workspace/ip-access-lists/ip-access-lists.go +++ b/cmd/workspace/ip-access-lists/ip-access-lists.go @@ -134,8 +134,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -418,8 +421,11 @@ func newReplace() *cobra.Command { if cmd.Flags().Changed("json") { diags := replaceJson.Unmarshal(&replaceReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -517,8 +523,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/jobs/jobs.go b/cmd/workspace/jobs/jobs.go index 640dfccd7..d4ceb0c28 100755 --- a/cmd/workspace/jobs/jobs.go +++ b/cmd/workspace/jobs/jobs.go @@ -117,8 +117,11 @@ func newCancelAllRuns() *cobra.Command { if cmd.Flags().Changed("json") { diags := cancelAllRunsJson.Unmarshal(&cancelAllRunsReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -197,8 +200,11 @@ func newCancelRun() *cobra.Command { if cmd.Flags().Changed("json") { diags := cancelRunJson.Unmarshal(&cancelRunReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -298,8 +304,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -374,8 +383,11 @@ func newDelete() *cobra.Command { if cmd.Flags().Changed("json") { diags := deleteJson.Unmarshal(&deleteReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -470,8 +482,11 @@ func newDeleteRun() *cobra.Command { if cmd.Flags().Changed("json") { diags := deleteRunJson.Unmarshal(&deleteRunReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -1159,8 +1174,11 @@ func newRepairRun() *cobra.Command { if cmd.Flags().Changed("json") { diags := repairRunJson.Unmarshal(&repairRunReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -1261,8 +1279,11 @@ func newReset() *cobra.Command { if cmd.Flags().Changed("json") { diags := resetJson.Unmarshal(&resetReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -1354,8 +1375,11 @@ func newRunNow() *cobra.Command { if cmd.Flags().Changed("json") { diags := runNowJson.Unmarshal(&runNowReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -1461,8 +1485,11 @@ func newSetPermissions() *cobra.Command { if cmd.Flags().Changed("json") { diags := setPermissionsJson.Unmarshal(&setPermissionsReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -1566,8 +1593,11 @@ func newSubmit() *cobra.Command { if cmd.Flags().Changed("json") { diags := submitJson.Unmarshal(&submitReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -1663,8 +1693,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -1751,8 +1784,11 @@ func newUpdatePermissions() *cobra.Command { if cmd.Flags().Changed("json") { diags := updatePermissionsJson.Unmarshal(&updatePermissionsReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/lakeview/lakeview.go b/cmd/workspace/lakeview/lakeview.go index 642b50e33..33a45c65f 100755 --- a/cmd/workspace/lakeview/lakeview.go +++ b/cmd/workspace/lakeview/lakeview.go @@ -109,8 +109,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -184,8 +187,11 @@ func newCreateSchedule() *cobra.Command { if cmd.Flags().Changed("json") { diags := createScheduleJson.Unmarshal(&createScheduleReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -257,8 +263,11 @@ func newCreateSubscription() *cobra.Command { if cmd.Flags().Changed("json") { diags := createSubscriptionJson.Unmarshal(&createSubscriptionReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -880,8 +889,11 @@ func newMigrate() *cobra.Command { if cmd.Flags().Changed("json") { diags := migrateJson.Unmarshal(&migrateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -954,8 +966,11 @@ func newPublish() *cobra.Command { if cmd.Flags().Changed("json") { diags := publishJson.Unmarshal(&publishReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -1144,8 +1159,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -1219,8 +1237,11 @@ func newUpdateSchedule() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateScheduleJson.Unmarshal(&updateScheduleReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/libraries/libraries.go b/cmd/workspace/libraries/libraries.go index 23c14f238..e6b332aef 100755 --- a/cmd/workspace/libraries/libraries.go +++ b/cmd/workspace/libraries/libraries.go @@ -191,8 +191,11 @@ func newInstall() *cobra.Command { if cmd.Flags().Changed("json") { diags := installJson.Unmarshal(&installReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -255,8 +258,11 @@ func newUninstall() *cobra.Command { if cmd.Flags().Changed("json") { diags := uninstallJson.Unmarshal(&uninstallReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/metastores/metastores.go b/cmd/workspace/metastores/metastores.go index 1f742b5cb..563beb2f4 100755 --- a/cmd/workspace/metastores/metastores.go +++ b/cmd/workspace/metastores/metastores.go @@ -113,8 +113,11 @@ func newAssign() *cobra.Command { if cmd.Flags().Changed("json") { diags := assignJson.Unmarshal(&assignReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -205,8 +208,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -613,8 +619,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -700,8 +709,11 @@ func newUpdateAssignment() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateAssignmentJson.Unmarshal(&updateAssignmentReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/model-registry/model-registry.go b/cmd/workspace/model-registry/model-registry.go index 6f0240854..b45d83e3d 100755 --- a/cmd/workspace/model-registry/model-registry.go +++ b/cmd/workspace/model-registry/model-registry.go @@ -142,8 +142,11 @@ func newApproveTransitionRequest() *cobra.Command { if cmd.Flags().Changed("json") { diags := approveTransitionRequestJson.Unmarshal(&approveTransitionRequestReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -239,8 +242,11 @@ func newCreateComment() *cobra.Command { if cmd.Flags().Changed("json") { diags := createCommentJson.Unmarshal(&createCommentReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -329,8 +335,11 @@ func newCreateModel() *cobra.Command { if cmd.Flags().Changed("json") { diags := createModelJson.Unmarshal(&createModelReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -413,8 +422,11 @@ func newCreateModelVersion() *cobra.Command { if cmd.Flags().Changed("json") { diags := createModelVersionJson.Unmarshal(&createModelVersionReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -506,8 +518,11 @@ func newCreateTransitionRequest() *cobra.Command { if cmd.Flags().Changed("json") { diags := createTransitionRequestJson.Unmarshal(&createTransitionRequestReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -586,8 +601,11 @@ func newCreateWebhook() *cobra.Command { if cmd.Flags().Changed("json") { diags := createWebhookJson.Unmarshal(&createWebhookReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -1098,8 +1116,11 @@ func newGetLatestVersions() *cobra.Command { if cmd.Flags().Changed("json") { diags := getLatestVersionsJson.Unmarshal(&getLatestVersionsReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -1651,8 +1672,11 @@ func newRejectTransitionRequest() *cobra.Command { if cmd.Flags().Changed("json") { diags := rejectTransitionRequestJson.Unmarshal(&rejectTransitionRequestReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -1740,8 +1764,11 @@ func newRenameModel() *cobra.Command { if cmd.Flags().Changed("json") { diags := renameModelJson.Unmarshal(&renameModelReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -1935,8 +1962,11 @@ func newSetModelTag() *cobra.Command { if cmd.Flags().Changed("json") { diags := setModelTagJson.Unmarshal(&setModelTagReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -2027,8 +2057,11 @@ func newSetModelVersionTag() *cobra.Command { if cmd.Flags().Changed("json") { diags := setModelVersionTagJson.Unmarshal(&setModelVersionTagReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -2110,8 +2143,11 @@ func newSetPermissions() *cobra.Command { if cmd.Flags().Changed("json") { diags := setPermissionsJson.Unmarshal(&setPermissionsReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -2203,8 +2239,11 @@ func newTestRegistryWebhook() *cobra.Command { if cmd.Flags().Changed("json") { diags := testRegistryWebhookJson.Unmarshal(&testRegistryWebhookReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -2299,8 +2338,11 @@ func newTransitionStage() *cobra.Command { if cmd.Flags().Changed("json") { diags := transitionStageJson.Unmarshal(&transitionStageReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -2393,8 +2435,11 @@ func newUpdateComment() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateCommentJson.Unmarshal(&updateCommentReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -2476,8 +2521,11 @@ func newUpdateModel() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateModelJson.Unmarshal(&updateModelReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -2557,8 +2605,11 @@ func newUpdateModelVersion() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateModelVersionJson.Unmarshal(&updateModelVersionReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -2634,8 +2685,11 @@ func newUpdatePermissions() *cobra.Command { if cmd.Flags().Changed("json") { diags := updatePermissionsJson.Unmarshal(&updatePermissionsReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -2718,8 +2772,11 @@ func newUpdateWebhook() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateWebhookJson.Unmarshal(&updateWebhookReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/model-versions/model-versions.go b/cmd/workspace/model-versions/model-versions.go index f8cc1da68..439e5f657 100755 --- a/cmd/workspace/model-versions/model-versions.go +++ b/cmd/workspace/model-versions/model-versions.go @@ -378,8 +378,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/notification-destinations/notification-destinations.go b/cmd/workspace/notification-destinations/notification-destinations.go index 757d31a2e..470765879 100755 --- a/cmd/workspace/notification-destinations/notification-destinations.go +++ b/cmd/workspace/notification-destinations/notification-destinations.go @@ -85,8 +85,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -317,8 +320,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/online-tables/online-tables.go b/cmd/workspace/online-tables/online-tables.go index e87f76c36..1c25d1e26 100755 --- a/cmd/workspace/online-tables/online-tables.go +++ b/cmd/workspace/online-tables/online-tables.go @@ -80,8 +80,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/permission-migration/permission-migration.go b/cmd/workspace/permission-migration/permission-migration.go index 8eeaac11b..15ff1b751 100755 --- a/cmd/workspace/permission-migration/permission-migration.go +++ b/cmd/workspace/permission-migration/permission-migration.go @@ -93,8 +93,11 @@ func newMigratePermissions() *cobra.Command { if cmd.Flags().Changed("json") { diags := migratePermissionsJson.Unmarshal(&migratePermissionsReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/permissions/permissions.go b/cmd/workspace/permissions/permissions.go index 032d3d421..d007a425f 100755 --- a/cmd/workspace/permissions/permissions.go +++ b/cmd/workspace/permissions/permissions.go @@ -266,8 +266,11 @@ func newSet() *cobra.Command { if cmd.Flags().Changed("json") { diags := setJson.Unmarshal(&setReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -344,8 +347,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/pipelines/pipelines.go b/cmd/workspace/pipelines/pipelines.go index baf1a50e8..4a1db8f3a 100755 --- a/cmd/workspace/pipelines/pipelines.go +++ b/cmd/workspace/pipelines/pipelines.go @@ -99,8 +99,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -703,8 +706,11 @@ func newSetPermissions() *cobra.Command { if cmd.Flags().Changed("json") { diags := setPermissionsJson.Unmarshal(&setPermissionsReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -795,8 +801,11 @@ func newStartUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := startUpdateJson.Unmarshal(&startUpdateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -985,8 +994,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -1069,8 +1081,11 @@ func newUpdatePermissions() *cobra.Command { if cmd.Flags().Changed("json") { diags := updatePermissionsJson.Unmarshal(&updatePermissionsReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/policy-compliance-for-clusters/policy-compliance-for-clusters.go b/cmd/workspace/policy-compliance-for-clusters/policy-compliance-for-clusters.go index e9d3b6e54..d128d80b8 100755 --- a/cmd/workspace/policy-compliance-for-clusters/policy-compliance-for-clusters.go +++ b/cmd/workspace/policy-compliance-for-clusters/policy-compliance-for-clusters.go @@ -111,8 +111,11 @@ func newEnforceCompliance() *cobra.Command { if cmd.Flags().Changed("json") { diags := enforceComplianceJson.Unmarshal(&enforceComplianceReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/policy-compliance-for-jobs/policy-compliance-for-jobs.go b/cmd/workspace/policy-compliance-for-jobs/policy-compliance-for-jobs.go index 7a6ae4b91..384dab2c9 100755 --- a/cmd/workspace/policy-compliance-for-jobs/policy-compliance-for-jobs.go +++ b/cmd/workspace/policy-compliance-for-jobs/policy-compliance-for-jobs.go @@ -105,8 +105,11 @@ func newEnforceCompliance() *cobra.Command { if cmd.Flags().Changed("json") { diags := enforceComplianceJson.Unmarshal(&enforceComplianceReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/provider-exchange-filters/provider-exchange-filters.go b/cmd/workspace/provider-exchange-filters/provider-exchange-filters.go index 9f714cbfd..fea836d20 100755 --- a/cmd/workspace/provider-exchange-filters/provider-exchange-filters.go +++ b/cmd/workspace/provider-exchange-filters/provider-exchange-filters.go @@ -74,8 +74,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -263,8 +266,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/provider-exchanges/provider-exchanges.go b/cmd/workspace/provider-exchanges/provider-exchanges.go index 1632c69dd..a96f0673e 100755 --- a/cmd/workspace/provider-exchanges/provider-exchanges.go +++ b/cmd/workspace/provider-exchanges/provider-exchanges.go @@ -92,8 +92,11 @@ func newAddListingToExchange() *cobra.Command { if cmd.Flags().Changed("json") { diags := addListingToExchangeJson.Unmarshal(&addListingToExchangeReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -158,8 +161,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -553,8 +559,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/provider-files/provider-files.go b/cmd/workspace/provider-files/provider-files.go index e30e24a29..392ed2890 100755 --- a/cmd/workspace/provider-files/provider-files.go +++ b/cmd/workspace/provider-files/provider-files.go @@ -78,8 +78,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -277,8 +280,11 @@ func newList() *cobra.Command { if cmd.Flags().Changed("json") { diags := listJson.Unmarshal(&listReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/provider-listings/provider-listings.go b/cmd/workspace/provider-listings/provider-listings.go index c6150b432..4c7c6c563 100755 --- a/cmd/workspace/provider-listings/provider-listings.go +++ b/cmd/workspace/provider-listings/provider-listings.go @@ -76,8 +76,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -330,8 +333,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/provider-personalization-requests/provider-personalization-requests.go b/cmd/workspace/provider-personalization-requests/provider-personalization-requests.go index 8f7b27734..48c444f1f 100755 --- a/cmd/workspace/provider-personalization-requests/provider-personalization-requests.go +++ b/cmd/workspace/provider-personalization-requests/provider-personalization-requests.go @@ -143,8 +143,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/provider-provider-analytics-dashboards/provider-provider-analytics-dashboards.go b/cmd/workspace/provider-provider-analytics-dashboards/provider-provider-analytics-dashboards.go index 136031f85..a8d151a20 100755 --- a/cmd/workspace/provider-provider-analytics-dashboards/provider-provider-analytics-dashboards.go +++ b/cmd/workspace/provider-provider-analytics-dashboards/provider-provider-analytics-dashboards.go @@ -209,8 +209,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/provider-providers/provider-providers.go b/cmd/workspace/provider-providers/provider-providers.go index 3eafd29d6..3c9c024e8 100755 --- a/cmd/workspace/provider-providers/provider-providers.go +++ b/cmd/workspace/provider-providers/provider-providers.go @@ -75,8 +75,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -329,8 +332,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/providers/providers.go b/cmd/workspace/providers/providers.go index ed934001f..504beac5e 100755 --- a/cmd/workspace/providers/providers.go +++ b/cmd/workspace/providers/providers.go @@ -98,8 +98,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -450,8 +453,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/quality-monitors/quality-monitors.go b/cmd/workspace/quality-monitors/quality-monitors.go index 08d89f3d9..58075aa54 100755 --- a/cmd/workspace/quality-monitors/quality-monitors.go +++ b/cmd/workspace/quality-monitors/quality-monitors.go @@ -197,8 +197,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -563,8 +566,11 @@ func newRegenerateDashboard() *cobra.Command { if cmd.Flags().Changed("json") { diags := regenerateDashboardJson.Unmarshal(®enerateDashboardReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -731,8 +737,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/queries-legacy/queries-legacy.go b/cmd/workspace/queries-legacy/queries-legacy.go index 6524b8f88..e35e1828b 100755 --- a/cmd/workspace/queries-legacy/queries-legacy.go +++ b/cmd/workspace/queries-legacy/queries-legacy.go @@ -97,8 +97,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -458,8 +461,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/queries/queries.go b/cmd/workspace/queries/queries.go index 1c87504f5..208f887da 100755 --- a/cmd/workspace/queries/queries.go +++ b/cmd/workspace/queries/queries.go @@ -86,8 +86,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -429,8 +432,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/query-visualizations-legacy/query-visualizations-legacy.go b/cmd/workspace/query-visualizations-legacy/query-visualizations-legacy.go index 41f5d3017..f48acff1e 100755 --- a/cmd/workspace/query-visualizations-legacy/query-visualizations-legacy.go +++ b/cmd/workspace/query-visualizations-legacy/query-visualizations-legacy.go @@ -88,8 +88,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -226,8 +229,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/query-visualizations/query-visualizations.go b/cmd/workspace/query-visualizations/query-visualizations.go index 3480f5b46..621661952 100755 --- a/cmd/workspace/query-visualizations/query-visualizations.go +++ b/cmd/workspace/query-visualizations/query-visualizations.go @@ -85,8 +85,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -221,8 +224,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/recipients/recipients.go b/cmd/workspace/recipients/recipients.go index 3398d4f12..56abd2014 100755 --- a/cmd/workspace/recipients/recipients.go +++ b/cmd/workspace/recipients/recipients.go @@ -119,8 +119,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -408,8 +411,11 @@ func newRotateToken() *cobra.Command { if cmd.Flags().Changed("json") { diags := rotateTokenJson.Unmarshal(&rotateTokenReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -561,8 +567,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/registered-models/registered-models.go b/cmd/workspace/registered-models/registered-models.go index a1662ec17..63f307a32 100755 --- a/cmd/workspace/registered-models/registered-models.go +++ b/cmd/workspace/registered-models/registered-models.go @@ -136,8 +136,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -513,8 +516,11 @@ func newSetAlias() *cobra.Command { if cmd.Flags().Changed("json") { diags := setAliasJson.Unmarshal(&setAliasReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -596,8 +602,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/repos/repos.go b/cmd/workspace/repos/repos.go index 10742ed5b..4cee799ab 100755 --- a/cmd/workspace/repos/repos.go +++ b/cmd/workspace/repos/repos.go @@ -111,8 +111,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -524,8 +527,11 @@ func newSetPermissions() *cobra.Command { if cmd.Flags().Changed("json") { diags := setPermissionsJson.Unmarshal(&setPermissionsReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -610,8 +616,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -697,8 +706,11 @@ func newUpdatePermissions() *cobra.Command { if cmd.Flags().Changed("json") { diags := updatePermissionsJson.Unmarshal(&updatePermissionsReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/restrict-workspace-admins/restrict-workspace-admins.go b/cmd/workspace/restrict-workspace-admins/restrict-workspace-admins.go index 23b5261a2..5d0fba923 100755 --- a/cmd/workspace/restrict-workspace-admins/restrict-workspace-admins.go +++ b/cmd/workspace/restrict-workspace-admins/restrict-workspace-admins.go @@ -198,8 +198,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/schemas/schemas.go b/cmd/workspace/schemas/schemas.go index 809974b25..3ce573bad 100755 --- a/cmd/workspace/schemas/schemas.go +++ b/cmd/workspace/schemas/schemas.go @@ -101,8 +101,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -390,8 +393,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/secrets/secrets.go b/cmd/workspace/secrets/secrets.go index 6cbb1f7dc..e9547b621 100755 --- a/cmd/workspace/secrets/secrets.go +++ b/cmd/workspace/secrets/secrets.go @@ -111,8 +111,11 @@ func newCreateScope() *cobra.Command { if cmd.Flags().Changed("json") { diags := createScopeJson.Unmarshal(&createScopeReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -195,8 +198,11 @@ func newDeleteAcl() *cobra.Command { if cmd.Flags().Changed("json") { diags := deleteAclJson.Unmarshal(&deleteAclReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -280,8 +286,11 @@ func newDeleteScope() *cobra.Command { if cmd.Flags().Changed("json") { diags := deleteScopeJson.Unmarshal(&deleteScopeReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -364,8 +373,11 @@ func newDeleteSecret() *cobra.Command { if cmd.Flags().Changed("json") { diags := deleteSecretJson.Unmarshal(&deleteSecretReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -772,8 +784,11 @@ func newPutAcl() *cobra.Command { if cmd.Flags().Changed("json") { diags := putAclJson.Unmarshal(&putAclReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/service-principals/service-principals.go b/cmd/workspace/service-principals/service-principals.go index c4ec20a41..317779f30 100755 --- a/cmd/workspace/service-principals/service-principals.go +++ b/cmd/workspace/service-principals/service-principals.go @@ -96,8 +96,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -362,8 +365,11 @@ func newPatch() *cobra.Command { if cmd.Flags().Changed("json") { diags := patchJson.Unmarshal(&patchReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -455,8 +461,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/serving-endpoints/serving-endpoints.go b/cmd/workspace/serving-endpoints/serving-endpoints.go index faa7adedd..3edb71d3e 100755 --- a/cmd/workspace/serving-endpoints/serving-endpoints.go +++ b/cmd/workspace/serving-endpoints/serving-endpoints.go @@ -168,8 +168,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -708,8 +711,11 @@ func newPatch() *cobra.Command { if cmd.Flags().Changed("json") { diags := patchJson.Unmarshal(&patchReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -781,8 +787,11 @@ func newPut() *cobra.Command { if cmd.Flags().Changed("json") { diags := putJson.Unmarshal(&putReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -862,8 +871,11 @@ func newQuery() *cobra.Command { if cmd.Flags().Changed("json") { diags := queryJson.Unmarshal(&queryReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -934,8 +946,11 @@ func newSetPermissions() *cobra.Command { if cmd.Flags().Changed("json") { diags := setPermissionsJson.Unmarshal(&setPermissionsReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -1016,8 +1031,11 @@ func newUpdateConfig() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateConfigJson.Unmarshal(&updateConfigReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -1101,8 +1119,11 @@ func newUpdatePermissions() *cobra.Command { if cmd.Flags().Changed("json") { diags := updatePermissionsJson.Unmarshal(&updatePermissionsReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/shares/shares.go b/cmd/workspace/shares/shares.go index a9611c11c..62c3407f4 100755 --- a/cmd/workspace/shares/shares.go +++ b/cmd/workspace/shares/shares.go @@ -101,8 +101,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -431,8 +434,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -508,8 +514,11 @@ func newUpdatePermissions() *cobra.Command { if cmd.Flags().Changed("json") { diags := updatePermissionsJson.Unmarshal(&updatePermissionsReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/storage-credentials/storage-credentials.go b/cmd/workspace/storage-credentials/storage-credentials.go index 17d53c4c4..2caf09041 100755 --- a/cmd/workspace/storage-credentials/storage-credentials.go +++ b/cmd/workspace/storage-credentials/storage-credentials.go @@ -112,8 +112,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -381,8 +384,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -485,8 +491,11 @@ func newValidate() *cobra.Command { if cmd.Flags().Changed("json") { diags := validateJson.Unmarshal(&validateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/table-constraints/table-constraints.go b/cmd/workspace/table-constraints/table-constraints.go index a6fd0f53a..4ac7cb9fb 100755 --- a/cmd/workspace/table-constraints/table-constraints.go +++ b/cmd/workspace/table-constraints/table-constraints.go @@ -93,8 +93,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/tables/tables.go b/cmd/workspace/tables/tables.go index 74a46f3f4..66c31f9da 100755 --- a/cmd/workspace/tables/tables.go +++ b/cmd/workspace/tables/tables.go @@ -477,8 +477,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/token-management/token-management.go b/cmd/workspace/token-management/token-management.go index 8efa81c3a..6deb8d125 100755 --- a/cmd/workspace/token-management/token-management.go +++ b/cmd/workspace/token-management/token-management.go @@ -97,8 +97,11 @@ func newCreateOboToken() *cobra.Command { if cmd.Flags().Changed("json") { diags := createOboTokenJson.Unmarshal(&createOboTokenReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -462,8 +465,11 @@ func newSetPermissions() *cobra.Command { if cmd.Flags().Changed("json") { diags := setPermissionsJson.Unmarshal(&setPermissionsReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -530,8 +536,11 @@ func newUpdatePermissions() *cobra.Command { if cmd.Flags().Changed("json") { diags := updatePermissionsJson.Unmarshal(&updatePermissionsReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/tokens/tokens.go b/cmd/workspace/tokens/tokens.go index ea2a7053a..5c9b4994d 100755 --- a/cmd/workspace/tokens/tokens.go +++ b/cmd/workspace/tokens/tokens.go @@ -85,8 +85,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -162,8 +165,11 @@ func newDelete() *cobra.Command { if cmd.Flags().Changed("json") { diags := deleteJson.Unmarshal(&deleteReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/users/users.go b/cmd/workspace/users/users.go index 0eb0ca875..b085ab413 100755 --- a/cmd/workspace/users/users.go +++ b/cmd/workspace/users/users.go @@ -108,8 +108,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -467,8 +470,11 @@ func newPatch() *cobra.Command { if cmd.Flags().Changed("json") { diags := patchJson.Unmarshal(&patchReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -553,8 +559,11 @@ func newSetPermissions() *cobra.Command { if cmd.Flags().Changed("json") { diags := setPermissionsJson.Unmarshal(&setPermissionsReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -629,8 +638,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -715,8 +727,11 @@ func newUpdatePermissions() *cobra.Command { if cmd.Flags().Changed("json") { diags := updatePermissionsJson.Unmarshal(&updatePermissionsReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/vector-search-endpoints/vector-search-endpoints.go b/cmd/workspace/vector-search-endpoints/vector-search-endpoints.go index eebc60e2e..0cfb76172 100755 --- a/cmd/workspace/vector-search-endpoints/vector-search-endpoints.go +++ b/cmd/workspace/vector-search-endpoints/vector-search-endpoints.go @@ -96,8 +96,11 @@ func newCreateEndpoint() *cobra.Command { if cmd.Flags().Changed("json") { diags := createEndpointJson.Unmarshal(&createEndpointReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/vector-search-indexes/vector-search-indexes.go b/cmd/workspace/vector-search-indexes/vector-search-indexes.go index 6bf94cdca..832f4a6dc 100755 --- a/cmd/workspace/vector-search-indexes/vector-search-indexes.go +++ b/cmd/workspace/vector-search-indexes/vector-search-indexes.go @@ -115,8 +115,11 @@ func newCreateIndex() *cobra.Command { if cmd.Flags().Changed("json") { diags := createIndexJson.Unmarshal(&createIndexReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -199,8 +202,11 @@ func newDeleteDataVectorIndex() *cobra.Command { if cmd.Flags().Changed("json") { diags := deleteDataVectorIndexJson.Unmarshal(&deleteDataVectorIndexReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -450,8 +456,11 @@ func newQueryIndex() *cobra.Command { if cmd.Flags().Changed("json") { diags := queryIndexJson.Unmarshal(&queryIndexReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -525,8 +534,11 @@ func newQueryNextPage() *cobra.Command { if cmd.Flags().Changed("json") { diags := queryNextPageJson.Unmarshal(&queryNextPageReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -598,8 +610,11 @@ func newScanIndex() *cobra.Command { if cmd.Flags().Changed("json") { diags := scanIndexJson.Unmarshal(&scanIndexReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -734,8 +749,11 @@ func newUpsertDataVectorIndex() *cobra.Command { if cmd.Flags().Changed("json") { diags := upsertDataVectorIndexJson.Unmarshal(&upsertDataVectorIndexReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/volumes/volumes.go b/cmd/workspace/volumes/volumes.go index ebd34c535..2f4555736 100755 --- a/cmd/workspace/volumes/volumes.go +++ b/cmd/workspace/volumes/volumes.go @@ -120,8 +120,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -431,8 +434,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/warehouses/warehouses.go b/cmd/workspace/warehouses/warehouses.go index 1e9d92ec6..43d6c8ab9 100755 --- a/cmd/workspace/warehouses/warehouses.go +++ b/cmd/workspace/warehouses/warehouses.go @@ -110,8 +110,11 @@ func newCreate() *cobra.Command { if cmd.Flags().Changed("json") { diags := createJson.Unmarshal(&createReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -281,8 +284,11 @@ func newEdit() *cobra.Command { if cmd.Flags().Changed("json") { diags := editJson.Unmarshal(&editReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -695,8 +701,11 @@ func newSetPermissions() *cobra.Command { if cmd.Flags().Changed("json") { diags := setPermissionsJson.Unmarshal(&setPermissionsReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -789,8 +798,11 @@ func newSetWorkspaceWarehouseConfig() *cobra.Command { if cmd.Flags().Changed("json") { diags := setWorkspaceWarehouseConfigJson.Unmarshal(&setWorkspaceWarehouseConfigReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -1043,8 +1055,11 @@ func newUpdatePermissions() *cobra.Command { if cmd.Flags().Changed("json") { diags := updatePermissionsJson.Unmarshal(&updatePermissionsReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/workspace-bindings/workspace-bindings.go b/cmd/workspace/workspace-bindings/workspace-bindings.go index 76bf03cf1..20f54e1dc 100755 --- a/cmd/workspace/workspace-bindings/workspace-bindings.go +++ b/cmd/workspace/workspace-bindings/workspace-bindings.go @@ -227,8 +227,11 @@ func newUpdate() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateJson.Unmarshal(&updateReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -301,8 +304,11 @@ func newUpdateBindings() *cobra.Command { if cmd.Flags().Changed("json") { diags := updateBindingsJson.Unmarshal(&updateBindingsReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/workspace-conf/workspace-conf.go b/cmd/workspace/workspace-conf/workspace-conf.go index f74e252a2..a17bc1630 100755 --- a/cmd/workspace/workspace-conf/workspace-conf.go +++ b/cmd/workspace/workspace-conf/workspace-conf.go @@ -128,8 +128,11 @@ func newSetStatus() *cobra.Command { if cmd.Flags().Changed("json") { diags := setStatusJson.Unmarshal(&setStatusReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/cmd/workspace/workspace/workspace.go b/cmd/workspace/workspace/workspace.go index 73b0a370b..21da478c4 100755 --- a/cmd/workspace/workspace/workspace.go +++ b/cmd/workspace/workspace/workspace.go @@ -107,8 +107,11 @@ func newDelete() *cobra.Command { if cmd.Flags().Changed("json") { diags := deleteJson.Unmarshal(&deleteReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -486,8 +489,11 @@ func newImport() *cobra.Command { if cmd.Flags().Changed("json") { diags := importJson.Unmarshal(&importReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -629,8 +635,11 @@ func newMkdirs() *cobra.Command { if cmd.Flags().Changed("json") { diags := mkdirsJson.Unmarshal(&mkdirsReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -720,8 +729,11 @@ func newSetPermissions() *cobra.Command { if cmd.Flags().Changed("json") { diags := setPermissionsJson.Unmarshal(&setPermissionsReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } @@ -794,8 +806,11 @@ func newUpdatePermissions() *cobra.Command { if cmd.Flags().Changed("json") { diags := updatePermissionsJson.Unmarshal(&updatePermissionsReq) + if diags.HasError() { + return diags.Error() + } if len(diags) > 0 { - err := cmdio.RenderDiags(ctx, diags) + err := cmdio.RenderDiagnosticsToErrorOut(ctx, diags) if err != nil { return err } diff --git a/libs/cmdio/render.go b/libs/cmdio/render.go index 64ec22fd0..6594a49b5 100644 --- a/libs/cmdio/render.go +++ b/libs/cmdio/render.go @@ -443,9 +443,9 @@ const warningTemplate = `{{ "Warning" | yellow }}: {{ .Summary }} ` -func RenderDiags(ctx context.Context, diags diag.Diagnostics) error { +func RenderDiagnosticsToErrorOut(ctx context.Context, diags diag.Diagnostics) error { c := fromContext(ctx) - return RenderDiagnostics(c.out, diags) + return RenderDiagnostics(c.err, diags) } func RenderDiagnostics(out io.Writer, diags diag.Diagnostics) error {