Skip to content

Commit b23087e

Browse files
denikdenik
committed
update
1 parent ae835f2 commit b23087e

File tree

11 files changed

+201
-119
lines changed

11 files changed

+201
-119
lines changed

‎acceptance/bundle/deployment/bind/job/noop-job/output.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@ Deployment complete!
1414

1515
>>> [CLI] jobs get [NUMID] --output json
1616
{
17+
"created_time":[UNIX_TIME_MILLIS],
18+
"creator_user_name":"[USERNAME]",
1719
"job_id":[NUMID],
20+
"run_as_user_name":"[USERNAME]",
1821
"settings": {
1922
"deployment": {
2023
"kind":"BUNDLE",
@@ -31,6 +34,7 @@ Deployment complete!
3134
"run_as": {
3235
"user_name":"[USERNAME]"
3336
},
37+
"timeout_seconds":0,
3438
"webhook_notifications": {}
3539
}
3640
}

‎acceptance/bundle/deployment/bind/job/python-job/output.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@ Deployment complete!
1414

1515
>>> [CLI] jobs get [NUMID] --output json
1616
{
17+
"created_time":[UNIX_TIME_MILLIS],
18+
"creator_user_name":"[USERNAME]",
1719
"job_id":[NUMID],
20+
"run_as_user_name":"[USERNAME]",
1821
"settings": {
1922
"deployment": {
2023
"kind":"BUNDLE",
@@ -31,6 +34,7 @@ Deployment complete!
3134
"run_as": {
3235
"user_name":"[USERNAME]"
3336
},
37+
"timeout_seconds":0,
3438
"webhook_notifications": {}
3539
}
3640
}

‎acceptance/bundle/resource_deps/id_chain/out.plan_skip.direct.json‎

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,41 @@
33
"resources.jobs.a": {
44
"action": "skip",
55
"remote_state": {
6+
"created_time": [UNIX_TIME_MILLIS][0],
7+
"creator_user_name": "[USERNAME]",
68
"job_id": [NUMID],
9+
"run_as_user_name": "[USERNAME]",
710
"settings": {
811
"deployment": {
912
"kind": "BUNDLE",
1013
"metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/metadata.json"
1114
},
1215
"description": "aa_new_desc",
1316
"edit_mode": "UI_LOCKED",
17+
"email_notifications": {},
1418
"format": "MULTI_TASK",
1519
"max_concurrent_runs": 1,
1620
"name": "aa",
1721
"queue": {
1822
"enabled": true
23+
},
24+
"timeout_seconds": 0,
25+
"webhook_notifications": {}
26+
}
27+
},
28+
"changes": {
29+
"remote": {
30+
"email_notifications": {
31+
"action": "skip",
32+
"reason": "server_side_default"
33+
},
34+
"timeout_seconds": {
35+
"action": "skip",
36+
"reason": "server_side_default"
37+
},
38+
"webhook_notifications": {
39+
"action": "skip",
40+
"reason": "server_side_default"
1941
}
2042
}
2143
}
@@ -29,19 +51,41 @@
2951
],
3052
"action": "skip",
3153
"remote_state": {
54+
"created_time": [UNIX_TIME_MILLIS][1],
55+
"creator_user_name": "[USERNAME]",
3256
"job_id": [NUMID],
57+
"run_as_user_name": "[USERNAME]",
3358
"settings": {
3459
"deployment": {
3560
"kind": "BUNDLE",
3661
"metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/metadata.json"
3762
},
3863
"description": "new_prefix [NUMID]",
3964
"edit_mode": "UI_LOCKED",
65+
"email_notifications": {},
4066
"format": "MULTI_TASK",
4167
"max_concurrent_runs": 1,
4268
"name": "bb",
4369
"queue": {
4470
"enabled": true
71+
},
72+
"timeout_seconds": 0,
73+
"webhook_notifications": {}
74+
}
75+
},
76+
"changes": {
77+
"remote": {
78+
"email_notifications": {
79+
"action": "skip",
80+
"reason": "server_side_default"
81+
},
82+
"timeout_seconds": {
83+
"action": "skip",
84+
"reason": "server_side_default"
85+
},
86+
"webhook_notifications": {
87+
"action": "skip",
88+
"reason": "server_side_default"
4589
}
4690
}
4791
}
@@ -55,19 +99,41 @@
5599
],
56100
"action": "skip",
57101
"remote_state": {
102+
"created_time": [UNIX_TIME_MILLIS][2],
103+
"creator_user_name": "[USERNAME]",
58104
"job_id": [NUMID],
105+
"run_as_user_name": "[USERNAME]",
59106
"settings": {
60107
"deployment": {
61108
"kind": "BUNDLE",
62109
"metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/metadata.json"
63110
},
64111
"description": "new_prefix [NUMID]",
65112
"edit_mode": "UI_LOCKED",
113+
"email_notifications": {},
66114
"format": "MULTI_TASK",
67115
"max_concurrent_runs": 1,
68116
"name": "cc",
69117
"queue": {
70118
"enabled": true
119+
},
120+
"timeout_seconds": 0,
121+
"webhook_notifications": {}
122+
}
123+
},
124+
"changes": {
125+
"remote": {
126+
"email_notifications": {
127+
"action": "skip",
128+
"reason": "server_side_default"
129+
},
130+
"timeout_seconds": {
131+
"action": "skip",
132+
"reason": "server_side_default"
133+
},
134+
"webhook_notifications": {
135+
"action": "skip",
136+
"reason": "server_side_default"
71137
}
72138
}
73139
}
@@ -81,19 +147,41 @@
81147
],
82148
"action": "skip",
83149
"remote_state": {
150+
"created_time": [UNIX_TIME_MILLIS][3],
151+
"creator_user_name": "[USERNAME]",
84152
"job_id": [NUMID],
153+
"run_as_user_name": "[USERNAME]",
85154
"settings": {
86155
"deployment": {
87156
"kind": "BUNDLE",
88157
"metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/metadata.json"
89158
},
90159
"description": "new_prefix [NUMID]",
91160
"edit_mode": "UI_LOCKED",
161+
"email_notifications": {},
92162
"format": "MULTI_TASK",
93163
"max_concurrent_runs": 1,
94164
"name": "dd",
95165
"queue": {
96166
"enabled": true
167+
},
168+
"timeout_seconds": 0,
169+
"webhook_notifications": {}
170+
}
171+
},
172+
"changes": {
173+
"remote": {
174+
"email_notifications": {
175+
"action": "skip",
176+
"reason": "server_side_default"
177+
},
178+
"timeout_seconds": {
179+
"action": "skip",
180+
"reason": "server_side_default"
181+
},
182+
"webhook_notifications": {
183+
"action": "skip",
184+
"reason": "server_side_default"
97185
}
98186
}
99187
}
@@ -107,19 +195,41 @@
107195
],
108196
"action": "skip",
109197
"remote_state": {
198+
"created_time": [UNIX_TIME_MILLIS][4],
199+
"creator_user_name": "[USERNAME]",
110200
"job_id": [NUMID],
201+
"run_as_user_name": "[USERNAME]",
111202
"settings": {
112203
"deployment": {
113204
"kind": "BUNDLE",
114205
"metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/metadata.json"
115206
},
116207
"description": "new_prefix [NUMID]",
117208
"edit_mode": "UI_LOCKED",
209+
"email_notifications": {},
118210
"format": "MULTI_TASK",
119211
"max_concurrent_runs": 1,
120212
"name": "ee",
121213
"queue": {
122214
"enabled": true
215+
},
216+
"timeout_seconds": 0,
217+
"webhook_notifications": {}
218+
}
219+
},
220+
"changes": {
221+
"remote": {
222+
"email_notifications": {
223+
"action": "skip",
224+
"reason": "server_side_default"
225+
},
226+
"timeout_seconds": {
227+
"action": "skip",
228+
"reason": "server_side_default"
229+
},
230+
"webhook_notifications": {
231+
"action": "skip",
232+
"reason": "server_side_default"
123233
}
124234
}
125235
}

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

