BC-7239 - change to http 403 and test cleanup improve

hpi-schul-cloud · Jun 21, 2024 · f2895f8 · f2895f8
1 parent 83f1dab
commit f2895f8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/src/main/java/de/svs/doido/mongo/ConfigmapApi.java b/src/main/java/de/svs/doido/mongo/ConfigmapApi.java
@@ -5,6 +5,8 @@
 import jakarta.ws.rs.POST;
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.sse.OutboundSseEvent;
+import jakarta.ws.rs.ForbiddenException;
 import jakarta.inject.Inject;
 import svs.doido.mongo.dto.Configmap;
 import svs.doido.mongo.kubernetes.configmap.Read;
@@ -33,6 +35,9 @@ public void configmapsWrite(String namespace, String configmapName) {
         Configmap cfg = new Configmap();
         cfg.setName(configmapName);
         cfg.setUri("http://www.test.org");
-        cfgWrite.writeConfigmap(namespace,configmapName,cfg);
+        if( !cfgWrite.writeConfigmap(namespace,configmapName,cfg) ) {
+            throw new ForbiddenException();
+        }
+
     }
 }
diff --git a/src/main/java/de/svs/doido/mongo/kubernetes/configmap/Write.java b/src/main/java/de/svs/doido/mongo/kubernetes/configmap/Write.java
@@ -17,7 +17,7 @@ public class Write {
     @Inject
     KubernetesClient client;
 
-    public void writeConfigmap(String namespace, String name, Configmap cfg) {
+    public boolean writeConfigmap(String namespace, String name, Configmap cfg) {
         ConfigMap configmap = client.configMaps().inNamespace(namespace).withName(cfg.getName()).get();
         Map<String,String> labels;
         Map<String,String> data;
@@ -33,6 +33,10 @@ public void writeConfigmap(String namespace, String name, Configmap cfg) {
                 data.put("uri", cfg.getUri());
                 configmap.setData(data);
                 client.configMaps().createOrReplace(configmap);
+                return true;
+            }
+            else {
+                return false;
             }
         }
         else {
@@ -46,6 +50,7 @@ public void writeConfigmap(String namespace, String name, Configmap cfg) {
             meta.setLabels(labels);
             configmap.setMetadata(meta);
             client.configMaps().create(configmap);
+            return true;
         }
     }
 }
diff --git a/src/test/java/de/svs/doido/mongo/ConfigmapApiTest.java b/src/test/java/de/svs/doido/mongo/ConfigmapApiTest.java
@@ -13,6 +13,7 @@
 import io.fabric8.kubernetes.api.model.Namespace;
 import io.fabric8.kubernetes.api.model.NamespaceBuilder;
 import io.fabric8.kubernetes.api.model.ConfigMap;
+import io.fabric8.kubernetes.api.model.ConfigMapList;
 import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
 
 import java.util.HashMap;
@@ -48,11 +49,12 @@ public void before() {
     @AfterEach
     public void after() {
         final Namespace namespace1 = new NamespaceBuilder().withNewMetadata().withName("namespaceA").and().build();
-        final ConfigMap cfgTest = new ConfigMapBuilder().withNewMetadata().withName("test").withNamespace("namespaceA").and().build();
 
         // Set up Kubernetes so that our "pretend" namespaces are deleted
         client.namespaces().resource(namespace1).delete();
-        client.configMaps().resource(cfgTest).delete();
+        for ( ConfigMapList cfg : client.configMaps().resource().list()) {
+            client.configMaps().delete(cfg);
+        }
     }