[DXP-1821] Windows fixes (#211)

jgardo-ds · web-flow · commit 8679a9935653 · 2025-04-24T16:12:31.000+02:00
diff --git a/.github/workflows/ci-test-build.yaml b/.github/workflows/ci-test-build.yaml
@@ -11,7 +11,7 @@ permissions:
   contents: read
 
 jobs:
-  test-build:
+  linux-test-build:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -36,3 +36,28 @@ jobs:
       - name: Build project
         run: |
           ./mvnw clean verify -P all-tests
+  windows-test-build:
+    runs-on: windows-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - id: 'auth'
+        name: 'Authenticate to Google Cloud'
+        uses: 'google-github-actions/auth@v2'
+        with:
+          workload_identity_provider: ${{ secrets.GCP_STREAMX_RELEASES_WORKLOAD_IDENTITY_PROVIDER }}
+          service_account: ${{ secrets.GCP_STREAMX_RELEASES_READ_SA }}
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'adopt'
+          cache: 'maven'
+
+      - name: Build project
+        run: |
+          ./mvnw clean verify "-Djacoco.skip=true" -P all-tests
diff --git a/core/src/main/java/dev/streamx/cli/ParameterExceptionHandler.java b/core/src/main/java/dev/streamx/cli/ParameterExceptionHandler.java
@@ -28,11 +28,12 @@ public int handleParseException(ParameterException ex, String[] args) {
     writer.println(cmd.getHelp().fullSynopsis());
 
     CommandSpec spec = cmd.getCommandSpec();
-    writer.printf("Try '%s --help' for more information.%n", spec.qualifiedName());
+    writer.printf("Try '%s --help' for more information.", spec.qualifiedName());
+    writer.println();
 
     if (cmd.getExitCodeExceptionMapper() != null) {
       return cmd.getExitCodeExceptionMapper().getExitCode(ex);
     }
     return spec.exitCodeOnInvalidInput();
   }
-}
+}
diff --git a/core/src/main/java/dev/streamx/cli/command/ingestion/batch/BatchCommand.java b/core/src/main/java/dev/streamx/cli/command/ingestion/batch/BatchCommand.java
@@ -89,7 +89,8 @@ protected void doRun(StreamxClient client) throws StreamxClientException {
     } catch (FileIngestionException e) {
       throw new RuntimeException(
           ExceptionUtils.appendLogSuggestion(
-              "Error performing batch publication while processing '" + e.getPath() + "' file.\n"
+              "Error performing batch publication while processing '"
+              + FileUtils.toString(e.getPath()) + "' file.\n"
               + "\n"
               + "Details:\n"
               + e.getCause().getMessage()), e);
@@ -135,12 +136,12 @@ private void updateCommandState(Path file, EventSourceDescriptor eventSource) {
 
     String relativePath = calculateRelativePath(file, eventSource);
     Map<String, String> variables = substitutor.createSubstitutionVariables(
-        file.toString(), eventSource.getChannel(), relativePath);
+        FileUtils.toString(file), eventSource.getChannel(), relativePath);
 
     String key = substitutor.substitute(variables, eventSource.getKey());
     JsonNode message = executeHandlingException(
         () -> payloadResolver.createPayload(eventSource, variables),
-        () -> "Could not resolve payload for file '" + file + "'"
+        () -> "Could not resolve payload for file '" + FileUtils.toString(file) + "'"
     );
 
     Map<String, String> properties = createProperties(eventSource, variables);
@@ -177,11 +178,11 @@ private <T> T executeHandlingException(Supplier<T> function,
   private String calculateRelativePath(Path file, EventSourceDescriptor eventSource) {
     String relativePath;
     if (eventSource.getRelativePathLevel() == null) {
-      relativePath = Path.of(batchIngestionArguments.getSourceDirectory()).relativize(file)
-          .toString();
+      relativePath = FileUtils.toString(
+          Path.of(batchIngestionArguments.getSourceDirectory()).relativize(file));
     } else {
-      relativePath = FileUtils.getNthParent(eventSource.getSource(),
-          eventSource.getRelativePathLevel()).relativize(file).toString();
+      relativePath = FileUtils.toString(FileUtils.getNthParent(eventSource.getSource(),
+          eventSource.getRelativePathLevel()).relativize(file));
     }
     return relativePath;
   }
diff --git a/core/src/main/java/dev/streamx/cli/command/ingestion/batch/walker/EventSourceFileTreeWalker.java b/core/src/main/java/dev/streamx/cli/command/ingestion/batch/walker/EventSourceFileTreeWalker.java
@@ -90,7 +90,7 @@ private void processDirectory(Path dir, EventSourceDescriptor currentDescriptor)
         for (Path entry : stream) {
           if (Files.isRegularFile(entry)
               // Skip .eventsource.yaml files
-              && !EventSourceDescriptor.FILENAME.equals(entry.getFileName().toString())
+              && !EventSourceDescriptor.FILENAME.equals(FileUtils.toString(entry.getFileName()))
               && noIgnorePatternMatches(entry, currentDescriptor)) {
             processor.apply(entry, currentDescriptor);
           }
@@ -109,8 +109,8 @@ private boolean noIgnorePatternMatches(Path payloadFile, EventSourceDescriptor d
     }
 
     int level = descriptor.getRelativePathLevel() == null ? 0 : descriptor.getRelativePathLevel();
-    String relativePath = FileUtils.getNthParent(descriptor.getSource(), level)
-        .relativize(payloadFile).toString();
+    String relativePath = FileUtils.toString(FileUtils.getNthParent(descriptor.getSource(), level)
+        .relativize(payloadFile));
 
     // Check against each ignore pattern.
     for (String regex : patterns) {
diff --git a/core/src/main/java/dev/streamx/cli/command/ingestion/stream/StreamCommand.java b/core/src/main/java/dev/streamx/cli/command/ingestion/stream/StreamCommand.java
@@ -7,6 +7,7 @@
 import dev.streamx.cli.command.ingestion.BaseIngestionCommand;
 import dev.streamx.cli.command.ingestion.stream.parser.StreamIngestionJsonParser;
 import dev.streamx.cli.util.ExceptionUtils;
+import dev.streamx.cli.util.FileUtils;
 import dev.streamx.clients.ingestion.exceptions.StreamxClientException;
 import dev.streamx.clients.ingestion.publisher.Publisher;
 import dev.streamx.clients.ingestion.publisher.SuccessResult;
@@ -57,10 +58,11 @@ protected void perform(Publisher<JsonNode> publisher) throws StreamxClientExcept
     } catch (IOException | IllegalArgumentException e) {
       throw new RuntimeException(
           ExceptionUtils.appendLogSuggestion(
-              "Error performing stream publication using '" + streamFile + "' file.\n"
-                  + "\n"
-                  + "Details:\n"
-                  + e.getMessage()), e);
+              "Error performing stream publication using '"
+              + FileUtils.toString(streamFile) + "' file.\n"
+              + "\n"
+              + "Details:\n"
+              + e.getMessage()), e);
     }
   }
 
