From 202091d644015e927a9dd5b997abfe6b418eee31 Mon Sep 17 00:00:00 2001 From: Eyal Kapon Date: Sun, 9 Mar 2025 11:54:27 +0200 Subject: [PATCH 01/17] get values from env variables --- .github/workflows/test.yml | 11 ++++++----- .../ide/common/configuration/JfrogCliDriverTest.java | 9 +++++---- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 634bfc60..f78dd5c4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,7 +1,5 @@ name: Test - on: [push, pull_request] - jobs: test: runs-on: ${{ matrix.os }} @@ -11,11 +9,15 @@ jobs: os: [ubuntu-latest, windows-latest, macOS-latest] node: [18, 20, 22] go: [1.23, 1.24] + env: + JFROG_CLI_TEST_PASSWORD: ${{ secrets.JFROG_CLI_TEST_PASSWORD }} + JFROG_CLI_TEST_USER: ${{ secrets.JFROG_CLI_TEST_USER }} + JFROG_CLI_TEST_URL: ${{ secrets.JFROG_CLI_TEST_URL }} + JFROG_CLI_TEST_ACCESS_TOKEN: ${{ secrets.JFROG_CLI_TEST_ACCESS_TOKEN }} steps: - uses: actions/checkout@v3 with: submodules: true - # Install required tools - name: Set up Java uses: actions/setup-java@v3 @@ -35,11 +37,10 @@ jobs: uses: actions/setup-go@v5 with: go-version: ${{ matrix.go }} - # Run tests - name: Tests on macOS, Linux run: ./gradlew clean test if: runner.os != 'Windows' - name: Tests on Windows run: ./gradlew.bat clean test - if: runner.os == 'Windows' + if: runner.os == 'Windows' \ No newline at end of file diff --git a/src/test/java/com/jfrog/ide/common/configuration/JfrogCliDriverTest.java b/src/test/java/com/jfrog/ide/common/configuration/JfrogCliDriverTest.java index db11b017..cd0f2207 100644 --- a/src/test/java/com/jfrog/ide/common/configuration/JfrogCliDriverTest.java +++ b/src/test/java/com/jfrog/ide/common/configuration/JfrogCliDriverTest.java @@ -30,9 +30,10 @@ public class JfrogCliDriverTest { private final SimpleDateFormat timeStampFormat = new SimpleDateFormat("yyyy.MM.dd.HH.mm.ss"); private final Map testEnv = new HashMap<>(); private JfrogCliDriver jfrogCliDriver; - private final String PASSWORD = "ide-plugins-common-test-password"; - private final String USER_NAME = "ide-plugins-common-test-user"; - private final String SERVER_URL = "https://ide/plugins/common/test/"; + private final String PASSWORD = System.getenv("JFROG_CLI_TEST_PASSWORD"); + private final String USER_NAME = System.getenv("JFROG_CLI_TEST_USER"); + private final String SERVER_URL = System.getenv("JFROG_CLI_TEST_URL"); + private final String ACCESS_TOKEN = System.getenv("JFROG_CLI_TEST_ACCESS_TOKEN"); private final String ARTIFACTORY_URL = SERVER_URL + "artifactory/"; private final String XRAY_URL = SERVER_URL + "xray/"; private String testServerId; @@ -137,7 +138,7 @@ public void testAddCliServerConfig_withUsernameAndPassword() { public void testAddCliServerConfig_withAccessToken() { String accessToken = UUID.randomUUID().toString(); try { - jfrogCliDriver.addCliServerConfig(XRAY_URL, ARTIFACTORY_URL, testServerId, null, null, accessToken, tempDir); + jfrogCliDriver.addCliServerConfig(XRAY_URL, ARTIFACTORY_URL, testServerId, null, null, ACCESS_TOKEN, tempDir); JfrogCliServerConfig serverConfig = jfrogCliDriver.getServerConfig(tempDir, Collections.emptyList()); assertNotNull(serverConfig); assertEquals(serverConfig.getAccessToken(), accessToken); From d1dd8f12dc8cc6f321e1701fa0da74dfdfd7cf55 Mon Sep 17 00:00:00 2001 From: Eyal Kapon Date: Sun, 9 Mar 2025 13:02:53 +0200 Subject: [PATCH 02/17] Update test.yml --- .github/workflows/test.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f78dd5c4..494facc0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,5 +1,7 @@ name: Test + on: [push, pull_request] + jobs: test: runs-on: ${{ matrix.os }} @@ -43,4 +45,4 @@ jobs: if: runner.os != 'Windows' - name: Tests on Windows run: ./gradlew.bat clean test - if: runner.os == 'Windows' \ No newline at end of file + if: runner.os == 'Windows' From 39b68cbc6f9b0542337e06746539a6895d8bf3cf Mon Sep 17 00:00:00 2001 From: Eyal Kapon Date: Sun, 9 Mar 2025 14:56:16 +0200 Subject: [PATCH 03/17] updated the access token test --- .../com/jfrog/ide/common/configuration/JfrogCliDriverTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/test/java/com/jfrog/ide/common/configuration/JfrogCliDriverTest.java b/src/test/java/com/jfrog/ide/common/configuration/JfrogCliDriverTest.java index cd0f2207..558fe94c 100644 --- a/src/test/java/com/jfrog/ide/common/configuration/JfrogCliDriverTest.java +++ b/src/test/java/com/jfrog/ide/common/configuration/JfrogCliDriverTest.java @@ -136,12 +136,11 @@ public void testAddCliServerConfig_withUsernameAndPassword() { @Test public void testAddCliServerConfig_withAccessToken() { - String accessToken = UUID.randomUUID().toString(); try { jfrogCliDriver.addCliServerConfig(XRAY_URL, ARTIFACTORY_URL, testServerId, null, null, ACCESS_TOKEN, tempDir); JfrogCliServerConfig serverConfig = jfrogCliDriver.getServerConfig(tempDir, Collections.emptyList()); assertNotNull(serverConfig); - assertEquals(serverConfig.getAccessToken(), accessToken); + assertEquals(serverConfig.getAccessToken(), ACCESS_TOKEN); assertEquals(serverConfig.getArtifactoryUrl(), ARTIFACTORY_URL); assertEquals(serverConfig.getXrayUrl(), XRAY_URL); } catch (IOException e) { From a054e68e0a329c8b93bd14710de7746e358bb9e3 Mon Sep 17 00:00:00 2001 From: Eyal Kapon Date: Mon, 10 Mar 2025 10:33:05 +0200 Subject: [PATCH 04/17] removed line deletion --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 494facc0..3bcdac93 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,6 +20,7 @@ jobs: - uses: actions/checkout@v3 with: submodules: true + # Install required tools - name: Set up Java uses: actions/setup-java@v3 From 75b0afe8b8d22392c8bdc3881a1374c37db0cf4d Mon Sep 17 00:00:00 2001 From: Eyal Kapon Date: Mon, 10 Mar 2025 15:23:21 +0200 Subject: [PATCH 05/17] Update test.yml --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3bcdac93..542e1bb6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -40,6 +40,7 @@ jobs: uses: actions/setup-go@v5 with: go-version: ${{ matrix.go }} + # Run tests - name: Tests on macOS, Linux run: ./gradlew clean test From d857d8f83d72416c28bc16e17537f231e0b3bc7e Mon Sep 17 00:00:00 2001 From: Eyal Kapon Date: Mon, 10 Mar 2025 15:37:44 +0200 Subject: [PATCH 06/17] debugging --- .../com/jfrog/ide/common/configuration/JfrogCliDriverTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/java/com/jfrog/ide/common/configuration/JfrogCliDriverTest.java b/src/test/java/com/jfrog/ide/common/configuration/JfrogCliDriverTest.java index 558fe94c..4ce38ecc 100644 --- a/src/test/java/com/jfrog/ide/common/configuration/JfrogCliDriverTest.java +++ b/src/test/java/com/jfrog/ide/common/configuration/JfrogCliDriverTest.java @@ -47,6 +47,8 @@ private void cliExportTest() { assertEquals(serverConfig.getUsername(), USER_NAME); assertEquals(serverConfig.getPassword(), PASSWORD); assertEquals(serverConfig.getUrl(), SERVER_URL); + System.out.println("srver url" +SERVER_URL); + System.out.println("xray url" + serverConfig.getXrayUrl()); assertEquals(serverConfig.getXrayUrl(), SERVER_URL + "xray/"); } catch (IOException e) { fail(e.getMessage(), e); From eb2ea012103737a8c8f9def8d7b644846fa0a620 Mon Sep 17 00:00:00 2001 From: Eyal Kapon Date: Tue, 11 Mar 2025 14:05:59 +0200 Subject: [PATCH 07/17] debugging --- .github/workflows/test.yml | 10 +++++----- .../ide/common/configuration/JfrogCliDriverTest.java | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 542e1bb6..82151bf1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,10 +12,10 @@ jobs: node: [18, 20, 22] go: [1.23, 1.24] env: - JFROG_CLI_TEST_PASSWORD: ${{ secrets.JFROG_CLI_TEST_PASSWORD }} - JFROG_CLI_TEST_USER: ${{ secrets.JFROG_CLI_TEST_USER }} - JFROG_CLI_TEST_URL: ${{ secrets.JFROG_CLI_TEST_URL }} - JFROG_CLI_TEST_ACCESS_TOKEN: ${{ secrets.JFROG_CLI_TEST_ACCESS_TOKEN }} + JF_CLI_TEST_PASSWORD: ${{ secrets.JFROG_CLI_TEST_PASSWORD }} + JF_CLI_TEST_USER: ${{ secrets.JFROG_CLI_TEST_USER }} + JF_CLI_TEST_URL: ${{ secrets.JFROG_CLI_TEST_URL }} + JF_CLI_TEST_ACCESS_TOKEN: ${{ secrets.JFROG_CLI_TEST_ACCESS_TOKEN }} steps: - uses: actions/checkout@v3 with: @@ -40,7 +40,7 @@ jobs: uses: actions/setup-go@v5 with: go-version: ${{ matrix.go }} - + # Run tests - name: Tests on macOS, Linux run: ./gradlew clean test diff --git a/src/test/java/com/jfrog/ide/common/configuration/JfrogCliDriverTest.java b/src/test/java/com/jfrog/ide/common/configuration/JfrogCliDriverTest.java index 4e5a69f3..11b9a0d3 100644 --- a/src/test/java/com/jfrog/ide/common/configuration/JfrogCliDriverTest.java +++ b/src/test/java/com/jfrog/ide/common/configuration/JfrogCliDriverTest.java @@ -30,10 +30,10 @@ public class JfrogCliDriverTest { private final SimpleDateFormat timeStampFormat = new SimpleDateFormat("yyyy.MM.dd.HH.mm.ss"); private final Map testEnv = new HashMap<>(); private JfrogCliDriver jfrogCliDriver; - private final String PASSWORD = System.getenv("JFROG_CLI_TEST_PASSWORD"); - private final String USER_NAME = System.getenv("JFROG_CLI_TEST_USER"); - private final String SERVER_URL = System.getenv("JFROG_CLI_TEST_URL"); - private final String ACCESS_TOKEN = System.getenv("JFROG_CLI_TEST_ACCESS_TOKEN"); + private final String PASSWORD = System.getenv("JF_CLI_TEST_PASSWORD"); + private final String USER_NAME = System.getenv("JF_CLI_TEST_USER"); + private final String SERVER_URL = System.getenv("JF_CLI_TEST_URL"); + private final String ACCESS_TOKEN = System.getenv("JF_CLI_TEST_ACCESS_TOKEN"); private final String ARTIFACTORY_URL = SERVER_URL + "artifactory/"; private final String XRAY_URL = SERVER_URL + "xray/"; private String testServerId; From 019282ec380e00bec79e79ec1bdabc11d1433369 Mon Sep 17 00:00:00 2001 From: Eyal Kapon Date: Tue, 11 Mar 2025 14:09:24 +0200 Subject: [PATCH 08/17] more debbuging --- .github/workflows/test.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 82151bf1..2f1e6ebb 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,6 +20,10 @@ jobs: - uses: actions/checkout@v3 with: submodules: true + - name: Echo + run: | + echo $JF_CLI_TEST_URL + echo JF_CLI_TEST_USER # Install required tools - name: Set up Java From 19fa186a18afd31a67b6fb42d9af5f42f812455e Mon Sep 17 00:00:00 2001 From: Eyal Kapon Date: Tue, 11 Mar 2025 14:11:17 +0200 Subject: [PATCH 09/17] more debbuging --- .github/workflows/test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2f1e6ebb..c7f10b65 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -23,7 +23,8 @@ jobs: - name: Echo run: | echo $JF_CLI_TEST_URL - echo JF_CLI_TEST_USER + echo $${{ secrets.JFROG_CLI_TEST_URL }} + echo $JF_CLI_TEST_USER # Install required tools - name: Set up Java From cfe416c929fd654a47d7db972f3d67602a15d4ec Mon Sep 17 00:00:00 2001 From: Eyal Kapon Date: Tue, 11 Mar 2025 14:14:29 +0200 Subject: [PATCH 10/17] more debbuging --- .github/workflows/test.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c7f10b65..bb14582a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,6 +1,10 @@ name: Test -on: [push, pull_request] +on: + push: + # Triggers the workflow on labeled PRs only. + pull_request_target: + types: [labeled] jobs: test: From 4b04c37ac65799d297b96e1d4c26aebe4d78ebd7 Mon Sep 17 00:00:00 2001 From: Eyal Kapon Date: Tue, 11 Mar 2025 14:15:51 +0200 Subject: [PATCH 11/17] more debbuging --- .github/workflows/test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bb14582a..5d8f0476 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -20,6 +20,7 @@ jobs: JF_CLI_TEST_USER: ${{ secrets.JFROG_CLI_TEST_USER }} JF_CLI_TEST_URL: ${{ secrets.JFROG_CLI_TEST_URL }} JF_CLI_TEST_ACCESS_TOKEN: ${{ secrets.JFROG_CLI_TEST_ACCESS_TOKEN }} + steps: - uses: actions/checkout@v3 with: From 1900eac99d7cebf15708c944a4c70683e6f0bda7 Mon Sep 17 00:00:00 2001 From: Eyal Kapon Date: Tue, 11 Mar 2025 14:19:38 +0200 Subject: [PATCH 12/17] more debbuging --- .github/workflows/test.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5d8f0476..2768c0e8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,10 +1,6 @@ name: Test -on: - push: - # Triggers the workflow on labeled PRs only. - pull_request_target: - types: [labeled] +on: [push, pull_request] jobs: test: @@ -20,7 +16,6 @@ jobs: JF_CLI_TEST_USER: ${{ secrets.JFROG_CLI_TEST_USER }} JF_CLI_TEST_URL: ${{ secrets.JFROG_CLI_TEST_URL }} JF_CLI_TEST_ACCESS_TOKEN: ${{ secrets.JFROG_CLI_TEST_ACCESS_TOKEN }} - steps: - uses: actions/checkout@v3 with: @@ -28,7 +23,7 @@ jobs: - name: Echo run: | echo $JF_CLI_TEST_URL - echo $${{ secrets.JFROG_CLI_TEST_URL }} + echo ${{ secrets.JFROG_CLI_TEST_URL }} echo $JF_CLI_TEST_USER # Install required tools @@ -56,5 +51,10 @@ jobs: run: ./gradlew clean test if: runner.os != 'Windows' - name: Tests on Windows + env: + JF_CLI_TEST_PASSWORD: ${{ secrets.JFROG_CLI_TEST_PASSWORD }} + JF_CLI_TEST_USER: ${{ secrets.JFROG_CLI_TEST_USER }} + JF_CLI_TEST_URL: ${{ secrets.JFROG_CLI_TEST_URL }} + JF_CLI_TEST_ACCESS_TOKEN: ${{ secrets.JFROG_CLI_TEST_ACCESS_TOKEN }} run: ./gradlew.bat clean test if: runner.os == 'Windows' From a137126dad2cdf22b1ce9042b5235a7f87624933 Mon Sep 17 00:00:00 2001 From: Eyal Kapon Date: Tue, 11 Mar 2025 14:20:07 +0200 Subject: [PATCH 13/17] more debbuging --- .github/workflows/test.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2768c0e8..c6ba962a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -49,6 +49,11 @@ jobs: # Run tests - name: Tests on macOS, Linux run: ./gradlew clean test + env: + JF_CLI_TEST_PASSWORD: ${{ secrets.JFROG_CLI_TEST_PASSWORD }} + JF_CLI_TEST_USER: ${{ secrets.JFROG_CLI_TEST_USER }} + JF_CLI_TEST_URL: ${{ secrets.JFROG_CLI_TEST_URL }} + JF_CLI_TEST_ACCESS_TOKEN: ${{ secrets.JFROG_CLI_TEST_ACCESS_TOKEN }} if: runner.os != 'Windows' - name: Tests on Windows env: From 8dc09e4594f89182868458527e3d5a1f55152486 Mon Sep 17 00:00:00 2001 From: Eyal Kapon Date: Tue, 11 Mar 2025 14:22:09 +0200 Subject: [PATCH 14/17] more debbuging --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c6ba962a..88de5b78 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,6 +1,6 @@ name: Test -on: [push, pull_request] +on: [push, pull_request_target] jobs: test: From ba6f7b206262175dfbb13c80b51baea3994be2b9 Mon Sep 17 00:00:00 2001 From: Eyal Kapon Date: Tue, 11 Mar 2025 14:24:27 +0200 Subject: [PATCH 15/17] more debbuging --- .github/workflows/test.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 88de5b78..880b278e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,9 +1,19 @@ name: Test -on: [push, pull_request_target] +on: + push: + # Triggers the workflow on labeled PRs only. + pull_request_target: + types: [labeled] +# Ensures that only the latest commit is running for each PR at a time. +# Ignores this rule for push events. +concurrency: + group: ${{ github.event.pull_request.number || github.sha }} + cancel-in-progress: true jobs: test: + if: contains(github.event.pull_request.labels.*.name, 'safe to test') || github.event_name == 'push' runs-on: ${{ matrix.os }} strategy: fail-fast: false From 2524b4a22b8e78a3a95698341fa5251d46f51549 Mon Sep 17 00:00:00 2001 From: Eyal Kapon Date: Tue, 11 Mar 2025 14:34:09 +0200 Subject: [PATCH 16/17] fixed the test yml --- .github/workflows/test.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 880b278e..bfbe8658 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -30,12 +30,11 @@ jobs: - uses: actions/checkout@v3 with: submodules: true - - name: Echo - run: | - echo $JF_CLI_TEST_URL - echo ${{ secrets.JFROG_CLI_TEST_URL }} - echo $JF_CLI_TEST_USER - + - name: Unlabel 'safe to test' + uses: actions-ecosystem/action-remove-labels@v1 + if: ${{ github.event_name != 'push' }} + with: + labels: "safe to test" # Install required tools - name: Set up Java uses: actions/setup-java@v3 From dd6db2457119d477f118923ae7a0c7a60aec60c9 Mon Sep 17 00:00:00 2001 From: Eyal Kapon Date: Tue, 11 Mar 2025 14:44:03 +0200 Subject: [PATCH 17/17] fixed the test yml and removed println --- .github/workflows/test.yml | 1 + .../com/jfrog/ide/common/configuration/JfrogCliDriverTest.java | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bfbe8658..90b77c19 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -30,6 +30,7 @@ jobs: - uses: actions/checkout@v3 with: submodules: true + ref: ${{ github.event.pull_request.head.sha }} - name: Unlabel 'safe to test' uses: actions-ecosystem/action-remove-labels@v1 if: ${{ github.event_name != 'push' }} diff --git a/src/test/java/com/jfrog/ide/common/configuration/JfrogCliDriverTest.java b/src/test/java/com/jfrog/ide/common/configuration/JfrogCliDriverTest.java index 11b9a0d3..dd550ab3 100644 --- a/src/test/java/com/jfrog/ide/common/configuration/JfrogCliDriverTest.java +++ b/src/test/java/com/jfrog/ide/common/configuration/JfrogCliDriverTest.java @@ -47,9 +47,6 @@ private void cliExportTest() { assertEquals(serverConfig.getUsername(), USER_NAME); assertEquals(serverConfig.getPassword(), PASSWORD); assertEquals(serverConfig.getUrl(), SERVER_URL); - System.out.println(USER_NAME); - System.out.println("srver url" +SERVER_URL); - System.out.println("xray url" + serverConfig.getXrayUrl()); assertEquals(serverConfig.getXrayUrl(), SERVER_URL + "xray/"); } catch (IOException e) { fail(e.getMessage(), e);