Fix projects bucket and add vault topdir (#107)

InseeFrLab · Nov 23, 2021 · 2eb333f · 2eb333f
1 parent 4e1199b
commit 2eb333f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/onyxia-api/src/main/java/fr/insee/onyxia/api/user/OnyxiaUserProvider.java b/onyxia-api/src/main/java/fr/insee/onyxia/api/user/OnyxiaUserProvider.java
@@ -34,6 +34,7 @@ public OnyxiaUser getUser() {
                 Project project = new Project();
                 project.setId(region.getServices().getGroupNamespacePrefix()+group);
                 project.setGroup(group);
+                project.setVaultTopDir(region.getServices().getGroupNamespacePrefix()+group);
                 project.setBucket(region.getServices().getGroupNamespacePrefix()+group);
                 project.setNamespace(region.getServices().getGroupNamespacePrefix()+group);
                 user.getProjects().add(project);
@@ -48,14 +49,16 @@ private Project getUserProject(Region region, OnyxiaUser user ) {
         if (region.getServices().isSingleNamespace()) {
             userProject.setId("single-project");
             userProject.setGroup(null);
-            userProject.setBucket(region.getServices().getNamespacePrefix()+user.getUser().getIdep());
+            userProject.setVaultTopDir(user.getUser().getIdep());
+            userProject.setBucket(user.getUser().getIdep());
             userProject.setNamespace(kubernetesService.getCurrentNamespace(region));
             userProject.setName("Single namespace, single project");
         }
         else {
             userProject.setId(region.getServices().getNamespacePrefix()+user.getUser().getIdep());
             userProject.setGroup(null);
-            userProject.setBucket(region.getServices().getNamespacePrefix()+user.getUser().getIdep());
+            userProject.setVaultTopDir(user.getUser().getIdep());
+            userProject.setBucket(user.getUser().getIdep());
             userProject.setNamespace(region.getServices().getNamespacePrefix()+user.getUser().getIdep());
             userProject.setName(user.getUser().getIdep()+" personal project");
         }

diff --git a/onyxia-model/src/main/java/fr/insee/onyxia/model/project/Project.java b/onyxia-model/src/main/java/fr/insee/onyxia/model/project/Project.java
@@ -7,6 +7,7 @@ public class Project {
     private String bucket;
     private String namespace;
     private String name;
+    private String vaultTopDir;
 
     public String getId() {
         return id;
@@ -50,4 +51,12 @@ public String getName() {
     public void setName(String name) {
         this.name = name;
     }
+
+    public String getVaultTopDir() {
+        return vaultTopDir;
+    }
+
+    public void setVaultTopDir(String vaultTopDir) {
+        this.vaultTopDir = vaultTopDir;
+    }
 }