Merge pull request #186 from mslowiak/issues/60

issue-60: Set up testcontainers (part 1)
carlspring · Jan 31, 2021 · 891edc8 · 891edc8
2 parents 9af7416 + 05c2ef0
commit 891edc8
Show file tree

Hide file tree

Showing 21 changed files with 168 additions and 39 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -27,7 +27,7 @@ jobs:
       PR_HEAD_LABEL: ${{ toJSON(github.event.pull_request.head.label) }}
       # format: boolean
       # check https://github.com/carlspring/s3fs-nio/pull/77#issuecomment-686804207
-      IS_EXTERNAL_PR: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository }}
+      IS_EXTERNAL_PR: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository }}
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -124,6 +124,8 @@ jobs:
         run: docker save minio/minio testcontainers/ryuk > ${{ github.workspace }}/docker-image-cache.tar
 
   run-it-s3:
+    # Do not run for forks since secrets will be missing and this will fail.
+    if: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository }}
     needs: [run-it-minio]
     runs-on: ${{ matrix.os }}
     strategy:

diff --git a/pom.xml b/pom.xml
@@ -89,6 +89,7 @@
         <version.mockito>3.7.7</version.mockito>
         <version.marschall.memoryfilesystem>2.1.0</version.marschall.memoryfilesystem>
         <version.surefire>3.0.0-M5</version.surefire>
+        <version.testcontainers>1.15.1</version.testcontainers>
     </properties>
 
     <build>
@@ -266,6 +267,14 @@
             <scope>test</scope>
         </dependency>
 
+
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>testcontainers</artifactId>
+            <version>${version.testcontainers}</version>
+            <scope>test</scope>
+        </dependency>
+
         <!-- needs extra dependencies: objenesis & hamcrest -->
         <dependency>
             <groupId>org.mockito</groupId>

diff --git a/src/test/java/org/carlspring/cloud/storage/s3fs/FileSystemsIT.java b/src/test/java/org/carlspring/cloud/storage/s3fs/FileSystemsIT.java
@@ -1,6 +1,7 @@
 package org.carlspring.cloud.storage.s3fs;
 
 import org.carlspring.cloud.storage.s3fs.junit.annotations.S3IntegrationTest;
+import org.carlspring.cloud.storage.s3fs.util.BaseIntegrationTest;
 import org.carlspring.cloud.storage.s3fs.util.EnvironmentBuilder;
 
 import java.io.IOException;
@@ -16,7 +17,7 @@
 import static org.junit.jupiter.api.Assertions.assertSame;
 
 @S3IntegrationTest
