This is an automated email from the ASF dual-hosted git repository.
bhliva pushed a commit to branch dlab_refactored
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/dlab_refactored by this push:
new 99b7fab DLAB-757 added possibility to import mongo roles on ss startup
99b7fab is described below
commit 99b7fabe4e3ec01ed86f591b2e04a5c4e59ec33c
Author: bhliva <[email protected]>
AuthorDate: Tue Aug 6 15:54:29 2019 +0300
DLAB-757 added possibility to import mongo roles on ss startup
---
.../dlab/backendapi/SelfServiceApplication.java | 10 +----
.../com/epam/dlab/backendapi/dao/UserRoleDao.java | 5 +++
.../epam/dlab/backendapi/dao/UserRoleDaoImpl.java | 10 +++++
.../backendapi/listeners/MongoStartupListener.java | 51 ++++++++++++++++++++++
.../src/main/resources/mongo}/aws/mongo_roles.json | 0
.../main/resources/mongo}/azure/mongo_roles.json | 0
.../src/main/resources/mongo}/gcp/mongo_roles.json | 0
7 files changed, 68 insertions(+), 8 deletions(-)
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/SelfServiceApplication.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/SelfServiceApplication.java
index 2c66f0a..3284e04 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/SelfServiceApplication.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/SelfServiceApplication.java
@@ -25,6 +25,7 @@ import com.epam.dlab.backendapi.dao.IndexCreator;
import com.epam.dlab.backendapi.domain.EnvStatusListener;
import com.epam.dlab.backendapi.domain.ExploratoryLibCache;
import com.epam.dlab.backendapi.healthcheck.MongoHealthCheck;
+import com.epam.dlab.backendapi.listeners.MongoStartupListener;
import com.epam.dlab.backendapi.listeners.RestoreHandlerStartupListener;
import com.epam.dlab.backendapi.modules.ModuleFactory;
import com.epam.dlab.backendapi.resources.*;
@@ -109,14 +110,6 @@ public class SelfServiceApplication extends
Application<SelfServiceApplicationCo
new
TemplateConfigBundleConfiguration().fileIncludePath(ServiceUtils.getConfPath())
));
- /*bootstrap.addBundle(new
SwaggerBundle<SelfServiceApplicationConfiguration>() {
- @Override
- protected SwaggerBundleConfiguration
getSwaggerBundleConfiguration(SelfServiceApplicationConfiguration
- configuration) {
- return configuration.getSwaggerConfiguration();
- }
- });*/
-
bootstrap.addBundle(new
KeycloakBundle<SelfServiceApplicationConfiguration>() {
@Override
protected KeycloakConfiguration
getKeycloakConfiguration(SelfServiceApplicationConfiguration configuration) {
@@ -170,6 +163,7 @@ public class SelfServiceApplication extends
Application<SelfServiceApplicationCo
if (configuration.isMongoMigrationEnabled()) {
environment.lifecycle().addServerLifecycleListener(server ->
applyMongoMigration(configuration));
}
+
environment.lifecycle().addServerLifecycleListener(injector.getInstance(MongoStartupListener.class));
final RestoreHandlerStartupListener
restoreHandlerStartupListener =
new
RestoreHandlerStartupListener(injector.getInstance(Key.get(RESTService.class,
Names.named(ServiceConsts.PROVISIONING_SERVICE_NAME))));
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/UserRoleDao.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/UserRoleDao.java
index a12cd5e..33d00d9 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/UserRoleDao.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/UserRoleDao.java
@@ -28,13 +28,18 @@ import java.util.Set;
public interface UserRoleDao {
List<UserRoleDto> findAll();
+ void removeAll();
+
void insert(UserRoleDto dto);
+ void insert(List<UserRoleDto> roles);
+
boolean update(UserRoleDto dto);
boolean addGroupToRole(Set<String> groups, Set<String> roleIds);
boolean removeGroupFromRole(Set<String> groups, Set<String> roleIds);
+
void removeGroupWhenRoleNotIn(String group, Set<String> roleIds);
void remove(String roleId);
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/UserRoleDaoImpl.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/UserRoleDaoImpl.java
index e73dd6b..f271723 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/UserRoleDaoImpl.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/UserRoleDaoImpl.java
@@ -58,11 +58,21 @@ public class UserRoleDaoImpl extends BaseDAO implements
UserRoleDao {
}
@Override
+ public void removeAll() {
+ mongoService.getCollection(MongoCollections.ROLES).drop();
+ }
+
+ @Override
public void insert(UserRoleDto dto) {
insertOne(MongoCollections.ROLES, dto, dto.getId());
}
@Override
+ public void insert(List<UserRoleDto> roles) {
+ roles.forEach(this::insert);
+ }
+
+ @Override
public boolean update(UserRoleDto dto) {
final Document userRoleDocument =
convertToBson(dto).append(TIMESTAMP, new Date());
return conditionMatched(updateOne(MongoCollections.ROLES,
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/listeners/MongoStartupListener.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/listeners/MongoStartupListener.java
new file mode 100644
index 0000000..e6825e9
--- /dev/null
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/listeners/MongoStartupListener.java
@@ -0,0 +1,51 @@
+package com.epam.dlab.backendapi.listeners;
+
+import com.epam.dlab.backendapi.SelfServiceApplicationConfiguration;
+import com.epam.dlab.backendapi.dao.UserRoleDao;
+import com.epam.dlab.backendapi.resources.dto.UserRoleDto;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.inject.Inject;
+import io.dropwizard.lifecycle.ServerLifecycleListener;
+import lombok.extern.slf4j.Slf4j;
+import org.eclipse.jetty.server.Server;
+
+import java.io.IOException;
+import java.util.List;
+
+import static java.lang.String.format;
+
+
+@Slf4j
+public class MongoStartupListener implements ServerLifecycleListener {
+
+ private static final String ROLES_FILE_FORMAT =
"/mongo/%s/mongo_roles.json";
+ private static final ObjectMapper MAPPER = new ObjectMapper();
+ private final UserRoleDao userRoleDao;
+ private final SelfServiceApplicationConfiguration configuration;
+
+ @Inject
+ public MongoStartupListener(UserRoleDao userRoleDao,
SelfServiceApplicationConfiguration configuration) {
+ this.userRoleDao = userRoleDao;
+ this.configuration = configuration;
+ }
+
+ @Override
+ public void serverStarted(Server server) {
+ log.debug("Populating DLab roles into database");
+ userRoleDao.removeAll();
+ userRoleDao.insert(getRoles());
+ }
+
+ private List<UserRoleDto> getRoles() {
+ try {
+ return
MAPPER.readValue(getClass().getResourceAsStream(format(ROLES_FILE_FORMAT,
+
configuration.getCloudProvider().getName())),
+ new TypeReference<List<UserRoleDto>>() {
+ });
+ } catch (IOException e) {
+ log.error("Can not marshall dlab roles due to: {}",
e.getMessage());
+ throw new IllegalStateException("Can not marshall dlab
roles due to: " + e.getMessage());
+ }
+ }
+}
diff --git a/infrastructure-provisioning/src/ssn/files/aws/mongo_roles.json
b/services/self-service/src/main/resources/mongo/aws/mongo_roles.json
similarity index 100%
rename from infrastructure-provisioning/src/ssn/files/aws/mongo_roles.json
rename to services/self-service/src/main/resources/mongo/aws/mongo_roles.json
diff --git a/infrastructure-provisioning/src/ssn/files/azure/mongo_roles.json
b/services/self-service/src/main/resources/mongo/azure/mongo_roles.json
similarity index 100%
rename from infrastructure-provisioning/src/ssn/files/azure/mongo_roles.json
rename to services/self-service/src/main/resources/mongo/azure/mongo_roles.json
diff --git a/infrastructure-provisioning/src/ssn/files/gcp/mongo_roles.json
b/services/self-service/src/main/resources/mongo/gcp/mongo_roles.json
similarity index 100%
rename from infrastructure-provisioning/src/ssn/files/gcp/mongo_roles.json
rename to services/self-service/src/main/resources/mongo/gcp/mongo_roles.json
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]