Skip to content

Commit 2dd904f

Browse files
committed
Fixed by @akudiyar comments
1 parent b1052f9 commit 2dd904f

File tree

2 files changed

+2
-38
lines changed

2 files changed

+2
-38
lines changed

CHANGELOG.md

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,13 @@
33
## [Unreleased]
44
- Fix problem if topology isn't applied correctly
55
- Bump testcontainers to 1.18.0
6-
- Move rocks building in build phase
7-
- Bump testcontainers to 1.18.0
86
- Move rocks building to the build phase
9-
- **[breaking change]** Update executeScript and executeCommand methods to execute code viva execInContainer
10-
(now it returns yaml string in Container.ExecResult not CompletableFuture).
11-
- **[breaking change]** Remove TarantoolContainer containers with TarantoolClientBuilder parameter.
12-
- **[breaking change]** Remove getClient method from TarantoolContainerClientHelper.
137
- **[breaking change]** Remove io.tarantool.cartridge-driver dependency
14-
because cartridge-java client was also removed.
8+
- **[breaking change]** Update executeScript and executeCommand methods to execute code viva execInContainer
9+
(now it returns yaml string in Container.ExecResult not CompletableFuture)
1510
- Add executeScriptDecoded and executeCommandDecoded methods to return parsed yaml not string.
1611
- Add SslContext class
1712
- Add withSslContext method to TarantoolContainer and TarantoolCartridgeContainer.
18-
- Rewrite tests and add new cases to support new API.
1913
- Update org.yaml.snakeyaml to 2.0 version.
2014

2115
## [0.5.4] - 2023-03-31

src/main/java/org/testcontainers/containers/TarantoolCartridgeContainer.java

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -191,22 +191,6 @@ public TarantoolCartridgeContainer(String dockerFile, String buildImageName, Str
191191
this(buildImage(dockerFile, buildImageName, buildArgs), instancesFile, topologyConfigurationFile, buildArgs);
192192
}
193193

194-
// todo add SSL and mTLS cartridge test
195-
// /**
196-
// * Create a container with specified image and specified instances file from the classpath resources. By providing
197-
// * the result Cartridge container image name, you can cache the image and avoid rebuilding on each test run (the
198-
// * image is tagged with the provided name and not deleted after tests finishing).
199-
// *
200-
// * @param tarantoolImageParams params for cached image creating
201-
// * @param instancesFile URL resource path to instances.yml relative in the classpath
202-
// * @param topologyConfigurationFile URL resource path to a topology bootstrap script in the classpath
203-
// */
204-
// public TarantoolCartridgeContainer(TarantoolImageParams tarantoolImageParams, String instancesFile,
205-
// String topologyConfigurationFile) {
206-
// this(new ImageFromDockerfile(TarantoolContainerImageHelper.getImage(tarantoolImageParams)), instancesFile,
207-
// topologyConfigurationFile, tarantoolImageParams.getBuildArgs());
208-
// }
209-
210194
private TarantoolCartridgeContainer(ImageFromDockerfile image, String instancesFile, String topologyConfigurationFile,
211195
Map<String, String> buildArgs) {
212196
super(withBuildArgs(image, buildArgs));
@@ -269,20 +253,6 @@ private static ImageFromDockerfile buildImage(String dockerFile, String buildIma
269253
"cartridge" : buildArgs.get("CARTRIDGE_SRC_DIR"));
270254
}
271255

272-
// todo add SSL and mTLS cartridge test
273-
// /**
274-
// * Specify SSL as connection transport. And path to key and cert files inside your container for mTLS connection
275-
// * Warning! SSL must be set as default transport on your tarantool cluster.
276-
// * Supported only in Tarantool Enterprise
277-
// *
278-
// * @return this container instance
279-
// */
280-
// public TarantoolCartridgeContainer withSslContext(SslContext sslContext) {
281-
// checkNotRunning();
282-
// this.sslContext = sslContext;
283-
// return this;
284-
// }
285-
286256
/**
287257
* Get the router host
288258
*

0 commit comments

Comments
 (0)