You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by bh...@apache.org on 2019/09/27 12:36:27 UTC
[incubator-dlab] branch DLAB-terraform updated: DLAB-000 replaced
dto property for use shared images
This is an automated email from the ASF dual-hosted git repository.
bhliva pushed a commit to branch DLAB-terraform
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-terraform by this push:
new 72c33e0 DLAB-000 replaced dto property for use shared images
72c33e0 is described below
commit 72c33e0b7fd27398fdde3d4bab67edba5dc2c6fb
Author: bhliva <bo...@epam.com>
AuthorDate: Fri Sep 27 15:36:04 2019 +0300
DLAB-000 replaced dto property for use shared images
---
.../src/main/java/com/epam/dlab/dto/project/ProjectCreateDTO.java | 4 ++--
.../src/main/java/com/epam/dlab/rest/contracts/KeyAPI.java | 2 +-
.../src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/services/dlab-model/src/main/java/com/epam/dlab/dto/project/ProjectCreateDTO.java b/services/dlab-model/src/main/java/com/epam/dlab/dto/project/ProjectCreateDTO.java
index 48532e8..6e11234 100644
--- a/services/dlab-model/src/main/java/com/epam/dlab/dto/project/ProjectCreateDTO.java
+++ b/services/dlab-model/src/main/java/com/epam/dlab/dto/project/ProjectCreateDTO.java
@@ -15,6 +15,6 @@ public class ProjectCreateDTO extends ResourceBaseDTO<ProjectCreateDTO> {
private final String tag;
@JsonProperty("endpoint_name")
private final String endpoint;
- @JsonProperty("use_shared_image")
- private boolean useSharedImage;
+ @JsonProperty("shared_image_enabled")
+ private String useSharedImage;
}
diff --git a/services/dlab-webapp-common/src/main/java/com/epam/dlab/rest/contracts/KeyAPI.java b/services/dlab-webapp-common/src/main/java/com/epam/dlab/rest/contracts/KeyAPI.java
index 4b5eba3..d93d440 100644
--- a/services/dlab-webapp-common/src/main/java/com/epam/dlab/rest/contracts/KeyAPI.java
+++ b/services/dlab-webapp-common/src/main/java/com/epam/dlab/rest/contracts/KeyAPI.java
@@ -21,7 +21,7 @@ package com.epam.dlab.rest.contracts;
public class KeyAPI {
public static final String REUPLOAD_KEY = "/key/reupload";
- public static final String GET_ADMIN_KEY = "/key";
+ public static final String GET_ADMIN_KEY = "key";
public static final String KEY_EXTENTION = ".pub";
private KeyAPI() {
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java
index b041a19..34cda1b 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/util/RequestBuilder.java
@@ -624,7 +624,7 @@ public class RequestBuilder {
.name(projectDTO.getName())
.tag(projectDTO.getTag())
.endpoint(endpoint)
- .useSharedImage(projectDTO.isUseSharedImage())
+ .useSharedImage(String.valueOf(projectDTO.isUseSharedImage()))
.build()
.withCloudSettings(cloudSettings(userInfo));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org