Skip to content

Commit 8dad255

Browse files
authored
Fix context propagation of engine tag (#3828)
## Changes Update all commands that use ConfigureBundleWithVariables to fetch context from cmd.Context(). ## Why ConfigureBundleWithVariables() updates context with engine information and stores it on cmd.SetContext() but does not return it. So ctx stored before this call is out of date. ## Tests Existing user_agent test shows engine tag propagated in more places.
1 parent 6f8e2b0 commit 8dad255

28 files changed

+153
-134
lines changed

acceptance/bundle/user_agent/output.txt

Lines changed: 67 additions & 67 deletions
Large diffs are not rendered by default.

acceptance/bundle/user_agent/simple/out.requests.deploy.direct-exp.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"headers": {
33
"User-Agent": [
4-
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] auth/pat"
4+
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] engine/direct-exp auth/pat"
55
]
66
},
77
"method": "GET",
@@ -10,7 +10,7 @@
1010
{
1111
"headers": {
1212
"User-Agent": [
13-
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] auth/pat"
13+
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] engine/direct-exp auth/pat"
1414
]
1515
},
1616
"method": "GET",
@@ -23,7 +23,7 @@
2323
{
2424
"headers": {
2525
"User-Agent": [
26-
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] auth/pat"
26+
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] engine/direct-exp auth/pat"
2727
]
2828
},
2929
"method": "GET",
@@ -36,7 +36,7 @@
3636
{
3737
"headers": {
3838
"User-Agent": [
39-
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] auth/pat"
39+
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] engine/direct-exp auth/pat"
4040
]
4141
},
4242
"method": "GET",
@@ -48,7 +48,7 @@
4848
{
4949
"headers": {
5050
"User-Agent": [
51-
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] auth/pat"
51+
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] engine/direct-exp auth/pat"
5252
]
5353
},
5454
"method": "GET",
@@ -61,7 +61,7 @@
6161
{
6262
"headers": {
6363
"User-Agent": [
64-
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] auth/pat"
64+
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] engine/direct-exp auth/pat"
6565
]
6666
},
6767
"method": "GET",
@@ -74,7 +74,7 @@
7474
{
7575
"headers": {
7676
"User-Agent": [
77-
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] auth/pat"
77+
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] engine/direct-exp auth/pat"
7878
]
7979
},
8080
"method": "GET",
@@ -87,7 +87,7 @@
8787
{
8888
"headers": {
8989
"User-Agent": [
90-
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] auth/pat"
90+
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] engine/direct-exp auth/pat"
9191
]
9292
},
9393
"method": "GET",
@@ -100,7 +100,7 @@
100100
{
101101
"headers": {
102102
"User-Agent": [
103-
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] auth/pat"
103+
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] engine/direct-exp auth/pat"
104104
]
105105
},
106106
"method": "GET",
@@ -113,7 +113,7 @@
113113
{
114114
"headers": {
115115
"User-Agent": [
116-
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] auth/pat"
116+
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] engine/direct-exp auth/pat"
117117
]
118118
},
119119
"method": "POST",
@@ -125,7 +125,7 @@
125125
{
126126
"headers": {
127127
"User-Agent": [
128-
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] auth/pat"
128+
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] engine/direct-exp auth/pat"
129129
]
130130
},
131131
"method": "POST",
@@ -143,7 +143,7 @@
143143
{
144144
"headers": {
145145
"User-Agent": [
146-
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] auth/pat"
146+
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] engine/direct-exp auth/pat"
147147
]
148148
},
149149
"method": "POST",
@@ -168,7 +168,7 @@
168168
{
169169
"headers": {
170170
"User-Agent": [
171-
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] auth/pat"
171+
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] engine/direct-exp auth/pat"
172172
]
173173
},
174174
"method": "POST",
@@ -198,7 +198,7 @@
198198
{
199199
"headers": {
200200
"User-Agent": [
201-
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] auth/pat"
201+
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] engine/direct-exp auth/pat"
202202
]
203203
},
204204
"method": "POST",
@@ -223,7 +223,7 @@
223223
{
224224
"headers": {
225225
"User-Agent": [
226-
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] auth/pat"
226+
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] engine/direct-exp auth/pat"
227227
]
228228
},
229229
"method": "POST",
@@ -236,7 +236,7 @@
236236
{
237237
"headers": {
238238
"User-Agent": [
239-
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] auth/pat"
239+
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] engine/direct-exp auth/pat"
240240
]
241241
},
242242
"method": "POST",
@@ -248,7 +248,7 @@
248248
{
249249
"headers": {
250250
"User-Agent": [
251-
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] auth/pat"
251+
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] engine/direct-exp auth/pat"
252252
]
253253
},
254254
"method": "POST",
@@ -260,7 +260,7 @@
260260
{
261261
"headers": {
262262
"User-Agent": [
263-
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] auth/pat"
263+
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] engine/direct-exp auth/pat"
264264
]
265265
},
266266
"method": "POST",

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"headers": {
33
"User-Agent": [
4-
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] auth/pat"
4+
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] engine/terraform auth/pat"
55
]
66
},
77
"method": "GET",
@@ -10,7 +10,7 @@
1010
{
1111
"headers": {
1212
"User-Agent": [
13-
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] auth/pat"
13+
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] engine/terraform auth/pat"
1414
]
1515
},
1616
"method": "GET",
@@ -23,7 +23,7 @@
2323
{
2424
"headers": {
2525
"User-Agent": [
26-
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] auth/pat"
26+
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] engine/terraform auth/pat"
2727
]
2828
},
2929
"method": "GET",
@@ -36,7 +36,7 @@
3636
{
3737
"headers": {
3838
"User-Agent": [
39-
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] auth/pat"
39+
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] engine/terraform auth/pat"
4040
]
4141
},
4242
"method": "GET",
@@ -48,7 +48,7 @@
4848
{
4949
"headers": {
5050
"User-Agent": [
51-
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] auth/pat"
51+
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] engine/terraform auth/pat"
5252
]
5353
},
5454
"method": "GET",
@@ -61,7 +61,7 @@
6161
{
6262
"headers": {
6363
"User-Agent": [
64-
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] auth/pat"
64+
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] engine/terraform auth/pat"
6565
]
6666
},
6767
"method": "GET",
@@ -74,7 +74,7 @@
7474
{
7575
"headers": {
7676
"User-Agent": [
77-
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] auth/pat"
77+
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] engine/terraform auth/pat"
7878
]
7979
},
8080
"method": "GET",
@@ -87,7 +87,7 @@
8787
{
8888
"headers": {
8989
"User-Agent": [
90-
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] auth/pat"
90+
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] engine/terraform auth/pat"
9191
]
9292
},
9393
"method": "GET",
@@ -100,7 +100,7 @@
100100
{
101101
"headers": {
102102
"User-Agent": [
103-
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] auth/pat"
103+
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] engine/terraform auth/pat"
104104
]
105105
},
106106
"method": "GET",
@@ -113,7 +113,7 @@
113113
{
114114
"headers": {
115115
"User-Agent": [
116-
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] auth/pat"
116+
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] engine/terraform auth/pat"
117117
]
118118
},
119119
"method": "POST",
@@ -125,7 +125,7 @@
125125
{
126126
"headers": {
127127
"User-Agent": [
128-
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] auth/pat"
128+
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] engine/terraform auth/pat"
129129
]
130130
},
131131
"method": "POST",
@@ -143,7 +143,7 @@
143143
{
144144
"headers": {
145145
"User-Agent": [
146-
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] auth/pat"
146+
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] engine/terraform auth/pat"
147147
]
148148
},
149149
"method": "POST",
@@ -168,7 +168,7 @@
168168
{
169169
"headers": {
170170
"User-Agent": [
171-
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] auth/pat"
171+
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] engine/terraform auth/pat"
172172
]
173173
},
174174
"method": "POST",
@@ -198,7 +198,7 @@
198198
{
199199
"headers": {
200200
"User-Agent": [
201-
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] auth/pat"
201+
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] engine/terraform auth/pat"
202202
]
203203
},
204204
"method": "POST",
@@ -246,7 +246,7 @@
246246
{
247247
"headers": {
248248
"User-Agent": [
249-
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] auth/pat"
249+
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] engine/terraform auth/pat"
250250
]
251251
},
252252
"method": "POST",
@@ -259,7 +259,7 @@
259259
{
260260
"headers": {
261261
"User-Agent": [
262-
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] auth/pat"
262+
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] engine/terraform auth/pat"
263263
]
264264
},
265265
"method": "POST",
@@ -271,7 +271,7 @@
271271
{
272272
"headers": {
273273
"User-Agent": [
274-
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] auth/pat"
274+
"cli/[DEV_VERSION] databricks-sdk-go/[SDK_VERSION] go/[GO_VERSION] os/OS cmd/bundle_deploy cmd-exec-id/[UUID] engine/terraform auth/pat"
275275
]
276276
},
277277
"method": "POST",

0 commit comments

Comments
 (0)