@@ -70,4 +72,4 @@ private static String getRequiredProperty(JsonNode message, String property) {
     }
     return message.get(property).asText();
   }
-}
+}
diff --git a/core/src/main/java/dev/streamx/cli/command/init/project/template/ProdProjectTemplateSource.java b/core/src/main/java/dev/streamx/cli/command/init/project/template/ProdProjectTemplateSource.java
@@ -3,7 +3,7 @@
 public class ProdProjectTemplateSource implements ProjectTemplateSource {
 
   public static final String PROD_PROJECT_TEMPLATE_SOURCE_URL =
-      "git@github.com:streamx-dev/streamx-sample-project.git";
+      "https://github.com/streamx-dev/streamx-sample-project.git";
 
   @Override
   public String getRepoUrl() {
diff --git a/core/src/main/java/dev/streamx/cli/settings/SettingsStore.java b/core/src/main/java/dev/streamx/cli/settings/SettingsStore.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import dev.streamx.cli.exception.SettingsFileException;
+import dev.streamx.cli.util.FileUtils;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import java.io.IOException;
@@ -31,7 +32,7 @@ public <T> Optional<T> retrieveSettings(String settingFile, Class<T> clazz) {
         return Optional.empty();
       }
     } catch (IOException e) {
-      throw new SettingsFileException(path.toString(), e);
+      throw new SettingsFileException(FileUtils.toString(path), e);
     }
   }
 
