Merge pull request #68 from xenit-eu/ACC-2367

ACC-2367 Deal with "wrong version" case in 'helm dependency list' command

Author: thijslemmens

contentgrid-helm-client/src/main/java/com/contentgrid/helm/impl/DefaultHelmDependencyCommand.java

@@ -23,9 +23,15 @@ class DefaultHelmDependencyCommand implements HelmDependencyCommand {
     public List<HelmDependency> list(String chart) {
         return Arrays.stream(this.executor.call(CMD_DEPENDENCY, "list", chart).split(System.lineSeparator()))
                 .skip(1) // skip header
-                .filter(Objects::nonNull)
-                .map(line -> line.split("\\s+"))
-                .filter(parts -> parts.length == 4)
+                .map(line -> {
+                    String[] parts = line.split("\\s+", 4);
+                    if (parts.length == 4) {
+                        parts[3] = parts[3].trim(); // Trim the last part
+                    } else {
+                        throw new IllegalStateException("Unexpected dependency list line: " + line);
+                    }
+                    return parts;
+                })
                 .map(parts -> createHelmDependency(parts[0], parts[1], parts[2], parts[3]))
                 .toList();
     }

contentgrid-helm-client/src/test/java/com/contentgrid/helm/impl/HelmDependencyCommandTest.java

@@ -29,17 +29,66 @@ void listDependency(@TempDir Path workingDirectory) throws Exception {
                         dependencies:
                           - name: keycloakx
                             repository: https://codecentric.github.io/helm-charts
-                            version: "2.3.0"    
+                            version: "2.3.0"
+                          - name: external-secrets
+                            version: 0.20.2
+                            repository: "https://charts.external-secrets.io/"
+                          - name: cert-manager
+                            repository: https://charts.jetstack.io/
+                            version: v1.17.2
                         """,
                 StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING);
 
+
+        // Copy test charts to working directory
+        var classLoader = getClass().getClassLoader();
+        var resource = classLoader.getResource("com/contentgrid/helm/impl/list-dependency/charts");
+        Assertions.assertThat(resource).isNotNull();
+
+        Path sourceChartsDir = Path.of(resource.toURI());
+        Path targetChartsDir = workingDirectory.resolve("charts");
+        Files.createDirectories(targetChartsDir);
+
+        try (var files = Files.list(sourceChartsDir)) {
+            files.filter(path -> path.toString().endsWith(".tgz"))
+                    .forEach(sourcePath -> {
+                        try {
+                            Path targetPath = targetChartsDir.resolve(sourcePath.getFileName());
+                            Files.copy(sourcePath, targetPath);
+                        } catch (Exception e) {
+                            throw new RuntimeException("Failed to copy chart: " + sourcePath, e);
+                        }
+                    });
+        }
+
+
         var result = helm.dependency().list();
 
-        Assertions.assertThat(result).singleElement().satisfies(dep -> {
-            Assertions.assertThat(dep.name()).isEqualTo("keycloakx");
-            Assertions.assertThat(dep.repository()).isEqualTo(URI.create("https://codecentric.github.io/helm-charts"));
-            Assertions.assertThat(dep.version()).isEqualTo("2.3.0");
-        });
+        Assertions.assertThat(result)
+                .hasSize(3)
+                .satisfiesExactlyInAnyOrder(
+                        dep -> {
+                            Assertions.assertThat(dep.name()).isEqualTo("keycloakx");
+                            Assertions.assertThat(dep.repository())
+                                    .isEqualTo(URI.create("https://codecentric.github.io/helm-charts"));
+                            Assertions.assertThat(dep.version()).isEqualTo("2.3.0");
+                            Assertions.assertThat(dep.status()).isEqualTo("missing");
+                        },
+                        dep -> {
+                            Assertions.assertThat(dep.name()).isEqualTo("external-secrets");
+                            Assertions.assertThat(dep.repository())
+                                    .isEqualTo(URI.create("https://charts.external-secrets.io/"));
+                            Assertions.assertThat(dep.version()).isEqualTo("0.20.2");
+                            Assertions.assertThat(dep.status()).isEqualTo("wrong version");
+                        },
+                        dep -> {
+                            Assertions.assertThat(dep.name()).isEqualTo("cert-manager");
+                            Assertions.assertThat(dep.repository())
+                                    .isEqualTo(URI.create("https://charts.jetstack.io/"));
+                            Assertions.assertThat(dep.version()).isEqualTo("v1.17.2");
+                            Assertions.assertThat(dep.status()).isEqualTo("ok");
+                        }
+                );
     }
 
 }