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

Cleanup

This commit is contained in:
Lennart Kats 2024-12-09 09:41:30 +01:00
parent 2ab497dc5c
commit b6fcc1d1db
No known key found for this signature in database
GPG Key ID: 1EB8B57673197023
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bundle/config/mutator/apply_presets.go
View File

@ -430,7 +430,7 @@ func recommendCatalogSchemaUsage(b *bundle.Bundle, ctx context.Context, key stri
var fix string var fix string
if t.NotebookTask != nil { if t.NotebookTask != nil {
relPath = t.NotebookTask.NotebookPath relPath = t.NotebookTask.NotebookPath
expected = `" dbutils.widgets.text(['"]schema|` + expected = `dbutils.widgets.text\(['"]schema|` +
`USE[^)]+schema` `USE[^)]+schema`
fix = " dbutils.widgets.text('catalog')\n" + fix = " dbutils.widgets.text('catalog')\n" +
" dbutils.widgets.text('schema')\n" + " dbutils.widgets.text('schema')\n" +
@ -462,16 +462,11 @@ func recommendCatalogSchemaUsage(b *bundle.Bundle, ctx context.Context, key stri
} }
localPath, _, err := GetLocalPath(ctx, b, sourceDir, relPath) localPath, _, err := GetLocalPath(ctx, b, sourceDir, relPath)
if err != nil { if err != nil || localPath == "" {
// Any path errors are reported by another mutator // We ignore errors (they're reported by another mutator)
// and ignore empty local paths (which means we'd have to download the file)
continue continue
} }
if localPath == "" {
// If there is no local copy we don't want to download it and skip this check
continue
}
log.Warnf(ctx, "LocalPath: %s, relPath: %s, sourceDir: %s", localPath, relPath, sourceDir)
if !fileIncludesPattern(ctx, localPath, expected) { if !fileIncludesPattern(ctx, localPath, expected) {
diags = diags.Extend(diag.Diagnostics{{ diags = diags.Extend(diag.Diagnostics{{