@@ -43,13 +44,13 @@ public <T> void updateSettings(String settingFile, T settings) {
         Files.createDirectories(rootPath);
       }
     } catch (IOException e) {
-      throw new SettingsFileException(path.toString(), e);
+      throw new SettingsFileException(FileUtils.toString(path), e);
     }
 
     try {
       objectMapper.writeValue(path.toFile(), settings);
     } catch (IOException e) {
-      throw new SettingsFileException(path.toString(), e);
+      throw new SettingsFileException(FileUtils.toString(path), e);
     }
   }
 
diff --git a/core/src/main/java/dev/streamx/cli/util/FileUtils.java b/core/src/main/java/dev/streamx/cli/util/FileUtils.java
@@ -42,4 +42,8 @@ public static Path getNthParent(Path path, int n) {
     }
     return current;
   }
+
+  public static String toString(Path path) {
+    return path.toString().replace("\\", "/");
+  }
 }
diff --git a/core/src/test/java/dev/streamx/cli/OsUtils.java b/core/src/test/java/dev/streamx/cli/OsUtils.java
@@ -0,0 +1,18 @@
+package dev.streamx.cli;
+
+import dev.streamx.runner.validation.DockerEnvironmentValidator;
+import org.apache.commons.lang3.StringEscapeUtils;
+
+public class OsUtils {
+  public static final String ESCAPED_LINE_SEPARATOR =
+      StringEscapeUtils.escapeJson(System.lineSeparator());
+
+  public static boolean isDockerAvailable() {
+    try {
+      new DockerEnvironmentValidator().validateDockerClient();
+      return true;
+    } catch (Exception e) {
+      return false;
+    }
+  }
+}
diff --git a/core/src/test/java/dev/streamx/cli/command/cloud/ProjectUtils.java b/core/src/test/java/dev/streamx/cli/command/cloud/ProjectUtils.java
@@ -26,7 +26,8 @@ public static Path getProjectPath() {
   public static String getResource(String resourceName) throws IOException {
     try (InputStream is = ServiceMeshResolverTest.class.getResourceAsStream(
         PROJECT_PATH + resourceName)) {
-      return new String(is.readAllBytes(), StandardCharsets.UTF_8);
+      return new String(is.readAllBytes(), StandardCharsets.UTF_8)
+          .replace("\r\n", "\n");
     }
   }
 }
diff --git a/core/src/test/java/dev/streamx/cli/command/cloud/deploy/DeployCommandIT.java b/core/src/test/java/dev/streamx/cli/command/cloud/deploy/DeployCommandIT.java
@@ -10,8 +10,10 @@
 import io.quarkus.test.junit.main.QuarkusMainTest;
 import java.nio.file.Path;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
 
 @QuarkusMainTest
