Skip to content

Commit ac61e27

Browse files
committed
Simplify project-environment paths and verify job deployment
1 parent d0b8ec5 commit ac61e27

13 files changed

Lines changed: 142 additions & 103 deletions

File tree

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* Resolve job `project_environment` paths relative to the YAML file that defines them. ([#6909](https://github.com/databricks/cli/pull/6909))
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
bundle:
2+
name: project_environment
3+
4+
include:
5+
- resources/*.yml
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Cloud = false
2+
EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
3+
EnvMatrix.DMS = ["", "true"]
Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
2+
>>> [CLI] bundle validate -o json
3+
{
4+
"tasks": [
5+
{
6+
"environment_key": "project",
7+
"notebook_task": {
8+
"notebook_path": "/Workspace/Users/[USERNAME]/.bundle/project_environment/default/files/src/notebook"
9+
},
10+
"task_key": "notebook"
11+
}
12+
],
13+
"environments": [
14+
{
15+
"environment_key": "project",
16+
"spec": {
17+
"project_environment": "/Workspace/Users/[USERNAME]/.bundle/project_environment/default/files/pyproject.toml"
18+
}
19+
}
20+
]
21+
}
22+
23+
>>> [CLI] bundle deploy
24+
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/project_environment/default/files...
25+
Created jobs.notebook
26+
Files: 5 uploaded, 0 deleted
27+
Resources: 1 created, 0 changed, 0 deleted, 0 unchanged
28+
29+
>>> print_requests.py //api/2.2/jobs/create
30+
{
31+
"tasks": [
32+
{
33+
"environment_key": "project",
34+
"notebook_task": {
35+
"notebook_path": "/Workspace/Users/[USERNAME]/.bundle/project_environment/default/files/src/notebook"
36+
},
37+
"task_key": "notebook"
38+
}
39+
],
40+
"environments": [
41+
{
42+
"environment_key": "project",
43+
"spec": {
44+
"project_environment": "/Workspace/Users/[USERNAME]/.bundle/project_environment/default/files/pyproject.toml"
45+
}
46+
}
47+
]
48+
}
49+
50+
>>> update_file.py resources/job.yml ../pyproject.toml ./pyproject.toml
51+
52+
>>> [CLI] bundle deploy
53+
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/project_environment/default/files...
54+
Updated jobs.notebook
55+
Files: 1 uploaded, 0 deleted
56+
Resources: 0 created, 1 changed, 0 deleted, 0 unchanged
57+
58+
>>> print_requests.py //api/2.2/jobs/reset
59+
{
60+
"tasks": [
61+
{
62+
"environment_key": "project",
63+
"notebook_task": {
64+
"notebook_path": "/Workspace/Users/[USERNAME]/.bundle/project_environment/default/files/src/notebook"
65+
},
66+
"task_key": "notebook"
67+
}
68+
],
69+
"environments": [
70+
{
71+
"environment_key": "project",
72+
"spec": {
73+
"project_environment": "/Workspace/Users/[USERNAME]/.bundle/project_environment/default/files/resources/pyproject.toml"
74+
}
75+
}
76+
]
77+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[project]
2+
name = "project-environment-test"
3+
version = "0.1.0"
4+
5+
[tool.databricks.environment]
6+
environment_version = "4"
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
resources:
2+
jobs:
3+
notebook:
4+
name: project_environment
5+
tasks:
6+
- task_key: notebook
7+
notebook_task:
8+
notebook_path: ../src/notebook.py
9+
environment_key: project
10+
environments:
11+
- environment_key: project
12+
spec:
13+
project_environment: ../pyproject.toml
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[project]
2+
name = "updated-project-environment-test"
3+
version = "0.1.0"
4+
5+
[tool.databricks.environment]
6+
environment_version = "4"
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
trace $CLI bundle validate -o json | jq '.resources.jobs.notebook | {tasks, environments}'
2+
3+
trace $CLI bundle deploy
4+
trace print_requests.py //api/2.2/jobs/create | jq '.body | {tasks, environments}'
5+
6+
trace update_file.py resources/job.yml ../pyproject.toml ./pyproject.toml
7+
trace $CLI bundle deploy
8+
trace print_requests.py //api/2.2/jobs/reset | jq '.body.new_settings | {tasks, environments}'
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Databricks notebook source
2+
print("Project environment")
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# The pinned Terraform provider does not support project_environment.
2+
EnvMatrix.DATABRICKS_BUNDLE_ENGINE = ["direct"]
3+
RecordRequests = true

0 commit comments

Comments
 (0)