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

decouple changes

This commit is contained in:
Shreyas Goenka 2025-01-24 12:03:11 +01:00
parent de326bf933
commit 09791fc16a
No known key found for this signature in database
GPG Key ID: 92A07DF49CCB0622
15 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
acceptance/bundle/templates/dbt-sql/output/my_dbt_sql/databricks.yml
View File

@ -3,7 +3,7 @@
# See https://docs.databricks.com/dev-tools/bundles/index.html for documentation.
bundle:
name: my_dbt_sql
uuid: [UUID]
uuid: <UUID>
include:
- resources/*.yml

2
acceptance/bundle/templates/default-python/output/my_default_python/databricks.yml
View File

@ -2,7 +2,7 @@
# See https://docs.databricks.com/dev-tools/bundles/index.html for documentation.
bundle:
name: my_default_python
uuid: [UUID]
uuid: <UUID>
include:
- resources/*.yml

2
acceptance/bundle/templates/default-python/output/my_default_python/scratch/exploration.ipynb
View File

@ -20,7 +20,7 @@
"rowLimit": 10000
},
"inputWidgets": {},
"nuid": "[UUID]",
"nuid": "<UUID>",
"showTitle": false,
"title": ""
}

6
acceptance/bundle/templates/default-python/output/my_default_python/src/dlt_pipeline.ipynb
View File

@ -6,7 +6,7 @@
"application/vnd.databricks.v1+cell": {
"cellMetadata": {},
"inputWidgets": {},
"nuid": "[UUID]",
"nuid": "<UUID>",
"showTitle": false,
"title": ""
}
@ -24,7 +24,7 @@
"application/vnd.databricks.v1+cell": {
"cellMetadata": {},
"inputWidgets": {},
"nuid": "[UUID]",
"nuid": "<UUID>",
"showTitle": false,
"title": ""
}
@ -47,7 +47,7 @@
"application/vnd.databricks.v1+cell": {
"cellMetadata": {},
"inputWidgets": {},
"nuid": "[UUID]",
"nuid": "<UUID>",
"showTitle": false,
"title": ""
}

4
acceptance/bundle/templates/default-python/output/my_default_python/src/notebook.ipynb
View File

@ -6,7 +6,7 @@
"application/vnd.databricks.v1+cell": {
"cellMetadata": {},
"inputWidgets": {},
"nuid": "[UUID]",
"nuid": "<UUID>",
"showTitle": false,
"title": ""
}
@ -37,7 +37,7 @@
"rowLimit": 10000
},
"inputWidgets": {},
"nuid": "[UUID]",
"nuid": "<UUID>",
"showTitle": false,
"title": ""
}

2
acceptance/bundle/templates/default-sql/output/my_default_sql/databricks.yml
View File

@ -2,7 +2,7 @@
# See https://docs.databricks.com/dev-tools/bundles/index.html for documentation.
bundle:
name: my_default_sql
uuid: [UUID]
uuid: <UUID>
include:
- resources/*.yml

2
acceptance/bundle/templates/default-sql/output/my_default_sql/scratch/exploration.ipynb
View File

@ -7,7 +7,7 @@
"application/vnd.databricks.v1+cell": {
"cellMetadata": {},
"inputWidgets": {},
"nuid": "[UUID]",
"nuid": "<UUID>",
"showTitle": false,
"title": ""
}

2
acceptance/bundle/templates/experimental-jobs-as-code/output/my_jobs_as_code/databricks.yml
View File

@ -2,7 +2,7 @@
# See https://docs.databricks.com/dev-tools/bundles/index.html for documentation.
bundle:
name: my_jobs_as_code
uuid: [UUID]
uuid: <UUID>
experimental:
python:

4
acceptance/bundle/templates/experimental-jobs-as-code/output/my_jobs_as_code/src/notebook.ipynb
View File

@ -6,7 +6,7 @@
"application/vnd.databricks.v1+cell": {
"cellMetadata": {},
"inputWidgets": {},
"nuid": "[UUID]",
"nuid": "<UUID>",
"showTitle": false,
"title": ""
}
@ -37,7 +37,7 @@
"rowLimit": 10000
},
"inputWidgets": {},
"nuid": "[UUID]",
"nuid": "<UUID>",
"showTitle": false,
"title": ""
}

14
acceptance/server_test.go
View File

@ -21,7 +21,7 @@ func StartServer(t *testing.T) *testserver.Server {
}
func AddHandlers(server *testserver.Server) {
server.Handle("GET /api/2.0/policies/clusters/list", func(r *http.Request) (any, error) {
server.Handle("/api/2.0/policies/clusters/list", func(r *http.Request) (any, error) {
return compute.ListPoliciesResponse{
Policies: []compute.Policy{
{
@ -36,7 +36,7 @@ func AddHandlers(server *testserver.Server) {
}, nil
})
server.Handle("GET /api/2.0/instance-pools/list", func(r *http.Request) (any, error) {
server.Handle("/api/2.0/instance-pools/list", func(r *http.Request) (any, error) {
return compute.ListInstancePools{
InstancePools: []compute.InstancePoolAndStats{
{
@ -47,7 +47,7 @@ func AddHandlers(server *testserver.Server) {
}, nil
})
server.Handle("GET /api/2.1/clusters/list", func(r *http.Request) (any, error) {
server.Handle("/api/2.1/clusters/list", func(r *http.Request) (any, error) {
return compute.ListClustersResponse{
Clusters: []compute.ClusterDetails{
{
@ -62,13 +62,13 @@ func AddHandlers(server *testserver.Server) {
}, nil
})
server.Handle("GET /api/2.0/preview/scim/v2/Me", func(r *http.Request) (any, error) {
server.Handle("/api/2.0/preview/scim/v2/Me", func(r *http.Request) (any, error) {
return iam.User{
UserName: "tester@databricks.com",
}, nil
})
server.Handle("GET /api/2.0/workspace/get-status", func(r *http.Request) (any, error) {
server.Handle("/api/2.0/workspace/get-status", func(r *http.Request) (any, error) {
return workspace.ObjectInfo{
ObjectId: 1001,
ObjectType: "DIRECTORY",
@ -77,13 +77,13 @@ func AddHandlers(server *testserver.Server) {
}, nil
})
server.Handle("GET /api/2.1/unity-catalog/current-metastore-assignment", func(r *http.Request) (any, error) {
server.Handle("/api/2.1/unity-catalog/current-metastore-assignment", func(r *http.Request) (any, error) {
return catalog.MetastoreAssignment{
DefaultCatalogName: "main",
}, nil
})
server.Handle("GET /api/2.0/permissions/directories/1001", func(r *http.Request) (any, error) {
server.Handle("/api/2.0/permissions/directories/1001", func(r *http.Request) (any, error) {
return workspace.WorkspaceObjectPermissions{
ObjectId: "1001",
ObjectType: "DIRECTORY",

2
acceptance/workspace/jobs/create/server.json
View File

@ -5,7 +5,7 @@
"request": {
"headers": {
"Authorization": "Bearer acceptance-test-token",
"User-Agent": "cli/[SEMVER] databricks-sdk-go/[SEMVER] go/[SEMVER] os/[OS] cmd/jobs_create cmd-exec-id/[UUID] auth/pat"
"User-Agent": "cli/[SEMVER] databricks-sdk-go/[SEMVER] go/[SEMVER] os/[OS] cmd/jobs_create cmd-exec-id/<UUID> auth/pat"
},
"body": {
"name": "abc"

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

@ -1,5 +1,5 @@
Building project_name_$UNIQUE_PRJ...
Uploading project_name_$UNIQUE_PRJ-0.0.1+[NUMID].[NUMID]-py3-none-any.whl...
Uploading project_name_$UNIQUE_PRJ-0.0.1+<NUMID>.<NUMID>-py3-none-any.whl...
Uploading bundle files to /Workspace/Users/$USERNAME/.bundle/project_name_$UNIQUE_PRJ/dev/files...
Deploying resources...
Updating deployment state...

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

@ -16,7 +16,7 @@
"enabled": false
}
},
"uuid": "[UUID]"
"uuid": "<UUID>"
},
"include": [
"resources/project_name_$UNIQUE_PRJ.job.yml",
@ -74,7 +74,7 @@
]
},
"format": "MULTI_TASK",
"id": "[NUMID]",
"id": "<NUMID>",
"job_clusters": [
{
"job_cluster_key": "job_cluster",
@ -141,7 +141,7 @@
"unit": "DAYS"
}
},
"url": "$DATABRICKS_URL/jobs/[NUMID]?o=[NUMID]"
"url": "$DATABRICKS_URL/jobs/<NUMID>?o=<NUMID>"
}
},
"pipelines": {
@ -155,7 +155,7 @@
"metadata_file_path": "/Workspace/Users/$USERNAME/.bundle/project_name_$UNIQUE_PRJ/dev/state/metadata.json"
},
"development": true,
"id": "[UUID]",
"id": "<UUID>",
"libraries": [
{
"notebook": {
@ -165,7 +165,7 @@
],
"name": "[dev $USERNAME] project_name_$UNIQUE_PRJ_pipeline",
"target": "project_name_$UNIQUE_PRJ_dev",
"url": "$DATABRICKS_URL/pipelines/[UUID]?o=[NUMID]"
"url": "$DATABRICKS_URL/pipelines/<UUID>?o=<NUMID>"
}
}
},

4
libs/testdiff/replacement.go
View File

@ -185,12 +185,12 @@ func PrepareReplacementsUser(t testutil.TestingT, r *ReplacementsContext, u iam.
func PrepareReplacementsUUID(t testutil.TestingT, r *ReplacementsContext) {
t.Helper()
r.append(uuidRegex, "[UUID]")
r.append(uuidRegex, "<UUID>")
}
func PrepareReplacementsNumber(t testutil.TestingT, r *ReplacementsContext) {
t.Helper()
r.append(numIdRegex, "[NUMID]")
r.append(numIdRegex, "<NUMID>")
}
func PrepareReplacementsTemporaryDirectory(t testutil.TestingT, r *ReplacementsContext) {

4
libs/testdiff/replacement_test.go
View File

@ -26,7 +26,7 @@ func TestReplacement_UUID(t *testing.T) {
PrepareReplacementsUUID(t, &repls)
assert.Equal(t, "[UUID]", repls.Replace("123e4567-e89b-12d3-a456-426614174000"))
assert.Equal(t, "<UUID>", repls.Replace("123e4567-e89b-12d3-a456-426614174000"))
}
func TestReplacement_Number(t *testing.T) {
@ -35,7 +35,7 @@ func TestReplacement_Number(t *testing.T) {
PrepareReplacementsNumber(t, &repls)
assert.Equal(t, "12", repls.Replace("12"))
assert.Equal(t, "[NUMID]", repls.Replace("123"))
assert.Equal(t, "<NUMID>", repls.Replace("123"))
}
func TestReplacement_TemporaryDirectory(t *testing.T) {