From 2eb55e8ddb028001553281645ec6bb6eeb184b46 Mon Sep 17 00:00:00 2001 From: Simon Schrottner Date: Fri, 22 Nov 2024 17:42:22 +0100 Subject: [PATCH 1/2] ci(flagd): remove sync server as it is part of flagd by now Signed-off-by: Simon Schrottner --- .../contrib/providers/flagd/e2e/ContainerConfig.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/ContainerConfig.java b/providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/ContainerConfig.java index f9f594b57..1df19bc2a 100644 --- a/providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/ContainerConfig.java +++ b/providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/ContainerConfig.java @@ -38,9 +38,9 @@ public static GenericContainer sync() { * @return a {@link org.testcontainers.containers.GenericContainer} instance of a sync flagd server with the port 9090 exposed */ public static GenericContainer sync(boolean unstable, boolean addNetwork) { - String container = generateContainerName("sync", unstable); + String container = generateContainerName("flagd", unstable); GenericContainer genericContainer = new GenericContainer(DockerImageName.parse(container)) - .withExposedPorts(9090); + .withExposedPorts(8015); if (addNetwork) { genericContainer.withNetwork(network); From 3ed5b24e3dd711967a3a7cedda6422fa48361b46 Mon Sep 17 00:00:00 2001 From: Simon Schrottner Date: Fri, 22 Nov 2024 17:44:23 +0100 Subject: [PATCH 2/2] fixup: changing ports in doc and envoy Signed-off-by: Simon Schrottner --- .../contrib/providers/flagd/e2e/ContainerConfig.java | 4 ++-- .../flagd/src/test/resources/envoy-config/envoy-custom.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/ContainerConfig.java b/providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/ContainerConfig.java index 1df19bc2a..0d51ef9e5 100644 --- a/providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/ContainerConfig.java +++ b/providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/ContainerConfig.java @@ -34,8 +34,8 @@ public static GenericContainer sync() { /** * * @param unstable if an unstable version of the container, which terminates the connection regularly should be used. - * @param addNetwork if set to true a custom network is attached for cross container access e.g. envoy --> sync:9090 - * @return a {@link org.testcontainers.containers.GenericContainer} instance of a sync flagd server with the port 9090 exposed + * @param addNetwork if set to true a custom network is attached for cross container access e.g. envoy --> sync:8015 + * @return a {@link org.testcontainers.containers.GenericContainer} instance of a sync flagd server with the port 8015 exposed */ public static GenericContainer sync(boolean unstable, boolean addNetwork) { String container = generateContainerName("flagd", unstable); diff --git a/providers/flagd/src/test/resources/envoy-config/envoy-custom.yaml b/providers/flagd/src/test/resources/envoy-config/envoy-custom.yaml index 758a46b6d..fb945e956 100644 --- a/providers/flagd/src/test/resources/envoy-config/envoy-custom.yaml +++ b/providers/flagd/src/test/resources/envoy-config/envoy-custom.yaml @@ -46,4 +46,4 @@ static_resources: address: socket_address: address: sync-service - port_value: 9090 + port_value: 8015