Skip to content

Commit 26e03ad

Browse files
authored
Fix bundle-run, use logging env vars (#1048)
Technically we only had a problem with bundle run in a custom terminal, but I'm moving to logging env vars in other places too. For bundle-deploy it makes the output easier to parse, since logging args aren't visible.
1 parent fc9d3e7 commit 26e03ad

File tree

1 file changed

+8
-31
lines changed

1 file changed

+8
-31
lines changed

packages/databricks-vscode/src/cli/CliWrapper.ts

Lines changed: 8 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -245,19 +245,14 @@ export class CliWrapper {
245245
) {
246246
const {stdout} = await execFile(
247247
this.cliPath,
248-
[
249-
"bundle",
250-
"validate",
251-
"--target",
252-
target,
253-
...this.getLoggingArguments(),
254-
],
248+
["bundle", "validate", "--target", target],
255249
{
256250
cwd: workspaceFolder.fsPath,
257251
env: {
258252
...EnvVarGenerators.getEnvVarsForCli(configfilePath),
259253
...EnvVarGenerators.getProxyEnvVars(),
260254
...authProvider.toEnv(),
255+
...this.getLogginEnvVars(),
261256
// eslint-disable-next-line @typescript-eslint/naming-convention
262257
DATABRICKS_CLUSTER_ID: this.clusterId,
263258
},
@@ -276,19 +271,14 @@ export class CliWrapper {
276271
) {
277272
const {stdout, stderr} = await execFile(
278273
this.cliPath,
279-
[
280-
"bundle",
281-
"summary",
282-
"--target",
283-
target,
284-
...this.getLoggingArguments(),
285-
],
274+
["bundle", "summary", "--target", target],
286275
{
287276
cwd: workspaceFolder.fsPath,
288277
env: {
289278
...EnvVarGenerators.getEnvVarsForCli(configfilePath),
290279
...EnvVarGenerators.getProxyEnvVars(),
291280
...authProvider.toEnv(),
281+
...this.getLogginEnvVars(),
292282
// eslint-disable-next-line @typescript-eslint/naming-convention
293283
DATABRICKS_CLUSTER_ID: this.clusterId,
294284
},
@@ -331,7 +321,6 @@ export class CliWrapper {
331321
outputDirPath,
332322
"--config-file",
333323
initConfigFilePath,
334-
...this.getLoggingArguments(),
335324
],
336325
{env: this.getBundleInitEnvVars(authProvider)}
337326
);
@@ -345,14 +334,7 @@ export class CliWrapper {
345334
onStdOut?: (data: string) => void,
346335
onStdError?: (data: string) => void
347336
) {
348-
const cmd = [
349-
this.cliPath,
350-
"bundle",
351-
"deploy",
352-
"--target",
353-
target,
354-
...this.getLoggingArguments(),
355-
];
337+
const cmd = [this.cliPath, "bundle", "deploy", "--target", target];
356338
if (onStdError) {
357339
onStdError(`Deploying the bundle for target ${target}...\n`);
358340
if (this.clusterId) {
@@ -366,6 +348,7 @@ export class CliWrapper {
366348
...EnvVarGenerators.getEnvVarsForCli(configfilePath),
367349
...EnvVarGenerators.getProxyEnvVars(),
368350
...authProvider.toEnv(),
351+
...this.getLogginEnvVars(),
369352
// eslint-disable-next-line @typescript-eslint/naming-convention
370353
DATABRICKS_CLUSTER_ID: this.clusterId,
371354
},
@@ -390,20 +373,14 @@ export class CliWrapper {
390373
...EnvVarGenerators.getEnvVarsForCli(configfilePath),
391374
...EnvVarGenerators.getProxyEnvVars(),
392375
...authProvider.toEnv(),
376+
...this.getLogginEnvVars(),
393377
// eslint-disable-next-line @typescript-eslint/naming-convention
394378
DATABRICKS_CLUSTER_ID: this.clusterId,
395379
});
396380

397381
return {
398382
cmd: this.cliPath,
399-
args: [
400-
"bundle",
401-
"run",
402-
"--target",
403-
target,
404-
resourceKey,
405-
...this.getLoggingArguments(),
406-
],
383+
args: ["bundle", "run", "--target", target, resourceKey],
407384
options: {
408385
cwd: workspaceFolder.fsPath,
409386
env,

0 commit comments

Comments
 (0)