Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ public class Configuration {
private final NameResolutionConfigurationSettings nameResolution;
private final ComponentsConfigurationSettings components;
private final SecretsConfigurationSettings secrets;

// @TODO: add middleware httpPipeline https://github.com/dapr/java-sdk/issues/1283
private final HttpPipeline httpPipeline;

/**
* Creates a new configuration.
Expand Down Expand Up @@ -175,6 +174,36 @@ public Configuration(
NameResolutionConfigurationSettings nameResolution,
ComponentsConfigurationSettings components,
SecretsConfigurationSettings secrets
) {
this(name, tracing, appHttpPipeline, mtls, logging, metrics, nameResolution, components, secrets, null);
}

/**
* Creates a new configuration.
*
* @param name Configuration name.
* @param tracing TracingConfigParameters tracing configuration
* parameters.
* @param appHttpPipeline AppHttpPipeline middleware configuration.
* @param mtls MtlsConfigurationSettings mTLS configuration.
* @param logging LoggingConfigurationSettings logging configuration.
* @param metrics MetricsConfigurationSettings metrics configuration.
* @param nameResolution NameResolutionConfigurationSettings name resolution configuration.
* @param components ComponentsConfigurationSettings disallowed component types configuration.
* @param secrets SecretsConfigurationSettings secret store access configuration.
* @param httpPipeline HttpPipeline middleware configuration for incoming requests.
*/
public Configuration(
String name,
TracingConfigurationSettings tracing,
AppHttpPipeline appHttpPipeline,
MtlsConfigurationSettings mtls,
LoggingConfigurationSettings logging,
MetricsConfigurationSettings metrics,
NameResolutionConfigurationSettings nameResolution,
ComponentsConfigurationSettings components,
SecretsConfigurationSettings secrets,
HttpPipeline httpPipeline
) {
this.name = name;
this.tracing = tracing;
Expand All @@ -185,6 +214,7 @@ public Configuration(
this.nameResolution = nameResolution;
this.components = components;
this.secrets = secrets;
this.httpPipeline = httpPipeline;
}

public String getName() {
Expand Down Expand Up @@ -222,4 +252,8 @@ public ComponentsConfigurationSettings getComponents() {
public SecretsConfigurationSettings getSecrets() {
return secrets;
}

public HttpPipeline getHttpPipeline() {
return httpPipeline;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
/*
* Copyright 2026 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;

import java.util.Collections;
import java.util.List;

/**
* Represents the middleware HTTP pipeline applied to incoming requests to the Dapr sidecar.
*/
public class HttpPipeline implements ConfigurationSettings {
private List<ListEntry> handlers;

/**
* Creates an HttpPipeline.
*
* @param handlers List of handlers for the HttpPipeline
*/
public HttpPipeline(List<ListEntry> handlers) {
if (handlers != null) {
this.handlers = Collections.unmodifiableList(handlers);
}
}

public List<ListEntry> getHandlers() {
return handlers;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import io.dapr.testcontainers.ComponentsConfigurationSettings;
import io.dapr.testcontainers.Configuration;
import io.dapr.testcontainers.HttpMetricsConfigurationSettings;
import io.dapr.testcontainers.HttpPipeline;
import io.dapr.testcontainers.ListEntry;
import io.dapr.testcontainers.LoggingConfigurationSettings;
import io.dapr.testcontainers.MetricsConfigurationSettings;
Expand Down Expand Up @@ -91,6 +92,16 @@ public String convert(Configuration configuration) {

}

HttpPipeline httpPipeline = configuration.getHttpPipeline();
if (httpPipeline != null) {

Map<String, Object> httpPipelineMap = new LinkedHashMap<>();
List<ListEntry> handlers = httpPipeline.getHandlers();
httpPipelineMap.put("handlers", handlers);
configurationSpec.put("httpPipeline", httpPipelineMap);

}

AppHttpPipeline appHttpPipeline = configuration.getAppHttpPipeline();
if (appHttpPipeline != null) {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import io.dapr.testcontainers.Configuration;
import io.dapr.testcontainers.DaprContainer;
import io.dapr.testcontainers.HttpMetricsConfigurationSettings;
import io.dapr.testcontainers.HttpPipeline;
import io.dapr.testcontainers.ListEntry;
import io.dapr.testcontainers.LoggingConfigurationSettings;
import io.dapr.testcontainers.MetricsConfigurationSettings;
Expand Down Expand Up @@ -994,4 +995,86 @@ public void testConfigurationWithDisallowedComponentsAndSecretsToYaml() {

assertEquals(expectedConfigurationYaml, configurationYaml);
}

@Test
public void testConfigurationWithHttpPipelineToYaml() {
HttpPipeline httpPipeline = new HttpPipeline(List.of(
new ListEntry("uppercase", "middleware.http.uppercase"),
new ListEntry("ratelimit", "middleware.http.ratelimit")));

Configuration configuration =
new Configuration("my-config", null, null, null, null, null, null, null, null, httpPipeline);
assertEquals(2, configuration.getHttpPipeline().getHandlers().size());

String configurationYaml = converter.convert(configuration);
String expectedConfigurationYaml =
"apiVersion: dapr.io/v1alpha1\n"
+ "kind: Configuration\n"
+ "metadata:\n"
+ " name: my-config\n"
+ "spec:\n"
+ " httpPipeline:\n"
+ " handlers:\n"
+ " - name: uppercase\n"
+ " type: middleware.http.uppercase\n"
+ " - name: ratelimit\n"
+ " type: middleware.http.ratelimit\n";

assertEquals(expectedConfigurationYaml, configurationYaml);
}

@Test
public void testConfigurationWithHttpPipelineAndAppHttpPipelineToYaml() {
HttpPipeline httpPipeline = new HttpPipeline(List.of(new ListEntry("uppercase", "middleware.http.uppercase")));
AppHttpPipeline appHttpPipeline =
new AppHttpPipeline(List.of(new ListEntry("alias", "middleware.http.routeralias")));

Configuration configuration =
new Configuration("my-config", null, appHttpPipeline, null, null, null, null, null, null, httpPipeline);

String configurationYaml = converter.convert(configuration);
String expectedConfigurationYaml =
"apiVersion: dapr.io/v1alpha1\n"
+ "kind: Configuration\n"
+ "metadata:\n"
+ " name: my-config\n"
+ "spec:\n"
+ " httpPipeline:\n"
+ " handlers:\n"
+ " - name: uppercase\n"
+ " type: middleware.http.uppercase\n"
+ " appHttpPipeline:\n"
+ " handlers:\n"
+ " - name: alias\n"
+ " type: middleware.http.routeralias\n";

assertEquals(expectedConfigurationYaml, configurationYaml);
}

@Test
public void testConfigurationWithNullHttpPipelineHandlersToYaml() {
HttpPipeline httpPipeline = new HttpPipeline(null);
assertNull(httpPipeline.getHandlers());

Configuration configuration =
new Configuration("my-config", null, null, null, null, null, null, null, null, httpPipeline);

String configurationYaml = converter.convert(configuration);
String expectedConfigurationYaml =
"apiVersion: dapr.io/v1alpha1\n"
+ "kind: Configuration\n"
+ "metadata:\n"
+ " name: my-config\n"
+ "spec:\n"
+ " httpPipeline:\n"
+ " handlers: null\n";

assertEquals(expectedConfigurationYaml, configurationYaml);
}

@Test
public void testConfigurationWithoutHttpPipelineHasNullGetter() {
Configuration configuration = new Configuration("my-config", null, null);
assertNull(configuration.getHttpPipeline());
}
}
Loading