-class FileSystemsIT
+class FileSystemsIT extends BaseIntegrationTest
 {
 
     private static final URI uriEurope = URI.create("s3://s3-eu-west-1.amazonaws.com/");

diff --git a/src/test/java/org/carlspring/cloud/storage/s3fs/FilesIT.java b/src/test/java/org/carlspring/cloud/storage/s3fs/FilesIT.java
@@ -1,6 +1,7 @@
 package org.carlspring.cloud.storage.s3fs;
 
 import org.carlspring.cloud.storage.s3fs.junit.annotations.S3IntegrationTest;
+import org.carlspring.cloud.storage.s3fs.util.BaseIntegrationTest;
 import org.carlspring.cloud.storage.s3fs.util.CopyDirVisitor;
 import org.carlspring.cloud.storage.s3fs.util.EnvironmentBuilder;
 
@@ -27,7 +28,7 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 @S3IntegrationTest
-class FilesIT
+class FilesIT extends BaseIntegrationTest
 {
 
     private static final String bucket = EnvironmentBuilder.getBucket();

diff --git a/src/test/java/org/carlspring/cloud/storage/s3fs/S3ClientIT.java b/src/test/java/org/carlspring/cloud/storage/s3fs/S3ClientIT.java
@@ -1,6 +1,7 @@
 package org.carlspring.cloud.storage.s3fs;
 
 import org.carlspring.cloud.storage.s3fs.junit.annotations.S3IntegrationTest;
+import org.carlspring.cloud.storage.s3fs.util.BaseIntegrationTest;
 import org.carlspring.cloud.storage.s3fs.util.EnvironmentBuilder;
 
 import java.io.ByteArrayInputStream;
@@ -30,7 +31,7 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 @S3IntegrationTest
-class S3ClientIT
+class S3ClientIT extends BaseIntegrationTest
 {
 
     S3Client client;

diff --git a/src/test/java/org/carlspring/cloud/storage/s3fs/S3UtilsIT.java b/src/test/java/org/carlspring/cloud/storage/s3fs/S3UtilsIT.java
@@ -3,6 +3,7 @@
 import org.carlspring.cloud.storage.s3fs.attribute.S3BasicFileAttributes;
 import org.carlspring.cloud.storage.s3fs.attribute.S3PosixFileAttributes;
 import org.carlspring.cloud.storage.s3fs.junit.annotations.S3IntegrationTest;
+import org.carlspring.cloud.storage.s3fs.util.BaseIntegrationTest;
 import org.carlspring.cloud.storage.s3fs.util.CopyDirVisitor;
 import org.carlspring.cloud.storage.s3fs.util.EnvironmentBuilder;
 import org.carlspring.cloud.storage.s3fs.util.S3Utils;
@@ -35,7 +36,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @S3IntegrationTest
-class S3UtilsIT
+class S3UtilsIT extends BaseIntegrationTest
 {
 
     private static final String bucket = EnvironmentBuilder.getBucket();

diff --git a/src/test/java/org/carlspring/cloud/storage/s3fs/fileSystemProvider/GetFileSystemIT.java b/src/test/java/org/carlspring/cloud/storage/s3fs/fileSystemProvider/GetFileSystemIT.java
@@ -2,6 +2,7 @@
 
 import org.carlspring.cloud.storage.s3fs.S3FileSystemProvider;
 import org.carlspring.cloud.storage.s3fs.junit.annotations.S3IntegrationTest;
+import org.carlspring.cloud.storage.s3fs.util.BaseIntegrationTest;
 
 import java.io.IOException;
 import java.nio.file.FileSystem;
@@ -25,7 +26,7 @@
 import static org.mockito.Mockito.spy;
 
 @S3IntegrationTest
-class GetFileSystemIT
+class GetFileSystemIT extends BaseIntegrationTest
 {
 
     private S3FileSystemProvider provider;

diff --git a/src/test/java/org/carlspring/cloud/storage/s3fs/fileSystemProvider/NewFileSystemIT.java b/src/test/java/org/carlspring/cloud/storage/s3fs/fileSystemProvider/NewFileSystemIT.java
@@ -2,6 +2,7 @@
 
 import org.carlspring.cloud.storage.s3fs.S3FileSystemProvider;
 import org.carlspring.cloud.storage.s3fs.junit.annotations.S3IntegrationTest;
+import org.carlspring.cloud.storage.s3fs.util.BaseIntegrationTest;
 
 import java.io.IOException;
 import java.net.URI;
@@ -29,7 +30,7 @@
 import static org.mockito.Mockito.verify;
 
 @S3IntegrationTest
-class NewFileSystemIT
+class NewFileSystemIT extends BaseIntegrationTest
 {
 
     private S3FileSystemProvider provider;

diff --git a/src/test/java/org/carlspring/cloud/storage/s3fs/junit/examples/CombinedIT.java b/src/test/java/org/carlspring/cloud/storage/s3fs/junit/examples/CombinedIT.java
@@ -2,6 +2,7 @@
 
 import org.carlspring.cloud.storage.s3fs.junit.annotations.MinioIntegrationTest;
 import org.carlspring.cloud.storage.s3fs.junit.annotations.S3IntegrationTest;
+import org.carlspring.cloud.storage.s3fs.util.BaseIntegrationTest;
 
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
@@ -13,7 +14,7 @@
  */
 @MinioIntegrationTest
 @S3IntegrationTest
-public class CombinedIT
+public class CombinedIT extends BaseIntegrationTest
 {
 
     private static final Logger logger = LoggerFactory.getLogger(S3MethodAnnotationIT.class);

diff --git a/src/test/java/org/carlspring/cloud/storage/s3fs/junit/examples/CombinedMinioS3IT.java b/src/test/java/org/carlspring/cloud/storage/s3fs/junit/examples/CombinedMinioS3IT.java
@@ -2,6 +2,7 @@
 
 import org.carlspring.cloud.storage.s3fs.junit.annotations.MinioIntegrationTest;
 import org.carlspring.cloud.storage.s3fs.junit.annotations.S3IntegrationTest;
+import org.carlspring.cloud.storage.s3fs.util.BaseIntegrationTest;
 
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
@@ -12,7 +13,7 @@
  * Class level {@link MinioIntegrationTest} annotation and method level {@link S3IntegrationTest} annotation.
  */
 @MinioIntegrationTest
-public class CombinedMinioS3IT
+public class CombinedMinioS3IT extends BaseIntegrationTest
 {
 
     private static final Logger logger = LoggerFactory.getLogger(S3MethodAnnotationIT.class);

diff --git a/src/test/java/org/carlspring/cloud/storage/s3fs/junit/examples/CombinedS3MinioIT.java b/src/test/java/org/carlspring/cloud/storage/s3fs/junit/examples/CombinedS3MinioIT.java
@@ -2,6 +2,7 @@
 
 import org.carlspring.cloud.storage.s3fs.junit.annotations.MinioIntegrationTest;
 import org.carlspring.cloud.storage.s3fs.junit.annotations.S3IntegrationTest;
+import org.carlspring.cloud.storage.s3fs.util.BaseIntegrationTest;
 
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
@@ -12,7 +13,7 @@
  * Class level {@link S3IntegrationTest} annotation and method level {@link MinioIntegrationTest} annotation.
  */
 @S3IntegrationTest
-public class CombinedS3MinioIT
+public class CombinedS3MinioIT extends BaseIntegrationTest
 {
 
     private static final Logger logger = LoggerFactory.getLogger(S3MethodAnnotationIT.class);

diff --git a/src/test/java/org/carlspring/cloud/storage/s3fs/junit/examples/MinioClassAnnotationIT.java b/src/test/java/org/carlspring/cloud/storage/s3fs/junit/examples/MinioClassAnnotationIT.java
@@ -1,14 +1,15 @@
 package org.carlspring.cloud.storage.s3fs.junit.examples;
 
 import org.carlspring.cloud.storage.s3fs.junit.annotations.MinioIntegrationTest;
+import org.carlspring.cloud.storage.s3fs.util.BaseIntegrationTest;
 
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @MinioIntegrationTest
-public class MinioClassAnnotationIT
+public class MinioClassAnnotationIT extends BaseIntegrationTest
 {
 
     private static final Logger logger = LoggerFactory.getLogger(MinioClassAnnotationIT.class);

diff --git a/src/test/java/org/carlspring/cloud/storage/s3fs/junit/examples/MinioMethodAnnotationIT.java b/src/test/java/org/carlspring/cloud/storage/s3fs/junit/examples/MinioMethodAnnotationIT.java
@@ -1,13 +1,14 @@
 package org.carlspring.cloud.storage.s3fs.junit.examples;
 
 import org.carlspring.cloud.storage.s3fs.junit.annotations.MinioIntegrationTest;
+import org.carlspring.cloud.storage.s3fs.util.BaseIntegrationTest;
 
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class MinioMethodAnnotationIT
+public class MinioMethodAnnotationIT extends BaseIntegrationTest
 {
 
     private static final Logger logger = LoggerFactory.getLogger(MinioMethodAnnotationIT.class);

diff --git a/src/test/java/org/carlspring/cloud/storage/s3fs/junit/examples/S3ClassAnnotationIT.java b/src/test/java/org/carlspring/cloud/storage/s3fs/junit/examples/S3ClassAnnotationIT.java
@@ -1,14 +1,15 @@
 package org.carlspring.cloud.storage.s3fs.junit.examples;
 
 import org.carlspring.cloud.storage.s3fs.junit.annotations.S3IntegrationTest;
+import org.carlspring.cloud.storage.s3fs.util.BaseIntegrationTest;
 
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @S3IntegrationTest
-public class S3ClassAnnotationIT
+public class S3ClassAnnotationIT extends BaseIntegrationTest
 {
 
     private static final Logger logger = LoggerFactory.getLogger(S3ClassAnnotationIT.class);

diff --git a/src/test/java/org/carlspring/cloud/storage/s3fs/junit/examples/S3MethodAnnotationIT.java b/src/test/java/org/carlspring/cloud/storage/s3fs/junit/examples/S3MethodAnnotationIT.java
@@ -1,13 +1,14 @@
 package org.carlspring.cloud.storage.s3fs.junit.examples;
 
 import org.carlspring.cloud.storage.s3fs.junit.annotations.S3IntegrationTest;
+import org.carlspring.cloud.storage.s3fs.util.BaseIntegrationTest;
 
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-public class S3MethodAnnotationIT
+public class S3MethodAnnotationIT extends BaseIntegrationTest
 {
 
     private static final Logger logger = LoggerFactory.getLogger(S3MethodAnnotationIT.class);

diff --git a/src/test/java/org/carlspring/cloud/storage/s3fs/path/ToURLIT.java b/src/test/java/org/carlspring/cloud/storage/s3fs/path/ToURLIT.java
@@ -3,6 +3,7 @@
 import org.carlspring.cloud.storage.s3fs.S3FileSystemProvider;
 import org.carlspring.cloud.storage.s3fs.S3Path;
 import org.carlspring.cloud.storage.s3fs.junit.annotations.S3IntegrationTest;
+import org.carlspring.cloud.storage.s3fs.util.BaseIntegrationTest;
 import org.carlspring.cloud.storage.s3fs.util.EnvironmentBuilder;
 
 import java.io.IOException;
@@ -24,7 +25,7 @@
 import static org.junit.jupiter.api.Assertions.assertNull;
 
 @S3IntegrationTest
-class ToURLIT
+class ToURLIT extends BaseIntegrationTest
 {
 
     private static final URI uriGlobal = EnvironmentBuilder.getS3URI(S3_GLOBAL_URI_IT);

diff --git a/src/test/java/org/carlspring/cloud/storage/s3fs/spike/EnvironmentIT.java b/src/test/java/org/carlspring/cloud/storage/s3fs/spike/EnvironmentIT.java
@@ -2,6 +2,7 @@
 
 import org.carlspring.cloud.storage.s3fs.junit.annotations.MinioIntegrationTest;
 import org.carlspring.cloud.storage.s3fs.junit.annotations.S3IntegrationTest;
+import org.carlspring.cloud.storage.s3fs.util.BaseIntegrationTest;
 import org.carlspring.cloud.storage.s3fs.util.EnvironmentBuilder;
 
 import java.util.Map;
@@ -13,7 +14,7 @@
 
 @S3IntegrationTest
 @MinioIntegrationTest
-class EnvironmentIT
+class EnvironmentIT extends BaseIntegrationTest
 {
     @Test
     void couldCreateFileSystem()

diff --git a/src/test/java/org/carlspring/cloud/storage/s3fs/util/BaseIntegrationTest.java b/src/test/java/org/carlspring/cloud/storage/s3fs/util/BaseIntegrationTest.java
@@ -0,0 +1,34 @@
+package org.carlspring.cloud.storage.s3fs.util;
+
+import static org.carlspring.cloud.storage.s3fs.S3Factory.ACCESS_KEY;
+import static org.carlspring.cloud.storage.s3fs.S3Factory.SECRET_KEY;
+
+public abstract class BaseIntegrationTest
+{
+
+    static
+    {
+        if (isMinioEnv())
+        {
+            try
+            {
+                final String accessKey = (String) EnvironmentBuilder.getRealEnv().get(ACCESS_KEY);
+                final String secretKey = (String) EnvironmentBuilder.getRealEnv().get(SECRET_KEY);
+                final String bucketName = (String) EnvironmentBuilder.getRealEnv().get(EnvironmentBuilder.BUCKET_NAME_KEY);
+                final MinioContainer minioContainer = new MinioContainer(accessKey, secretKey, bucketName);
+                minioContainer.start();
+            }
+            catch (Exception e)
+            {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    public static boolean isMinioEnv()
+    {
+        String integrationTestType = System.getProperty("running.it");
+        return integrationTestType != null && integrationTestType.equalsIgnoreCase("minio");
+    }
+
+}