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

Merge remote-tracking branch 'origin' into sync-logger

This commit is contained in:
Shreyas Goenka 2025-03-05 16:29:35 +01:00
parent 9774046825 a24a7f5738
commit 709e8c54d2
No known key found for this signature in database
GPG Key ID: 92A07DF49CCB0622
7 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
acceptance/bundle/templates/default-python/classic/out.compare-vs-serverless.diff
View File

@ -48,7 +48,7 @@
- catalog: main - catalog: main
+ ## Specify the 'catalog' field to configure this pipeline to make use of Unity Catalog: + ## Specify the 'catalog' field to configure this pipeline to make use of Unity Catalog:
+ # catalog: catalog_name + # catalog: catalog_name
target: my_default_python_${bundle.target} schema: my_default_python_${bundle.target}
- serverless: true - serverless: true
libraries: libraries:
- notebook: - notebook:

2
acceptance/bundle/templates/default-python/classic/output/my_default_python/resources/my_default_python.pipeline.yml
View File

@ -5,7 +5,7 @@ resources:
name: my_default_python_pipeline name: my_default_python_pipeline
## Specify the 'catalog' field to configure this pipeline to make use of Unity Catalog: ## Specify the 'catalog' field to configure this pipeline to make use of Unity Catalog:
# catalog: catalog_name # catalog: catalog_name
target: my_default_python_${bundle.target} schema: my_default_python_${bundle.target}
libraries: libraries:
- notebook: - notebook:
path: ../src/dlt_pipeline.ipynb path: ../src/dlt_pipeline.ipynb

2
acceptance/bundle/templates/default-python/serverless-customcatalog/output.txt
View File

@ -18,5 +18,5 @@ See also the documentation at https://docs.databricks.com/dev-tools/bundles/inde
- ## Catalog is required for serverless compute - ## Catalog is required for serverless compute
- catalog: main - catalog: main
+ catalog: customcatalog + catalog: customcatalog
target: my_default_python_${bundle.target} schema: my_default_python_${bundle.target}
serverless: true serverless: true

2
acceptance/bundle/templates/default-python/serverless/output/my_default_python/resources/my_default_python.pipeline.yml
View File

@ -5,7 +5,7 @@ resources:
name: my_default_python_pipeline name: my_default_python_pipeline
## Catalog is required for serverless compute ## Catalog is required for serverless compute
catalog: main catalog: main
target: my_default_python_${bundle.target} schema: my_default_python_${bundle.target}
serverless: true serverless: true
libraries: libraries:
- notebook: - notebook:

2
integration/bundle/testdata/default_python/bundle_summary.txt vendored
View File

@ -164,7 +164,7 @@
} }
], ],
"name": "[dev [USERNAME]] project_name_$UNIQUE_PRJ_pipeline", "name": "[dev [USERNAME]] project_name_$UNIQUE_PRJ_pipeline",
"target": "project_name_$UNIQUE_PRJ_dev", "schema": "project_name_$UNIQUE_PRJ_dev",
"url": "[DATABRICKS_URL]/pipelines/[UUID]?o=[NUMID]" "url": "[DATABRICKS_URL]/pipelines/[UUID]?o=[NUMID]"
} }
} }

6
libs/telemetry/protos/databricks_cli_log.go
View File

@ -24,10 +24,12 @@ type ExecutionContext struct {
FromWebTerminal bool `json:"from_web_terminal,omitempty"` FromWebTerminal bool `json:"from_web_terminal,omitempty"`
// Time taken for the CLI command to execute. // Time taken for the CLI command to execute.
ExecutionTimeMs int64 `json:"execution_time_ms,omitempty"` // We want to serialize the zero value as well so the omitempty tag is not set.
ExecutionTimeMs int64 `json:"execution_time_ms"`
// Exit code of the CLI command. // Exit code of the CLI command.
ExitCode int64 `json:"exit_code,omitempty"` // We want to serialize the zero value as well so the omitempty tag is not set.
ExitCode int64 `json:"exit_code"`
} }
type CliTestEvent struct { type CliTestEvent struct {

2
libs/template/templates/default-python/template/{{.project_name}}/resources/{{.project_name}}.pipeline.yml.tmpl
View File

@ -13,7 +13,7 @@ resources:
{{- else}} {{- else}}
catalog: {{default_catalog}} catalog: {{default_catalog}}
{{- end}} {{- end}}
target: {{.project_name}}_${bundle.target} schema: {{.project_name}}_${bundle.target}
{{- if $with_serverless }} {{- if $with_serverless }}
serverless: true serverless: true
{{- end}} {{- end}}