You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2025/09/12 15:28:54 UTC
(shardingsphere) branch master updated: Refactor DockerITContainer.mapResources() (#36549)
This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new f12e337bda3 Refactor DockerITContainer.mapResources() (#36549)
f12e337bda3 is described below
commit f12e337bda372b4a686b9db49a10cec4cdefa041
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Fri Sep 12 23:28:47 2025 +0800
Refactor DockerITContainer.mapResources() (#36549)
---
.../container/ShardingSphereJdbcAgentContainer.java | 3 +--
.../e2e/env/container/atomic/DockerITContainer.java | 8 +++++++-
.../impl/ShardingSphereProxyClusterContainer.java | 21 +--------------------
.../ShardingSphereProxyStandaloneContainer.java | 7 +------
.../storage/type/docker/DockerStorageContainer.java | 5 -----
5 files changed, 10 insertions(+), 34 deletions(-)
diff --git a/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/container/ShardingSphereJdbcAgentContainer.java b/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/container/ShardingSphereJdbcAgentContainer.java
index 9c8cadc12cd..3788e2d9959 100644
--- a/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/container/ShardingSphereJdbcAgentContainer.java
+++ b/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/container/ShardingSphereJdbcAgentContainer.java
@@ -19,7 +19,6 @@ package org.apache.shardingsphere.test.e2e.agent.engine.container;
import com.google.common.base.Strings;
import org.apache.shardingsphere.test.e2e.env.container.atomic.DockerITContainer;
-import org.testcontainers.containers.BindMode;
import org.testcontainers.containers.output.OutputFrame;
import org.testcontainers.containers.wait.strategy.LogMessageWaitStrategy;
@@ -47,7 +46,7 @@ public final class ShardingSphereJdbcAgentContainer extends DockerITContainer {
@Override
protected void configure() {
- createResourceMappingForProxy().forEach((key, value) -> withClasspathResourceMapping(key, value, BindMode.READ_ONLY));
+ mapResources(createResourceMappingForProxy());
Optional.ofNullable(consumer).ifPresent(optional -> withLogConsumer(consumer));
setWaitStrategy(new LogMessageWaitStrategy().withRegEx(".*JdbcProjectApplication started.*"));
}
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/DockerITContainer.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/DockerITContainer.java
index 8f99a402943..41a48a7b4fe 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/DockerITContainer.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/DockerITContainer.java
@@ -20,6 +20,7 @@ package org.apache.shardingsphere.test.e2e.env.container.atomic;
import lombok.Getter;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
+import org.testcontainers.containers.BindMode;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.wait.strategy.DockerHealthcheckWaitStrategy;
import org.testcontainers.images.RemoteDockerImage;
@@ -28,6 +29,7 @@ import org.testcontainers.utility.DockerImageName;
import java.time.Duration;
import java.time.temporal.ChronoUnit;
import java.util.Collection;
+import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -45,8 +47,12 @@ public abstract class DockerITContainer extends GenericContainer<DockerITContain
this.name = name;
}
+ protected final void mapResources(final Map<String, String> resources) {
+ resources.forEach((key, value) -> withClasspathResourceMapping(key, value, BindMode.READ_ONLY));
+ }
+
@Override
- public void start() {
+ public final void start() {
startDependencies();
super.start();
postStart();
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereProxyClusterContainer.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereProxyClusterContainer.java
index a826e72a92a..9c6e7b610e7 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereProxyClusterContainer.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereProxyClusterContainer.java
@@ -27,7 +27,6 @@ import org.apache.shardingsphere.test.e2e.env.container.atomic.constants.ProxyCo
import org.apache.shardingsphere.test.e2e.env.container.atomic.util.StorageContainerUtils;
import org.apache.shardingsphere.test.e2e.env.container.wait.JdbcConnectionWaitStrategy;
import org.apache.shardingsphere.test.e2e.env.runtime.DataSourceEnvironment;
-import org.testcontainers.containers.BindMode;
import javax.sql.DataSource;
import java.sql.DriverManager;
@@ -40,8 +39,6 @@ import java.util.concurrent.atomic.AtomicReference;
*/
public final class ShardingSphereProxyClusterContainer extends DockerITContainer implements AdapterContainer {
- private static final String PROPERTY_AGENT_HOME = "AGENT_HOME";
-
private final DatabaseType databaseType;
private final AdaptorContainerConfiguration config;
@@ -57,18 +54,6 @@ public final class ShardingSphereProxyClusterContainer extends DockerITContainer
this.config = config;
}
- /**
- * Mount the agent into container.
- *
- * @param agentHome agent home
- * @return self
- */
- public ShardingSphereProxyClusterContainer withAgent(final String agentHome) {
- withEnv(PROPERTY_AGENT_HOME, ProxyContainerConstants.AGENT_HOME_IN_CONTAINER);
- withFileSystemBind(agentHome, ProxyContainerConstants.AGENT_HOME_IN_CONTAINER, BindMode.READ_ONLY);
- return this;
- }
-
@Override
protected void configure() {
if (!Strings.isNullOrEmpty(config.getContainerCommand())) {
@@ -79,16 +64,12 @@ public final class ShardingSphereProxyClusterContainer extends DockerITContainer
setPortBindings(config.getPortBindings());
}
addEnv("TZ", "UTC");
- mountConfigurationFiles();
+ mapResources(config.getMountedResources());
setWaitStrategy(new JdbcConnectionWaitStrategy(() -> DriverManager.getConnection(DataSourceEnvironment.getURL(databaseType,
getHost(), getMappedPort(3307), config.getProxyDataSourceName()), ProxyContainerConstants.USERNAME, ProxyContainerConstants.PASSWORD)));
withStartupTimeout(Duration.of(120L, ChronoUnit.SECONDS));
}
- private void mountConfigurationFiles() {
- config.getMountedResources().forEach((key, value) -> withClasspathResourceMapping(key, value, BindMode.READ_ONLY));
- }
-
@Override
public DataSource getTargetDataSource(final String serverLists) {
DataSource dataSource = targetDataSourceProvider.get();
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereProxyStandaloneContainer.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereProxyStandaloneContainer.java
index 4ff7745ceea..08e72f8d5dd 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereProxyStandaloneContainer.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereProxyStandaloneContainer.java
@@ -25,7 +25,6 @@ import org.apache.shardingsphere.test.e2e.env.container.atomic.constants.ProxyCo
import org.apache.shardingsphere.test.e2e.env.container.atomic.util.StorageContainerUtils;
import org.apache.shardingsphere.test.e2e.env.container.wait.JdbcConnectionWaitStrategy;
import org.apache.shardingsphere.test.e2e.env.runtime.DataSourceEnvironment;
-import org.testcontainers.containers.BindMode;
import javax.sql.DataSource;
import java.sql.DriverManager;
@@ -51,15 +50,11 @@ public final class ShardingSphereProxyStandaloneContainer extends DockerITContai
@Override
protected void configure() {
withExposedPorts(3307, 3308);
- mountConfigurationFiles();
+ mapResources(config.getMountedResources());
setWaitStrategy(new JdbcConnectionWaitStrategy(() -> DriverManager.getConnection(
DataSourceEnvironment.getURL(databaseType, getHost(), getMappedPort(3307), config.getProxyDataSourceName()), "proxy", "Proxy@123")));
}
- private void mountConfigurationFiles() {
- config.getMountedResources().forEach((key, value) -> withClasspathResourceMapping(key, value, BindMode.READ_ONLY));
- }
-
@Override
public DataSource getTargetDataSource(final String serverLists) {
DataSource dataSource = targetDataSourceProvider.get();
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/DockerStorageContainer.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/DockerStorageContainer.java
index b55618560ab..55f6f0b74ff 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/DockerStorageContainer.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/type/docker/DockerStorageContainer.java
@@ -27,7 +27,6 @@ import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.St
import org.apache.shardingsphere.test.e2e.env.container.atomic.util.StorageContainerUtils;
import org.apache.shardingsphere.test.e2e.env.container.wait.JdbcConnectionWaitStrategy;
import org.apache.shardingsphere.test.e2e.env.runtime.DataSourceEnvironment;
-import org.testcontainers.containers.BindMode;
import javax.sql.DataSource;
import java.sql.DriverManager;
@@ -84,10 +83,6 @@ public abstract class DockerStorageContainer extends DockerITContainer implement
storageContainerConfig.getConfigurationOption().getEnvironments().forEach(this::addEnv);
}
- private void mapResources(final Map<String, String> resources) {
- resources.forEach((key, value) -> withClasspathResourceMapping(key, value, BindMode.READ_ONLY));
- }
-
private void setPrivilegedMode() {
if (storageContainerConfig.getConfigurationOption().withPrivilegedMode()) {
withPrivilegedMode(true);