Skip to content

Commit 5372ba3

Browse files
denikdenik
authored
Merge branch 'main' into denik/env-var-strict
2 parents 9e0c211 + a7e9ebd commit 5372ba3

File tree

110 files changed

+1239
-1148
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+1239
-1148
lines changed

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,7 @@ tools/golangci-lint
4242

4343
# Release artifacts
4444
dist/
45+
46+
# Local development notes, tmp
47+
/pr-*
48+
/tmp/

‎Makefile‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,6 @@ test-update:
6767
# Updates acceptance test output for template tests only
6868
test-update-templates:
6969
-go test ./acceptance -run '^TestAccept/bundle/templates' -update -timeout=${LOCAL_TIMEOUT}
70-
@# at the moment second pass is required because some tests show diff against output of another test for easier review
71-
-go test ./acceptance -run '^TestAccept/bundle/templates' -update -timeout=${LOCAL_TIMEOUT}
7270

7371
# Updates acceptance test output (integration tests, requires access)
7472
test-update-aws:

‎acceptance/bundle/state/state_present/output.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Updating deployment state...
1515
Deployment complete!
1616

1717
>>> print_requests.py //api/2.1/unity-catalog/schemas
18-
"databricks-tf-provider/1.94.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat"
18+
"databricks-tf-provider/1.96.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat"
1919

2020
>>> DATABRICKS_BUNDLE_ENGINE= [CLI] bundle deploy
2121
Uploading bundle files to /Workspace/Users/[USERNAME]/.bundle/test-bundle/default/files...

‎acceptance/bundle/templates/pydabs/check-consistency/script‎

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,30 @@ for enable_pydabs in yes no; do
1717
rm -rf my_pydabs input.json
1818
done
1919

20-
trace diff -Naur enable_pydabs=yes enable_pydabs=no
20+
if ! trace diff -Naur enable_pydabs=yes enable_pydabs=no; then
21+
cat <<'EOF'
22+
23+
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
24+
❌ PyDABs Template Consistency Check Failed
25+
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
26+
27+
Python and YAML resource templates are generating different configurations!
28+
29+
📁 Check ALL template files in:
30+
libs/template/templates/default/template/{{.project_name}}/resources/
31+
• *.py.tmpl (Python resource definitions)
32+
• *.yml.tmpl (YAML resource definitions)
33+
34+
🐛 Example issue: Field is ACTIVE in one format but COMMENTED in the other
35+
"catalog": "${var.catalog}" vs # "catalog": "${var.catalog}"
36+
37+
💡 Steps to fix:
38+
1. Look at the diff above to identify which field differs
39+
2. Find which *.py.tmpl file contains that field
40+
3. Compare it to the corresponding *.yml.tmpl file
41+
4. Ensure the field has the same active/commented state in both formats
42+
43+
━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
44+
EOF
45+
fi
2146
rm enable_pydabs=yes enable_pydabs=no