Lines changed: 0 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -82,115 +82,14 @@ Updating deployment state...
8282
Deployment complete!
8383

8484
>>> print_requests.py //jobs
85-
{
86-
"method": "POST",
87-
"path": "/api/2.2/jobs/reset",
88-
"body": {
89-
"job_id": [FOO_ID],
90-
"new_settings": {
91-
"deployment": {
92-
"kind": "BUNDLE",
93-
"metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/metadata.json"
94-
},
95-
"edit_mode": "UI_LOCKED",
96-
"email_notifications": {},
97-
"format": "MULTI_TASK",
98-
"job_clusters": [
99-
{
100-
"job_cluster_key": "key",
101-
"new_cluster": {
102-
"num_workers": 0,
103-
"spark_version": "13.3.x-scala2.12"
104-
}
105-
}
106-
],
107-
"max_concurrent_runs": 1,
108-
"name": "foo",
109-
"queue": {
110-
"enabled": true
111-
},
112-
"run_as": {
113-
"user_name": "[USERNAME]"
114-
},
115-
"trigger": {
116-
"pause_status": "UNPAUSED",
117-
"periodic": {
118-
"interval": 1,
119-
"unit": "HOURS"
120-
}
121-
},
122-
"webhook_notifications": {}
123-
}
124-
}
125-
}
12685

