feat: Adding basic HTTPEndpoint configuration support in testcontainers module (#1210)

* feat: Adding basic HTTPEndpoint configuration support in testcontainers module

Signed-off-by: Laurent Broudoux <laurent.broudoux@gmail.com>

* feat: #1209 Adding test for HTTPEndpoint in testcontainers module

Signed-off-by: Laurent Broudoux <laurent.broudoux@gmail.com>

---------

Signed-off-by: Laurent Broudoux <laurent.broudoux@gmail.com>
This commit is contained in:
Laurent Broudoux 2025-02-06 20:02:21 +01:00 committed by GitHub
parent 58d6218861
commit 0cec586d35
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 112 additions and 0 deletions

View File

@ -15,6 +15,7 @@ package io.dapr.testcontainers;
import io.dapr.testcontainers.converter.ComponentYamlConverter;
import io.dapr.testcontainers.converter.ConfigurationYamlConverter;
import io.dapr.testcontainers.converter.HttpEndpointYamlConverter;
import io.dapr.testcontainers.converter.SubscriptionYamlConverter;
import io.dapr.testcontainers.converter.YamlConverter;
import io.dapr.testcontainers.converter.YamlMapperFactory;
@ -48,6 +49,7 @@ public class DaprContainer extends GenericContainer<DaprContainer> {
private static final Yaml YAML_MAPPER = YamlMapperFactory.create();
private static final YamlConverter<Component> COMPONENT_CONVERTER = new ComponentYamlConverter(YAML_MAPPER);
private static final YamlConverter<Subscription> SUBSCRIPTION_CONVERTER = new SubscriptionYamlConverter(YAML_MAPPER);
private static final YamlConverter<HttpEndpoint> HTTPENDPOINT_CONVERTER = new HttpEndpointYamlConverter(YAML_MAPPER);
private static final YamlConverter<Configuration> CONFIGURATION_CONVERTER = new ConfigurationYamlConverter(
YAML_MAPPER);
private static final WaitStrategy WAIT_STRATEGY = Wait.forHttp("/v1.0/healthz/outbound")
@ -56,6 +58,7 @@ public class DaprContainer extends GenericContainer<DaprContainer> {
private final Set<Component> components = new HashSet<>();
private final Set<Subscription> subscriptions = new HashSet<>();
private final Set<HttpEndpoint> httpEndpoints = new HashSet<>();
private DaprLogLevel daprLogLevel = DaprLogLevel.INFO;
private String appChannelAddress = "localhost";
private String placementService = "placement";
@ -99,6 +102,10 @@ public class DaprContainer extends GenericContainer<DaprContainer> {
return subscriptions;
}
public Set<HttpEndpoint> getHttpEndpoints() {
return httpEndpoints;
}
public DaprContainer withAppPort(Integer port) {
this.appPort = port;
return this;
@ -134,6 +141,11 @@ public class DaprContainer extends GenericContainer<DaprContainer> {
return this;
}
public DaprContainer withHttpEndpoint(HttpEndpoint httpEndpoint) {
httpEndpoints.add(httpEndpoint);
return this;
}
public DaprContainer withPlacementImage(String placementDockerImageName) {
this.placementDockerImageName = placementDockerImageName;
return this;
@ -291,6 +303,15 @@ public class DaprContainer extends GenericContainer<DaprContainer> {
withCopyToContainer(Transferable.of(subscriptionYaml), "/dapr-resources/" + subscription.getName() + ".yaml");
}
for (HttpEndpoint endpoint : httpEndpoints) {
String endpointYaml = HTTPENDPOINT_CONVERTER.convert(endpoint);
LOGGER.info("> HTTPEndpoint YAML: \n");
LOGGER.info("\t\n" + endpointYaml + "\n");
withCopyToContainer(Transferable.of(endpointYaml), "/dapr-resources/" + endpoint.getName() + ".yaml");
}
dependsOn(placementContainer);
}

View File

@ -0,0 +1,19 @@
package io.dapr.testcontainers;
public class HttpEndpoint {
private String name;
private String baseUrl;
public HttpEndpoint(String name, String baseUrl) {
this.name = name;
this.baseUrl = baseUrl;
}
public String getName() {
return name;
}
public String getBaseUrl() {
return baseUrl;
}
}

View File

@ -0,0 +1,32 @@
package io.dapr.testcontainers.converter;
import io.dapr.testcontainers.HttpEndpoint;
import org.yaml.snakeyaml.Yaml;
import java.util.LinkedHashMap;
import java.util.Map;
public class HttpEndpointYamlConverter implements YamlConverter<HttpEndpoint> {
private final Yaml mapper;
public HttpEndpointYamlConverter(Yaml mapper) {
this.mapper = mapper;
}
@Override
public String convert(HttpEndpoint endpoint) {
Map<String, Object> endpointProps = new LinkedHashMap<>();
endpointProps.put("apiVersion", "dapr.io/v1alpha1");
endpointProps.put("kind", "HTTPEndpoint");
Map<String, String> endpointMetadata = new LinkedHashMap<>();
endpointMetadata.put("name", endpoint.getName());
endpointProps.put("metadata", endpointMetadata);
Map<String, Object> endpointSpec = new LinkedHashMap<>();
endpointSpec.put("baseUrl", endpoint.getBaseUrl());
endpointProps.put("spec", endpointSpec);
return mapper.dumpAsMap(endpointProps);
}
}

View File

@ -0,0 +1,40 @@
package io.dapr.testcontainers.converter;
import io.dapr.testcontainers.DaprContainer;
import io.dapr.testcontainers.HttpEndpoint;
import org.junit.jupiter.api.Test;
import org.yaml.snakeyaml.Yaml;
import java.util.Set;
import static org.junit.jupiter.api.Assertions.assertEquals;
class HttpEndpointYamlConverterTest {
private final Yaml MAPPER = YamlMapperFactory.create();
private final HttpEndpointYamlConverter converter = new HttpEndpointYamlConverter(MAPPER);
@Test
void testHttpEndpointToYaml() {
DaprContainer dapr = new DaprContainer("daprio/daprd")
.withAppName("dapr-app")
.withAppPort(8081)
.withHttpEndpoint(new HttpEndpoint("my-endpoint", "http://localhost:8080"))
.withAppChannelAddress("host.testcontainers.internal");
Set<HttpEndpoint> endpoints = dapr.getHttpEndpoints();
assertEquals(1, endpoints.size());
HttpEndpoint endpoint = endpoints.iterator().next();
String endpointYaml = converter.convert(endpoint);
String expectedEndpointYaml =
"apiVersion: dapr.io/v1alpha1\n"
+ "kind: HTTPEndpoint\n"
+ "metadata:\n"
+ " name: my-endpoint\n"
+ "spec:\n"
+ " baseUrl: http://localhost:8080\n";
assertEquals(expectedEndpointYaml, endpointYaml);
}
}