+@EnabledIf("dev.streamx.cli.OsUtils#isDockerAvailable")
 @TestProfile(KubernetesClientProfile.class)
 public class DeployCommandIT {
 
diff --git a/core/src/test/java/dev/streamx/cli/command/cloud/undeploy/UndeployCommandIT.java b/core/src/test/java/dev/streamx/cli/command/cloud/undeploy/UndeployCommandIT.java
@@ -8,8 +8,10 @@
 import io.quarkus.test.junit.main.QuarkusMainLauncher;
 import io.quarkus.test.junit.main.QuarkusMainTest;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
 
 @QuarkusMainTest
+@EnabledIf("dev.streamx.cli.OsUtils#isDockerAvailable")
 @TestProfile(KubernetesClientProfile.class)
 class UndeployCommandIT {
 
@@ -19,4 +21,4 @@ void shouldUndeployProject(QuarkusMainLauncher launcher) {
     assertThat(result.getOutput()).contains(
         "StreamX project successfully undeployed from 'default' namespace.");
   }
-}
+}
diff --git a/core/src/test/java/dev/streamx/cli/command/dev/DevCommandTest.java b/core/src/test/java/dev/streamx/cli/command/dev/DevCommandTest.java
@@ -39,13 +39,15 @@
 import org.jetbrains.annotations.NotNull;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
 import org.junit.jupiter.api.io.TempDir;
 import org.testcontainers.DockerClientFactory;
 import org.testcontainers.shaded.com.github.dockerjava.core.command.ExecStartResultCallback;
 import org.testcontainers.shaded.org.apache.commons.io.IOUtils;
 
 
 @QuarkusMainTest
+@EnabledIf("dev.streamx.cli.OsUtils#isDockerAvailable")
 @TestProfile(DevCommandProfile.class)
 class DevCommandTest {
 
diff --git a/core/src/test/java/dev/streamx/cli/command/dev/DockerValidatorTest.java b/core/src/test/java/dev/streamx/cli/command/dev/DockerValidatorTest.java
@@ -17,13 +17,15 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 import org.mockito.Mockito;
 import org.testcontainers.DockerClientFactory;
 
 
 @QuarkusTest
+@EnabledIf("dev.streamx.cli.OsUtils#isDockerAvailable")
 class DockerValidatorTest {
 
   public static final String HELLO_WORLD_IMAGE = "hello-world:latest";
diff --git a/core/src/test/java/dev/streamx/cli/command/ingestion/BaseIngestionCommandTest.java b/core/src/test/java/dev/streamx/cli/command/ingestion/BaseIngestionCommandTest.java
@@ -48,7 +48,7 @@ protected static void expectSuccess(LaunchResult result) {
 
   protected static void expectError(LaunchResult result, String expectedErrorOutput) {
     assertThat(result.exitCode()).isNotZero();
-    assertThat(result.getErrorOutput()).contains(expectedErrorOutput);
+    assertThat(result.getErrorOutput().replace("\r\n", "\n")).contains(expectedErrorOutput);
   }
 
   protected static void setupMockChannelsSchemasResponse() {
diff --git a/core/src/test/java/dev/streamx/cli/command/ingestion/batch/BatchPublishCommandTest.java b/core/src/test/java/dev/streamx/cli/command/ingestion/batch/BatchPublishCommandTest.java
@@ -8,6 +8,7 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
 import static com.github.tomakehurst.wiremock.common.ContentTypes.APPLICATION_JSON;
 import static com.github.tomakehurst.wiremock.common.ContentTypes.CONTENT_TYPE;
+import static dev.streamx.cli.OsUtils.ESCAPED_LINE_SEPARATOR;
 import static org.apache.hc.core5.http.HttpStatus.SC_ACCEPTED;
 import static org.apache.hc.core5.http.HttpStatus.SC_BAD_REQUEST;
 
@@ -126,12 +127,12 @@ public void shouldBatchPublishValidDirectory(QuarkusMainLauncher launcher) {
                 "payload" : {
                   "dev.streamx.blueprints.data.Page" : {
                     "content" : {
-                      "bytes" : "<h1>Hello World!</h1>\\n"
+                      "bytes" : "<h1>Hello World!</h1>%s"
                     }
                   }
                 }
               }
-              """))
+              """.formatted(ESCAPED_LINE_SEPARATOR)))
           .withoutHeader("Authorization"));
       wm.verify(1, postRequestedFor(urlEqualTo(getPublicationPath(CHANNEL))));
     }
