From 6afffd5d81b551739a74cd90d540a3570ac3a27b Mon Sep 17 00:00:00 2001 From: Belonogov Nikolay Date: Mon, 2 Oct 2023 14:54:29 +0300 Subject: [PATCH] Fix command template -Fix `COMMAND_TEMPLATE` for use with the 1.x Tarantool version. Closes #87. --- .github/workflows/ubuntu-master.yml | 2 +- CHANGELOG.md | 2 ++ .../containers/TarantoolContainerClientHelper.java | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ubuntu-master.yml b/.github/workflows/ubuntu-master.yml index 37d1524..581037c 100644 --- a/.github/workflows/ubuntu-master.yml +++ b/.github/workflows/ubuntu-master.yml @@ -25,7 +25,7 @@ jobs: env: TARANTOOL_SERVER_USER: root TARANTOOL_SERVER_GROUP: root - run: mvn -B verify --file pom.xml + run: mvn -e -B verify --file pom.xml - name: Run enterprise tests env: diff --git a/CHANGELOG.md b/CHANGELOG.md index dec955d..9634816 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## [Unreleased] +- Fix command template for use with the 1.x Tarantool version ([#87](https://github.com/tarantool/testcontainers-java-tarantool/issues/87)) + ## [1.0.0] - 2023-06-16 - Fix problem if topology isn't applied correctly - Bump testcontainers to 1.18.0 diff --git a/src/main/java/org/testcontainers/containers/TarantoolContainerClientHelper.java b/src/main/java/org/testcontainers/containers/TarantoolContainerClientHelper.java index b133804..242b041 100644 --- a/src/main/java/org/testcontainers/containers/TarantoolContainerClientHelper.java +++ b/src/main/java/org/testcontainers/containers/TarantoolContainerClientHelper.java @@ -49,7 +49,7 @@ public final class TarantoolContainerClientHelper { private static final String COMMAND_TEMPLATE = "echo \" " + " print(require('yaml').encode( " + " {require('net.box').connect( " + - " { uri='%s:%d' }, " + + " '%s:%d', " + " { user = '%s', password = '%s' } " + " ):eval('%s')}) " + " ); " +