Fix when group bucket prefix is null (#266)

InseeFrLab · Oct 3, 2023 · d1ba838 · d1ba838
1 parent 7053feb
commit d1ba838
Show file tree

Hide file tree

Showing 2 changed files with 249 additions and 247 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
@@ -14,14 +14,11 @@
 @Service
 public class OnyxiaUserProvider {
 
+    Pattern rfc1123Pattern = Pattern.compile("[a-z0-9]([-a-z0-9]*[a-z0-9])?");
     @Autowired private UserProvider userProvider;
-
     @Autowired private KubernetesService kubernetesService; // TODO : cleanup
-
     private Logger logger = LoggerFactory.getLogger(OnyxiaUserProvider.class);
 
-    Pattern rfc1123Pattern = Pattern.compile("[a-z0-9]([-a-z0-9]*[a-z0-9])?");
-
     public OnyxiaUser getUser(Region region) {
         OnyxiaUser user = new OnyxiaUser(userProvider.getUser(region));
 
@@ -51,7 +48,12 @@ public OnyxiaUser getUser(Region region) {
                                     if (region.getData() != null
                                             && region.getData().getS3() != null) {
                                         project.setBucket(
-                                                region.getData().getS3().getGroupBucketPrefix()
+                                                (region.getData().getS3().getGroupBucketPrefix()
+                                                                        == null
+                                                                ? ""
+                                                                : region.getData()
+                                                                        .getS3()
+                                                                        .getGroupBucketPrefix())
                                                         + projectBaseName);
                                     }
                                     project.setNamespace(