From e4b0371b2acd4faf1277022f1bf7226ae3d8f26c Mon Sep 17 00:00:00 2001 From: Alan Ren Date: Fri, 25 Oct 2019 13:54:19 -0700 Subject: [PATCH] fix 2 issues found during testing (#8029) --- .../bdc/2019/deploy-bdc-existing-kubeadm.ipynb | 11 ++++------- .../deployClusterWizard/deployClusterWizardModel.ts | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-existing-kubeadm.ipynb b/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-existing-kubeadm.ipynb index d44b006402..9c2270ba7b 100644 --- a/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-existing-kubeadm.ipynb +++ b/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-existing-kubeadm.ipynb @@ -77,16 +77,13 @@ " !{command}\n", " if _exit_code != 0:\n", " sys.exit(f'Command execution failed with exit code: {str(_exit_code)}.\\n\\t{command}\\n')\n", - " print(f'Successfully executed: {command}')\n", - "\n", - "run_command('kubectl version --client=true')\n", - "run_command('azdata --version')" + " print(f'Successfully executed: {command}')" ], "metadata": { "azdata_cell_guid": "26fa8bc4-4b8e-4c31-ae11-50484821cea8", "tags": [ - "hide_input" - ] + "hide_input" + ] }, "outputs": [], "execution_count": 1 @@ -334,4 +331,4 @@ "execution_count": 10 } ] -} \ No newline at end of file +} diff --git a/extensions/resource-deployment/src/ui/deployClusterWizard/deployClusterWizardModel.ts b/extensions/resource-deployment/src/ui/deployClusterWizard/deployClusterWizardModel.ts index 2d9aac2c1a..9bfbad422c 100644 --- a/extensions/resource-deployment/src/ui/deployClusterWizard/deployClusterWizardModel.ts +++ b/extensions/resource-deployment/src/ui/deployClusterWizard/deployClusterWizardModel.ts @@ -163,7 +163,7 @@ export class DeployClusterWizardModel extends Model { statements.push(`os.environ["DOCKER_USERNAME"] = '${this.getStringValue(VariableNames.DockerUsername_VariableName)}'`); statements.push(`os.environ["DOCKER_PASSWORD"] = os.environ["${VariableNames.DockerPassword_VariableName}"]`); } - statements.push(`os.environ["PATH"] = os.environ["PATH"] + "${delimiter}" + "${process.env[VariableNames.ToolsInstallPath]}"`); + statements.push(`os.environ["PATH"] = os.environ["PATH"] + "${delimiter}" + "${this.escapeForNotebookCodeCell(process.env[VariableNames.ToolsInstallPath]!)}"`); statements.push(`print('Variables have been set successfully.')`); return statements.map(line => line + EOL); }