diff --git a/core/src/test/java/dev/streamx/cli/command/ingestion/batch/BatchUnpublishCommandTest.java b/core/src/test/java/dev/streamx/cli/command/ingestion/batch/BatchUnpublishCommandTest.java
@@ -8,6 +8,7 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
 import static com.github.tomakehurst.wiremock.common.ContentTypes.APPLICATION_JSON;
 import static com.github.tomakehurst.wiremock.common.ContentTypes.CONTENT_TYPE;
+import static dev.streamx.cli.OsUtils.ESCAPED_LINE_SEPARATOR;
 import static org.apache.hc.core5.http.HttpStatus.SC_ACCEPTED;
 import static org.apache.hc.core5.http.HttpStatus.SC_BAD_REQUEST;
 
@@ -114,12 +115,12 @@ public void shouldUnpublishUsingAuthorizedIngestionClient(QuarkusMainLauncher la
                     "payload" : {
                       "dev.streamx.blueprints.data.Page" : {
                         "content" : {
-                          "bytes" : "<h1>Hello World!</h1>\\n"
+                          "bytes" : "<h1>Hello World!</h1>%s"
                         }
                       }
                     }
                   }
-              """.formatted("valid/" + KEY), true, true))
+              """.formatted("valid/" + KEY, ESCAPED_LINE_SEPARATOR), true, true))
               .withHeader("Authorization", new ContainsPattern(AuthorizedProfile.AUTH_TOKEN)));
     }
   }
diff --git a/core/src/test/java/dev/streamx/cli/command/run/RunCommandTest.java b/core/src/test/java/dev/streamx/cli/command/run/RunCommandTest.java
@@ -23,8 +23,10 @@
 import org.awaitility.Awaitility;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIf;
 
 @QuarkusMainTest
+@EnabledIf("dev.streamx.cli.OsUtils#isDockerAvailable")
 @TestProfile(RunCommandProfile.class)
 public class RunCommandTest {
 
diff --git a/e2e-tests/pom.xml b/e2e-tests/pom.xml
@@ -43,6 +43,11 @@
       <artifactId>quarkus-junit5</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>dev.streamx</groupId>
+      <artifactId>streamx-runner</artifactId>
+      <scope>test</scope>
+    </dependency>
 
   </dependencies>
 
diff --git a/e2e-tests/src/main/java/dev/streamx/cli/StreamxTerminalCommandProducer.java b/e2e-tests/src/main/java/dev/streamx/cli/StreamxTerminalCommandProducer.java
@@ -40,7 +40,7 @@ private String findStreamxJar() {
         .map(File::listFiles)
         .flatMap(Stream::of)
         .map(File::getAbsolutePath)
-        .filter(p -> pattern.matcher(p).matches())
+        .filter(p -> pattern.matcher(p.replace("\\", "/")).matches())
         .findFirst()
         .orElseThrow(() -> new RuntimeException("Could not find streamx Jar"));
   }
diff --git a/e2e-tests/src/main/java/dev/streamx/cli/test/tools/ResourcePathResolver.java b/e2e-tests/src/main/java/dev/streamx/cli/test/tools/ResourcePathResolver.java
@@ -13,6 +13,6 @@ public static String absolutePath(String fileName) {
     } catch (Exception e) {
       throw new RuntimeException("Can not get file path", e);
     }
-    return path.toAbsolutePath().toString();
+    return path.toAbsolutePath().toString().replace("\\", "/");
   }
 }
diff --git a/e2e-tests/src/test/java/dev/streamx/cli/OsUtils.java b/e2e-tests/src/test/java/dev/streamx/cli/OsUtils.java
@@ -0,0 +1,14 @@
+package dev.streamx.cli;
+
+import dev.streamx.runner.validation.DockerEnvironmentValidator;
+
+public class OsUtils {
+  public static boolean isDockerAvailable() {
+    try {
+      new DockerEnvironmentValidator().validateDockerClient();
+      return true;
+    } catch (Exception e) {
+      return false;
+    }
+  }
+}
diff --git a/e2e-tests/src/test/java/dev/streamx/cli/StreamxCliPublicationIT.java b/e2e-tests/src/test/java/dev/streamx/cli/StreamxCliPublicationIT.java

