Skip to content

Commit f3d9950

Browse files
pieternpietern
authored
Merge branch 'main' into bump-tf-1.120.0
2 parents 4e22dd4 + dff97a0 commit f3d9950

33 files changed

Lines changed: 1004 additions & 137 deletions

‎.github/actions/setup-build-environment/action.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ runs:
1010
using: 'composite'
1111
steps:
1212
- name: Checkout repository and submodules
13-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
13+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
1414

1515
- name: Setup JFrog
1616
uses: ./.github/actions/setup-jfrog
1717

1818
- id: setup-go
1919
name: Setup Go
20-
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
20+
uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6.5.0
2121
with:
2222
go-version-file: go.mod
2323
# Disable setup-go's built-in cache; the steps below manage the
@@ -41,7 +41,7 @@ runs:
4141
# end, even when invoked from a composite).
4242
- name: Restore and save Go cache (main)
4343
if: github.ref == 'refs/heads/main'
44-
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
44+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
4545
with:
4646
path: |
4747
${{ steps.go-paths.outputs.mod }}
@@ -56,7 +56,7 @@ runs:
5656
# the delta.
5757
- name: Restore Go cache (non-main)
5858
if: github.ref != 'refs/heads/main'
59-
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
59+
uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
6060
with:
6161
path: |
6262
${{ steps.go-paths.outputs.mod }}
@@ -66,7 +66,7 @@ runs:
6666
setup-go-${{ inputs.cache-key }}-${{ runner.os }}-go${{ steps.setup-go.outputs.go-version }}-
6767
6868
- name: Setup Python
69-
uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
69+
uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
7070
with:
7171
python-version: '3.13'
7272

‎acceptance/bundle/resources/alerts/with_file_run_from_subdir/databricks.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
bundle:
2+
name: alerts-with-file-run-from-subdir
3+
4+
include:
5+
- resources/*.yml

‎acceptance/bundle/resources/alerts/with_file_run_from_subdir/out.test.toml‎

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎acceptance/bundle/resources/alerts/with_file_run_from_subdir/output.txt‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
2+
=== validate from the bundle root
3+
>>> [CLI] bundle validate -o json
4+
{
5+
"custom_summary": "My alert from file",
6+
"display_name": "myalert",
7+
"evaluation": {
8+
"comparison_operator": "EQUAL",
9+
"notification": {
10+
"notify_on_ok": false,
11+
"retrigger_seconds": 1
12+
},
13+
"source": {
14+
"aggregation": "MAX",
15+
"display": "1",
16+
"name": "1"
17+
},
18+
"threshold": {
19+
"value": {
20+
"double_value": 2
21+
}
22+
}
23+
},
24+
"file_path": "resources/alert.dbalert.json",
25+
"parent_path": "/Workspace/Users/[USERNAME]/.bundle/alerts-with-file-run-from-subdir/default/resources",
26+
"query_text": "select 2\n",
27+
"schedule": {
28+
"pause_status": "UNPAUSED",
29+
"quartz_cron_schedule": "44 19 */1 * * ?",
30+
"timezone_id": "Europe/Amsterdam"
31+
},
32+
"warehouse_id": "[NUMID]"
33+
}
34+
35+
=== validate from a subdirectory of the bundle
36+
>>> [CLI] bundle validate -o json
37+
{
38+
"custom_summary": "My alert from file",
39+
"display_name": "myalert",
40+
"evaluation": {
41+
"comparison_operator": "EQUAL",
42+
"notification": {
43+
"notify_on_ok": false,
44+
"retrigger_seconds": 1
45+
},
46+
"source": {
47+
"aggregation": "MAX",
48+
"display": "1",
49+
"name": "1"
50+
},
51+
"threshold": {
52+
"value": {
53+
"double_value": 2
54+
}
55+
}
56+
},
57+
"file_path": "resources/alert.dbalert.json",
58+
"parent_path": "/Workspace/Users/[USERNAME]/.bundle/alerts-with-file-run-from-subdir/default/resources",
59+
"query_text": "select 2\n",
60+
"schedule": {
61+
"pause_status": "UNPAUSED",
62+
"quartz_cron_schedule": "44 19 */1 * * ?",
63+
"timezone_id": "Europe/Amsterdam"
64+
},
65+
"warehouse_id": "[NUMID]"
66+
}

‎acceptance/bundle/resources/alerts/with_file_run_from_subdir/resources/alert.dbalert.json‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"custom_summary": "My alert from file",
3+
"evaluation": {
4+
"comparison_operator": "EQUAL",
5+
"notification": {
6+
"notify_on_ok": false,
7+
"retrigger_seconds": 1
8+
},
9+
"source": {
10+
"aggregation": "MAX",
11+
"display": "1",
12+
"name": "1"
13+
},
14+
"threshold": {
15+
"value": {
16+
"double_value": 2
17+
}
18+
}
19+
},
20+
"query_lines": [
21+
"select 2"
22+
],
23+
"schedule": {
24+
"pause_status": "UNPAUSED",
25+
"quartz_cron_schedule": "44 19 */1 * * ?",
26+
"timezone_id": "Europe/Amsterdam"
27+
}
28+
}

‎acceptance/bundle/resources/alerts/with_file_run_from_subdir/resources/alert.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
resources:
2+
alerts:
3+
myalert:
4+
warehouse_id: "0123456789012345"
5+
display_name: "myalert"
6+
file_path: ./alert.dbalert.json

‎acceptance/bundle/resources/alerts/with_file_run_from_subdir/script‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
title "validate from the bundle root"
2+
trace $CLI bundle validate -o json | jq .resources.alerts.myalert
3+
4+
title "validate from a subdirectory of the bundle"
5+
cd resources
6+
trace $CLI bundle validate -o json | jq .resources.alerts.myalert

‎acceptance/bundle/resources/alerts/with_file_run_from_subdir/test.toml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Local = true
2+
RecordRequests = false
3+
Ignore = [".databricks"]

‎acceptance/experimental/genie/ask-protocol-drift/output.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ Exit code: 1
99
>>> [CLI] experimental genie ask What are total sales by franchise? --output json
1010
{
1111
"status": "error",
12+
"conversation_id": "conv_1",
1213
"error": "the stream ended without an answer (received 2 events); the API may have changed: update the Databricks CLI to the latest version (run 'databricks version --check'), or re-run with --raw to inspect the raw stream"
1314
}
1415
Error: the stream ended without an answer (received 2 events); the API may have changed: update the Databricks CLI to the latest version (run 'databricks version --check'), or re-run with --raw to inspect the raw stream

‎acceptance/experimental/genie/ask/output.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ Alpha leads with 1,250 total sales.
2828
>>> [CLI] experimental genie ask What are total sales by franchise? --output json
2929
{
3030
"status": "completed",
31+
"conversation_id": "conv_1",
3132
"text": "Alpha leads with 1,250 total sales.\n\n![Total by Franchise](#viz_1)",
3233
"tool_calls": [
3334
{

0 commit comments

Comments
 (0)