ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

keep up with latest azdata (#9276)

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/resource-deployment/package.json
View File

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

21
extensions/resource-deployment/src/services/bigDataClusterDeploymentProfile.ts
View File

@@ -275,19 +275,22 @@ export class BigDataClusterDeploymentProfile {
} }
public setActiveDirectorySettings(adSettings: ActiveDirectorySettings): void { public setActiveDirectorySettings(adSettings: ActiveDirectorySettings): void {
this._controlConfig.security.ouDistinguishedName = adSettings.organizationalUnit; const activeDirectoryObject: any = {};
this._controlConfig.security.dnsIpAddresses = this.splitByComma(adSettings.dnsIPAddresses); activeDirectoryObject.ouDistinguishedName = adSettings.organizationalUnit;
this._controlConfig.security.domainControllerFullyQualifiedDns = this.splitByComma(adSettings.domainControllerFQDNs); activeDirectoryObject.dnsIpAddresses = this.splitByComma(adSettings.dnsIPAddresses);
this._controlConfig.security.domainDnsName = adSettings.domainDNSName; activeDirectoryObject.domainControllerFullyQualifiedDns = this.splitByComma(adSettings.domainControllerFQDNs.toLowerCase());
this._controlConfig.security.realm = adSettings.domainDNSName.toUpperCase(); activeDirectoryObject.domainDnsName = adSettings.domainDNSName;
this._controlConfig.security.clusterAdmins = this.splitByComma(adSettings.clusterAdmins); activeDirectoryObject.realm = adSettings.domainDNSName.toUpperCase();
this._controlConfig.security.clusterUsers = this.splitByComma(adSettings.clusterUsers); activeDirectoryObject.clusterAdmins = this.splitByComma(adSettings.clusterAdmins);
activeDirectoryObject.clusterUsers = this.splitByComma(adSettings.clusterUsers);
if (adSettings.appReaders) { if (adSettings.appReaders) {
this._controlConfig.security.appReaders = this.splitByComma(adSettings.appReaders); activeDirectoryObject.appReaders = this.splitByComma(adSettings.appReaders);
} }
if (adSettings.appOwners) { 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 { public getBdcJson(readable: boolean = true): string {

2
extensions/resource-deployment/src/ui/deployClusterWizard/pages/deploymentProfilePage.ts
View File

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