ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

[Port] Fix env var names for Arc deployment (#13735)

Browse Source 
* Fix environment variables for controller create (#13732)


(cherry picked from commit aee8bc2759)

* vBump and update engine version
This commit is contained in:
Charles Gagnon
2020-12-09 10:50:16 -08:00
committed by GitHub
parent 634ea0ab6a
commit 88a4dba695
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/arc/notebooks/arcDeployment/deploy.arc.data.controller.ipynb
View File

@@ -135,7 +135,7 @@
" sys.exit(f'Passwords do not match.')\n", " sys.exit(f'Passwords do not match.')\n",
"\n", "\n",
"os.environ[\"SPN_CLIENT_ID\"] = sp_client_id\n", "os.environ[\"SPN_CLIENT_ID\"] = sp_client_id\n",
"os.environ[\"SPN_CLIENT_TENANTID\"] = sp_client_tenantid\n", "os.environ[\"SPN_TENANT_ID\"] = sp_tenant_id\n",
"if \"AZDATA_NB_VAR_SP_CLIENT_SECRET\" in os.environ:\n", "if \"AZDATA_NB_VAR_SP_CLIENT_SECRET\" in os.environ:\n",
" os.environ[\"SPN_CLIENT_SECRET\"] = os.environ[\"AZDATA_NB_VAR_SP_CLIENT_SECRET\"]\n", " os.environ[\"SPN_CLIENT_SECRET\"] = os.environ[\"AZDATA_NB_VAR_SP_CLIENT_SECRET\"]\n",
"os.environ[\"SPN_AUTHORITY\"] = \"https://login.microsoftonline.com\"" "os.environ[\"SPN_AUTHORITY\"] = \"https://login.microsoftonline.com\""

6
extensions/arc/package.json
View File

@@ -2,14 +2,14 @@
"name": "arc", "name": "arc",
"displayName": "%arc.displayName%", "displayName": "%arc.displayName%",
"description": "%arc.description%", "description": "%arc.description%",
"version": "0.6.4", "version": "0.6.5",
"publisher": "Microsoft", "publisher": "Microsoft",
"preview": true, "preview": true,
"license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/main/LICENSE.txt", "license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/main/LICENSE.txt",
"icon": "images/extension.png", "icon": "images/extension.png",
"engines": { "engines": {
"vscode": "*", "vscode": "*",
"azdata": ">=1.23.0" "azdata": ">=1.25.0"
}, },
"activationEvents": [ "activationEvents": [
"onCommand:arc.connectToController", "onCommand:arc.connectToController",
@@ -311,7 +311,7 @@
{ {
"label": "%arc.data.controller.sptenantid%", "label": "%arc.data.controller.sptenantid%",
"description": "%arc.data.controller.sptenantid.description%", "description": "%arc.data.controller.sptenantid.description%",
"variableName": "AZDATA_NB_VAR_SP_CLIENT_TENANTID", "variableName": "AZDATA_NB_VAR_SP_TENANT_ID",
"type": "text", "type": "text",
"required": true, "required": true,
"defaultValue": "", "defaultValue": "",