Parametrize integration tests

.github/workflows/gradle.yml

@@ -2,18 +2,60 @@ name: CI
 
 on:
   push:
-    branches: [ "master", "release-5.2.0" ]
+    branches:
+      - "master"
   pull_request:
-    branches: [ "master" ]
+    branches:
+      - "master"
 
 jobs:
   build:
-    name: Build on JDK ${{ matrix.java }} and ${{ matrix.os }}
+    name: Build on JDK ${{ matrix.java }}, ${{ matrix.os }} and Vault ${{ matrix.vault }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        java: [ 11 ]
-        os: [ ubuntu-latest, windows-latest ]
+        java:
+          - 11
+        vault:
+          - 1.1.3
+          - 1.9.0
+          - 1.9.1
+          - 1.9.2
+          - 1.9.3
+          - 1.9.4
+          - 1.9.5
+          - 1.9.6
+          - 1.9.7
+          - 1.9.8
+          - 1.9.9
+          - 1.9.10
+          - 1.10.0
+          - 1.10.1
+          - 1.10.2
+          - 1.10.3
+          - 1.10.4
+          - 1.10.5
+          - 1.10.6
+          - 1.10.7
+          - 1.10.8
+          - 1.10.9
+          - 1.10.10
+          - 1.11.0
+          - 1.11.1
+          - 1.11.2
+          - 1.11.3
+          - 1.11.4
+          - 1.11.5
+          - 1.11.6
+          - 1.11.7
+          - 1.12.0
+          - 1.12.1
+          - 1.12.2
+          - 1.12.3
+          - latest
+        os:
+        - ubuntu-latest
+        - windows-latest
         include:
           # TODO(casz) remove once https://github.com/testcontainers/testcontainers-java/pull/1780 is available
           - os: 'ubuntu-latest'
@@ -33,6 +75,8 @@ jobs:
             ${{ matrix.tasks }}
             -s
             --info
+        env:
+          VAULT_VERSION: ${{ matrix.vault }}
       - uses: actions/upload-artifact@v3  # upload test results
         if: success() || failure()        # run this step even if previous step failed
         with:

src/test-integration/java/io/github/jopenlibs/vault/v1_11_4/api/AuthBackendAppIdTests.java → src/test-integration/java/io/github/jopenlibs/vault/api/AuthBackendAppIdTests.java

@@ -1,30 +1,53 @@
-package io.github.jopenlibs.vault.v1_11_4.api;
+package io.github.jopenlibs.vault.api;
 
 import io.github.jopenlibs.vault.Vault;
 import io.github.jopenlibs.vault.VaultException;
-import io.github.jopenlibs.vault.v1_11_4.util.VaultContainer;
+import io.github.jopenlibs.vault.util.VaultContainer;
+import io.github.jopenlibs.vault.util.VaultVersion;
 import java.io.IOException;
+import java.util.Optional;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNotSame;
+import static org.junit.Assume.assumeTrue;
 
 /**
- * Integration tests for the AppId auth backend.
+ * Integration tests for the AppId auth backend. According to the Vault documentation, this method
+ * is deprecated. Also, from Vault 1.11.7 it fails the usage. For this reason, we skip this test if
+ * Vault version is greater than 1.11.6
  */
 public class AuthBackendAppIdTests {
 
     @ClassRule
     public static final VaultContainer container = new VaultContainer();
 
+    private static boolean checkVersion() {
+        VaultVersion accepted = new VaultVersion("1.11.6");
+        try {
+            VaultVersion current = new VaultVersion(
+                    Optional.ofNullable(System.getenv("VAULT_VERSION")).orElse("latest"));
+            if (current.compareTo(accepted) > 0) {
+                return false;
+            }
+        } catch (NumberFormatException ignored) {
+            return false;
+        }
+
+        return true;
+    }
+
     @BeforeClass
     public static void setupClass() throws IOException, InterruptedException {
+        assumeTrue(checkVersion());
+
         container.initAndUnsealVault();
         container.setupBackendAppId();
     }
 
+
     /**
      * Test Authentication with app-id auth backend
      */

src/test-integration/java/io/github/jopenlibs/vault/v1_1_3/api/AuthBackendAppRoleTests.java → src/test-integration/java/io/github/jopenlibs/vault/api/AuthBackendAppRoleTests.java

@@ -1,10 +1,10 @@
-package io.github.jopenlibs.vault.v1_1_3.api;
+package io.github.jopenlibs.vault.api;
 
 import io.github.jopenlibs.vault.Vault;
 import io.github.jopenlibs.vault.VaultConfig;
 import io.github.jopenlibs.vault.VaultException;
 import io.github.jopenlibs.vault.response.LogicalResponse;
-import io.github.jopenlibs.vault.v1_1_3.util.VaultContainer;
+import io.github.jopenlibs.vault.util.VaultContainer;
 import java.io.IOException;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;

src/test-integration/java/io/github/jopenlibs/vault/v1_1_3/api/AuthBackendCertTests.java → src/test-integration/java/io/github/jopenlibs/vault/api/AuthBackendCertTests.java

@@ -1,12 +1,12 @@
-package io.github.jopenlibs.vault.v1_1_3.api;
+package io.github.jopenlibs.vault.api;
 
 import io.github.jopenlibs.vault.SslConfig;
 import io.github.jopenlibs.vault.Vault;
 import io.github.jopenlibs.vault.VaultConfig;
 import io.github.jopenlibs.vault.VaultException;
-import io.github.jopenlibs.vault.v1_1_3.util.SSLUtils;
-import io.github.jopenlibs.vault.v1_1_3.util.TestConstants;
-import io.github.jopenlibs.vault.v1_1_3.util.VaultContainer;
+import io.github.jopenlibs.vault.util.SSLUtils;
+import io.github.jopenlibs.vault.util.TestConstants;
+import io.github.jopenlibs.vault.util.VaultContainer;
 import java.io.File;
 import java.io.IOException;
 import java.security.KeyStore;

src/test-integration/java/io/github/jopenlibs/vault/v1_1_3/api/AuthBackendDatabaseTests.java → src/test-integration/java/io/github/jopenlibs/vault/api/AuthBackendDatabaseTests.java

@@ -1,11 +1,11 @@
-package io.github.jopenlibs.vault.v1_1_3.api;
+package io.github.jopenlibs.vault.api;
 
 import io.github.jopenlibs.vault.Vault;
 import io.github.jopenlibs.vault.VaultException;
 import io.github.jopenlibs.vault.api.database.DatabaseRoleOptions;
 import io.github.jopenlibs.vault.response.DatabaseResponse;
-import io.github.jopenlibs.vault.v1_1_3.util.DbContainer;
-import io.github.jopenlibs.vault.v1_1_3.util.VaultContainer;
+import io.github.jopenlibs.vault.util.DbContainer;
+import io.github.jopenlibs.vault.util.VaultContainer;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;

src/test-integration/java/io/github/jopenlibs/vault/v1_11_4/api/AuthBackendPkiTests.java → src/test-integration/java/io/github/jopenlibs/vault/api/AuthBackendPkiTests.java

@@ -1,13 +1,13 @@
-package io.github.jopenlibs.vault.v1_11_4.api;
+package io.github.jopenlibs.vault.api;
 
 import io.github.jopenlibs.vault.Vault;
 import io.github.jopenlibs.vault.VaultException;
 import io.github.jopenlibs.vault.api.pki.CredentialFormat;
 import io.github.jopenlibs.vault.api.pki.RoleOptions;
 import io.github.jopenlibs.vault.response.PkiResponse;
 import io.github.jopenlibs.vault.rest.RestResponse;
-import io.github.jopenlibs.vault.v1_11_4.util.SSLUtils;
-import io.github.jopenlibs.vault.v1_11_4.util.VaultContainer;
+import io.github.jopenlibs.vault.util.SSLUtils;
+import io.github.jopenlibs.vault.util.VaultContainer;
 import java.io.IOException;
 import java.security.KeyPair;
 import java.security.KeyPairGenerator;

src/test-integration/java/io/github/jopenlibs/vault/v1_11_4/api/AuthBackendTokenTests.java → src/test-integration/java/io/github/jopenlibs/vault/api/AuthBackendTokenTests.java

@@ -1,12 +1,12 @@
-package io.github.jopenlibs.vault.v1_11_4.api;
+package io.github.jopenlibs.vault.api;
 
 import io.github.jopenlibs.vault.Vault;
 import io.github.jopenlibs.vault.VaultException;
 import io.github.jopenlibs.vault.api.Auth.TokenRequest;
 import io.github.jopenlibs.vault.json.Json;
 import io.github.jopenlibs.vault.response.AuthResponse;
 import io.github.jopenlibs.vault.response.LookupResponse;
-import io.github.jopenlibs.vault.v1_11_4.util.VaultContainer;
+import io.github.jopenlibs.vault.util.VaultContainer;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;

src/test-integration/java/io/github/jopenlibs/vault/v1_1_3/api/AuthBackendUserPassTests.java → src/test-integration/java/io/github/jopenlibs/vault/api/AuthBackendUserPassTests.java

@@ -1,9 +1,9 @@
-package io.github.jopenlibs.vault.v1_1_3.api;
+package io.github.jopenlibs.vault.api;
 
 import io.github.jopenlibs.vault.Vault;
 import io.github.jopenlibs.vault.VaultException;
 import io.github.jopenlibs.vault.response.AuthResponse;
-import io.github.jopenlibs.vault.v1_1_3.util.VaultContainer;
+import io.github.jopenlibs.vault.util.VaultContainer;
 import java.io.IOException;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;

src/test-integration/java/io/github/jopenlibs/vault/v1_11_4/api/DebugTests.java → src/test-integration/java/io/github/jopenlibs/vault/api/DebugTests.java

@@ -1,9 +1,9 @@
-package io.github.jopenlibs.vault.v1_11_4.api;
+package io.github.jopenlibs.vault.api;
 
 import io.github.jopenlibs.vault.Vault;
 import io.github.jopenlibs.vault.VaultException;
 import io.github.jopenlibs.vault.response.HealthResponse;
-import io.github.jopenlibs.vault.v1_11_4.util.VaultContainer;
+import io.github.jopenlibs.vault.util.VaultContainer;
 import java.io.IOException;
 import junit.framework.TestCase;
 import org.junit.Before;

src/test-integration/java/io/github/jopenlibs/vault/v1_11_4/api/LeasesTests.java → src/test-integration/java/io/github/jopenlibs/vault/api/LeasesTests.java

@@ -1,12 +1,12 @@
-package io.github.jopenlibs.vault.v1_11_4.api;
+package io.github.jopenlibs.vault.api;
 
 import io.github.jopenlibs.vault.Vault;
 import io.github.jopenlibs.vault.VaultException;
 import io.github.jopenlibs.vault.api.database.DatabaseRoleOptions;
 import io.github.jopenlibs.vault.response.DatabaseResponse;
 import io.github.jopenlibs.vault.response.VaultResponse;
-import io.github.jopenlibs.vault.v1_11_4.util.DbContainer;
-import io.github.jopenlibs.vault.v1_11_4.util.VaultContainer;
+import io.github.jopenlibs.vault.util.DbContainer;
+import io.github.jopenlibs.vault.util.VaultContainer;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;

src/test-integration/java/io/github/jopenlibs/vault/v1_11_4/api/LogicalTests.java → src/test-integration/java/io/github/jopenlibs/vault/api/LogicalTests.java

@@ -1,11 +1,11 @@
-package io.github.jopenlibs.vault.v1_11_4.api;
+package io.github.jopenlibs.vault.api;
 
 import io.github.jopenlibs.vault.Vault;
 import io.github.jopenlibs.vault.VaultConfig;
 import io.github.jopenlibs.vault.VaultException;
 import io.github.jopenlibs.vault.response.AuthResponse;
 import io.github.jopenlibs.vault.response.LogicalResponse;
-import io.github.jopenlibs.vault.v1_11_4.util.VaultContainer;
+import io.github.jopenlibs.vault.util.VaultContainer;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;

src/test-integration/java/io/github/jopenlibs/vault/v1_1_3/api/MountsTests.java → src/test-integration/java/io/github/jopenlibs/vault/api/MountsTests.java

@@ -1,4 +1,4 @@
-package io.github.jopenlibs.vault.v1_1_3.api;
+package io.github.jopenlibs.vault.api;
 
 import io.github.jopenlibs.vault.Vault;
 import io.github.jopenlibs.vault.VaultException;
@@ -8,7 +8,7 @@
 import io.github.jopenlibs.vault.api.mounts.MountType;
 import io.github.jopenlibs.vault.api.mounts.TimeToLive;
 import io.github.jopenlibs.vault.response.MountResponse;
-import io.github.jopenlibs.vault.v1_1_3.util.VaultContainer;
+import io.github.jopenlibs.vault.util.VaultContainer;
 import java.io.IOException;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;

src/test-integration/java/io/github/jopenlibs/vault/v1_1_3/api/SealTests.java → src/test-integration/java/io/github/jopenlibs/vault/api/SealTests.java

@@ -1,8 +1,8 @@
-package io.github.jopenlibs.vault.v1_1_3.api;
+package io.github.jopenlibs.vault.api;
 
 import io.github.jopenlibs.vault.VaultException;
 import io.github.jopenlibs.vault.response.SealResponse;
-import io.github.jopenlibs.vault.v1_1_3.util.VaultContainer;
+import io.github.jopenlibs.vault.util.VaultContainer;
 import java.io.IOException;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;

src/test-integration/java/io/github/jopenlibs/vault/v1_1_3/api/VaultAgentTests.java → src/test-integration/java/io/github/jopenlibs/vault/api/VaultAgentTests.java

@@ -1,11 +1,11 @@
-package io.github.jopenlibs.vault.v1_1_3.api;
+package io.github.jopenlibs.vault.api;
 
 import io.github.jopenlibs.vault.Vault;
 import io.github.jopenlibs.vault.VaultConfig;
 import io.github.jopenlibs.vault.VaultException;
 import io.github.jopenlibs.vault.response.LogicalResponse;
-import io.github.jopenlibs.vault.v1_1_3.util.VaultAgentContainer;
-import io.github.jopenlibs.vault.v1_1_3.util.VaultContainer;
+import io.github.jopenlibs.vault.util.VaultAgentContainer;
+import io.github.jopenlibs.vault.util.VaultContainer;
 import java.io.File;
 import java.io.IOException;
 import java.util.HashMap;

src/test-integration/java/io/github/jopenlibs/vault/v1_1_3/api/WrappingTests.java → src/test-integration/java/io/github/jopenlibs/vault/api/WrappingTests.java

@@ -1,4 +1,4 @@
-package io.github.jopenlibs.vault.v1_1_3.api;
+package io.github.jopenlibs.vault.api;
 
 import io.github.jopenlibs.vault.Vault;
 import io.github.jopenlibs.vault.VaultException;
@@ -7,7 +7,7 @@
 import io.github.jopenlibs.vault.response.LogicalResponse;
 import io.github.jopenlibs.vault.response.UnwrapResponse;
 import io.github.jopenlibs.vault.response.WrapResponse;
-import io.github.jopenlibs.vault.v1_1_3.util.VaultContainer;
+import io.github.jopenlibs.vault.util.VaultContainer;
 import java.io.IOException;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;

src/test-integration/java/io/github/jopenlibs/vault/v1_1_3/util/DbContainer.java → src/test-integration/java/io/github/jopenlibs/vault/util/DbContainer.java

@@ -1,4 +1,4 @@
-package io.github.jopenlibs.vault.v1_1_3.util;
+package io.github.jopenlibs.vault.util;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

src/test-integration/java/io/github/jopenlibs/vault/v1_11_4/util/SSLUtils.java → src/test-integration/java/io/github/jopenlibs/vault/util/SSLUtils.java

@@ -1,4 +1,4 @@
-package io.github.jopenlibs.vault.v1_11_4.util;
+package io.github.jopenlibs.vault.util;
 
 import java.io.ByteArrayOutputStream;
 import java.io.FileReader;

src/test-integration/java/io/github/jopenlibs/vault/v1_1_3/util/TestConstants.java → src/test-integration/java/io/github/jopenlibs/vault/util/TestConstants.java

@@ -1,4 +1,4 @@
-package io.github.jopenlibs.vault.v1_1_3.util;
+package io.github.jopenlibs.vault.util;
 
 import java.io.File;
 import org.testcontainers.containers.Network;

src/test-integration/java/io/github/jopenlibs/vault/v1_11_4/util/VaultAgentContainer.java → src/test-integration/java/io/github/jopenlibs/vault/util/VaultAgentContainer.java

@@ -1,4 +1,4 @@
-package io.github.jopenlibs.vault.v1_11_4.util;
+package io.github.jopenlibs.vault.util;
 
 import com.github.dockerjava.api.model.Capability;
 import io.github.jopenlibs.vault.Vault;

src/test-integration/java/io/github/jopenlibs/vault/v1_11_4/util/VaultContainer.java → src/test-integration/java/io/github/jopenlibs/vault/util/VaultContainer.java

@@ -1,4 +1,4 @@
-package io.github.jopenlibs.vault.v1_11_4.util;
+package io.github.jopenlibs.vault.util;
 
 import com.github.dockerjava.api.model.Capability;
 import io.github.jopenlibs.vault.SslConfig;
@@ -10,6 +10,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.net.HttpURLConnection;
+import java.util.Optional;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.containers.BindMode;
@@ -28,7 +29,8 @@
 public class VaultContainer extends GenericContainer<VaultContainer> implements TestConstants,
         TestLifecycleAware {
 
-    public static final String DEFAULT_IMAGE_AND_TAG = "vault:1.11.4";
+    public static final String VAULT_DEFAULT_IMAGE = "vault";
+    public static final String VAULT_DEFAULT_TAG = "latest";
     private static final Logger LOGGER = LoggerFactory.getLogger(VaultContainer.class);
     private String rootToken;
     private String unsealKey;
@@ -73,7 +75,8 @@ public VaultContainer(String image) {
     }
 
     public VaultContainer() {
-        this(DEFAULT_IMAGE_AND_TAG);
+        this(VAULT_DEFAULT_IMAGE + ":" + Optional.ofNullable(
+                System.getenv("VAULT_VERSION")).orElse(VAULT_DEFAULT_TAG));
     }
 
     /**