You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by yk...@apache.org on 2021/04/06 07:07:07 UTC
[incubator-datalab] branch DATALAB-2314 created (now 06824a7)
This is an automated email from the ASF dual-hosted git repository.
ykinash pushed a change to branch DATALAB-2314
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git.
at 06824a7 [DATALAB-2314] -- fixed request for admin page
This branch includes the following new commits:
new 06824a7 [DATALAB-2314] -- fixed request for admin page
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 01/01: [DATALAB-2314] -- fixed request for
admin page
Posted by yk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ykinash pushed a commit to branch DATALAB-2314
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 06824a75c84ef355c0c776d7db5e68280f57170a
Author: KinashYurii <ur...@gmail.com>
AuthorDate: Tue Apr 6 10:05:36 2021 +0300
[DATALAB-2314] -- fixed request for admin page
---
.../epam/datalab/properties/DynamicChangeProperties.java | 2 +-
.../datalab/backendapi/ProvisioningServiceApplication.java | 13 ++-----------
.../backendapi/resources/ChangePropertiesResource.java | 5 ++---
.../backendapi/resources/ChangePropertiesResource.java | 2 +-
4 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/services/datalab-webapp-common/src/main/java/com/epam/datalab/properties/DynamicChangeProperties.java b/services/datalab-webapp-common/src/main/java/com/epam/datalab/properties/DynamicChangeProperties.java
index dd3a4e7..9691739 100644
--- a/services/datalab-webapp-common/src/main/java/com/epam/datalab/properties/DynamicChangeProperties.java
+++ b/services/datalab-webapp-common/src/main/java/com/epam/datalab/properties/DynamicChangeProperties.java
@@ -117,7 +117,7 @@ public class DynamicChangeProperties implements ChangePropertiesConst {
private String readFileAsString(String selfServicePropPath, String serviceName) {
try {
- log.info("Trying to read self-service.yml, file from path {} :", selfServicePropPath);
+ log.info("Trying to read {}, file from path {} :", serviceName, selfServicePropPath);
String currentConf = FileUtils.readFileToString(new File(selfServicePropPath), Charset.defaultCharset());
return hideSecretsAndRemoveLicence(currentConf);
} catch (IOException e) {
diff --git a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/ProvisioningServiceApplication.java b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/ProvisioningServiceApplication.java
index 76a1cdb..bb711a2 100644
--- a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/ProvisioningServiceApplication.java
+++ b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/ProvisioningServiceApplication.java
@@ -26,17 +26,7 @@ import com.epam.datalab.backendapi.core.DockerWarmuper;
import com.epam.datalab.backendapi.core.response.handlers.ComputationalConfigure;
import com.epam.datalab.backendapi.modules.CloudModuleConfigurator;
import com.epam.datalab.backendapi.modules.ModuleFactory;
-import com.epam.datalab.backendapi.resources.BackupResource;
-import com.epam.datalab.backendapi.resources.BucketResource;
-import com.epam.datalab.backendapi.resources.CallbackHandlerResource;
-import com.epam.datalab.backendapi.resources.DockerResource;
-import com.epam.datalab.backendapi.resources.GitExploratoryResource;
-import com.epam.datalab.backendapi.resources.ImageResource;
-import com.epam.datalab.backendapi.resources.InfrastructureResource;
-import com.epam.datalab.backendapi.resources.LibraryResource;
-import com.epam.datalab.backendapi.resources.OdahuResource;
-import com.epam.datalab.backendapi.resources.ProjectResource;
-import com.epam.datalab.backendapi.resources.ProvisioningHealthCheckResource;
+import com.epam.datalab.backendapi.resources.*;
import com.epam.datalab.backendapi.resources.base.KeyResource;
import com.epam.datalab.backendapi.service.impl.RestoreCallbackHandlerServiceImpl;
import com.epam.datalab.cloud.CloudModule;
@@ -147,6 +137,7 @@ public class ProvisioningServiceApplication extends Application<ProvisioningServ
jersey.register(new RuntimeExceptionMapper());
jersey.register(new JsonProcessingExceptionMapper());
+ jersey.register(injector.getInstance(ChangePropertiesResource.class));
jersey.register(injector.getInstance(DockerResource.class));
jersey.register(injector.getInstance(GitExploratoryResource.class));
jersey.register(injector.getInstance(LibraryResource.class));
diff --git a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/resources/ChangePropertiesResource.java b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/resources/ChangePropertiesResource.java
index 9589f27..0f61552 100644
--- a/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/resources/ChangePropertiesResource.java
+++ b/services/provisioning-service/src/main/java/com/epam/datalab/backendapi/resources/ChangePropertiesResource.java
@@ -27,7 +27,7 @@ import java.util.function.Predicate;
import static com.epam.datalab.backendapi.core.response.folderlistener.WatchItem.ItemStatus.INPROGRESS;
import static com.epam.datalab.backendapi.core.response.folderlistener.WatchItem.ItemStatus.WAIT_FOR_FILE;
-@Path("config")
+@Path("/config")
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
@Slf4j
@@ -36,10 +36,9 @@ public class ChangePropertiesResource implements ChangePropertiesConst {
private final DynamicChangeProperties dynamicChangeProperties;
private final List<WatchItem.ItemStatus> inProgressStatuses = Arrays.asList(INPROGRESS, WAIT_FOR_FILE);
-
@Inject
public ChangePropertiesResource(DynamicChangeProperties dynamicChangeProperties,
- ProvisioningServiceApplicationConfiguration conf, FolderListenerExecutor folderListenerExecutor, FileHandlerCallback fileHandlerCallback, CallbackHandlerDao handlerDao, FolderListener listener) {
+ ProvisioningServiceApplicationConfiguration conf) {
this.dynamicChangeProperties = dynamicChangeProperties;
}
diff --git a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/ChangePropertiesResource.java b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/ChangePropertiesResource.java
index e38a2b5..fa86d6d 100644
--- a/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/ChangePropertiesResource.java
+++ b/services/self-service/src/main/java/com/epam/datalab/backendapi/resources/ChangePropertiesResource.java
@@ -17,7 +17,7 @@ import javax.ws.rs.*;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-@Path("config")
+@Path("/config")
@Produces(MediaType.APPLICATION_JSON)
@Consumes(MediaType.APPLICATION_JSON)
public class ChangePropertiesResource implements ChangePropertiesConst {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org