Skip to content

Commit 6dd2fbf

Browse files
denikdenik
authored
direct: include remote_state in plan for "delete" (#3726)
## Why We already have it, no reason not to share it. ## Tests New acceptance tests for "delete" action.
1 parent 26536bf commit 6dd2fbf

File tree

17 files changed

+343
-10
lines changed

17 files changed

+343
-10
lines changed

‎acceptance/bundle/resource_deps/job_id/databricks.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
bundle:
2+
name: test-bundle
3+
14
resources:
25
jobs:
36
bar:

‎acceptance/bundle/resource_deps/job_id/empty.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
bundle:
2+
name: test-bundle
3+
4+
resources: {}

‎acceptance/bundle/resource_deps/job_id/out.plan_create.direct-exp.json‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
{
2+
"plan": {
3+
"resources.jobs.bar": {
4+
"action": "create",
5+
"new_state": {
6+
"config": {
7+
"deployment": {
8+
"kind": "BUNDLE",
9+
"metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/metadata.json"
10+
},
11+
"edit_mode": "UI_LOCKED",
12+
"format": "MULTI_TASK",
13+
"max_concurrent_runs": 1,
14+
"name": "job bar",
15+
"queue": {
16+
"enabled": true
17+
}
18+
}
19+
}
20+
},
21+
"resources.jobs.foo": {
22+
"depends_on": [
23+
{
24+
"node": "resources.jobs.bar",
25+
"label": "${resources.jobs.bar.id}"
26+
}
27+
],
28+
"action": "create",
29+
"new_state": {
30+
"config": {
31+
"deployment": {
32+
"kind": "BUNDLE",
33+
"metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/metadata.json"
34+
},
35+
"edit_mode": "UI_LOCKED",
36+
"format": "MULTI_TASK",
37+
"max_concurrent_runs": 1,
38+
"name": "job foo",
39+
"queue": {
40+
"enabled": true
41+
},
42+
"tasks": [
43+
{
44+
"run_job_task": {
45+
"job_id": 0
46+
},
47+
"task_key": "job_task"
48+
}
49+
]
50+
},
51+
"vars": {
52+
"tasks[0].run_job_task.job_id": "${resources.jobs.bar.id}"
53+
}
54+
}
55+
}
56+
}
57+
}

‎acceptance/bundle/resource_deps/job_id/out.plan_create.terraform.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"plan": {
3+
"resources.jobs.bar": {
4+
"action": "create"
5+
},
6+
"resources.jobs.foo": {
7+
"action": "create"
8+
}
9+
}
10+
}

‎acceptance/bundle/resource_deps/job_id/out.plan_delete.direct-exp.json‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
{
2+
"plan": {
3+
"resources.jobs.bar": {
4+
"action": "delete",
5+
"remote_state": {
6+
"creator_user_name": "[USERNAME]",
7+
"job_id": [BAR_ID],
8+
"settings": {
9+
"deployment": {
10+
"kind": "BUNDLE",
11+
"metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/metadata.json"
12+
},
13+
"edit_mode": "UI_LOCKED",
14+
"format": "MULTI_TASK",
15+
"max_concurrent_runs": 1,
16+
"name": "job bar",
17+
"queue": {
18+
"enabled": true
19+
}
20+
}
21+
}
22+
},
23+
"resources.jobs.foo": {
24+
"action": "delete",
25+
"remote_state": {
26+
"creator_user_name": "[USERNAME]",
27+
"job_id": [FOO_ID],
28+
"settings": {
29+
"deployment": {
30+
"kind": "BUNDLE",
31+
"metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/metadata.json"
32+
},
33+
"edit_mode": "UI_LOCKED",
34+
"format": "MULTI_TASK",
35+
"max_concurrent_runs": 1,
36+
"name": "job foo",
37+
"queue": {
38+
"enabled": true
39+
},
40+
"tasks": [
41+
{
42+
"run_job_task": {
43+
"job_id": [BAR_ID]
44+
},
45+
"task_key": "job_task"
46+
}
47+
]
48+
}
49+
}
50+
}
51+
}
52+
}

