This is an automated email from the ASF dual-hosted git repository.
ofuks pushed a commit to branch DLAB-1467
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1467 by this push:
new fefdf67 Added ldap parameters
fefdf67 is described below
commit fefdf67b917fea739774b85abe508203e047a4c7
Author: Oleh Fuks <[email protected]>
AuthorDate: Fri Feb 7 15:22:22 2020 +0200
Added ldap parameters
---
.../main/java/com/epam/dlab/dto/azure/AzureCloudSettings.java | 10 ++++++++++
.../com/epam/dlab/backendapi/core/commands/CommandBuilder.java | 8 +++++++-
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git
a/services/dlab-model/src/main/java/com/epam/dlab/dto/azure/AzureCloudSettings.java
b/services/dlab-model/src/main/java/com/epam/dlab/dto/azure/AzureCloudSettings.java
index 23af25c..07013c6 100644
---
a/services/dlab-model/src/main/java/com/epam/dlab/dto/azure/AzureCloudSettings.java
+++
b/services/dlab-model/src/main/java/com/epam/dlab/dto/azure/AzureCloudSettings.java
@@ -50,6 +50,16 @@ public class AzureCloudSettings extends CloudSettings {
private String azureResourceGroupName;
@JsonProperty("azure_security_group_name")
private String azureSecurityGroupName;
+ @JsonProperty("ldap_hostname")
+ protected String ldapHost;
+ @JsonProperty("ldap_dn")
+ protected String ldapDn;
+ @JsonProperty("ldap_ou")
+ protected String ldapOu;
+ @JsonProperty("ldap_service_username")
+ protected String ldapUser;
+ @JsonProperty("ldap_service_password")
+ protected String ldapPassword;
@JsonProperty("conf_key_dir")
protected String confKeyDir;
@JsonProperty("conf_image_enabled")
diff --git
a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/commands/CommandBuilder.java
b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/commands/CommandBuilder.java
index a0028f9..a212d0a 100644
---
a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/commands/CommandBuilder.java
+++
b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/commands/CommandBuilder.java
@@ -76,19 +76,25 @@ public class CommandBuilder {
} else if (cloudProvider == CloudProvider.GCP) {
return gcpCloudSettings(settings, cloudConfiguration,
ldapConfig, stepCerts, keycloak);
} else if (cloudProvider == CloudProvider.AZURE) {
- return azureCloudSettings(settings, cloudConfiguration,
stepCerts, keycloak);
+ return azureCloudSettings(settings, cloudConfiguration,
ldapConfig, stepCerts, keycloak);
} else {
throw new UnsupportedOperationException("Unsupported
cloud provider " + cloudProvider.getName());
}
}
private AzureCloudSettings azureCloudSettings(CloudSettings settings,
CloudConfiguration cloudConfiguration,
+
CloudConfiguration.LdapConfig ldapConfig,
CloudConfiguration.StepCerts stepCerts,
CloudConfiguration.Keycloak keycloak) {
return AzureCloudSettings.builder()
.azureRegion(cloudConfiguration.getRegion())
.azureResourceGroupName(cloudConfiguration.getAzureResourceGroupName())
.azureSecurityGroupName(cloudConfiguration.getSecurityGroupIds())
+ .ldapDn(ldapConfig.getDn())
+ .ldapHost(ldapConfig.getHost())
+ .ldapOu(ldapConfig.getOu())
+ .ldapUser(ldapConfig.getUser())
+ .ldapPassword(ldapConfig.getPassword())
.azureSubnetName(cloudConfiguration.getSubnetId())
.azureVpcName(cloudConfiguration.getVpcId())
.confKeyDir(cloudConfiguration.getConfKeyDir())
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]