Merge branch 'datasafe_frontend_update' into feature/dat-249_BringBac…

…kSwagger
adorsys · Apr 18, 2024 · b768d53 · b768d53
2 parents b16c62f + 8c36cb8
commit b768d53
Show file tree

Hide file tree

Showing 90 changed files with 1,459 additions and 857 deletions.
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -0,0 +1,44 @@
+name: Actions on pull requests
+on:
+ pull_request:
+ branches:
+ - develop
+ - master
+
+jobs:
+ pull-request-job:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Step 1 - Checkout repository code
+ uses: actions/checkout@v4
+
+ - name: Step 2 - Set up JDK 17
+ uses: actions/setup-java@v4
+ with:
+ java-version: '17'
+ distribution: 'temurin'
+ cache: 'maven'
+
+ - name: Step 3 - Cache Docker images.
+ uses: ScribeMD/[email protected]
+ with:
+ key: docker-${{ runner.os }}
+
+ - name: Step 4 - Build & Test
+ run: mvn clean verify -ntp -PIT
+
+ - name: Step 5 - Upload coverage unittests reports to Codecov
+ uses: codecov/codecov-action@v3
+ with:
+ token: ${{ secrets.CODECOV_TOKEN }}
+ gcov_ignore: '!*datasafe-business*'
+ flags: unittests
+ verbose: true
+
+ - name: Step 6 - Upload coverage e2e tests reports to Codecov
+ uses: codecov/codecov-action@v3
+ with:
+ token: ${{ secrets.CODECOV_TOKEN }}
+ gcov_include: '*datasafe-business*'
+ flags: e2e_tests
+ verbose: true
diff --git a/.github/workflows/pull-requests.yml b/.github/workflows/pull-requests.yml
diff --git a/.github/workflows/push-develop.yml b/.github/workflows/push-develop.yml
@@ -0,0 +1,53 @@
+name: Develop branch build
+on:
+ push:
+ branches:
+ - develop
+
+jobs:
+ develop-build-job:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Step 1 - Checkout repository code
+ uses: actions/checkout@v4
+
+ - name: Step 2 - Set up JDK 17
+ uses: actions/setup-java@v4
+ with:
+ java-version: '17'
+ distribution: 'temurin'
+ cache: 'maven'
+
+ - name: Step 3 - Cache Docker images.
+ uses: ScribeMD/[email protected]
+ with:
+ key: docker-${{ runner.os }}
+
+ - name: Step 4 - Build & Test
+ run: mvn clean verify -ntp -PIT
+
+ - name: Step 5 - Deploy Snapshot
+ run: ./scripts/mvn_deploy.sh
+ env:
+ SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+ SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+ GPG_EXECUTABLE: gpg
+ GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+ GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}
+ GPG_OWNERTRUST: ${{ secrets.GPG_OWNERTRUST }}
+
+ - name: Step 6 - Upload coverage unittests reports to Codecov
+ uses: codecov/codecov-action@v3
+ with:
+ token: ${{ secrets.CODECOV_TOKEN }}
+ gcov_ignore: '!*datasafe-business*'
+ flags: unittests
+ verbose: true
+
+ - name: Step 7 - Upload coverage e2e tests reports to Codecov
+ uses: codecov/codecov-action@v3
+ with:
+ token: ${{ secrets.CODECOV_TOKEN }}
+ gcov_include: '*datasafe-business*'
+ flags: e2e_tests
+ verbose: true
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,37 @@
+name: Release to Maven Central
+on:
+ push:
+ tags:
+ - v*
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Step 1 - Checkout repository code
+ uses: actions/checkout@v4
+
+ - name: Step 2 - Setup JDK
+ uses: actions/setup-java@v4
+ with:
+ java-version: '17'
+ distribution: 'temurin'
+ cache: 'maven'
+
+ - name: Step 3 - Cache Docker images.
+ uses: ScribeMD/[email protected]
+ with:
+ key: docker-${{ runner.os }}
+
+ - name: Step 4 - Maven deploy release
+ run: ./scripts/mvn_deploy.sh
+ env:
+ SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
+ SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+ GPG_EXECUTABLE: gpg
+ GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
+ GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}
+ GPG_OWNERTRUST: ${{ secrets.GPG_OWNERTRUST }}
+
+# - name: Step 4 - Push JavaDoc to GitHub Pages
+# run: ./scripts/push-javadoc-to-gh-pages.sh
diff --git a/.travis/codecov_bash.sh b/.travis/codecov_bash.sh
diff --git a/.travis/deploy.sh b/.travis/deploy.sh
diff --git a/README.md b/README.md
@@ -1,6 +1,5 @@
-[![Build Status](https://travis-ci.com/adorsys/datasafe.svg?branch=develop)](https://travis-ci.com/adorsys/datasafe)
 [![codecov](https://codecov.io/gh/adorsys/datasafe/branch/develop/graph/badge.svg)](https://codecov.io/gh/adorsys/datasafe)
-[![Maintainability](https://api.codeclimate.com/v1/badges/06ae7d4cafc3012cee85/maintainability)](https://codeclimate.com/github/adorsys/datasafe/maintainability)
+[![Maintainability](https://codeclimate.com/github/adorsys/datasafe.png)](https://codeclimate.com/github/adorsys/datasafe/maintainability)
 
 # Secure, Encrypted and Versioned Data Storage Library
 

diff --git a/datasafe-business/pom.xml b/datasafe-business/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe</artifactId>
  <groupId>de.adorsys</groupId>
- <version>2.0.2</version>
+ <version>2.0.2-SNAPSHOT</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/...tasafe/business/impl/e2e/BaseE2ETest.java → ...datasafe/business/impl/e2e/BaseE2EIT.java b/...tasafe/business/impl/e2e/BaseE2ETest.java → ...datasafe/business/impl/e2e/BaseE2EIT.java
@@ -52,7 +52,7 @@
 
 @Slf4j
 @RequiredArgsConstructor
-public abstract class BaseE2ETest extends WithStorageProvider {
+public abstract class BaseE2EIT extends WithStorageProvider {
 
  protected static final String PRIVATE_COMPONENT = "private";
  protected static final String PRIVATE_FILES_COMPONENT = PRIVATE_COMPONENT + "/files";

diff --git a/...ness/impl/e2e/BasicFunctionalityTest.java → ...siness/impl/e2e/BasicFunctionalityIT.java b/...ness/impl/e2e/BasicFunctionalityTest.java → ...siness/impl/e2e/BasicFunctionalityIT.java
@@ -47,7 +47,7 @@
  * Tests that validates basic functionality - storing data to inbox, privatespace, listing files, etc.
  */
 @Slf4j
-class BasicFunctionalityTest extends BaseE2ETest {
+class BasicFunctionalityIT extends BaseE2EIT {
 
  private static final int LARGE_SIZE = 10 * 1024 * 1024 + 100;
 

diff --git a/.../impl/e2e/BasicFunctionalityUtf8Test.java → ...ss/impl/e2e/BasicFunctionalityUtf8IT.java b/.../impl/e2e/BasicFunctionalityUtf8Test.java → ...ss/impl/e2e/BasicFunctionalityUtf8IT.java
@@ -15,7 +15,7 @@
  * Tests that validates basic functionality - storing data to inbox, privatespace, listing files, etc. using UTF-8 paths.
  */
 @Slf4j
-class BasicFunctionalityUtf8Test extends BaseE2ETest {
+class BasicFunctionalityUtf8IT extends BaseE2EIT {
 
  private static final String MESSAGE_ONE = "Hello here 1";
  private static final String FOLDER = "folder1";

diff --git a/...asicFunctionalityWithConcurrencyTest.java → .../BasicFunctionalityWithConcurrencyIT.java b/...asicFunctionalityWithConcurrencyTest.java → .../BasicFunctionalityWithConcurrencyIT.java
@@ -56,7 +56,7 @@
  * Multithreaded test of basic operations.
  */
 @Slf4j
-class BasicFunctionalityWithConcurrencyTest extends BaseE2ETest {
+class BasicFunctionalityWithConcurrencyIT extends BaseE2EIT {
 
  private static final int TIMEOUT_S = 30;
 

diff --git a/...cFunctionalityWithPasswordChangeTest.java → ...sicFunctionalityWithPasswordChangeIT.java b/...cFunctionalityWithPasswordChangeTest.java → ...sicFunctionalityWithPasswordChangeIT.java
@@ -28,7 +28,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-class BasicFunctionalityWithPasswordChangeTest extends BaseE2ETest {
+class BasicFunctionalityWithPasswordChangeIT extends BaseE2EIT {
 
  @SneakyThrows
  @ParameterizedTest

diff --git a/...impl/e2e/DataTamperingResistanceTest.java → ...s/impl/e2e/DataTamperingResistanceIT.java b/...impl/e2e/DataTamperingResistanceTest.java → ...s/impl/e2e/DataTamperingResistanceIT.java
@@ -38,7 +38,7 @@
  * attacker is unable to modify encrypted text without being detected.
  */
 @Slf4j
-class DataTamperingResistanceTest extends BaseE2ETest {
+class DataTamperingResistanceIT extends BaseE2EIT {
 
  private static final Set<Character> NOT_TO_REPLACE_IN_PATH = ImmutableSet.of('=', '/');
 

diff --git a/...ess/impl/e2e/KeyStoreTypeCompareTest.java → ...iness/impl/e2e/KeyStoreTypeCompareIT.java b/...ess/impl/e2e/KeyStoreTypeCompareTest.java → ...iness/impl/e2e/KeyStoreTypeCompareIT.java
@@ -24,7 +24,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 @Slf4j
-public class KeyStoreTypeCompareTest extends BaseE2ETest {
+public class KeyStoreTypeCompareIT extends BaseE2EIT {
  private final static int NUMBER_WRITES = 100;
  private final static int NUMBER_READS = 100;
 

diff --git a/...s/impl/e2e/MultiDFSFunctionalityTest.java → ...ess/impl/e2e/MultiDFSFunctionalityIT.java b/...s/impl/e2e/MultiDFSFunctionalityTest.java → ...ess/impl/e2e/MultiDFSFunctionalityIT.java
@@ -70,7 +70,7 @@
  * access `credentialsBucket` that has user profile and his storage access keystore.
  */
 @Slf4j
-class MultiDFSFunctionalityTest extends BaseMockitoTest {
+class MultiDFSFunctionalityIT extends BaseMockitoTest {
 
  private static final String REGION = "eu-central-1";
  private static final String LOCALHOST = getDockerUri("http://127.0.0.1");

diff --git a/...e/ProfileContainsDatasafeVersionTest.java → ...e/ProfileContainsDatasafeVersion2EIT.java b/...e/ProfileContainsDatasafeVersionTest.java → ...e/ProfileContainsDatasafeVersion2EIT.java
@@ -8,7 +8,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-class ProfileContainsDatasafeVersionTest extends BaseE2ETest {
+class ProfileContainsDatasafeVersion2EIT extends BaseE2EIT {
 
  @Test
  @SneakyThrows

diff --git a/...siness/impl/e2e/SchemeDelegationTest.java → ...business/impl/e2e/SchemeDelegationIT.java b/...siness/impl/e2e/SchemeDelegationTest.java → ...business/impl/e2e/SchemeDelegationIT.java
@@ -1,5 +1,4 @@
 package de.adorsys.datasafe.business.impl.e2e;
-
 import de.adorsys.datasafe.business.impl.service.DaggerDefaultDatasafeServices;
 import de.adorsys.datasafe.business.impl.service.DefaultDatasafeServices;
 import de.adorsys.datasafe.directory.impl.profile.config.DefaultDFSConfig;
@@ -32,7 +31,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-class SchemeDelegationTest extends WithStorageProvider {
+class SchemeDelegationIT extends WithStorageProvider {
 
  private Path fsPath;
  private Uri minioPath;
@@ -125,4 +124,4 @@ public AbsoluteLocation privateProfile(UserID forUser) {
  );
  }
  }
-}
+}
diff --git a/.../impl/e2e/SchemeDelegationWithDbTest.java → ...ss/impl/e2e/SchemeDelegationWithDbIT.java b/.../impl/e2e/SchemeDelegationWithDbTest.java → ...ss/impl/e2e/SchemeDelegationWithDbIT.java
@@ -38,7 +38,7 @@
 import static de.adorsys.datasafe.types.api.global.PathEncryptionId.AES_SIV;
 import static org.assertj.core.api.Assertions.assertThat;
 
-class SchemeDelegationWithDbTest extends WithStorageProvider {
+class SchemeDelegationWithDbIT extends WithStorageProvider {
 
  private static final Set<String> ALLOWED_TABLES = ImmutableSet.of("users", "private_profiles", "public_profiles");
 

diff --git a/.../impl/e2e/StorageBasedVersioningTest.java → ...ss/impl/e2e/StorageBasedVersioningIT.java b/.../impl/e2e/StorageBasedVersioningTest.java → ...ss/impl/e2e/StorageBasedVersioningIT.java
@@ -25,7 +25,7 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 @DisabledIfSystemProperty(named = WithStorageProvider.SKIP_CEPH, matches = "true")
-class StorageBasedVersioningTest extends BaseE2ETest {
+class StorageBasedVersioningIT extends BaseE2EIT {
 
  private static final String FILE = "file.txt";
 

diff --git a/...ess/impl/e2e/UserProfileWithUtf8Test.java → ...iness/impl/e2e/UserProfileWithUtf8IT.java b/...ess/impl/e2e/UserProfileWithUtf8Test.java → ...iness/impl/e2e/UserProfileWithUtf8IT.java
@@ -32,7 +32,7 @@
 import static de.adorsys.datasafe.types.api.shared.Dirs.computeRelativePreventingDoubleUrlEncode;
 import static org.assertj.core.api.Assertions.assertThat;
 
-class UserProfileWithUtf8Test extends WithStorageProvider {
+class UserProfileWithUtf8IT extends WithStorageProvider {
 
  private Path fsPath;
  private Uri minioPath;

diff --git a/.../business/impl/e2e/VersionedDataTest.java → ...fe/business/impl/e2e/VersionedDataIT.java b/.../business/impl/e2e/VersionedDataTest.java → ...fe/business/impl/e2e/VersionedDataIT.java
@@ -36,7 +36,7 @@
  * Validates software versioned operations.
  */
 @Slf4j
-public class VersionedDataTest extends BaseE2ETest {
+public class VersionedDataIT extends BaseE2EIT {
 
  private static final String MESSAGE_ONE = "Hello here 1";
  private static final String MESSAGE_TWO = "Hello here 2";

diff --git a/datasafe-cli/pom.xml b/datasafe-cli/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe</artifactId>
- <version>2.0.2</version>
+ <version>2.0.2-SNAPSHOT</version>
  </parent>
 
  <artifactId>datasafe-cli</artifactId>

diff --git a/datasafe-directory/datasafe-directory-api/pom.xml b/datasafe-directory/datasafe-directory-api/pom.xml
@@ -3,7 +3,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-directory</artifactId>
- <version>2.0.2</version>
+ <version>2.0.2-SNAPSHOT</version>
  </parent>
  <artifactId>datasafe-directory-api</artifactId>
  <dependencies>

diff --git a/datasafe-directory/datasafe-directory-impl/pom.xml b/datasafe-directory/datasafe-directory-impl/pom.xml
@@ -3,7 +3,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-directory</artifactId>
- <version>2.0.2</version>
+ <version>2.0.2-SNAPSHOT</version>
  </parent>
  <artifactId>datasafe-directory-impl</artifactId>
  <dependencies>

diff --git a/datasafe-directory/pom.xml b/datasafe-directory/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <artifactId>datasafe</artifactId>
  <groupId>de.adorsys</groupId>
- <version>2.0.2</version>
+ <version>2.0.2-SNAPSHOT</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>
 

diff --git a/datasafe-encryption/datasafe-encryption-api/pom.xml b/datasafe-encryption/datasafe-encryption-api/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>de.adorsys</groupId>
  <artifactId>datasafe-encryption</artifactId>
- <version>2.0.2</version>
+ <version>2.0.2-SNAPSHOT</version>
  </parent>
  <artifactId>datasafe-encryption-api</artifactId>
  <dependencies>