Skip to content

Commit 7839126

Browse files
committed
Remove cartridge-java from dependencies
- [breaking change] Remove io.tarantool.cartridge-driver dependency - [breaking change] Update executeScript and executeCommand methods to execute code viva execInContainer (now it returns yaml string in Container.ExecResult not CompletableFuture) - Add executeScriptDecoded and executeCommandDecoded methods to return parsed yaml not string. - Add SslContext class - Add withSslContext method to TarantoolContainer and TarantoolCartridgeContainer. - Update org.yaml.snakeyaml to 2.0 version. Closes #69
1 parent d49b08b commit 7839126

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,23 +100,20 @@ public Container.ExecResult executeCommand(String command, SslContext sslContext
100100
command = command.replace("\'", "\\\'");
101101

102102
String bashCommand;
103-
// No SSL
104-
if (sslContext == null) {
103+
if (sslContext == null) { // No SSL
105104
bashCommand = String.format(COMMAND_TEMPLATE,
106105
container.getHost(), container.getInternalPort(),
107106
container.getUsername(), container.getPassword(),
108107
command
109108
);
110-
// mTLS
111-
} else if (sslContext.getKeyFile() != null && sslContext.getCertFile() != null) {
109+
} else if (sslContext.getKeyFile() != null && sslContext.getCertFile() != null) { // mTLS
112110
bashCommand = String.format(MTLS_COMMAND_TEMPLATE,
113111
container.getHost(), container.getInternalPort(),
114112
sslContext.getKeyFile(), sslContext.getCertFile(),
115113
container.getUsername(), container.getPassword(),
116114
command
117115
);
118-
// SSL
119-
} else {
116+
} else { // SSL
120117
bashCommand = String.format(SSL_COMMAND_TEMPLATE,
121118
container.getHost(), container.getInternalPort(),
122119
container.getUsername(), container.getPassword(),

0 commit comments

Comments
 (0)