keep up with latest azdata (#9276)

This commit is contained in:
Alan Ren
2020-02-24 10:54:54 -08:00
committed by GitHub
parent 9090143f9d
commit 5982925ed7
3 changed files with 14 additions and 11 deletions

View File

@@ -251,7 +251,7 @@
},
{
"name": "azdata",
"version": "15.0.2070"
"version": "15.0.4013"
}
],
"when": "target=new-aks&&version=bdc2019"

View File

@@ -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 {

View File

@@ -29,7 +29,7 @@ export class DeploymentProfilePage extends WizardPageBase<DeployClusterWizard> {
this._cardContainer = view.modelBuilder.radioCardGroup().withProperties<azdata.RadioCardGroupComponentProperties>({
cards: [],
cardWidth: '240px',
cardHeight: '340px',
cardHeight: '355px',
ariaLabel: localize('deploymentDialog.deploymentOptions', "Deployment options"),
width: '1000px'
}).component();