diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 730c303..94cfcfa 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -9,6 +9,10 @@ on: pull_request: branches: [ master ] +env: + TARANTOOL_REGISTRY: "registry.ps.tarantool.io/" + TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX: "registry.ps.tarantool.io/" + jobs: tests-cartridge-container: runs-on: ubuntu-latest @@ -25,6 +29,9 @@ jobs: java-version: '8' cache: 'maven' + - name: Docker login to private registry + run: docker login "$TARANTOOL_REGISTRY" -u admin -p "${{ secrets.TARANTOOL_REGISTRY_PASSWORD }}" + - name: Build and run unit tests run: ./mvnw -B verify -Djacoco.destFile=target/jacoco-cartridge-container.exec --file pom.xml @@ -35,6 +42,9 @@ jobs: TARANTOOL_VERSION: "2.11.2-ubuntu20.04" run: ./mvnw -B test -P integration -Djacoco.destFile=target/jacoco-cartridge-container.exec --file pom.xml + - name: Print system images + run: docker images + - name: Upload jacoco exec results uses: actions/upload-artifact@v4 with: @@ -43,35 +53,6 @@ jobs: retention-days: 5 overwrite: true - tests-ee: - runs-on: ubuntu-latest - timeout-minutes: 20 - steps: - - uses: actions/checkout@v4 - - - name: Set up JDK 1.8 - uses: actions/setup-java@v4 - with: - distribution: 'zulu' - java-version: '8' - cache: 'maven' - - - name: Run enterprise tests - env: - TARANTOOL_SERVER_USER: root - TARANTOOL_SERVER_GROUP: root - DOWNLOAD_HOST: https://tarantool:${{ secrets.DOWNLOAD_SDK_TOKEN }}@download.tarantool.io - SDK_PATH: enterprise/release/linux/x86_64/2.11/tarantool-enterprise-sdk-nogc64-2.11.2-0-r609.linux.x86_64.tar.gz - run: ./mvnw -B test -P enterprise -Djacoco.destFile=target/jacoco-ee.exec --file pom.xml - - - name: Upload jacoco exec results - uses: actions/upload-artifact@v4 - with: - name: tests-ee-jacoco - path: "**/jacoco-ee.exec" - retention-days: 5 - overwrite: true - tests-tarantool-container: runs-on: ubuntu-latest timeout-minutes: 25 @@ -89,6 +70,9 @@ jobs: java-version: '8' cache: 'maven' + - name: Docker login to private registry + run: docker login "$TARANTOOL_REGISTRY" -u admin -p "${{ secrets.TARANTOOL_REGISTRY_PASSWORD }}" + - name: Build and run integration matrix tests env: TARANTOOL_VERSION: ${{ matrix.tarantool-version }} @@ -96,6 +80,9 @@ jobs: TARANTOOL_SERVER_GROUP: root run: ./mvnw -B test -P tarantool-container -Djacoco.destFile=target/jacoco-tarantool-container.exec --file pom.xml + - name: Print system images + run: docker images + - name: Upload jacoco exec results uses: actions/upload-artifact@v4 with: @@ -108,7 +95,6 @@ jobs: name: Jacoco Merge Results needs: - tests-cartridge-container - - tests-ee - tests-tarantool-container runs-on: ubuntu-latest steps: @@ -126,11 +112,6 @@ jobs: name: tests-cartridge-container-jacoco path: . - - uses: actions/download-artifact@v4 - with: - name: tests-ee-jacoco - path: . - - uses: actions/download-artifact@v4 with: name: tests-tarantool-container-jacoco @@ -149,7 +130,6 @@ jobs: if-no-files-found: error overwrite: true - - name: Jacoco Report to PR id: jacoco uses: madrapps/jacoco-report@v1.6.1 diff --git a/CHANGELOG.md b/CHANGELOG.md index c6d3def..554ad9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ ## [Unreleased] +## [1.3.3] - 2024-05-06 +- Add support for environment variable `TARANTOOL_REGISTRY` +- Remove enterprise tests + + ## [1.3.2] - 2024-04-25 - Fix NullPointerException during building docker image when images with null tags exist on a local machine. diff --git a/README.md b/README.md index b87e8e5..12ea22a 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Add the Maven dependency: io.tarantool testcontainers-java-tarantool - 1.3.2 + 1.3.3 ``` diff --git a/pom.xml b/pom.xml index 470e5f7..15ed4eb 100644 --- a/pom.xml +++ b/pom.xml @@ -258,7 +258,6 @@ **/*IT.java - **/*EnterpriseIT.java **/*TarantoolContainer*IT.java @@ -271,29 +270,6 @@ - - enterprise - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.0.0-M5 - - - **/*TestEnterprise.java - **/*EnterpriseIT.java - - - ${logging.config} - ${logging.logLevel} - - false - - - - - release diff --git a/src/main/java/org/testcontainers/containers/TarantoolContainer.java b/src/main/java/org/testcontainers/containers/TarantoolContainer.java index 7190ae4..0e42d9d 100644 --- a/src/main/java/org/testcontainers/containers/TarantoolContainer.java +++ b/src/main/java/org/testcontainers/containers/TarantoolContainer.java @@ -17,9 +17,9 @@ public class TarantoolContainer extends GenericContainer implements TarantoolContainerOperations { - public static final String TARANTOOL_IMAGE = "tarantool/tarantool"; - public static final String DEFAULT_IMAGE_VERSION = "2.11.2-ubuntu20.04"; - public static final String DEFAULT_TARANTOOL_BASE_IMAGE = String.format("%s:%s", TARANTOOL_IMAGE, DEFAULT_IMAGE_VERSION); + public static final String DEFAULT_IMAGE = "tarantool/tarantool"; + public static final String DEFAULT_TAG = "2.11.2-ubuntu20.04"; + public static final String DEFAULT_BASE_IMAGE = String.format("%s:%s", DEFAULT_IMAGE, DEFAULT_TAG); private static final String DEFAULT_HOST = "localhost"; @@ -50,7 +50,7 @@ public class TarantoolContainer extends GenericContainer * Constructor for {@link TarantoolContainer} */ public TarantoolContainer() { - this(DEFAULT_TARANTOOL_BASE_IMAGE); + this(DEFAULT_BASE_IMAGE); setImageNameFromEnv(); } @@ -386,7 +386,11 @@ public T executeCommandDecoded(String command) throws Exception { private void setImageNameFromEnv() { String version = System.getenv("TARANTOOL_VERSION"); if (version != null && !version.trim().isEmpty()) { - setDockerImageName(String.format("%s:%s", TARANTOOL_IMAGE, version)); + String registry = System.getenv("TARANTOOL_REGISTRY"); + String image = registry == null || registry.isEmpty() ? + DEFAULT_IMAGE : + (registry.endsWith("/") ? registry + DEFAULT_IMAGE : registry + "/" + DEFAULT_IMAGE); + setDockerImageName(String.format("%s:%s", image, version)); } } } diff --git a/src/main/java/org/testcontainers/containers/TarantoolImageParams.java b/src/main/java/org/testcontainers/containers/TarantoolImageParams.java index 6c0f8a7..3723f8f 100644 --- a/src/main/java/org/testcontainers/containers/TarantoolImageParams.java +++ b/src/main/java/org/testcontainers/containers/TarantoolImageParams.java @@ -2,6 +2,7 @@ import java.io.File; import java.util.Collections; +import java.util.HashMap; import java.util.Map; /** @@ -38,6 +39,17 @@ public TarantoolImageParams(String tag, File dockerfile, Map bui this.buildArgs = buildArgs; } + /** + * Custom constructor for tarantool image parameters + * + * @param tag docker image tag + * @param dockerfile dockerfile for building custom tarantool image + * @param baseImageName default image name for building docker image + */ + public TarantoolImageParams(String tag, File dockerfile, String baseImageName) { + this(tag, dockerfile, extract(baseImageName)); + } + /** * Getter for sdk version * @@ -64,4 +76,22 @@ public File getDockerfile() { Map getBuildArgs() { return buildArgs; } + + /** + * Extract build arguments from environment variables + * + * @param defaultImage default image name for building docker image + * @return map of building arguments + */ + private static Map extract(String defaultImage) { + final Map buildArgs = new HashMap<>(); + String registry = System.getenv("TARANTOOL_REGISTRY"); + if (registry != null && !registry.isEmpty()) { + buildArgs.put("IMAGE", registry.endsWith("/") ? registry + defaultImage : registry + "/" + defaultImage); + } + buildArgs.put("DOWNLOAD_HOST", System.getenv("DOWNLOAD_HOST")); + buildArgs.put("SDK_PATH", System.getenv("SDK_PATH")); + buildArgs.put("CLUSTER_SRC_DIR", "vshard_cluster"); + return buildArgs; + } } diff --git a/src/main/resources/Dockerfile b/src/main/resources/Dockerfile index f928e09..b4511cb 100644 --- a/src/main/resources/Dockerfile +++ b/src/main/resources/Dockerfile @@ -1,5 +1,6 @@ -ARG TARANTOOL_VERSION=2.11.2-ubuntu20.04 -FROM tarantool/tarantool:${TARANTOOL_VERSION} AS cartridge-base +ARG IMAGE="tarantool/tarantool" +ARG TARANTOOL_VERSION="2.11.2-ubuntu20.04" +FROM $IMAGE:$TARANTOOL_VERSION AS cartridge-base ARG TARANTOOL_SERVER_USER="root" ARG TARANTOOL_SERVER_GROUP="root" diff --git a/src/test/java/org/testcontainers/containers/TarantoolCartridgeBootstrapFromLuaWithFixedPortsIT.java b/src/test/java/org/testcontainers/containers/TarantoolCartridgeBootstrapFromLuaWithFixedPortsIT.java index 8be732d..654c36d 100644 --- a/src/test/java/org/testcontainers/containers/TarantoolCartridgeBootstrapFromLuaWithFixedPortsIT.java +++ b/src/test/java/org/testcontainers/containers/TarantoolCartridgeBootstrapFromLuaWithFixedPortsIT.java @@ -8,6 +8,7 @@ import org.junit.jupiter.api.Test; import org.rnorth.ducttape.RetryCountExceededException; import org.slf4j.LoggerFactory; +import org.testcontainers.containers.Container.ExecResult; import org.testcontainers.containers.exceptions.CartridgeTopologyException; import org.testcontainers.containers.output.Slf4jLogConsumer; import org.testcontainers.junit.jupiter.Container; @@ -16,8 +17,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import org.testcontainers.containers.Container.ExecResult; - /** * @author Alexey Kuzin @@ -29,7 +28,7 @@ public class TarantoolCartridgeBootstrapFromLuaWithFixedPortsIT { private static final TarantoolCartridgeContainer container = new TarantoolCartridgeContainer( "Dockerfile", - "cartridge", + System.getenv().getOrDefault("TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX", "") + "cartridge", "cartridge/instances_fixedport.yml", "cartridge/topology_fixedport.lua") .withEnv("TARANTOOL_INSTANCES_FILE", "instances_fixedport.yml") @@ -58,7 +57,7 @@ public void testTarantoolClusterCookieDefault() throws Exception { public void testTarantoolClusterCookieWithEnv() throws Exception { try(TarantoolCartridgeContainer newContainer = new TarantoolCartridgeContainer( "Dockerfile", - "cartridge", + System.getenv().getOrDefault("TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX", "") + "cartridge", "cartridge/instances.yml", "cartridge/replicasets.yml") .withEnv(TarantoolCartridgeContainer.ENV_TARANTOOL_CLUSTER_COOKIE, "secret") @@ -86,7 +85,7 @@ public void test_retryingSetupTopology_shouldWork() { try (TarantoolCartridgeContainer testContainer = new TarantoolCartridgeContainer( "Dockerfile", - "cartridge", + System.getenv().getOrDefault("TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX", "") + "cartridge", "cartridge/instances.yml", "cartridge/incorrect_topology.lua") .withLogConsumer(new Slf4jLogConsumer( @@ -120,7 +119,7 @@ public void testBuildArgs() throws Exception { try(TarantoolCartridgeContainer newContainer = new TarantoolCartridgeContainer( "Dockerfile", - "build_args_test", + System.getenv().getOrDefault("TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX", "") + "build_args_test", "cartridge/instances.yml", "cartridge/replicasets.yml", buildArgs) diff --git a/src/test/java/org/testcontainers/containers/TarantoolCartridgeBootstrapFromYamlIT.java b/src/test/java/org/testcontainers/containers/TarantoolCartridgeBootstrapFromYamlIT.java index a52366e..9d64310 100644 --- a/src/test/java/org/testcontainers/containers/TarantoolCartridgeBootstrapFromYamlIT.java +++ b/src/test/java/org/testcontainers/containers/TarantoolCartridgeBootstrapFromYamlIT.java @@ -22,7 +22,7 @@ public class TarantoolCartridgeBootstrapFromYamlIT { private static final TarantoolCartridgeContainer container = new TarantoolCartridgeContainer( "Dockerfile", - "cartridge", + System.getenv().getOrDefault("TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX", "") + "cartridge", "cartridge/instances.yml", "cartridge/replicasets.yml") .withStartupTimeout(Duration.ofMinutes(5)) diff --git a/src/test/java/org/testcontainers/containers/TarantoolCartridgePortMappingIT.java b/src/test/java/org/testcontainers/containers/TarantoolCartridgePortMappingIT.java index 8f6d005..07ca99b 100644 --- a/src/test/java/org/testcontainers/containers/TarantoolCartridgePortMappingIT.java +++ b/src/test/java/org/testcontainers/containers/TarantoolCartridgePortMappingIT.java @@ -26,7 +26,7 @@ public class TarantoolCartridgePortMappingIT { @Container private final static TarantoolCartridgeContainer container = new TarantoolCartridgeContainer( "Dockerfile", - "mapping-ports-container", + System.getenv().getOrDefault("TESTCONTAINERS_HUB_IMAGE_NAME_PREFIX", "") + "mapping-ports-container", "cartridge/instances.yml", "cartridge/replicasets.yml") .withEnv(TarantoolCartridgeContainer.ENV_TARANTOOL_CLUSTER_COOKIE, "secret") diff --git a/src/test/java/org/testcontainers/containers/enterprise/TarantoolMTlsContainerEnterpriseIT.java b/src/test/java/org/testcontainers/containers/enterprise/TarantoolMTlsContainerEnterpriseIT.java deleted file mode 100644 index 84c918b..0000000 --- a/src/test/java/org/testcontainers/containers/enterprise/TarantoolMTlsContainerEnterpriseIT.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.testcontainers.containers.enterprise; - -import java.io.File; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.testcontainers.containers.SslContext; -import org.testcontainers.containers.TarantoolContainer; -import org.testcontainers.containers.TarantoolImageParams; -import org.testcontainers.containers.output.Slf4jLogConsumer; -import static org.junit.jupiter.api.Assertions.assertEquals; - -/** - * @author Ivan Dneprov - */ -public class TarantoolMTlsContainerEnterpriseIT { - - private static final Logger log = LoggerFactory.getLogger(TarantoolMTlsContainerEnterpriseIT.class); - - private static TarantoolContainer containerWithSsl; - - @BeforeAll - public static void setUp() throws Exception { - final File dockerfile = new File( - TarantoolMTlsContainerEnterpriseIT.class.getClassLoader() - .getResource("enterprise/Dockerfile").toURI() - ); - final Map buildArgs = new HashMap<>(); - buildArgs.put("DOWNLOAD_HOST", System.getenv("DOWNLOAD_HOST")); - buildArgs.put("SDK_PATH", System.getenv("SDK_PATH")); - - containerWithSsl = new TarantoolContainer( - new TarantoolImageParams("tarantool-enterprise", dockerfile, buildArgs)) - .withScriptFileName("mtls_server.lua") - .withUsername("api_user") - .withPassword("secret") - .withMemtxMemory(256 * 1024 * 1024) - .withDirectoryBinding("enterprise/ssl/mtls") - .withSslContext(SslContext.getSslContext("/app/ca.key", "/app/ca.crt")) - .withLogConsumer(new Slf4jLogConsumer(log)); - - if (!containerWithSsl.isRunning()) { - containerWithSsl.start(); - } - } - - @Test - public void test_clientWithSsl_shouldWork() throws Exception { - List resultList = containerWithSsl.executeCommandDecoded("return box.cfg.listen"); - HashMap result = resultList.get(0); - HashMap params = result.get("params"); - assertEquals("ssl", params.get("transport")); - assertEquals("server.key", params.get("ssl_key_file")); - assertEquals("server.crt", params.get("ssl_cert_file")); - assertEquals("ca.crt", params.get("ssl_ca_file")); - } -} diff --git a/src/test/java/org/testcontainers/containers/enterprise/TarantoolSdkContainerEnterpriseIT.java b/src/test/java/org/testcontainers/containers/enterprise/TarantoolSdkContainerEnterpriseIT.java deleted file mode 100644 index 87dc667..0000000 --- a/src/test/java/org/testcontainers/containers/enterprise/TarantoolSdkContainerEnterpriseIT.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.testcontainers.containers.enterprise; - -import java.io.File; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; -import org.testcontainers.containers.TarantoolContainer; -import org.testcontainers.containers.TarantoolImageParams; - -/** - * @author Oleg Kuznetsov - * @author Ivan Dneprov - */ -public class TarantoolSdkContainerEnterpriseIT { - - - @Test - void test_should_createTarantoolContainerFromSdk() throws Exception { - final File dockerfile = new File( - TarantoolSdkContainerEnterpriseIT.class.getClassLoader().getResource("enterprise/Dockerfile").toURI() - ); - final Map buildArgs = new HashMap<>(); - buildArgs.put("DOWNLOAD_HOST", System.getenv("DOWNLOAD_HOST")); - buildArgs.put("SDK_PATH", System.getenv("SDK_PATH")); - - try (final TarantoolContainer tarantoolContainer = new TarantoolContainer( - new TarantoolImageParams("tarantool-enterprise-bundle:latest", dockerfile, buildArgs)) - .withDirectoryBinding("enterprise")) { - - tarantoolContainer.start(); - - List result = tarantoolContainer.executeCommandDecoded("return 'test'"); - - Assertions.assertEquals("test", result.get(0)); - } - } -} diff --git a/src/test/java/org/testcontainers/containers/enterprise/TarantoolSslContainerEnterpriseIT.java b/src/test/java/org/testcontainers/containers/enterprise/TarantoolSslContainerEnterpriseIT.java deleted file mode 100644 index 5ddc691..0000000 --- a/src/test/java/org/testcontainers/containers/enterprise/TarantoolSslContainerEnterpriseIT.java +++ /dev/null @@ -1,61 +0,0 @@ -package org.testcontainers.containers.enterprise; - -import java.io.File; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.testcontainers.containers.SslContext; -import org.testcontainers.containers.TarantoolContainer; -import org.testcontainers.containers.TarantoolImageParams; -import org.testcontainers.containers.output.Slf4jLogConsumer; -import static org.junit.jupiter.api.Assertions.assertEquals; - -/** - * @author Ivan Dneprov - */ -public class TarantoolSslContainerEnterpriseIT { - - private static final Logger log = LoggerFactory.getLogger(TarantoolSslContainerEnterpriseIT.class); - - private static TarantoolContainer containerWithSsl; - - @BeforeAll - public static void setUp() throws Exception { - final File dockerfile = new File( - TarantoolSslContainerEnterpriseIT.class.getClassLoader() - .getResource("enterprise/Dockerfile").toURI() - ); - final Map buildArgs = new HashMap<>(); - buildArgs.put("DOWNLOAD_HOST", System.getenv("DOWNLOAD_HOST")); - buildArgs.put("SDK_PATH", System.getenv("SDK_PATH")); - - containerWithSsl = new TarantoolContainer( - new TarantoolImageParams("tarantool-enterprise", dockerfile, buildArgs)) - .withScriptFileName("ssl_server.lua") - .withUsername("api_user") - .withPassword("secret") - .withMemtxMemory(256 * 1024 * 1024) - .withDirectoryBinding("enterprise/ssl") - .withSslContext(SslContext.getSslContext()) - .withLogConsumer(new Slf4jLogConsumer(log)); - - if (!containerWithSsl.isRunning()) { - containerWithSsl.start(); - } - } - - @Test - public void test_clientWithSsl_shouldWork() throws Exception { - List resultList = containerWithSsl.executeCommandDecoded("return box.cfg.listen"); - HashMap result = resultList.get(0); - HashMap params = result.get("params"); - assertEquals("ssl", params.get("transport")); - assertEquals("key.pem", params.get("ssl_key_file")); - assertEquals("certificate.crt", params.get("ssl_cert_file")); - } -} diff --git a/src/test/resources/enterprise/Dockerfile b/src/test/resources/enterprise/Dockerfile deleted file mode 100644 index b012ee1..0000000 --- a/src/test/resources/enterprise/Dockerfile +++ /dev/null @@ -1,26 +0,0 @@ -FROM centos:7 - -ARG SDK_DIR="/sdk" -ARG TARANTOOL_RUNDIR="/tmp/run" -ARG TARANTOOL_WORKDIR="/app" -ARG TARANTOOL_DATADIR="/tmp/data" - -ARG DOWNLOAD_HOST -ARG SDK_PATH - -ENV DOWNLOAD_HOST=$DOWNLOAD_HOST -ENV SDK_PATH=$SDK_PATH -ENV SDK_DIR=$SDK_DIR -ENV TARANTOOL_RUNDIR=$TARANTOOL_RUNDIR -ENV TARANTOOL_WORKDIR=$TARANTOOL_WORKDIR -ENV TARANTOOL_DATADIR=$TARANTOOL_DATADIR - -RUN curl https://curl.se/ca/cacert.pem -o /etc/pki/tls/certs/ca-bundle.crt -RUN yum -y install wget -RUN wget $DOWNLOAD_HOST/$SDK_PATH -RUN tar -xf ${SDK_PATH##*/} -RUN mv ./tarantool-enterprise $SDK_DIR -RUN cp $SDK_DIR/tarantool /usr/bin/tarantool && \ - cp $SDK_DIR/tt /usr/bin/tt - -WORKDIR $TARANTOOL_WORKDIR diff --git a/src/test/resources/enterprise/server.lua b/src/test/resources/enterprise/server.lua deleted file mode 100644 index cc6580b..0000000 --- a/src/test/resources/enterprise/server.lua +++ /dev/null @@ -1,10 +0,0 @@ -box.cfg { - listen = 3301, - memtx_memory = 128 * 1024 * 1024, -- 128 Mb - -- log = 'file:/tmp/tarantool.log', - log_level = 6, -} --- API user will be able to login with this password -box.schema.user.create('api_user', { password = 'secret', if_not_exists = true }) --- API user will be able to create spaces, add or remove data, execute functions -box.schema.user.grant('api_user', 'read,write,execute', 'universe', nil, { if_not_exists = true }) diff --git a/src/test/resources/enterprise/ssl/certificate.crt b/src/test/resources/enterprise/ssl/certificate.crt deleted file mode 100644 index 62ebf3a..0000000 --- a/src/test/resources/enterprise/ssl/certificate.crt +++ /dev/null @@ -1,21 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDhDCCAmwCCQCbVZGkNwxnRzANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UEBhMC -UlUxDzANBgNVBAgMBk1vc2NvdzEPMA0GA1UEBwwGTW9zY293MQswCQYDVQQKDAJW -SzESMBAGA1UECwwJVGFyYW50b29sMRIwEAYDVQQDDAlUYXJhbnRvb2wxHTAbBgkq -hkiG9w0BCQEWDnRlc3RAdGVzdC50ZXN0MB4XDTIyMDQwNzE2MDU1NFoXDTIzMDQw -NzE2MDU1NFowgYMxCzAJBgNVBAYTAlJVMQ8wDQYDVQQIDAZNb3Njb3cxDzANBgNV -BAcMBk1vc2NvdzELMAkGA1UECgwCVksxEjAQBgNVBAsMCVRhcmFudG9vbDESMBAG -A1UEAwwJVGFyYW50b29sMR0wGwYJKoZIhvcNAQkBFg50ZXN0QHRlc3QudGVzdDCC -ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM/3KMHSybroxV5nR8tm19kg -uVlWoFzd7IXGcVbeVCdu30wBLeDQ2XvsnjYYMkHUDPWLkVosZO4de0D+vyS2CmgE -zeurAjCrUEs4Sc/Aa+CTSRuI17EkJjPpDQNSCmp3KJfPGGAypYNT7kH2Va+HvNBR -HHsSk3xuyXujX02DwsuUnf5XqYuuZ39S5jRZ3qvmQytmVXrOtSeNyhWz50XISTER -ErczPVfKOIFYEZWj+9cKaTZssYZp95MCbkagKh9ZQ6E/T3TGTMEHrqYuXQC4mHI8 -PEISqnY3Vo4lpe+SBWxpJBOK5YWSTUWdPygyt71xEPkyss+C87bMsdQaY8r4TrkC -AwEAATANBgkqhkiG9w0BAQsFAAOCAQEAj2xf7QdcSbG0nF783TGnqFK7/pBrrdDb -zlT3NReHP70FjxPIK5alMkQBM+kn/+j1RDnjJhQQa5NKadhEHqpaRd7R2Iv9a2h8 -xQ78jB1GGygFnc5rGx3h5kOFSLjQlFcm9HYafTlasKYAjvhM4SiBQU/jgG2bHrIb -KrElFswBsfV2VvmvyYyhwDqrtZzKayS3BMD6fls95W+hUlMtcQXFZCVlIkJj6BVc -okM2tvkM/6ShokidAIkrq34dg4IJf3ZBXrXdiqtznMdaHAqb++Z4w3DY+hB+82qy -rUzOXligeS/xxzhiZRuIiGgMg4WbGAv7yexRgqv2wyJiGZfIfBrEdw== ------END CERTIFICATE----- diff --git a/src/test/resources/enterprise/ssl/gen.sh b/src/test/resources/enterprise/ssl/gen.sh deleted file mode 100644 index f767927..0000000 --- a/src/test/resources/enterprise/ssl/gen.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/bash - -HOST=tarantool.io -NEW_KEY_ARG=rsa:4096 -DAYS_ARG=36500 -CYPHER="PBE-SHA1-RC2-40" - -gen_ca() { - local ca="${1}" - openssl req \ - -new \ - -nodes \ - -newkey "${NEW_KEY_ARG}" \ - -keyout "${ca}.key" \ - -days "${DAYS_ARG}" \ - -x509 \ - -subj "/OU=Unknown/O=Unknown/L=Unknown/ST=unknown/C=AU" \ - -out "${ca}.crt" - -} - -gen_cert() { - local cert="${1}" - local ca="${2}" - - openssl req \ - -new \ - -nodes \ - -newkey "${NEW_KEY_ARG}" \ - -subj "/CN=${HOST}/OU=Unknown/O=Unknown/L=Unknown/ST=unknown/C=AU" \ - -keyout "${cert}.key" \ - -out "${cert}.csr" - - openssl x509 \ - -req \ - -days "${DAYS_ARG}" \ - -CAcreateserial \ - -CA "${ca}.crt" \ - -CAkey "${ca}.key" \ - -in "${cert}.csr" \ - -out "${cert}.crt" - - rm -f "${cert}.csr" - rm -f "${ca}.srl" -} - -secure_key() { - local file="${1}" - local pass="${2}" - openssl pkcs8 \ - -topk8 \ - -v1 ${CYPHER} \ - -in ${file}.key \ - -out ${file}.pkcs8.key \ - -passout "pass:${pass}" -} - -gen_ca ca -gen_cert server ca -gen_cert client ca -secure_key client 1q2w3e diff --git a/src/test/resources/enterprise/ssl/key.pem b/src/test/resources/enterprise/ssl/key.pem deleted file mode 100644 index 81493b0..0000000 --- a/src/test/resources/enterprise/ssl/key.pem +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDP9yjB0sm66MVe -Z0fLZtfZILlZVqBc3eyFxnFW3lQnbt9MAS3g0Nl77J42GDJB1Az1i5FaLGTuHXtA -/r8ktgpoBM3rqwIwq1BLOEnPwGvgk0kbiNexJCYz6Q0DUgpqdyiXzxhgMqWDU+5B -9lWvh7zQURx7EpN8bsl7o19Ng8LLlJ3+V6mLrmd/UuY0Wd6r5kMrZlV6zrUnjcoV -s+dFyEkxERK3Mz1XyjiBWBGVo/vXCmk2bLGGafeTAm5GoCofWUOhP090xkzBB66m -Ll0AuJhyPDxCEqp2N1aOJaXvkgVsaSQTiuWFkk1FnT8oMre9cRD5MrLPgvO2zLHU -GmPK+E65AgMBAAECggEAVpNrOT1aU+Bhggp2/ftjcnXIE6QXgHG27H4PYv2NhRkI -BqkbA1OOpqN7vcNW8MapWnNu4F5I6kQFsqoawtqx/Fm7rBd2AvLeq2HUgJN3lXdb -YQYX3RvSd5vWmgJGacoPcRt651lORBzlvDojs75LYWHS/H1gPtYUNM9vdmKa7orA -wWL1SITeR3gla0euaPItBUUNEyH4wepqG22ERqk/A7u54KRSvXp0mXRYcoDah6Y/ -nmuWwWfPbqCHgopiT3IBOsqklWIkCzLNx24OhOEXXAfgH5pw85NiPP/ZJN3moNYg -2Tj3VUt9Po3TnmKX+Az8gG4tNQ9R2F4YbnKm2wxFAQKBgQD1B2guaee/wUR16foX -pgOW+9TnDwTpBwHFaymzLHG2Gs3Zb0fR5HAGfV9Oxnde8Jw4bprRa5IZYzwgKgKY -jD9Qa8u+WsYKKOObmyBPTzpJevp0cQ9pxIgR/PSj98LL5Wvitcc82fGQAbA4KK02 -6VnaSfCrW2YDrl4Wk2NBFQACGQKBgQDZRuuD2Cn1dbCPuroQmYE4Pl++ke4mDl7F -xcOL7syu3uBbep/JwMB/ujruhtY9qBdKdLYjIO11xFtdQWhi7sMhhp3hlv8OGhR4 -b2Po3XnNZJ16/gSu4UqgSJ8ZQA8luNNMA0jUFW8Ki15O6vhvFDS/HIcLot+l3Lna -B71+l+CFoQKBgQCCtUDOAZCuqdprTDUtCFJB6HTaDRkBdctsFI5aFgtSqVnF86bM -QJ/B1n9Q9m4XJyMut1G/BTMad+VLAx3/YlEkBVzaXnHmWYmRKF9D72+YYxHXq7gd -I8myTs3x6ejv+6Jhfbaar2g8+amXS5ua/z//QhIwVsFElW97e4Qm45ztgQKBgEBB -JeL+qSHq5QUMTnwcOUedwojD9S6R71sDahnWy/cm+Ch1cg2jEAp103m4rGDddc3S -CA8JbM/3+qDwd+NSAqjGe6g8FD9iXQ1ku6Ig5SVljODTgCULgRs3fr1j4VbherMv -AXmewRDYOFKUUFXhHtwpnpJFX2hYhynAQjzOw1ohAoGBAIGypNhAgnhc2hyeqYC9 -Sg5JA06PFjuvrpymdcO3pfx9K7fHpU+wH17uYmzscMkFd5KrXVtqkziqMNV78hB4 -+x5qgabXlrZj4lVaTJLB5nPWt1VBZXcAwSDw5QAVhZtiXmsqKHgvVzR4hNnOWILq -1sQlocjdaPKH0EEbP84Ae2a7 ------END PRIVATE KEY----- diff --git a/src/test/resources/enterprise/ssl/mtls/ca.crt b/src/test/resources/enterprise/ssl/mtls/ca.crt deleted file mode 100644 index 7000d37..0000000 --- a/src/test/resources/enterprise/ssl/mtls/ca.crt +++ /dev/null @@ -1,32 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIFjTCCA3WgAwIBAgIUD0mJoUjJsB4mrsSsBlAorJwmgcUwDQYJKoZIhvcNAQEL -BQAwVTEQMA4GA1UECwwHVW5rbm93bjEQMA4GA1UECgwHVW5rbm93bjEQMA4GA1UE -BwwHVW5rbm93bjEQMA4GA1UECAwHdW5rbm93bjELMAkGA1UEBhMCQVUwIBcNMjIw -NTMxMjEwNTA2WhgPMjEyMjA1MDcyMTA1MDZaMFUxEDAOBgNVBAsMB1Vua25vd24x -EDAOBgNVBAoMB1Vua25vd24xEDAOBgNVBAcMB1Vua25vd24xEDAOBgNVBAgMB3Vu -a25vd24xCzAJBgNVBAYTAkFVMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC -AgEAtpV9sxa6KPfTP4r5IJAHML0SlIUX9rSzEwKnbsMuyEKUwmcZVQ1aUWrmTQ0J -UGboOuVMBaNqmWaeqgJBTXns60/MrKSBQmOUwm1/FIBt6KQF2WZZUM13yq+UN5i/ -MHtAzHxSrecHNmzpvL9y48QJFs4ruoCzVsnLz9EmYChQCrFj1JsfLVvSpcDTFgdV -bTHJIBF9rHFKB92qMbhDJjrSmvPKNqyaLnWP0WttNIMtE5djrqwGbHolX5JrFIKr -9LDV2jJiMA7tFVl2cgg+uEcrxqOz421S9VYD0hl5hFF81rpdg/q7MEBHPYD2cCyl -92mxUYqz7r9OdK7KeMlLD/sjL34IXsT4TbcbMLYcfBdBmDRAbaAlON3spU9EPUxd -Yvhd3qKDlOP3oCXDE5MKQujz7gR3XQpX3Zdd5zxdcp/GiE9RivoKstm5/JznN+ns -BaBzw6d4gBTzIPMmiAmUTrnWD5UEhsG/kHzk+K2WXJS8/05CIZThLgILl/vfgrMX -3OBUsw1ePXj2Jmp1HLExtpX8U1NKA8UtU97QRX40eWvMuLGz7sKMS/VZiA9eNkMI -hQhkjMt0JPo9gfMggVMBOjQbLV4Ni4XZeMzurtGOmlD61s7GECySKHy5pYZtXisO -VpKABYTEyTIPPjuwN5W90h+/NI2h8xW2Z9xsE7K0flGtA1cCAwEAAaNTMFEwHQYD -VR0OBBYEFKA+WAfH0GT8G4aM4RTplY4ECcQDMB8GA1UdIwQYMBaAFKA+WAfH0GT8 -G4aM4RTplY4ECcQDMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIB -AG++VdNo894uxESkzjVEC6hSLdcER6EbQOM34H13MzseMIjlv/4ely/Vsh79QEXA -fnAadrdVk/0r3BpBaO/iOLdMquePLBi/IYxfLaY8z2nwaocbMKUVmVjFuOgm+oXq -atyc/yzVG5yyaxoC1jHIgjn81fesI0f17opqda13u+4hXTcdAbpOY7yZY8YmP2o+ -SCCfGco1BBSyKIteHLzQzpG8pZnKM0seAitZ9jD5CF9jw0tzJCWkDIhJ2dgjpigz -Go5WBxY3FMyKQPOIP5a+5AWRV+fVWENdZu9EwEWpLqc/GxQrvhbXhJ/L2ZiYRNd8 -SNTBL7H0Sw65jHRWWSfz7osVntL+LYRPh30sF9LYTpUnp3gr4VTXLo6jaxwhvsIy -CacNhLpgco0sM6RLcHaSxYMUtO3EttDbkcBmIyP1KHEq1mzcVcXSetS7g9efxToh -G7NH1zVP1a8qJF5qKjXgRBASIXke9AHeAOYDI7om7qQtGuqI7nI3eg5E0qUM1gqH -kTKXJcXn/pwCkJL8TvRZWlYNJMG2YEwdA4KFgywHGn3GaM2quNqbZosMF84vlvnp -lrzJbrg2nD/wwQWdljJPVp5WReoPI9t08UqopR2P+zFcDh75X+3SXL8mMRIXMvFU -eTU7QSXhc9Q6l+skY2cRgvYl++fIooebBXpCYY9uDht9 ------END CERTIFICATE----- diff --git a/src/test/resources/enterprise/ssl/mtls/ca.key b/src/test/resources/enterprise/ssl/mtls/ca.key deleted file mode 100644 index 48c1040..0000000 --- a/src/test/resources/enterprise/ssl/mtls/ca.key +++ /dev/null @@ -1,52 +0,0 @@ ------BEGIN PRIVATE KEY----- -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 -YfB9GdaUnR0F648bsknruMJrFjfZFbo= ------END PRIVATE KEY----- diff --git a/src/test/resources/enterprise/ssl/mtls/mtls_server.lua b/src/test/resources/enterprise/ssl/mtls/mtls_server.lua deleted file mode 100644 index 9079bff..0000000 --- a/src/test/resources/enterprise/ssl/mtls/mtls_server.lua +++ /dev/null @@ -1,12 +0,0 @@ -box.cfg { listen = { - uri = 3301, - params = { - transport = 'ssl', - ssl_key_file = 'server.key', - ssl_cert_file = 'server.crt', - ssl_ca_file = 'ca.crt' - } -} } - -box.schema.user.create('api_user', { password = 'secret', if_not_exists = true }) -box.schema.user.grant('api_user', 'read, write, execute', 'universe', nil, { if_not_exists = true }) diff --git a/src/test/resources/enterprise/ssl/mtls/server.crt b/src/test/resources/enterprise/ssl/mtls/server.crt deleted file mode 100644 index fe661cc..0000000 --- a/src/test/resources/enterprise/ssl/mtls/server.crt +++ /dev/null @@ -1,31 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIFSjCCAzICFAGDWf+4nbv3f7+QrRbP8Q3YhzOaMA0GCSqGSIb3DQEBCwUAMFUx -EDAOBgNVBAsMB1Vua25vd24xEDAOBgNVBAoMB1Vua25vd24xEDAOBgNVBAcMB1Vu -a25vd24xEDAOBgNVBAgMB3Vua25vd24xCzAJBgNVBAYTAkFVMCAXDTIyMDUzMTIx -MDUwOVoYDzIxMjIwNTA3MjEwNTA5WjBsMRUwEwYDVQQDDAx0YXJhbnRvb2wuaW8x -EDAOBgNVBAsMB1Vua25vd24xEDAOBgNVBAoMB1Vua25vd24xEDAOBgNVBAcMB1Vu -a25vd24xEDAOBgNVBAgMB3Vua25vd24xCzAJBgNVBAYTAkFVMIICIjANBgkqhkiG -9w0BAQEFAAOCAg8AMIICCgKCAgEAy8ClyS3WZlJwycdRM1Nteke6adcgScUz0hVn -yhZJpZo4crReCTtCzOWNstlA5nnzlDT56YbnmzAwDNG6pPP00t2jVUU5wxMJSDGy -SkDk0nxq4Rd20EDV3+GIxJ+aEEPYwMcY4RcGErG+5yrSVbWniDLcvKeMjLjODzUr -vzSuBsRgtMt8Z6vQUaBxIdT3XupLFSZb4k883TkQE8wXjqbLmmOPoQAu1WZVAKEV -uvxXKonYlgC00Rl7HsaEMw8zUL7P1e+qtn6GaXkdI55Lk2y/yk0UKhBWR43mDoTx -VWyWrVnL7rFLt7Doz6F8Q5tiekjz3WpVhm2z7aGMZ/n3FE3etNVbnZg1/wqXjini -VXCgaUKryEYKR1kgPxUJB7EHjSLIGIn1Ix6toMK6ntr+WySMUfSt0A5jsQ3WM1TY -8YOdFuFbeiPpTD9Qq7hDPW1AyGOkh31eecqVwBJQlajRrkZBBZ8EacbR6aDgBfm4 -n3gtoUuZZYf1aW1HzlWjaVp6M5gJCbbvuGjcfpVAbq71PTM6PYHvfe2wlbfJR02V -H7kGUUbE3A1JIGSys44FLaitY3Gy+X/Tj+bEH1uid/Q6ykcCcU/ICDoaXBQ9jbSv -56CfIjoSUY2JXpDG/Ahli/b6pwvP9CkLGTDc0VWpuG4sB3sbzjhYyijDac48/JuJ -HVk1mMcCAwEAATANBgkqhkiG9w0BAQsFAAOCAgEARGdetChBKbDNaxGA+NHAtDGe -2lVISV21j5L1EkWQhrp39bx1YsFmvV+wibYuTDTlk/XSh+MpuRvTmc8xWXIIe30Y -PQXQPCrRd8vNjHt6i0MpW4kCe0QU/PTGOOBpD1VnJuAuebqmLuvdwCHb5uCacbVJ -Gt9voyM3yQQNZ0A3jYcm7Y6PAEL/gxq0+F30+LwvZqaAGO6hqC7WJuiyoE9No9ri -+0vZG0F0l1ZiVWaIi5m38KfYGuhd8tAEKkTUZ2cL0Td/KOavCgJ1D8s4co3wyDZG -qrIVKHYvl8G2YivQdXpMuh32QAog/34zI909pM0E2IzxRl6YBjP9UaAUW6LWWuWZ -1pso3pL/+WynAUC9gsWFcnsv3Ji4ZH24nA7BemBwo5JT/5WTtMTAA4phQDH340x4 -VnHPigcvyu3eh/PDS7ZdiUSGuNcibSTrhn4bluCv5vzzmw+Atp9eccF81LxfERJY -4H94Kw70/8LBLR/7McL/aobJ5mSpAK1nnsRdr1xE46uGpkmK4pgHfD5xkcn9AFxE -vsCnwynYp4RNPfiLUHNzez0T4JWnJqPtSNtR2jTO3iVz04SUbUj/cltXOLzyPfyM -VouEL2VnAmC1WCN5KC6NnzyKVLbQ7EAi4x+61lJWWkRugxrXeaVdNbgQlA1yvAlF -cA8F69eVyPJnFsdWSq0= ------END CERTIFICATE----- diff --git a/src/test/resources/enterprise/ssl/mtls/server.key b/src/test/resources/enterprise/ssl/mtls/server.key deleted file mode 100644 index f6f5117..0000000 --- a/src/test/resources/enterprise/ssl/mtls/server.key +++ /dev/null @@ -1,52 +0,0 @@ ------BEGIN PRIVATE KEY----- -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 -jE5s8iIxjb4IkPziVOzgev4epyIs ------END PRIVATE KEY----- diff --git a/src/test/resources/enterprise/ssl/mtls/trustStoreFile b/src/test/resources/enterprise/ssl/mtls/trustStoreFile deleted file mode 100644 index af02d8b..0000000 Binary files a/src/test/resources/enterprise/ssl/mtls/trustStoreFile and /dev/null differ diff --git a/src/test/resources/enterprise/ssl/ssl_server.lua b/src/test/resources/enterprise/ssl/ssl_server.lua deleted file mode 100644 index 72ca5bf..0000000 --- a/src/test/resources/enterprise/ssl/ssl_server.lua +++ /dev/null @@ -1,11 +0,0 @@ -box.cfg { listen = { - uri = 3301, - params = { - transport = 'ssl', - ssl_key_file = 'key.pem', - ssl_cert_file = 'certificate.crt' - } -} } - -box.schema.user.create('api_user', { password = 'secret', if_not_exists = true }) -box.schema.user.grant('api_user', 'read, write, execute', 'universe', nil, { if_not_exists = true })