Catalog : fix maintainers (#267)

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

Hide file tree

Showing 5 changed files with 116 additions and 117 deletions.
diff --git a/onyxia-api/src/test/java/fr/insee/onyxia/api/dao/universe/CatalogLoaderTest.java b/onyxia-api/src/test/java/fr/insee/onyxia/api/dao/universe/CatalogLoaderTest.java
@@ -7,13 +7,16 @@
 import fr.insee.onyxia.api.configuration.CatalogWrapper;
 import fr.insee.onyxia.api.configuration.CustomObjectMapper;
 import fr.insee.onyxia.api.util.TestUtils;
+import fr.insee.onyxia.model.helm.Chart;
 import java.util.List;
+import java.util.stream.Collectors;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.util.CollectionUtils;
 
 @ExtendWith(SpringExtension.class)
 @SpringBootTest(classes = {CatalogLoader.class, CustomObjectMapper.class})
@@ -49,6 +52,27 @@ public void excludeChartTest() {
                         .noneMatch(p -> p.getName().equalsIgnoreCase("excludeme")));
     }
 
+    @Test
+    public void loadMaintainers() {
+        CatalogWrapper cw = new CatalogWrapper();
+        cw.setType("helm");
+        cw.setLocation("classpath:/catalog-loader-test");
+        cw.setExcludedCharts(List.of("excludemetoo", "excludeme"));
+        catalogLoader.updateCatalog(cw);
+        List<List<Chart.Maintainer>> maintainers =
+                cw.getCatalog().getPackages().stream()
+                        .map(p -> ((Chart) p).getMaintainers())
+                        .collect(Collectors.toList());
+        assertThat(
+                "Maintainers have been loaded",
+                maintainers.stream()
+                        .filter(l -> !CollectionUtils.isEmpty(l))
+                        .anyMatch(
+                                l ->
+                                        l.get(0).getName().equals("test")
+                                                && l.get(0).getEmail().equals("[email protected]")));
+    }
+
     @DisplayName(
             "Given a helm catalog wrapper with local charts and excluded charts, "
                     + "when we update the catalog, "

diff --git a/onyxia-api/src/test/resources/catalog-loader-test/index.yaml b/onyxia-api/src/test/resources/catalog-loader-test/index.yaml
@@ -1,93 +1,96 @@
 apiVersion: v1
 entries:
   keepme:
-  - apiVersion: v2
-    appVersion: "1"
-    created: "2022-10-03T11:53:20.589754116Z"
-    dependencies:
-    - name: argo-cd
-      repository: https://argoproj.github.io/argo-helm
-      version: 4.9.11
-    - name: library-chart
-      repository: https://inseefrlab.github.io/helm-charts-datascience
-      version: 2.0.21
-    description: Argo CD is a declarative, GitOps continuous delivery tool for Kubernetes.
-    digest: beedc71c7f5730cf68000b5665dd4da636e72a026edd9b12c1d048398d4166dd
-    home: https://argo-cd.readthedocs.io/en/stable/
-    icon: https://minio.lab.sspcloud.fr/projet-onyxia/assets/servicesImg/argo.png
-    name: keepme
-    sources:
-    - https://github.com/InseeFrLab/helm-charts-datascience/tree/master/charts/argo-cd
-    - https://github.com/argoproj/argo-helm/tree/master/charts/argo-cd
-    type: application
-    urls:
-    - keepeme1.gz
-    version: 2.4.0
-  - apiVersion: v2
-    appVersion: "2"
-    created: "2022-10-03T11:53:20.589754116Z"
-    dependencies:
-    - name: argo-cd
-      repository: https://argoproj.github.io/argo-helm
-      version: 4.9.11
-    - name: library-chart
-      repository: https://inseefrlab.github.io/helm-charts-datascience
-      version: 2.0.21
-    description: Argo CD is a declarative, GitOps continuous delivery tool for Kubernetes.
-    digest: beedc71c7f5730cf68000b5665dd4da636e72a026edd9b12c1d048398d4166dd
-    home: https://argo-cd.readthedocs.io/en/stable/
-    icon: https://minio.lab.sspcloud.fr/projet-onyxia/assets/servicesImg/argo.png
-    name: keepme
-    sources:
-    - https://github.com/InseeFrLab/helm-charts-datascience/tree/master/charts/argo-cd
-    - https://github.com/argoproj/argo-helm/tree/master/charts/argo-cd
-    type: application
-    urls:
-    - keepeme2.gz
-    version: 2.4.0
+    - apiVersion: v2
+      appVersion: "1"
+      created: "2022-10-03T11:53:20.589754116Z"
+      dependencies:
+        - name: argo-cd
+          repository: https://argoproj.github.io/argo-helm
+          version: 4.9.11
+        - name: library-chart
+          repository: https://inseefrlab.github.io/helm-charts-datascience
+          version: 2.0.21
+      description: Argo CD is a declarative, GitOps continuous delivery tool for Kubernetes.
+      digest: beedc71c7f5730cf68000b5665dd4da636e72a026edd9b12c1d048398d4166dd
+      home: https://argo-cd.readthedocs.io/en/stable/
+      icon: https://minio.lab.sspcloud.fr/projet-onyxia/assets/servicesImg/argo.png
+      name: keepme
+      sources:
+        - https://github.com/InseeFrLab/helm-charts-datascience/tree/master/charts/argo-cd
+        - https://github.com/argoproj/argo-helm/tree/master/charts/argo-cd
+      type: application
+      urls:
+        - keepeme1.gz
+      version: 2.4.0
+      maintainers:
+        - email: [email protected]
+          name: test
+    - apiVersion: v2
+      appVersion: "2"
+      created: "2022-10-03T11:53:20.589754116Z"
+      dependencies:
+        - name: argo-cd
+          repository: https://argoproj.github.io/argo-helm
+          version: 4.9.11
+        - name: library-chart
+          repository: https://inseefrlab.github.io/helm-charts-datascience
+          version: 2.0.21
+      description: Argo CD is a declarative, GitOps continuous delivery tool for Kubernetes.
+      digest: beedc71c7f5730cf68000b5665dd4da636e72a026edd9b12c1d048398d4166dd
+      home: https://argo-cd.readthedocs.io/en/stable/
+      icon: https://minio.lab.sspcloud.fr/projet-onyxia/assets/servicesImg/argo.png
+      name: keepme
+      sources:
+        - https://github.com/InseeFrLab/helm-charts-datascience/tree/master/charts/argo-cd
+        - https://github.com/argoproj/argo-helm/tree/master/charts/argo-cd
+      type: application
+      urls:
+        - keepeme2.gz
+      version: 2.4.0
   excludeme:
-  - apiVersion: v2
-    appVersion: "1"
-    created: "2022-10-03T11:53:20.589754116Z"
-    dependencies:
-    - name: argo-cd
-      repository: https://argoproj.github.io/argo-helm
-      version: 4.9.11
-    - name: library-chart
-      repository: https://inseefrlab.github.io/helm-charts-datascience
-      version: 2.0.21
-    description: Argo CD is a declarative, GitOps continuous delivery tool for Kubernetes.
-    digest: beedc71c7f5730cf68000b5665dd4da636e72a026edd9b12c1d048398d4166dd
-    home: https://argo-cd.readthedocs.io/en/stable/
-    icon: https://minio.lab.sspcloud.fr/projet-onyxia/assets/servicesImg/argo.png
-    name: excludeme
-    sources:
-    - https://github.com/InseeFrLab/helm-charts-datascience/tree/master/charts/argo-cd
-    - https://github.com/argoproj/argo-helm/tree/master/charts/argo-cd
-    type: application
-    urls:
-    - excludeme1.gz
-    version: 2.4.0
-  - apiVersion: v2
-    appVersion: "2"
-    created: "2022-10-03T11:53:20.589754116Z"
-    dependencies:
-    - name: argo-cd
-      repository: https://argoproj.github.io/argo-helm
-      version: 4.9.11
-    - name: library-chart
-      repository: https://inseefrlab.github.io/helm-charts-datascience
-      version: 2.0.21
-    description: Argo CD is a declarative, GitOps continuous delivery tool for Kubernetes.
-    digest: beedc71c7f5730cf68000b5665dd4da636e72a026edd9b12c1d048398d4166dd
-    home: https://argo-cd.readthedocs.io/en/stable/
-    icon: https://minio.lab.sspcloud.fr/projet-onyxia/assets/servicesImg/argo.png
-    name: excludeme
-    sources:
-    - https://github.com/InseeFrLab/helm-charts-datascience/tree/master/charts/argo-cd
-    - https://github.com/argoproj/argo-helm/tree/master/charts/argo-cd
-    type: application
-    urls:
-    - excludeme2.gz
-    version: 2.4.0
+    - apiVersion: v2
+      appVersion: "1"
+      created: "2022-10-03T11:53:20.589754116Z"
+      dependencies:
+        - name: argo-cd
+          repository: https://argoproj.github.io/argo-helm
+          version: 4.9.11
+        - name: library-chart
+          repository: https://inseefrlab.github.io/helm-charts-datascience
+          version: 2.0.21
+      description: Argo CD is a declarative, GitOps continuous delivery tool for Kubernetes.
+      digest: beedc71c7f5730cf68000b5665dd4da636e72a026edd9b12c1d048398d4166dd
+      home: https://argo-cd.readthedocs.io/en/stable/
+      icon: https://minio.lab.sspcloud.fr/projet-onyxia/assets/servicesImg/argo.png
+      name: excludeme
+      sources:
+        - https://github.com/InseeFrLab/helm-charts-datascience/tree/master/charts/argo-cd
+        - https://github.com/argoproj/argo-helm/tree/master/charts/argo-cd
+      type: application
+      urls:
+        - excludeme1.gz
+      version: 2.4.0
+    - apiVersion: v2
+      appVersion: "2"
+      created: "2022-10-03T11:53:20.589754116Z"
+      dependencies:
+        - name: argo-cd
+          repository: https://argoproj.github.io/argo-helm
+          version: 4.9.11
+        - name: library-chart
+          repository: https://inseefrlab.github.io/helm-charts-datascience
+          version: 2.0.21
+      description: Argo CD is a declarative, GitOps continuous delivery tool for Kubernetes.
+      digest: beedc71c7f5730cf68000b5665dd4da636e72a026edd9b12c1d048398d4166dd
+      home: https://argo-cd.readthedocs.io/en/stable/
+      icon: https://minio.lab.sspcloud.fr/projet-onyxia/assets/servicesImg/argo.png
+      name: excludeme
+      sources:
+        - https://github.com/InseeFrLab/helm-charts-datascience/tree/master/charts/argo-cd
+        - https://github.com/argoproj/argo-helm/tree/master/charts/argo-cd
+      type: application
+      urls:
+        - excludeme2.gz
+      version: 2.4.0
 
diff --git a/onyxia-api/src/test/resources/multiverse.json b/onyxia-api/src/test/resources/multiverse.json
diff --git a/onyxia-api/src/test/resources/sample-helm.yaml b/onyxia-api/src/test/resources/sample-helm.yaml
diff --git a/onyxia-model/src/main/java/fr/insee/onyxia/model/helm/Chart.java b/onyxia-model/src/main/java/fr/insee/onyxia/model/helm/Chart.java
@@ -249,7 +249,7 @@ public void setAdditionalProperty(String name, Object value) {
         this.additionalProperties.put(name, value);
     }
 
-    private class Maintainer {
+    public static class Maintainer {
         @JsonProperty("email")
         private String email;