steve/databricks-cli
steve
/
databricks-cli
mirror of https://github.com/databricks/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: More detailed error for json parsing

This commit is contained in:
Ilya Kuznetsov 2025-01-17 12:04:50 +01:00
parent a75c6afd6b
commit 66dae816ab
No known key found for this signature in database
GPG Key ID: 91F3DDCF5D21CDDF
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/bundle/utils/utils.go
View File

@ -2,13 +2,14 @@ package utils
import ( import (
"context" "context"
"encoding/json"
"fmt" "fmt"
"os" "os"
"github.com/databricks/cli/bundle" "github.com/databricks/cli/bundle"
"github.com/databricks/cli/cmd/root" "github.com/databricks/cli/cmd/root"
"github.com/databricks/cli/libs/diag" "github.com/databricks/cli/libs/diag"
"github.com/databricks/cli/libs/dyn/convert"
"github.com/databricks/cli/libs/dyn/jsonloader"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
@ -20,18 +21,29 @@ func configureVariables(cmd *cobra.Command, b *bundle.Bundle, variables []string
} }
func configureVariablesFromFile(cmd *cobra.Command, b *bundle.Bundle, filePath string) diag.Diagnostics { func configureVariablesFromFile(cmd *cobra.Command, b *bundle.Bundle, filePath string) diag.Diagnostics {
var diags diag.Diagnostics
return bundle.ApplyFunc(cmd.Context(), b, func(ctx context.Context, b *bundle.Bundle) diag.Diagnostics { return bundle.ApplyFunc(cmd.Context(), b, func(ctx context.Context, b *bundle.Bundle) diag.Diagnostics {
f, err := os.ReadFile(filePath) f, err := os.ReadFile(filePath)
if err != nil { if err != nil {
return diag.FromErr(fmt.Errorf("failed to read variables file: %w", err)) return diag.FromErr(fmt.Errorf("failed to read variables file: %w", err))
} }
vars := map[string]any{} val, err := jsonloader.LoadJSON(f, filePath)
err = json.Unmarshal(f, &vars)
if err != nil { if err != nil {
return diag.FromErr(fmt.Errorf("failed to parse variables file: %w", err)) return diag.FromErr(fmt.Errorf("failed to parse variables file: %w", err))
} }
vars := map[string]any{}
err = convert.ToTyped(&vars, val)
if err != nil {
return diags.Append(diag.Diagnostic{
Severity: diag.Error,
Summary: "failed to parse variables file: " + err.Error(),
Detail: "Variables file must be a JSON object with the following format:\n{\"var1\": \"value1\", \"var2\": \"value2\"}",
Locations: val.Locations(),
})
}
if len(vars) > 0 { if len(vars) > 0 {
err = b.Config.InitializeAnyTypeVariables(vars) err = b.Config.InitializeAnyTypeVariables(vars)
if err != nil { if err != nil {