supporting appHttpPipelines for middleware

Signed-off-by: salaboy <[email protected]>

Author: salaboy

spring-boot-examples/consumer-app/src/test/java/io/dapr/springboot/examples/consumer/DaprTestContainersConfig.java

@@ -35,7 +35,7 @@
 public class DaprTestContainersConfig {
 
   @Bean
-  public Network getDaprNetwork() {
+  public Network getNetwork() {
     Network defaultDaprNetwork = new Network() {
       @Override
       public String getId() {

testcontainers-dapr/src/main/java/io/dapr/testcontainers/AppHttpPipeline.java

@@ -0,0 +1,19 @@
+package io.dapr.testcontainers;
+
+import java.util.Collections;
+import java.util.List;
+
+public class AppHttpPipeline implements ConfigurationSettings {
+    private List<ListEntry> handlers;
+    
+    public AppHttpPipeline(){}
+
+    public AppHttpPipeline(List<ListEntry> handlers){
+        this.handlers = Collections.unmodifiableList(handlers);
+    }
+
+    public List<ListEntry> getHandlers(){
+        return handlers;
+    }
+
+}

testcontainers-dapr/src/main/java/io/dapr/testcontainers/Configuration.java

@@ -19,8 +19,8 @@
 public class Configuration {
   private final String name;
   private final TracingConfigurationSettings tracing;
+  private final AppHttpPipeline appHttpPipeline;
 
-  //@TODO: add httpPipeline
   //@TODO: add secrets
   //@TODO: add components
   //@TODO: add accessControl
@@ -30,9 +30,10 @@ public class Configuration {
    * @param name     Configuration name.
    * @param tracing     TracingConfigParameters tracing configuration parameters.
    */
-  public Configuration(String name, TracingConfigurationSettings tracing) {
+  public Configuration(String name, TracingConfigurationSettings tracing, AppHttpPipeline appHttpPipeline) {
     this.name = name;
     this.tracing = tracing;
+    this.appHttpPipeline = appHttpPipeline;
   }
 
   public String getName() {
@@ -42,4 +43,8 @@ public String getName() {
   public TracingConfigurationSettings getTracing() {
     return tracing;
   }
+
+  public AppHttpPipeline getAppHttpPipeline(){
+    return appHttpPipeline;
+  }
 }

testcontainers-dapr/src/main/java/io/dapr/testcontainers/ListEntry.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright 2024 The Dapr Authors
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package io.dapr.testcontainers;
+
+public class ListEntry {
+  private String name;
+  private String type;
+
+  public ListEntry(String name, String type) {
+    this.name = name;
+    this.type = type;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public String getType() {
+    return type;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public void setType(String type) {
+    this.type = type;
+  }
+}

testcontainers-dapr/src/main/java/io/dapr/testcontainers/converter/ConfigurationYamlConverter.java

@@ -1,12 +1,15 @@
 package io.dapr.testcontainers.converter;
 
+import io.dapr.testcontainers.AppHttpPipeline;
 import io.dapr.testcontainers.Configuration;
+import io.dapr.testcontainers.ListEntry;
 import io.dapr.testcontainers.OtelTracingConfigurationSettings;
 import io.dapr.testcontainers.TracingConfigurationSettings;
 import io.dapr.testcontainers.ZipkinTracingConfigurationSettings;
 import org.yaml.snakeyaml.Yaml;
 
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
 
 public class ConfigurationYamlConverter implements YamlConverter<Configuration> {
@@ -58,6 +61,16 @@ public String convert(Configuration configuration) {
       }
 
       configurationSpec.put("tracing", tracingMap);
+
+    }
+
+    AppHttpPipeline appHttpPipeline = configuration.getAppHttpPipeline();
+    if( appHttpPipeline != null ){
+      Map<String, Object> appHttpPipelineMap = new LinkedHashMap<>();
+      List<ListEntry> handlers = appHttpPipeline.getHandlers();
+      appHttpPipelineMap.put("handlers", handlers);
+      configurationSpec.put("appHttpPipeline", appHttpPipelineMap);
+
     }
 
     configurationProps.put("spec", configurationSpec);

testcontainers-dapr/src/main/java/io/dapr/testcontainers/converter/YamlMapperFactory.java

@@ -1,5 +1,6 @@
 package io.dapr.testcontainers.converter;
 
+import io.dapr.testcontainers.ListEntry;
 import io.dapr.testcontainers.MetadataEntry;
 import org.yaml.snakeyaml.DumperOptions;
 import org.yaml.snakeyaml.Yaml;
@@ -21,6 +22,7 @@ public static Yaml create() {
     options.setPrettyFlow(true);
     Representer representer = new Representer(options);
     representer.addClassTag(MetadataEntry.class, Tag.MAP);
+    representer.addClassTag(ListEntry.class, Tag.MAP);
     return new Yaml(representer);
   }
 }

testcontainers-dapr/src/test/java/io/dapr/testcontainers/converter/ConfigurationYamlConverterTest.java

@@ -1,7 +1,9 @@
 package io.dapr.testcontainers.converter;
 
+import io.dapr.testcontainers.AppHttpPipeline;
 import io.dapr.testcontainers.Configuration;
 import io.dapr.testcontainers.DaprContainer;
+import io.dapr.testcontainers.ListEntry;
 import io.dapr.testcontainers.OtelTracingConfigurationSettings;
 import io.dapr.testcontainers.TracingConfigurationSettings;
 import org.junit.jupiter.api.Test;
@@ -10,6 +12,9 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
+import java.util.ArrayList;
+import java.util.List;
+
 class ConfigurationYamlConverterTest {
   private final Yaml MAPPER = YamlMapperFactory.create();
   private final ConfigurationYamlConverter converter = new ConfigurationYamlConverter(MAPPER);
@@ -28,10 +33,16 @@ public void testConfigurationToYaml() {
         null
     );
 
+    
+    List<ListEntry> handlers = new ArrayList<>();
+    handlers.add(new ListEntry("alias", "middleware.http.routeralias"));
+
+    AppHttpPipeline appHttpPipeline = new AppHttpPipeline(handlers);
+
     DaprContainer dapr = new DaprContainer("daprio/daprd")
         .withAppName("dapr-app")
         .withAppPort(8081)
-        .withConfiguration(new Configuration("my-config", tracing))
+        .withConfiguration(new Configuration("my-config", tracing, appHttpPipeline))
         .withAppChannelAddress("host.testcontainers.internal");
 
     Configuration configuration = dapr.getConfiguration();
@@ -50,7 +61,11 @@ public void testConfigurationToYaml() {
         + "    otel:\n"
         + "      endpointAddress: localhost:4317\n"
         + "      isSecure: false\n"
-        + "      protocol: grpc\n";
+        + "      protocol: grpc\n"
+        + "  appHttpPipeline:\n"
+        + "    handlers:\n"
+        + "    - name: alias\n"
+        + "      type: middleware.http.routeralias\n";
 
     assertEquals(expectedConfigurationYaml, configurationYaml);
   }