Skip to content

Commit 720e2af

Browse files
andrewnesterandrewnester
authored
Fix bind and unbind for non-Terraform resources (#4850)
## Changes Fixed bind and unbind for non-Terraform resources ## Why Bind and unbind code depended on `TerraformToGroupName` map which only defined resources supported in Terraform. Catalogs and external locations were the first non TF resources and did not have bind / unbind tests and thus these commands did not work correctly Fixes #4842 ## Tests Added missing acceptance tests <!-- If your PR needs to be included in the release notes for next release, add a separate entry in NEXT_CHANGELOG.md as part of your PR. -->
1 parent 45710fc commit 720e2af

File tree

15 files changed

+218
-5
lines changed

15 files changed

+218
-5
lines changed

‎NEXT_CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
* engine/direct: Fix 400 error when deploying grants with ALL_PRIVILEGES ([#4801](https://github.com/databricks/cli/pull/4801))
1212
* Deduplicate grant entries with duplicate principals or privileges during initialization ([#4801](https://github.com/databricks/cli/pull/4801))
1313
* engine/direct: Fix unwanted recreation of secret scopes when scope_backend_type is not set ([#4834](https://github.com/databricks/cli/pull/4834))
14+
* engine/direct: Fix bind and unbind for non-Terraform resources ([#4850](https://github.com/databricks/cli/pull/4850))
1415
* engine/direct: Fix deploying removed principals ([#4824](https://github.com/databricks/cli/pull/4824))
1516

1617
### Dependency updates

‎acceptance/bundle/deployment/bind/catalog/databricks.yml.tmpl‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
bundle:
2+
name: test-bundle-$UNIQUE_NAME
3+
4+
resources:
5+
catalogs:
6+
foo:
7+
name: test-catalog-$UNIQUE_NAME
8+
comment: This is a test catalog

‎acceptance/bundle/deployment/bind/catalog/out.test.toml‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎acceptance/bundle/deployment/bind/catalog/output.txt‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
2+
>>> [CLI] catalogs create test-catalog-[UNIQUE_NAME]
3+
{
4+
"comment": null,
5+
"name": "test-catalog-[UNIQUE_NAME]"
6+
}
7+
8+
>>> [CLI] bundle deployment bind foo test-catalog-[UNIQUE_NAME] --auto-approve
9+
Updating deployment state...
10+
Successfully bound catalog with an id 'test-catalog-[UNIQUE_NAME]'
11+
Run 'bundle deploy' to deploy changes to your workspace
12+
13+
=== Deploy bundle
14+
>>> [CLI] bundle deploy --force-lock --auto-approve
15+
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
16+
Deploying resources...
17+
Updating deployment state...
18+
Deployment complete!
19+
20+
>>> [CLI] catalogs get test-catalog-[UNIQUE_NAME]
21+
{
22+
"comment": "This is a test catalog",
23+
"name": "test-catalog-[UNIQUE_NAME]"
24+
}
25+
26+
=== Unbind catalog
27+
>>> [CLI] bundle deployment unbind foo
28+
Updating deployment state...
29+
30+
=== Destroy bundle
31+
>>> [CLI] bundle destroy --auto-approve
32+
All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default
33+
34+
Deleting files...
35+
Destroy complete!
36+
37+
=== Read the pre-defined catalog again (expecting it still exists):
38+
>>> [CLI] catalogs get test-catalog-[UNIQUE_NAME]
39+
{
40+
"comment": "This is a test catalog",
41+
"name": "test-catalog-[UNIQUE_NAME]"
42+
}
43+
44+
=== Test cleanup
45+
>>> [CLI] catalogs delete test-catalog-[UNIQUE_NAME] --force
46+
0

‎acceptance/bundle/deployment/bind/catalog/script‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
cleanup() {
2+
title "Test cleanup"
3+
trace $CLI catalogs delete "test-catalog-$UNIQUE_NAME" --force
4+
echo $?
5+
}
6+
trap cleanup EXIT
7+
8+
envsubst < databricks.yml.tmpl > databricks.yml
9+
10+
trace $CLI catalogs create "test-catalog-$UNIQUE_NAME" | jq '{comment, name}'
11+
12+
trace $CLI bundle deployment bind foo "test-catalog-$UNIQUE_NAME" --auto-approve
13+
14+
title "Deploy bundle"
15+
trace $CLI bundle deploy --force-lock --auto-approve
16+
17+
trace $CLI catalogs get "test-catalog-$UNIQUE_NAME" | jq '{comment, name}'
18+
19+
title "Unbind catalog"
20+
trace $CLI bundle deployment unbind foo
21+
22+
title "Destroy bundle"
23+
trace $CLI bundle destroy --auto-approve
24+
25+
title "Read the pre-defined catalog again (expecting it still exists): "
26+
trace $CLI catalogs get "test-catalog-$UNIQUE_NAME" | jq '{comment, name}'

‎acceptance/bundle/deployment/bind/catalog/test.toml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
Local = true
2+
Cloud = true
3+
RequiresUnityCatalog = true
4+
5+
Ignore = [
6+
".databricks",
7+
"databricks.yml",
8+
]
9+
10+
[EnvMatrix]
11+
DATABRICKS_BUNDLE_ENGINE = ["direct"]

‎acceptance/bundle/deployment/bind/external_location/databricks.yml.tmpl‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
bundle:
2+
name: test-bundle-$UNIQUE_NAME
3+
4+
resources:
5+
external_locations:
6+
test_location:
7+
name: test-location-$UNIQUE_NAME
8+
url: s3://test-bucket/path-dabs
9+
credential_name: test_storage_credential
10+
comment: "Test external location from DABs"

‎acceptance/bundle/deployment/bind/external_location/out.test.toml‎

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎acceptance/bundle/deployment/bind/external_location/output.txt‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
2+
>>> [CLI] external-locations create test-location-[UNIQUE_NAME] s3://test-bucket/path test_storage_credential
3+
{
4+
"name": "test-location-[UNIQUE_NAME]",
5+
"url": "s3://test-bucket/path",
6+
"credential_name": "test_storage_credential"
7+
}
8+
9+
>>> [CLI] bundle deployment bind test_location test-location-[UNIQUE_NAME] --auto-approve
10+
Updating deployment state...
11+
Successfully bound external_location with an id 'test-location-[UNIQUE_NAME]'
12+
Run 'bundle deploy' to deploy changes to your workspace
13+
14+
=== Deploy bundle
15+
>>> [CLI] bundle deploy --force-lock --auto-approve
16+
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default/files...
17+
Deploying resources...
18+
Updating deployment state...
19+
Deployment complete!
20+
21+
>>> [CLI] external-locations get test-location-[UNIQUE_NAME]
22+
{
23+
"name": "test-location-[UNIQUE_NAME]",
24+
"url": "s3://test-bucket/path-dabs",
25+
"credential_name": "test_storage_credential"
26+
}
27+
28+
=== Unbind external location
29+
>>> [CLI] bundle deployment unbind test_location
30+
Updating deployment state...
31+
32+
=== Destroy bundle
33+
>>> [CLI] bundle destroy --auto-approve
34+
All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle-[UNIQUE_NAME]/default
35+
36+
Deleting files...
37+
Destroy complete!
38+
39+
=== Read the pre-defined external location again (expecting it still exists):
40+
>>> [CLI] external-locations get test-location-[UNIQUE_NAME]
41+
{
42+
"name": "test-location-[UNIQUE_NAME]",
43+
"url": "s3://test-bucket/path-dabs",
44+
"credential_name": "test_storage_credential"
45+
}
46+
47+
=== Test cleanup
48+
>>> [CLI] external-locations delete test-location-[UNIQUE_NAME]
49+
0

‎acceptance/bundle/deployment/bind/external_location/script‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
cleanup() {
2+
title "Test cleanup"
3+
trace $CLI external-locations delete "test-location-$UNIQUE_NAME"
4+
echo $?
5+
}
6+
trap cleanup EXIT
7+
8+
envsubst < databricks.yml.tmpl > databricks.yml
9+
10+
trace $CLI external-locations create "test-location-$UNIQUE_NAME" "s3://test-bucket/path" "test_storage_credential" | jq '{name, url, credential_name}'
11+
12+
trace $CLI bundle deployment bind test_location "test-location-$UNIQUE_NAME" --auto-approve
13+
14+
title "Deploy bundle"
15+
trace $CLI bundle deploy --force-lock --auto-approve
16+
17+
trace $CLI external-locations get "test-location-$UNIQUE_NAME" | jq '{name, url, credential_name}'
18+
19+
title "Unbind external location"
20+
trace $CLI bundle deployment unbind test_location
21+
22+
title "Destroy bundle"
23+
trace $CLI bundle destroy --auto-approve
24+
25+
title "Read the pre-defined external location again (expecting it still exists): "
26+
trace $CLI external-locations get "test-location-$UNIQUE_NAME" | jq '{name, url, credential_name}'

0 commit comments

Comments
 (0)