Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add the session header to every Docker request #5145

Merged
merged 2 commits into from
Mar 3, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,12 @@
import org.rnorth.ducttape.ratelimits.RateLimiter;
import org.rnorth.ducttape.ratelimits.RateLimiterBuilder;
import org.rnorth.ducttape.unreliables.Unreliables;
import org.testcontainers.DockerClientFactory;
import org.testcontainers.utility.TestcontainersConfiguration;

import java.net.URI;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
Expand Down Expand Up @@ -282,7 +284,10 @@ public static DockerClient getClientForConfig(TransportConfig transportConfig) {
.withDockerHost(transportConfig.getDockerHost().toString())
.build()
),
dockerHttpClient
new HeadersAddingDockerHttpClient(
dockerHttpClient,
Collections.singletonMap("x-tc-sid", DockerClientFactory.SESSION_ID)
)
);
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package org.testcontainers.dockerclient;

import com.github.dockerjava.transport.DockerHttpClient;
import lombok.RequiredArgsConstructor;
import lombok.ToString;
import lombok.experimental.Delegate;

import java.io.Closeable;
import java.util.Map;

@RequiredArgsConstructor
@ToString
class HeadersAddingDockerHttpClient implements DockerHttpClient {

@Delegate(types = Closeable.class)
final DockerHttpClient delegate;

final Map<String, String> headers;

@Override
public Response execute(Request request) {
request = Request.builder().from(request)
.putAllHeaders(headers)
.build();
return delegate.execute(request);
}
}