Original file line number	Diff line number	Diff line change
`@@ -28,11 +28,12 @@ public int handleParseException(ParameterException ex, String[] args) {`
`28`	`28`	`writer.println(cmd.getHelp().fullSynopsis());`
`29`	`29`
`30`	`30`	`CommandSpec spec = cmd.getCommandSpec();`
`31`		`- writer.printf("Try '%s --help' for more information.%n", spec.qualifiedName());`
	`31`	`+ writer.printf("Try '%s --help' for more information.", spec.qualifiedName());`
	`32`	`+ writer.println();`
`32`	`33`
`33`	`34`	`if (cmd.getExitCodeExceptionMapper() != null) {`
`34`	`35`	`return cmd.getExitCodeExceptionMapper().getExitCode(ex);`
`35`	`36`	`}`
`36`	`37`	`return spec.exitCodeOnInvalidInput();`
`37`	`38`	`}`
`38`		`-}`
	`39`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`import com.fasterxml.jackson.databind.ObjectMapper;`
`4`	`4`	`import dev.streamx.cli.exception.SettingsFileException;`
	`5`	`+import dev.streamx.cli.util.FileUtils;`
`5`	`6`	`import jakarta.enterprise.context.ApplicationScoped;`
`6`	`7`	`import jakarta.inject.Inject;`
`7`	`8`	`import java.io.IOException;`
`@@ -31,7 +32,7 @@ public <T> Optional<T> retrieveSettings(String settingFile, Class<T> clazz) {`
`31`	`32`	`return Optional.empty();`
`32`	`33`	`}`
`33`	`34`	`} catch (IOException e) {`
`34`		`- throw new SettingsFileException(path.toString(), e);`
	`35`	`+ throw new SettingsFileException(FileUtils.toString(path), e);`
`35`	`36`	`}`
`36`	`37`	`}`
`37`	`38`
`@@ -43,13 +44,13 @@ public <T> void updateSettings(String settingFile, T settings) {`
`43`	`44`	`Files.createDirectories(rootPath);`
`44`	`45`	`}`
`45`	`46`	`} catch (IOException e) {`
`46`		`- throw new SettingsFileException(path.toString(), e);`
	`47`	`+ throw new SettingsFileException(FileUtils.toString(path), e);`
`47`	`48`	`}`
`48`	`49`
`49`	`50`	`try {`
`50`	`51`	`objectMapper.writeValue(path.toFile(), settings);`
`51`	`52`	`} catch (IOException e) {`
`52`		`- throw new SettingsFileException(path.toString(), e);`
	`53`	`+ throw new SettingsFileException(FileUtils.toString(path), e);`
`53`	`54`	`}`
`54`	`55`	`}`
`55`	`56`
Original file line number	Diff line number	Diff line change
`@@ -42,4 +42,8 @@ public static Path getNthParent(Path path, int n) {`
`42`	`42`	`}`
`43`	`43`	`return current;`
`44`	`44`	`}`
	`45`	`+`
	`46`	`+ public static String toString(Path path) {`
	`47`	`+ return path.toString().replace("\\", "/");`
	`48`	`+ }`
`45`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,8 @@ public static Path getProjectPath() {`
`26`	`26`	`public static String getResource(String resourceName) throws IOException {`
`27`	`27`	`try (InputStream is = ServiceMeshResolverTest.class.getResourceAsStream(`
`28`	`28`	`PROJECT_PATH + resourceName)) {`
`29`		`- return new String(is.readAllBytes(), StandardCharsets.UTF_8);`
	`29`	`+ return new String(is.readAllBytes(), StandardCharsets.UTF_8)`
	`30`	`+ .replace("\r\n", "\n");`
`30`	`31`	`}`
`31`	`32`	`}`
`32`	`33`	`}`