From 5982925ed720d253f5d1baebb4c7c3a597fb40ab Mon Sep 17 00:00:00 2001 From: Alan Ren Date: Mon, 24 Feb 2020 10:54:54 -0800 Subject: [PATCH] keep up with latest azdata (#9276) --- extensions/resource-deployment/package.json | 2 +- .../bigDataClusterDeploymentProfile.ts | 21 +++++++++++-------- .../pages/deploymentProfilePage.ts | 2 +- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/extensions/resource-deployment/package.json b/extensions/resource-deployment/package.json index 93ebf85654..e30de80636 100644 --- a/extensions/resource-deployment/package.json +++ b/extensions/resource-deployment/package.json @@ -251,7 +251,7 @@ }, { "name": "azdata", - "version": "15.0.2070" + "version": "15.0.4013" } ], "when": "target=new-aks&&version=bdc2019" diff --git a/extensions/resource-deployment/src/services/bigDataClusterDeploymentProfile.ts b/extensions/resource-deployment/src/services/bigDataClusterDeploymentProfile.ts index 01abb5bda3..21c50e78e0 100644 --- a/extensions/resource-deployment/src/services/bigDataClusterDeploymentProfile.ts +++ b/extensions/resource-deployment/src/services/bigDataClusterDeploymentProfile.ts @@ -275,19 +275,22 @@ export class BigDataClusterDeploymentProfile { } public setActiveDirectorySettings(adSettings: ActiveDirectorySettings): void { - this._controlConfig.security.ouDistinguishedName = adSettings.organizationalUnit; - this._controlConfig.security.dnsIpAddresses = this.splitByComma(adSettings.dnsIPAddresses); - this._controlConfig.security.domainControllerFullyQualifiedDns = this.splitByComma(adSettings.domainControllerFQDNs); - this._controlConfig.security.domainDnsName = adSettings.domainDNSName; - this._controlConfig.security.realm = adSettings.domainDNSName.toUpperCase(); - this._controlConfig.security.clusterAdmins = this.splitByComma(adSettings.clusterAdmins); - this._controlConfig.security.clusterUsers = this.splitByComma(adSettings.clusterUsers); + const activeDirectoryObject: any = {}; + activeDirectoryObject.ouDistinguishedName = adSettings.organizationalUnit; + activeDirectoryObject.dnsIpAddresses = this.splitByComma(adSettings.dnsIPAddresses); + activeDirectoryObject.domainControllerFullyQualifiedDns = this.splitByComma(adSettings.domainControllerFQDNs.toLowerCase()); + activeDirectoryObject.domainDnsName = adSettings.domainDNSName; + activeDirectoryObject.realm = adSettings.domainDNSName.toUpperCase(); + activeDirectoryObject.clusterAdmins = this.splitByComma(adSettings.clusterAdmins); + activeDirectoryObject.clusterUsers = this.splitByComma(adSettings.clusterUsers); if (adSettings.appReaders) { - this._controlConfig.security.appReaders = this.splitByComma(adSettings.appReaders); + activeDirectoryObject.appReaders = this.splitByComma(adSettings.appReaders); } if (adSettings.appOwners) { - this._controlConfig.security.appOwners = this.splitByComma(adSettings.appOwners); + activeDirectoryObject.appOwners = this.splitByComma(adSettings.appOwners); } + + this._controlConfig.security.activeDirectory = activeDirectoryObject; } public getBdcJson(readable: boolean = true): string { diff --git a/extensions/resource-deployment/src/ui/deployClusterWizard/pages/deploymentProfilePage.ts b/extensions/resource-deployment/src/ui/deployClusterWizard/pages/deploymentProfilePage.ts index 9540b8946d..ef718e4892 100644 --- a/extensions/resource-deployment/src/ui/deployClusterWizard/pages/deploymentProfilePage.ts +++ b/extensions/resource-deployment/src/ui/deployClusterWizard/pages/deploymentProfilePage.ts @@ -29,7 +29,7 @@ export class DeploymentProfilePage extends WizardPageBase { this._cardContainer = view.modelBuilder.radioCardGroup().withProperties({ cards: [], cardWidth: '240px', - cardHeight: '340px', + cardHeight: '355px', ariaLabel: localize('deploymentDialog.deploymentOptions', "Deployment options"), width: '1000px' }).component();