Skip to content

Commit 8d0d3d7

Browse files
DXP-1110 Updated to new mesh definition (#122)
1 parent 74fbf2d commit 8d0d3d7

File tree

6 files changed

+21
-27
lines changed

6 files changed

+21
-27
lines changed
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
server {
2+
listen 80;
3+
listen [::]:80;
4+
server_name localhost;
5+
6+
location /overridden {
7+
alias /usr/share/nginx/html;
8+
}
9+
}
10+

e2e-tests/src/main/java/dev/streamx/cli/StreamxTerminalCommandProducer.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@ public StreamxTerminalCommand produce() {
2525
}
2626

2727
public String built() {
28-
return "java -jar " + findStreamxJar();
28+
return "java %s -jar %s".formatted(createParameters(), findStreamxJar());
29+
}
30+
31+
private static String createParameters() {
32+
return "-Dstreamx.runner.observability.enabled=false";
2933
}
3034

3135
private String findStreamxJar() {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
public class StreamxCliPublicationIT {
2626

2727
private static final int CLI_SHORT_TIMEOUT_IN_SEC = 2;
28-
@ConfigProperty(name = "streamx.cli.e2e.web.delivery.port.url", defaultValue = "http://localhost:8087/")
28+
@ConfigProperty(name = "streamx.cli.e2e.web.delivery.url", defaultValue = "http://localhost:8087/")
2929
String webDeliveryPortUrl;
30-
@ConfigProperty(name = "streamx.cli.e2e.nginx.port.url", defaultValue = "http://localhost:8089/")
30+
@ConfigProperty(name = "streamx.cli.e2e.nginx.url", defaultValue = "http://localhost:8089/overridden/")
3131
String nginxPortUrl;
3232

3333
@ConfigProperty(name = "streamx.cli.e2e.setup.timeoutInSec", defaultValue = "60")

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ delivery:
3838
ports:
3939
- 8089:80
4040
repositoryVolume: "/usr/share/nginx/html"
41-
volumes:
42-
- "${project.basedir}/target/test-classes/overridden-nginx-conf:/etc/nginx/conf.d/default.conf"
41+
volumesFrom:
42+
configs:
43+
- "overridden-nginx-conf:/etc/nginx/conf.d/default.conf"
4344

e2e-tests/src/test/resources/filtered/overridden-nginx-conf

Lines changed: 0 additions & 21 deletions
This file was deleted.

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
4040
<quarkus.platform.version>3.13.3</quarkus.platform.version>
4141

42-
<streamx.version>0.0.46</streamx.version>
42+
<streamx.version>1.0.0</streamx.version>
4343
<json-path.version>2.9.0</json-path.version>
4444
<assertj-core.version>3.24.2</assertj-core.version>
4545
<wiremock.version>3.3.1</wiremock.version>

0 commit comments

Comments
 (0)