From edcb966b5faf14b292c05eccafa398f8f6c53fc4 Mon Sep 17 00:00:00 2001 From: saileshwar-skyflow Date: Thu, 11 Dec 2025 13:09:41 +0530 Subject: [PATCH 1/6] SK-2440: add code cov upload step for java v3 sdk --- .github/workflows/pr.yml | 28 +++++++++++++++++++--------- pom.xml | 8 +------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 3883a1a9..db08607a 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -1,6 +1,9 @@ name: PR CI Checks -on: [pull_request] +on: + pull_request: + push: + branches: [ "v3" ] jobs: check-commit-message: @@ -15,14 +18,18 @@ jobs: excludeDescription: "true" checkAllCommitMessages: "true" accessToken: ${{ secrets.PAT_ACTIONS }} - error: "One of your your commit messages is not matching the format with JIRA ID Ex: ( SDK-123 commit message )" + error: "One of your commit messages is not matching the format with JIRA ID Ex: ( SDK-123 commit message )" + Test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 - - uses: actions/setup-java@v1 + - uses: actions/checkout@v3 + + - uses: actions/setup-java@v3 with: - java-version: "1.8" + java-version: "8" + distribution: "temurin" + cache: "maven" - name: create-json id: create-json @@ -40,12 +47,15 @@ jobs: echo TEST_REUSABLE_TOKEN=${{ secrets.TEST_REUSABLE_TOKEN }} >> .env - name: Build & Run tests with Maven - run: mvn -B package -f pom.xml -Dmaven.javadoc.skip=true + run: mvn -B clean test jacoco:report -pl v3 -am -Dmaven.javadoc.skip=true - name: Codecov - uses: codecov/codecov-action@v2.1.0 + uses: codecov/codecov-action@v3 with: token: ${{ secrets.CODECOV_REPO_UPLOAD_TOKEN }} - files: target/site/jacoco/jacoco.xml + files: v3/target/site/jacoco/jacoco.xml + flags: unittests + name: codecov-skyflow-java - verbose: true + fail_ci_if_error: true + verbose: true \ No newline at end of file diff --git a/pom.xml b/pom.xml index e94e5f2e..611ce4e6 100644 --- a/pom.xml +++ b/pom.xml @@ -126,7 +126,7 @@ junit junit - ${junit-version} + 4.13.2 test @@ -141,12 +141,6 @@ 2.0.9 test - - org.junit.jupiter - junit-jupiter - 5.13.2 - compile - From b032597a5784a939801c3d117db9b5104afbbafa Mon Sep 17 00:00:00 2001 From: saileshwar-skyflow Date: Thu, 11 Dec 2025 13:16:16 +0530 Subject: [PATCH 2/6] SK-2440: update imports to use junit 4 --- v3/src/test/java/com/skyflow/utils/UtilsTests.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/v3/src/test/java/com/skyflow/utils/UtilsTests.java b/v3/src/test/java/com/skyflow/utils/UtilsTests.java index 9d2e237f..cb09ecc4 100644 --- a/v3/src/test/java/com/skyflow/utils/UtilsTests.java +++ b/v3/src/test/java/com/skyflow/utils/UtilsTests.java @@ -18,7 +18,7 @@ import java.util.*; -import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.Assert.assertEquals; public class UtilsTests { private static final String INVALID_EXCEPTION_THROWN = "Should not have thrown any exception"; From 389b214d52f237c9baaea2bb4fbb3b1faafd29ad Mon Sep 17 00:00:00 2001 From: saileshwar-skyflow Date: Thu, 11 Dec 2025 13:25:08 +0530 Subject: [PATCH 3/6] SK-2440: fix vault controller tests --- .github/workflows/pr.yml | 4 ++-- .../com/skyflow/vault/controller/VaultControllerTests.java | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index db08607a..2229214e 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -27,7 +27,7 @@ jobs: - uses: actions/setup-java@v3 with: - java-version: "8" + java-version: "17" distribution: "temurin" cache: "maven" @@ -47,7 +47,7 @@ jobs: echo TEST_REUSABLE_TOKEN=${{ secrets.TEST_REUSABLE_TOKEN }} >> .env - name: Build & Run tests with Maven - run: mvn -B clean test jacoco:report -pl v3 -am -Dmaven.javadoc.skip=true + run: mvn -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn clean test jacoco:report -pl v3 -am -Dmaven.javadoc.skip=true - name: Codecov uses: codecov/codecov-action@v3 diff --git a/v3/src/test/java/com/skyflow/vault/controller/VaultControllerTests.java b/v3/src/test/java/com/skyflow/vault/controller/VaultControllerTests.java index f11f6c0f..7c90d1f6 100644 --- a/v3/src/test/java/com/skyflow/vault/controller/VaultControllerTests.java +++ b/v3/src/test/java/com/skyflow/vault/controller/VaultControllerTests.java @@ -25,7 +25,12 @@ import static org.junit.Assert.*; +import org.junit.runner.RunWith; +import org.powermock.core.classloader.annotations.PowerMockIgnore; // Import this +import org.powermock.modules.junit4.PowerMockRunner; +@RunWith(PowerMockRunner.class) +@PowerMockIgnore({"javax.management.*", "java.nio.*", "com.sun.*", "jdk.internal.reflect.*", "javax.crypto.*"}) public class VaultControllerTests { private static final String ENV_PATH = "./.env"; From 3a8da8c68b18ec39a30f405c625576ce163566d6 Mon Sep 17 00:00:00 2001 From: saileshwar-skyflow Date: Thu, 11 Dec 2025 13:30:22 +0530 Subject: [PATCH 4/6] SK-2440: revert java version to 8 in pr.yml --- .github/workflows/pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 2229214e..5fd3c7df 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -27,7 +27,7 @@ jobs: - uses: actions/setup-java@v3 with: - java-version: "17" + java-version: "8" distribution: "temurin" cache: "maven" From a77a304147784b46e9e245732cbe641cf8b4d7b4 Mon Sep 17 00:00:00 2001 From: saileshwar-skyflow Date: Thu, 11 Dec 2025 13:33:20 +0530 Subject: [PATCH 5/6] SK-2440: update java version to 11 in pr.yml --- .github/workflows/pr.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 5fd3c7df..fc96f166 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -23,13 +23,11 @@ jobs: Test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v1 - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v1 with: - java-version: "8" - distribution: "temurin" - cache: "maven" + java-version: "11" - name: create-json id: create-json From f64d8ce2dc020f4d0c04adf2fcf2821513632a79 Mon Sep 17 00:00:00 2001 From: saileshwar-skyflow Date: Thu, 11 Dec 2025 13:43:42 +0530 Subject: [PATCH 6/6] SK-2440: update pr.yml to use env variables --- .github/workflows/pr.yml | 8 ++++---- v3/src/test/java/com/skyflow/VaultClientTests.java | 5 ++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index fc96f166..b4259322 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -39,10 +39,10 @@ jobs: - name: create env id: create-env run: | - touch .env - echo SKYFLOW_CREDENTIALS=${{ secrets.SKYFLOW_CREDENTIALS }} >> .env - echo TEST_EXPIRED_TOKEN=${{ secrets.TEST_EXPIRED_TOKEN }} >> .env - echo TEST_REUSABLE_TOKEN=${{ secrets.TEST_REUSABLE_TOKEN }} >> .env + touch v3/.env + echo SKYFLOW_CREDENTIALS=${{ secrets.SKYFLOW_CREDENTIALS }} >> v3/.env + echo TEST_EXPIRED_TOKEN=${{ secrets.TEST_EXPIRED_TOKEN }} >> v3/.env + echo TEST_REUSABLE_TOKEN=${{ secrets.TEST_REUSABLE_TOKEN }} >> v3/.env - name: Build & Run tests with Maven run: mvn -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn clean test jacoco:report -pl v3 -am -Dmaven.javadoc.skip=true diff --git a/v3/src/test/java/com/skyflow/VaultClientTests.java b/v3/src/test/java/com/skyflow/VaultClientTests.java index f91b5b44..d54b46d6 100644 --- a/v3/src/test/java/com/skyflow/VaultClientTests.java +++ b/v3/src/test/java/com/skyflow/VaultClientTests.java @@ -116,7 +116,10 @@ public void testSetBearerTokenWithEnvCredentials() { vaultClient.setBearerToken(); // Credentials at ENV level should be prioritised - Assert.assertEquals(credentials, getPrivateField(vaultClient, "finalCredentials")); + Assert.assertEquals( + credentials.getCredentialsString(), + ((Credentials) getPrivateField(vaultClient, "finalCredentials")).getCredentialsString() + ); } catch (SkyflowException e) { Assert.assertEquals(ErrorCode.INVALID_INPUT.getCode(), 400);