12786
>>> [CLI] bundle plan
12887
Plan: 0 to add, 0 to change, 0 to delete, 2 unchanged
12988

13089
=== Fetch job ID and verify remote state
13190
>>> [CLI] jobs get [FOO_ID]
132-
{
133-
"job_id":[FOO_ID],
134-
"settings": {
135-
"deployment": {
136-
"kind":"BUNDLE",
137-
"metadata_file_path":"/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/metadata.json"
138-
},
139-
"edit_mode":"UI_LOCKED",
140-
"email_notifications": {},
141-
"format":"MULTI_TASK",
142-
"job_clusters": [
143-
{
144-
"job_cluster_key":"key",
145-
"new_cluster": {
146-
"num_workers":0,
147-
"spark_version":"13.3.x-scala2.12"
148-
}
149-
}
150-
],
151-
"max_concurrent_runs":1,
152-
"name":"foo",
153-
"queue": {
154-
"enabled":true
155-
},
156-
"run_as": {
157-
"user_name":"[USERNAME]"
158-
},
159-
"trigger": {
160-
"pause_status":"UNPAUSED",
161-
"periodic": {
162-
"interval":1,
163-
"unit":"HOURS"
164-
}
165-
},
166-
"webhook_notifications": {}
167-
}
168-
}
16991

17092
>>> [CLI] jobs get [BAR_ID]
171-
{
172-
"created_time":[UNIX_TIME_MILLIS],
173-
"creator_user_name":"[USERNAME]",
174-
"job_id":[BAR_ID],
175-
"run_as_user_name":"[USERNAME]",
176-
"settings": {
177-
"deployment": {
178-
"kind":"BUNDLE",
179-
"metadata_file_path":"/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/metadata.json"
180-
},
181-
"description":"depends on foo id [FOO_ID]",
182-
"edit_mode":"UI_LOCKED",
183-
"email_notifications": {},
184-
"format":"MULTI_TASK",
185-
"max_concurrent_runs":1,
186-
"name":"bar",
187-
"queue": {
188-
"enabled":true
189-
},
190-
"timeout_seconds":0,
191-
"webhook_notifications": {}
192-
}
193-
}
19493

19594
>>> [CLI] bundle destroy --auto-approve
19695
The following resources will be deleted:

‎acceptance/bundle/resource_deps/jobs_update/script‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ title "Update trigger.periodic.unit and re-deploy; jobs.bar is unchanged"
1616
trace update_file.py databricks.yml DAYS HOURS
1717
trace $CLI bundle plan
1818
trace $CLI bundle deploy
19-
trace print_requests.py //jobs
19+
trace print_requests.py //jobs > out.deploy2.requests.$DATABRICKS_BUNDLE_ENGINE.txt
2020
trace $CLI bundle plan
2121

2222
title "Fetch job ID and verify remote state"
2323

24-
trace $CLI jobs get $foo_id
25-
trace $CLI jobs get $bar_id
24+
trace $CLI jobs get $foo_id > out.get_foo.$DATABRICKS_BUNDLE_ENGINE.json
25+
trace $CLI jobs get $bar_id > out.get_bar.$DATABRICKS_BUNDLE_ENGINE.json
2626
rm out.requests.txt
2727

2828
trace $CLI bundle destroy --auto-approve

0 commit comments

Comments
 (0)