‎acceptance/bundle/resource_deps/job_id/out.plan_delete.terraform.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"plan": {
3+
"resources.jobs.bar": {
4+
"action": "delete"
5+
},
6+
"resources.jobs.foo": {
7+
"action": "delete"
8+
}
9+
}
10+
}

‎acceptance/bundle/resource_deps/job_id/output.txt‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ create jobs.foo
55

66
Plan: 2 to add, 0 to change, 0 to delete, 0 unchanged
77

8+
>>> [CLI] bundle debug plan
9+
810
>>> [CLI] bundle deploy
911
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
1012
Deploying resources...
@@ -55,15 +57,13 @@ Deployment complete!
5557
"path": "/api/2.2/jobs/create"
5658
}
5759

58-
>>> [CLI] bundle destroy --auto-approve
59-
The following resources will be deleted:
60-
delete job bar
61-
delete job foo
60+
>>> [CLI] bundle debug plan
6261

63-
All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default
64-
65-
Deleting files...
66-
Destroy complete!
62+
>>> [CLI] bundle deploy
63+
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...
64+
Deploying resources...
65+
Updating deployment state...
66+
Deployment complete!
6767

6868
>>> print_sorted_requests
6969
{
@@ -80,3 +80,11 @@ Destroy complete!
8080
"method": "POST",
8181
"path": "/api/2.2/jobs/delete"
8282
}
83+
84+
>>> [CLI] bundle destroy --auto-approve
85+
All files and directories at the following location will be deleted: /Workspace/Users/[USERNAME]/.bundle/test-bundle/default
86+
87+
Deleting files...
88+
Destroy complete!
89+
90+
>>> print_requests

‎acceptance/bundle/resource_deps/job_id/script‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ print_sorted_requests() {
99
}
1010

1111
trace $CLI bundle plan
12+
trace $CLI bundle debug plan > out.plan_create.$DATABRICKS_BUNDLE_ENGINE.json
1213
trace $CLI bundle deploy
1314
trace print_requests
1415

@@ -18,5 +19,11 @@ echo "$foo_id:FOO_ID" >> ACC_REPLS
1819
bar_id=`read_id.py jobs bar`
1920
echo "$bar_id:BAR_ID" >> ACC_REPLS
2021

21-
trace $CLI bundle destroy --auto-approve
22+
cp empty.yml databricks.yml
23+
trace $CLI bundle debug plan > out.plan_delete.$DATABRICKS_BUNDLE_ENGINE.json
24+
trace $CLI bundle deploy
25+
# TODO sorting requests should not be needed one we persist depends_on in state
2226
trace print_sorted_requests
27+
28+
trace $CLI bundle destroy --auto-approve
29+
trace print_requests

‎acceptance/bundle/resources/jobs/delete_job/databricks.yml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
bundle:
2+
name: test-bundle
3+
4+
resources:
5+
jobs:
6+
job:
7+
tasks:
8+
- task_key: TestTask1
9+
existing_cluster_id: "0717-132531-5opeqon1"
10+
python_wheel_task:
11+
package_name: "whl"
12+
entry_point: "run"
13+
libraries:
14+
- whl: /Workspace/Users/[email protected]/mywheel.whl
15+
- task_key: TestTask2
16+
for_each_task:
17+
inputs: "[1]"
18+
task:
19+
task_key: TestTask2
20+
existing_cluster_id: "0717-132531-5opeqon1"
21+
python_wheel_task:
22+
package_name: "whl"
23+
entry_point: "run"
24+
libraries:
25+
- whl: /Workspace/Users/[email protected]/mywheel.whl

‎acceptance/bundle/resources/jobs/delete_job/empty.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
bundle:
2+
name: test-bundle
3+
4+
resources: {}

0 commit comments

Comments
 (0)