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

directly pass config value

This commit is contained in:
Shreyas Goenka 2024-09-26 16:07:32 +02:00
parent 5308ad8bf3
commit d14b1e2cca
No known key found for this signature in database
GPG Key ID: 92A07DF49CCB0622
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bundle/config/loader/process_include.go
View File

@ -25,11 +25,11 @@ var resourceTypes = []string{
"cluster", "cluster",
} }
func validateFileFormat(r *config.Root, filePath string) diag.Diagnostics { func validateFileFormat(configRoot dyn.Value, filePath string) diag.Diagnostics {
for _, typ := range resourceTypes { for _, typ := range resourceTypes {
for _, ext := range []string{fmt.Sprintf(".%s.yml", typ), fmt.Sprintf(".%s.yaml", typ)} { for _, ext := range []string{fmt.Sprintf(".%s.yml", typ), fmt.Sprintf(".%s.yaml", typ)} {
if strings.HasSuffix(filePath, ext) { if strings.HasSuffix(filePath, ext) {
return validateSingleResourceDefined(r, ext, typ) return validateSingleResourceDefined(configRoot, ext, typ)
} }
} }
} }
@ -37,7 +37,7 @@ func validateFileFormat(r *config.Root, filePath string) diag.Diagnostics {
return nil return nil
} }
func validateSingleResourceDefined(r *config.Root, ext, typ string) diag.Diagnostics { func validateSingleResourceDefined(configRoot dyn.Value, ext, typ string) diag.Diagnostics {
type resource struct { type resource struct {
path dyn.Path path dyn.Path
value dyn.Value value dyn.Value
@ -49,7 +49,7 @@ func validateSingleResourceDefined(r *config.Root, ext, typ string) diag.Diagnos
// Gather all resources defined in the resources block. // Gather all resources defined in the resources block.
_, err := dyn.MapByPattern( _, err := dyn.MapByPattern(
r.Value(), configRoot,
dyn.NewPattern(dyn.Key("resources"), dyn.AnyKey(), dyn.AnyKey()), dyn.NewPattern(dyn.Key("resources"), dyn.AnyKey(), dyn.AnyKey()),
func(p dyn.Path, v dyn.Value) (dyn.Value, error) { func(p dyn.Path, v dyn.Value) (dyn.Value, error) {
// The key for the resource. Eg: "my_job" for jobs.my_job. // The key for the resource. Eg: "my_job" for jobs.my_job.
@ -66,7 +66,7 @@ func validateSingleResourceDefined(r *config.Root, ext, typ string) diag.Diagnos
// Gather all resources defined in a target block. // Gather all resources defined in a target block.
_, err = dyn.MapByPattern( _, err = dyn.MapByPattern(
r.Value(), configRoot,
dyn.NewPattern(dyn.Key("targets"), dyn.AnyKey(), dyn.Key("resources"), dyn.AnyKey(), dyn.AnyKey()), dyn.NewPattern(dyn.Key("targets"), dyn.AnyKey(), dyn.Key("resources"), dyn.AnyKey(), dyn.AnyKey()),
func(p dyn.Path, v dyn.Value) (dyn.Value, error) { func(p dyn.Path, v dyn.Value) (dyn.Value, error) {
// The key for the resource. Eg: "my_job" for jobs.my_job. // The key for the resource. Eg: "my_job" for jobs.my_job.
@ -164,7 +164,7 @@ func (m *processInclude) Apply(_ context.Context, b *bundle.Bundle) diag.Diagnos
} }
// Add any diagnostics associated with the file format. // Add any diagnostics associated with the file format.
diags = append(diags, validateFileFormat(this, m.relPath)...) diags = append(diags, validateFileFormat(this.Value(), m.relPath)...)
if diags.HasError() { if diags.HasError() {
return diags return diags
} }

2
bundle/config/loader/process_include_test.go
View File

@ -376,7 +376,7 @@ func TestValidateFileFormat(t *testing.T) {
bundletest.SetLocation(tc.bundle, k, []dyn.Location{v}) bundletest.SetLocation(tc.bundle, k, []dyn.Location{v})
} }
diags := validateFileFormat(&tc.bundle.Config, tc.fileName) diags := validateFileFormat(tc.bundle.Config.Value(), tc.fileName)
assert.Equal(t, tc.expected, diags) assert.Equal(t, tc.expected, diags)
}) })
} }