Skip to content

Commit 228a202

Browse files
denikdenik
authored
Add a test for name_prefix and 'mode: development' (#3738)
## Why Clarifying feature interaction, not obvious what should happen and why current behaviour is best.
1 parent 1dfe716 commit 228a202

File tree

11 files changed

+480
-27
lines changed

11 files changed

+480
-27
lines changed

‎acceptance/bundle/validate/presets_name_prefix/databricks.yml.tmpl‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ resources:
1111

1212
schemas:
1313
schema1:
14+
catalog_name: c
1415
name: schema1
1516

1617
volumes:
@@ -19,9 +20,9 @@ resources:
1920
catalog_name: catalog1
2021
schema_name: schema1
2122

22-
alerts:
23-
alert1:
24-
display_name: alert1
23+
models:
24+
model1:
25+
name: model 1
2526

2627
presets:
2728
name_prefix: "$PREFIX"

‎acceptance/bundle/validate/presets_name_prefix/output.txt‎

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,6 @@
33
name_prefix: "prefix-"
44

55
>>> [CLI] bundle validate -o json
6-
Warning: unknown field: alerts
7-
at resources
8-
in databricks.yml:22:3
9-
10-
Warning: required field "catalog_name" is not set
11-
at resources.schemas.schema1
12-
in databricks.yml:14:7
13-
146
{
157
"jobs": {
168
"job1": {
@@ -27,8 +19,14 @@ Warning: required field "catalog_name" is not set
2719
}
2820
}
2921
},
22+
"models": {
23+
"model1": {
24+
"name": "prefix-model 1"
25+
}
26+
},
3027
"schemas": {
3128
"schema1": {
29+
"catalog_name": "c",
3230
"name": "prefixschema1"
3331
}
3432
},
@@ -46,14 +44,6 @@ Warning: required field "catalog_name" is not set
4644
name_prefix: "[prefix]"
4745

4846
>>> [CLI] bundle validate -o json
49-
Warning: unknown field: alerts
50-
at resources
51-
in databricks.yml:22:3
52-
53-
Warning: required field "catalog_name" is not set
54-
at resources.schemas.schema1
55-
in databricks.yml:14:7
56-
5747
{
5848
"jobs": {
5949
"job1": {
@@ -70,8 +60,14 @@ Warning: required field "catalog_name" is not set
7060
}
7161
}
7262
},
63+
"models": {
64+
"model1": {
65+
"name": "[prefix]model 1"
66+
}
67+
},
7368
"schemas": {
7469
"schema1": {
70+
"catalog_name": "c",
7571
"name": "prefix_schema1"
7672
}
7773
},
@@ -89,14 +85,6 @@ Warning: required field "catalog_name" is not set
8985
name_prefix: ""
9086

9187
>>> [CLI] bundle validate -o json
92-
Warning: unknown field: alerts
93-
at resources
94-
in databricks.yml:22:3
95-
96-
Warning: required field "catalog_name" is not set
97-
at resources.schemas.schema1
98-
in databricks.yml:14:7
99-
10088
{
10189
"jobs": {
10290
"job1": {
@@ -113,8 +101,14 @@ Warning: required field "catalog_name" is not set
113101
}
114102
}
115103
},
104+
"models": {
105+
"model1": {
106+
"name": "model 1"
107+
}
108+
},
116109
"schemas": {
117110
"schema1": {
111+
"catalog_name": "c",
118112
"name": "schema1"
119113
}
120114
},

‎acceptance/bundle/validate/presets_name_prefix_dev/databricks.yml.tmpl‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
bundle:
2+
name: BUNDLE
3+
4+
resources:
5+
jobs:
6+
job1:
7+
name: job1
8+
9+
schemas:
10+
schema1:
11+
catalog_name: mycatalog
12+
name: schema1
13+
14+
volumes:
15+
volume1:
16+
name: volume1
17+
catalog_name: catalog1
18+
schema_name: schema1
19+
20+
models:
21+
model1:
22+
name: model 1
23+
24+
presets: # PRESETS
25+
name_prefix: $PREFIX # PRESETS
26+
27+
targets:
28+
dev:
29+
mode: development

‎acceptance/bundle/validate/presets_name_prefix_dev/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/validate/presets_name_prefix_dev/out.with_empty_prefix.json‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
{
2+
"bundle": {
3+
"deployment": {
4+
"lock": {
5+
"enabled": false
6+
}
7+
},
8+
"environment": "dev",
9+
"git": {
10+
"bundle_root_path": "."
11+
},
12+
"mode": "development",
13+
"name": "BUNDLE",
14+
"target": "dev"
15+
},
16+
"presets": {
17+
"jobs_max_concurrent_runs": 4,
18+
"name_prefix": "[dev [USERNAME]] ",
19+
"pipelines_development": true,
20+
"tags": {
21+
"dev": "[USERNAME]"
22+
},
23+
"trigger_pause_status": "PAUSED"
24+
},
25+
"resources": {
26+
"jobs": {
27+
"job1": {
28+
"deployment": {
29+
"kind": "BUNDLE",
30+
"metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/BUNDLE/dev/state/metadata.json"
31+
},
32+
"edit_mode": "UI_LOCKED",
33+
"format": "MULTI_TASK",
34+
"max_concurrent_runs": 4,
35+
"name": "[dev [USERNAME]] job1",
36+
"queue": {
37+
"enabled": true
38+
},
39+
"tags": {
40+
"dev": "[USERNAME]"
41+
}
42+
}
43+
},
44+
"models": {
45+
"model1": {
46+
"name": "[dev [USERNAME]] model 1",
47+
"tags": [
48+
{
49+
"key": "dev",
50+
"value": "[USERNAME]"
51+
}
52+
]
53+
}
54+
},
55+
"schemas": {
56+
"schema1": {
57+
"catalog_name": "mycatalog",
58+
"name": "dev_[USERNAME]_schema1"
59+
}
60+
},
61+
"volumes": {
62+
"volume1": {
63+
"catalog_name": "catalog1",
64+
"name": "volume1",
65+
"schema_name": "schema1",
66+
"volume_type": "MANAGED"
67+
}
68+
}
69+
},
70+
"sync": {
71+
"paths": [
72+
"."
73+
]
74+
},
75+
"workspace": {
76+
"artifact_path": "/Workspace/Users/[USERNAME]/.bundle/BUNDLE/dev/artifacts",
77+
"current_user": {
78+
"domain_friendly_name": "[USERNAME]",
79+
"id": "[USERID]",
80+
"short_name": "[USERNAME]",
81+
"userName": "[USERNAME]"
82+
},
83+
"file_path": "/Workspace/Users/[USERNAME]/.bundle/BUNDLE/dev/files",
84+
"resource_path": "/Workspace/Users/[USERNAME]/.bundle/BUNDLE/dev/resources",
85+
"root_path": "/Workspace/Users/[USERNAME]/.bundle/BUNDLE/dev",
86+
"state_path": "/Workspace/Users/[USERNAME]/.bundle/BUNDLE/dev/state"
87+
}
88+
}

‎acceptance/bundle/validate/presets_name_prefix_dev/out.with_nil_prefix.json‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
{
2+
"bundle": {
3+
"deployment": {
4+
"lock": {
5+
"enabled": false
6+
}
7+
},
8+
"environment": "dev",
9+
"git": {
10+
"bundle_root_path": "."
11+
},
12+
"mode": "development",
13+
"name": "BUNDLE",
14+
"target": "dev"
15+
},
16+
"presets": {
17+
"jobs_max_concurrent_runs": 4,
18+
"name_prefix": "[dev [USERNAME]] ",
19+
"pipelines_development": true,
20+
"tags": {
21+
"dev": "[USERNAME]"
22+
},
23+
"trigger_pause_status": "PAUSED"
24+
},
25+
"resources": {
26+
"jobs": {
27+
"job1": {
28+
"deployment": {
29+
"kind": "BUNDLE",
30+
"metadata_file_path": "/Workspace/Users/[USERNAME]/.bundle/BUNDLE/dev/state/metadata.json"
31+
},
32+
"edit_mode": "UI_LOCKED",
33+
"format": "MULTI_TASK",
34+
"max_concurrent_runs": 4,
35+
"name": "[dev [USERNAME]] job1",
36+
"queue": {
37+
"enabled": true
38+
},
39+
"tags": {
40+
"dev": "[USERNAME]"
41+
}
42+
}
43+
},
44+
"models": {
45+
"model1": {
46+
"name": "[dev [USERNAME]] model 1",
47+
"tags": [
48+
{
49+
"key": "dev",
50+
"value": "[USERNAME]"
51+
}
52+
]
53+
}
54+
},
55+
"schemas": {
56+
"schema1": {
57+
"catalog_name": "mycatalog",
58+
"name": "dev_[USERNAME]_schema1"
59+
}
60+
},
61+
"volumes": {
62+
"volume1": {
63+
"catalog_name": "catalog1",
64+
"name": "volume1",
65+
"schema_name": "schema1",
66+
"volume_type": "MANAGED"
67+
}
68+
}
69+
},
70+
"sync": {
71+
"paths": [
72+
"."
73+
]
74+
},
75+
"workspace": {
76+
"artifact_path": "/Workspace/Users/[USERNAME]/.bundle/BUNDLE/dev/artifacts",
77+
"current_user": {
78+
"domain_friendly_name": "[USERNAME]",
79+
"id": "[USERID]",
80+
"short_name": "[USERNAME]",
81+
"userName": "[USERNAME]"
82+
},
83+
"file_path": "/Workspace/Users/[USERNAME]/.bundle/BUNDLE/dev/files",
84+
"resource_path": "/Workspace/Users/[USERNAME]/.bundle/BUNDLE/dev/resources",
85+
"root_path": "/Workspace/Users/[USERNAME]/.bundle/BUNDLE/dev",
86+
"state_path": "/Workspace/Users/[USERNAME]/.bundle/BUNDLE/dev/state"
87+
}
88+
}

0 commit comments

Comments
 (0)