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

Use namespace for azdata login with postgres deployment (#15592)

Browse Source 
* Azdata login uses namespace since required, checks for endpoint

* Change back version

* Remove tabs
This commit is contained in:
nasc17
2021-05-28 08:37:18 -07:00
committed by GitHub
parent ddb442f1e1
commit 52a223e9ff
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
extensions/arc/notebooks/arcDeployment/deploy.postgres.existing.arc.ipynb
View File

@@ -117,7 +117,8 @@
"os.environ[\"AZDATA_PASSWORD\"] = os.environ[\"AZDATA_NB_VAR_CONTROLLER_PASSWORD\"]\n", "os.environ[\"AZDATA_PASSWORD\"] = os.environ[\"AZDATA_NB_VAR_CONTROLLER_PASSWORD\"]\n",
"os.environ[\"KUBECONFIG\"] = controller_kubeconfig\n", "os.environ[\"KUBECONFIG\"] = controller_kubeconfig\n",
"os.environ[\"KUBECTL_CONTEXT\"] = controller_kubectl_context\n", "os.environ[\"KUBECTL_CONTEXT\"] = controller_kubectl_context\n",
"cmd = f'azdata login -e {controller_endpoint} -u {controller_username}'\n", "endpoint_option = f' -e {controller_endpoint}' if controller_endpoint else \"\"\n",
"cmd = f'azdata login --namespace {arc_data_controller_namespace} -u {controller_username}{endpoint_option}'\n",
"out=run_command()" "out=run_command()"
], ],
"metadata": { "metadata": {

1
extensions/arc/package.json
View File

@@ -572,6 +572,7 @@
"source": { "source": {
"providerId": "arc.controllers", "providerId": "arc.controllers",
"variableNames": { "variableNames": {
"namespace": "AZDATA_NB_VAR_ARC_DATA_CONTROLLER_NAMESPACE",
"endpoint": "AZDATA_NB_VAR_CONTROLLER_ENDPOINT", "endpoint": "AZDATA_NB_VAR_CONTROLLER_ENDPOINT",
"username": "AZDATA_NB_VAR_CONTROLLER_USERNAME", "username": "AZDATA_NB_VAR_CONTROLLER_USERNAME",
"kubeConfig": "AZDATA_NB_VAR_CONTROLLER_KUBECONFIG", "kubeConfig": "AZDATA_NB_VAR_CONTROLLER_KUBECONFIG",

2
extensions/arc/src/providers/arcControllersOptionsSourceProvider.ts
View File

@@ -30,6 +30,7 @@ export class ArcControllersOptionsSourceProvider implements rd.IOptionsSourcePro
const controller = (await getRegisteredDataControllers(this._treeProvider)).find(ci => ci.label === controllerLabel); const controller = (await getRegisteredDataControllers(this._treeProvider)).find(ci => ci.label === controllerLabel);
throwUnless(controller !== undefined, loc.noControllerInfoFound(controllerLabel)); throwUnless(controller !== undefined, loc.noControllerInfoFound(controllerLabel));
switch (variableName) { switch (variableName) {
case 'namespace': return controller.info.namespace || '';
case 'endpoint': return controller.info.endpoint || ''; case 'endpoint': return controller.info.endpoint || '';
case 'username': return controller.info.username; case 'username': return controller.info.username;
case 'kubeConfig': return controller.info.kubeConfigFilePath; case 'kubeConfig': return controller.info.kubeConfigFilePath;
@@ -50,6 +51,7 @@ export class ArcControllersOptionsSourceProvider implements rd.IOptionsSourcePro
public getIsPassword(variableName: string): boolean { public getIsPassword(variableName: string): boolean {
switch (variableName) { switch (variableName) {
case 'namespace': return false;
case 'endpoint': return false; case 'endpoint': return false;
case 'username': return false; case 'username': return false;
case 'kubeConfig': return false; case 'kubeConfig': return false;