‎acceptance/bundle/user_agent/output.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ OK deploy.terraform /api/2.0/workspace-files/import-file/Workspace/Users/[USER
3535
OK deploy.terraform /api/2.0/workspace/delete engine/terraform
3636
OK deploy.terraform /api/2.0/workspace/delete engine/terraform
3737
OK deploy.terraform /api/2.0/workspace/mkdirs engine/terraform
38-
MISS deploy.terraform /api/2.1/unity-catalog/schemas/mycatalog.myschema 'databricks-tf-provider/1.94.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat'
39-
MISS deploy.terraform /api/2.1/unity-catalog/schemas 'databricks-tf-provider/1.94.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat'
38+
MISS deploy.terraform /api/2.1/unity-catalog/schemas/mycatalog.myschema 'databricks-tf-provider/1.96.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat'
39+
MISS deploy.terraform /api/2.1/unity-catalog/schemas 'databricks-tf-provider/1.96.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat'
4040
MISS destroy.direct /api/2.0/preview/scim/v2/Me 'cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_destroy cmd-exec-id/[UUID] auth/pat'
4141
MISS destroy.direct /api/2.0/workspace-files/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/resources.json 'cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_destroy cmd-exec-id/[UUID] auth/pat'
4242
MISS destroy.direct /api/2.0/workspace/get-status 'cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_destroy cmd-exec-id/[UUID] auth/pat'
@@ -59,8 +59,8 @@ OK destroy.terraform /api/2.0/workspace/get-status engine/terraform
5959
OK destroy.terraform /api/2.0/workspace/get-status engine/terraform
6060
OK destroy.terraform /api/2.0/workspace-files/import-file/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/deploy.lock engine/terraform
6161
OK destroy.terraform /api/2.0/workspace/delete engine/terraform
62-
MISS destroy.terraform /api/2.1/unity-catalog/schemas/mycatalog.myschema 'databricks-tf-provider/1.94.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat'
63-
MISS destroy.terraform /api/2.1/unity-catalog/schemas/mycatalog.myschema 'databricks-tf-provider/1.94.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat'
62+
MISS destroy.terraform /api/2.1/unity-catalog/schemas/mycatalog.myschema 'databricks-tf-provider/1.96.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat'
63+
MISS destroy.terraform /api/2.1/unity-catalog/schemas/mycatalog.myschema 'databricks-tf-provider/1.96.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat'
6464
MISS plan.direct /api/2.0/preview/scim/v2/Me 'cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_plan cmd-exec-id/[UUID] auth/pat'
6565
MISS plan.direct /api/2.0/workspace/get-status 'cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_plan cmd-exec-id/[UUID] auth/pat'
6666
MISS plan.direct /api/2.0/workspace/get-status 'cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_plan cmd-exec-id/[UUID] auth/pat'
@@ -82,7 +82,7 @@ MISS plan2.terraform /api/2.0/workspace/get-status 'cli/[DEV_VERSION] databricks
8282
MISS plan2.terraform /api/2.0/workspace/get-status 'cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_plan cmd-exec-id/[UUID] auth/pat'
8383
OK plan2.terraform /api/2.0/workspace-files/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/deployment.json engine/terraform
8484
OK plan2.terraform /api/2.0/workspace/get-status engine/terraform
85-
MISS plan2.terraform /api/2.1/unity-catalog/schemas/mycatalog.myschema 'databricks-tf-provider/1.94.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat'
85+
MISS plan2.terraform /api/2.1/unity-catalog/schemas/mycatalog.myschema 'databricks-tf-provider/1.96.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat'
8686
MISS run.direct /api/2.0/preview/scim/v2/Me 'cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_run cmd-exec-id/[UUID] auth/pat'
8787
MISS run.direct /api/2.0/workspace-files/Workspace/Users/[USERNAME]/.bundle/test-bundle/default/state/resources.json 'cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_run cmd-exec-id/[UUID] auth/pat'
8888
MISS run.direct /api/2.0/workspace/get-status 'cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/[OS] cmd/bundle_run cmd-exec-id/[UUID] auth/pat'

‎acceptance/bundle/user_agent/simple/out.requests.deploy.terraform.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@
296296
{
297297
"headers": {
298298
"User-Agent": [
299-
"databricks-tf-provider/1.94.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat"
299+
"databricks-tf-provider/1.96.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat"
300300
]
301301
},
302302
"method": "GET",
@@ -305,7 +305,7 @@
305305
{
306306
"headers": {
307307
"User-Agent": [
308-
"databricks-tf-provider/1.94.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat"
308+
"databricks-tf-provider/1.96.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat"
309309
]
310310
},
311311
"method": "POST",

‎acceptance/bundle/user_agent/simple/out.requests.destroy.terraform.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127
{
128128
"headers": {
129129
"User-Agent": [
130-
"databricks-tf-provider/1.94.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat"
130+
"databricks-tf-provider/1.96.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat"
131131
]
132132
},
133133
"method": "DELETE",
@@ -139,7 +139,7 @@
139139
{
140140
"headers": {
141141
"User-Agent": [
142-
"databricks-tf-provider/1.94.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat"
142+
"databricks-tf-provider/1.96.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat"
143143
]
144144
},
145145
"method": "GET",

‎acceptance/bundle/user_agent/simple/out.requests.plan2.terraform.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
{
6868
"headers": {
6969
"User-Agent": [
70-
"databricks-tf-provider/1.94.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat"
70+
"databricks-tf-provider/1.96.0 databricks-sdk-go/[SDK_VERSION] go/1.24.0 os/[OS] cli/[DEV_VERSION] terraform/1.5.5 sdk/sdkv2 resource/schema auth/pat"
7171
]
7272
},
7373
"method": "GET",

‎bundle/direct/dresources/cluster.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ func (r *ResourceCluster) DoUpdate(ctx context.Context, id string, config *compu
9898
// Only Running and Terminated clusters can be modified. In particular, autoscaling clusters cannot be modified
9999
// while the resizing is ongoing. We retry in this case. Scaling can take several minutes.
100100
if errors.As(err, &apiErr) && apiErr.ErrorCode == "INVALID_STATE" {
101-
return nil, retries.Continues(fmt.Sprintf("cluster %s cannot be modified in its current state", id))
101+
return nil, retries.Continues(fmt.Sprintf("cluster %s cannot be modified in its current state: %s", id, apiErr.Message))
102102
}
103103
return nil, retries.Halt(err)
104104
})

‎bundle/internal/schema/annotations.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ func assignAnnotation(s *jsonschema.Schema, a annotation.Descriptor) {
139139
}
140140

141141
if a.OutputOnly != nil && *a.OutputOnly {
142-
s.DoNotSuggest = true
142+
s.FieldBehaviors = []string{"OUTPUT_ONLY"}
143143
}
144144

145145
s.MarkdownDescription = convertLinksToAbsoluteUrl(a.MarkdownDescription)

0 commit comments

Comments
 (0)