Skip to content

Commit 976a3d6

Browse files
committed
Volumes cleanup
1 parent cd8b684 commit 976a3d6

File tree

6 files changed

+1
-38
lines changed

6 files changed

+1
-38
lines changed

core/src/test/resources/filtered/mesh-interpolated.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ descriptors:
1010

1111
web-server-sink:
1212
type: "edge"
13-
volumes:
14-
repository-volume: {}
1513
containers:
1614
sink:
1715
image: "${config.image.interpolated}"

core/src/test/resources/filtered/mesh.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ descriptors:
1010

1111
web-server-sink:
1212
type: "edge"
13-
volumes:
14-
repository-volume: {}
1513
containers:
1614
sink:
1715
image: "ghcr.io/streamx-com/streamx-blueprints/web-server-sink:3.0.7-jvm"

e2e-tests/repository/web-server-sink/repository-volume/batch/publish/index.html

Lines changed: 0 additions & 1 deletion
This file was deleted.

e2e-tests/repository/web-server-sink/repository-volume/publish/index.html

Lines changed: 0 additions & 1 deletion
This file was deleted.

e2e-tests/src/test/java/dev/streamx/cli/StreamxCliPublicationIT.java

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package dev.streamx.cli;
22

33
import static dev.streamx.cli.test.tools.ResourcePathResolver.absolutePath;
4-
import static org.assertj.core.api.Assertions.fail;
54

65
import dev.streamx.cli.test.tools.terminal.TerminalCommandRunner;
76
import dev.streamx.cli.test.tools.terminal.process.ShellProcess;
@@ -11,14 +10,10 @@
1110
import jakarta.inject.Inject;
1211
import jakarta.inject.Named;
1312
import java.io.IOException;
14-
import java.nio.charset.StandardCharsets;
1513
import java.nio.file.Files;
1614
import java.nio.file.Path;
1715
import java.time.Duration;
18-
import org.apache.commons.io.IOUtils;
19-
import org.apache.commons.lang3.StringUtils;
2016
import org.eclipse.microprofile.config.inject.ConfigProperty;
21-
import org.jboss.logging.Logger;
2217
import org.junit.jupiter.api.BeforeAll;
2318
import org.junit.jupiter.api.Test;
2419
import org.junit.jupiter.api.TestInstance;
@@ -72,19 +67,7 @@ public void shouldPublishAndUnpublishPageUsingStreamOperation() {
7267
"Sent com.streamx.blueprints.page.published.v1 event using stream with key 'hello.html'"
7368
);
7469

75-
// TODO remove the catch
76-
try {
77-
validateStreamxPage("hello.html", "<b>Hello World!</b>");
78-
} catch (Throwable t) {
79-
String dockerPsOutput = readProcessOutput("docker ps");
80-
String containerLine = dockerPsOutput.lines()
81-
.filter(line -> line.contains("web-server-sink"))
82-
.findFirst().orElseThrow();
83-
String containerId = StringUtils.substringBefore(containerLine, " ");
84-
String logs = readProcessOutput("docker logs " + containerId);
85-
Logger log = Logger.getLogger(StreamxCliPublicationIT.class);
86-
log.info("\n---- DOCKER CONTAINER LOGS ---\n" + logs);
87-
}
70+
validateStreamxPage("hello.html", "<b>Hello World!</b>");
8871

8972
runStreamxIngestionCommand(
9073
"stream_v2",
@@ -95,18 +78,6 @@ public void shouldPublishAndUnpublishPageUsingStreamOperation() {
9578
validateStreamxPageNotAvailable("hello.html");
9679
}
9780

98-
private static String readProcessOutput(String command) {
99-
String[] words = command.split(" ");
100-
ProcessBuilder builder = new ProcessBuilder(words);
101-
builder.redirectErrorStream(true); // merge STDOUT + STDERR
102-
try {
103-
Process process = builder.start();
104-
return IOUtils.toString(process.getInputStream(), StandardCharsets.UTF_8);
105-
} catch (IOException ex) {
106-
return fail("Error reading output of command", ex);
107-
}
108-
}
109-
11081
@Test
11182
public void shouldPublishAndUnpublishPageUsingBatchOperation() {
11283
runStreamxIngestionCommand(

e2e-tests/src/test/resources/filtered/mesh.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ descriptors:
1010

1111
web-server-sink:
1212
type: "edge"
13-
volumes:
14-
repository-volume: {}
1513
containers:
1614
sink:
1715
image: "ghcr.io/streamx-com/streamx-blueprints/web-server-sink:3.0.7-jvm"

0 commit comments

Comments
 (0)