This is an automated email from the ASF dual-hosted git repository.
ofuks pushed a commit to branch DLAB-1158
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1158 by this push:
new b284df3 Changed type of boolean parameters to String
b284df3 is described below
commit b284df308eb6ecfd65a5c0acecf4b69bb90bcc9d
Author: Oleh Fuks <olegfuk...@gmail.com>
AuthorDate: Mon Nov 4 17:45:21 2019 +0200
Changed type of boolean parameters to String
---
.../java/com/epam/dlab/dto/aws/AwsCloudSettings.java | 6 +++---
.../com/epam/dlab/dto/azure/AzureCloudSettings.java | 6 +++---
.../java/com/epam/dlab/dto/gcp/GcpCloudSettings.java | 6 +++---
.../dlab/backendapi/core/commands/CommandBuilder.java | 18 +++++++++---------
4 files changed, 18 insertions(+), 18 deletions(-)
diff --git
a/services/dlab-model/src/main/java/com/epam/dlab/dto/aws/AwsCloudSettings.java
b/services/dlab-model/src/main/java/com/epam/dlab/dto/aws/AwsCloudSettings.java
index aad91c6..ed64985 100644
---
a/services/dlab-model/src/main/java/com/epam/dlab/dto/aws/AwsCloudSettings.java
+++
b/services/dlab-model/src/main/java/com/epam/dlab/dto/aws/AwsCloudSettings.java
@@ -69,11 +69,11 @@ public class AwsCloudSettings extends CloudSettings {
@JsonProperty("conf_key_dir")
protected String confKeyDir;
@JsonProperty("conf_image_enabled")
- private boolean imageEnabled;
+ private String imageEnabled;
@JsonProperty("conf_shared_image_enabled")
- private boolean sharedImageEnabled;
+ private String sharedImageEnabled;
@JsonProperty("conf_stepcerts_enabled")
- private boolean stepCertsEnabled;
+ private String stepCertsEnabled;
@JsonProperty("conf_stepcerts_root_ca")
private String stepCertsRootCA;
@JsonProperty("conf_stepcerts_kid")
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 3bffe3a..c4f001b 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
@@ -47,11 +47,11 @@ public class AzureCloudSettings extends CloudSettings {
@JsonProperty("conf_key_dir")
protected String confKeyDir;
@JsonProperty("conf_image_enabled")
- private boolean imageEnabled;
+ private String imageEnabled;
@JsonProperty("conf_shared_image_enabled")
- private boolean sharedImageEnabled;
+ private String sharedImageEnabled;
@JsonProperty("conf_stepcerts_enabled")
- private boolean stepCertsEnabled;
+ private String stepCertsEnabled;
@JsonProperty("conf_stepcerts_root_ca")
private String stepCertsRootCA;
@JsonProperty("conf_stepcerts_kid")
diff --git
a/services/dlab-model/src/main/java/com/epam/dlab/dto/gcp/GcpCloudSettings.java
b/services/dlab-model/src/main/java/com/epam/dlab/dto/gcp/GcpCloudSettings.java
index d9628a0..6587a32 100644
---
a/services/dlab-model/src/main/java/com/epam/dlab/dto/gcp/GcpCloudSettings.java
+++
b/services/dlab-model/src/main/java/com/epam/dlab/dto/gcp/GcpCloudSettings.java
@@ -63,11 +63,11 @@ public class GcpCloudSettings extends CloudSettings {
@JsonProperty("gcp_region")
protected String region;
@JsonProperty("conf_image_enabled")
- private boolean imageEnabled;
+ private String imageEnabled;
@JsonProperty("conf_shared_image_enabled")
- private boolean sharedImageEnabled;
+ private String sharedImageEnabled;
@JsonProperty("conf_stepcerts_enabled")
- private boolean stepCertsEnabled;
+ private String stepCertsEnabled;
@JsonProperty("conf_stepcerts_root_ca")
private String stepCertsRootCA;
@JsonProperty("conf_stepcerts_kid")
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 4c0e73d..746ec2c 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
@@ -91,9 +91,9 @@ public class CommandBuilder {
.azureVpcName(cloudConfiguration.getVpcId())
.confKeyDir(cloudConfiguration.getConfKeyDir())
.azureIamUser(settings.getIamUser())
-
.imageEnabled(cloudConfiguration.isImageEnabled())
-
.sharedImageEnabled(cloudConfiguration.isSharedImageEnabled())
- .stepCertsEnabled(stepCerts.isEnabled())
+
.imageEnabled(String.valueOf(cloudConfiguration.isImageEnabled()))
+
.sharedImageEnabled(String.valueOf(cloudConfiguration.isSharedImageEnabled()))
+
.stepCertsEnabled(String.valueOf(stepCerts.isEnabled()))
.stepCertsRootCA(stepCerts.getRootCA())
.stepCertsKid(stepCerts.getKid())
.stepCertsKidPassword(stepCerts.getKidPassword())
@@ -120,9 +120,9 @@ public class CommandBuilder {
.os(cloudConfiguration.getOs())
.confKeyDir(cloudConfiguration.getConfKeyDir())
.gcpIamUser(settings.getIamUser())
-
.imageEnabled(cloudConfiguration.isImageEnabled())
-
.sharedImageEnabled(cloudConfiguration.isSharedImageEnabled())
- .stepCertsEnabled(stepCerts.isEnabled())
+
.imageEnabled(String.valueOf(cloudConfiguration.isImageEnabled()))
+
.sharedImageEnabled(String.valueOf(cloudConfiguration.isSharedImageEnabled()))
+
.stepCertsEnabled(String.valueOf(stepCerts.isEnabled()))
.stepCertsRootCA(stepCerts.getRootCA())
.stepCertsKid(stepCerts.getKid())
.stepCertsKidPassword(stepCerts.getKidPassword())
@@ -152,9 +152,9 @@ public class CommandBuilder {
.cloud(conf.getCloudProvider().getName())
.os(cloudConfiguration.getOs())
.confKeyDir(cloudConfiguration.getConfKeyDir())
-
.imageEnabled(cloudConfiguration.isImageEnabled())
-
.sharedImageEnabled(cloudConfiguration.isSharedImageEnabled())
- .stepCertsEnabled(stepCerts.isEnabled())
+
.imageEnabled(String.valueOf(cloudConfiguration.isImageEnabled()))
+
.sharedImageEnabled(String.valueOf(cloudConfiguration.isSharedImageEnabled()))
+
.stepCertsEnabled(String.valueOf(stepCerts.isEnabled()))
.stepCertsRootCA(stepCerts.getRootCA())
.stepCertsKid(stepCerts.getKid())
.stepCertsKidPassword(stepCerts.getKidPassword())
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
