From f72807158356655b71618e1ebd9bc91287314800 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Tue, 16 Jul 2024 17:38:37 +0300 Subject: [PATCH 01/17] Fix npm script Signed-off-by: Michael Sverdlov --- .../install-go-with-cache/action.yml | 19 ++++++++ .../install-local-artifactory/action.yml | 22 +++++++++ .github/workflows/accessTests.yml | 14 ++---- .github/workflows/addReleaseLinks.yml | 2 +- .github/workflows/analysis.yml | 29 ++++-------- .github/workflows/artifactoryTests.yml | 22 ++------- .github/workflows/distributionTests.yml | 14 ++---- .github/workflows/dockerTests.yml | 16 ++----- .../workflows/frogbot-scan-pull-request.yml | 7 +-- .github/workflows/frogbot-scan-repository.yml | 7 +-- .github/workflows/goTests.yml | 14 ++---- .github/workflows/gradleTests.yml | 31 +++++-------- .github/workflows/lifecycleTests.yml | 18 ++------ .github/workflows/mavenTests.yml | 26 ++++------- .github/workflows/npmTests.yml | 30 ++++-------- .github/workflows/nugetTests.yml | 32 +++++-------- .github/workflows/pluginsTests.yml | 23 +++------- .github/workflows/podmanTests.yml | 14 ++---- .github/workflows/pythonTests.yml | 31 +++++-------- .github/workflows/scriptTests.yml | 13 +----- .github/workflows/transferTests.yml | 46 +++++-------------- 21 files changed, 150 insertions(+), 280 deletions(-) create mode 100644 .github/common-steps/install-go-with-cache/action.yml create mode 100644 .github/common-steps/install-local-artifactory/action.yml diff --git a/.github/common-steps/install-go-with-cache/action.yml b/.github/common-steps/install-go-with-cache/action.yml new file mode 100644 index 000000000..1695db418 --- /dev/null +++ b/.github/common-steps/install-go-with-cache/action.yml @@ -0,0 +1,19 @@ +name: 'Setup and Cache Go and Configure Private' +description: 'Setup and Cache Go 1.22' + +runs: + using: 'composite' + steps: + - name: Go Cache + uses: actions/cache@v4 + with: + path: ~/go/pkg/mod + key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} + restore-keys: | + ${{ runner.os }}-go- + + - name: Setup Go + uses: actions/setup-go@v5 + with: + go-version: 1.22.4 + cache: false \ No newline at end of file diff --git a/.github/common-steps/install-local-artifactory/action.yml b/.github/common-steps/install-local-artifactory/action.yml new file mode 100644 index 000000000..43dd78562 --- /dev/null +++ b/.github/common-steps/install-local-artifactory/action.yml @@ -0,0 +1,22 @@ +name: 'Setup Local Artifactory' +description: 'Setup Local Artifactory' +inputs: + RTLIC: + description: 'Local Artifactory License' + required: true + JFROG_HOME: + description: 'JFrog Home' + required: false + +runs: + using: 'composite' + steps: + - name: Install Local Artifactory + run: | + go install github.com/jfrog/jfrog-testing-infra/local-rt-setup@latest + ~/go/bin/local-rt-setup + shell: bash + env: + RTLIC: ${{ inputs.RTLIC }} + GOPROXY: direct + JFROG_HOME: ${{ inputs.JFROG_HOME }} \ No newline at end of file diff --git a/.github/workflows/accessTests.yml b/.github/workflows/accessTests.yml index 01b99abce..484b35b35 100644 --- a/.github/workflows/accessTests.yml +++ b/.github/workflows/accessTests.yml @@ -22,20 +22,12 @@ jobs: os: [ ubuntu, windows, macos ] runs-on: ${{ matrix.os }}-latest steps: - - name: Setup Go - uses: actions/setup-go@v5 - with: - go-version: 1.22.x - cache: false - - name: Go Cache - uses: actions/cache@v4 - with: - path: ~/go/pkg/mod - key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} - restore-keys: ${{ runner.os }}-go- - name: Checkout code uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.sha }} + + - uses: ./.github/common-steps/install-go-with-cache + - name: Run Access tests run: go test -v github.com/jfrog/jfrog-cli --timeout 0 --test.access --jfrog.url=${{ secrets.PLATFORM_URL }} --jfrog.adminToken=${{ secrets.PLATFORM_ADMIN_TOKEN }} --jfrog.user=${{ secrets.PLATFORM_USER }} --ci.runId=${{ runner.os }}-access diff --git a/.github/workflows/addReleaseLinks.yml b/.github/workflows/addReleaseLinks.yml index 75622164b..14d44f719 100644 --- a/.github/workflows/addReleaseLinks.yml +++ b/.github/workflows/addReleaseLinks.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Create markdown download links run: | diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml index b87f99800..666bf3046 100644 --- a/.github/workflows/analysis.yml +++ b/.github/workflows/analysis.yml @@ -18,21 +18,12 @@ jobs: os: [ ubuntu, windows, macos ] runs-on: ${{ matrix.os }}-latest steps: - - name: Setup Go - uses: actions/setup-go@v5 - with: - go-version: 1.22.x - cache: false + - uses: ./.github/common-steps/install-go-with-cache - name: Checkout code uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.sha }} - - name: Go Cache - uses: actions/cache@v4 - with: - path: ~/go/pkg/mod - key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} - restore-keys: ${{ runner.os }}-go- + - name: Run Go vet run: go vet -v ./... @@ -42,11 +33,9 @@ jobs: steps: - name: Checkout Source uses: actions/checkout@v4 - - name: Setup Go - uses: actions/setup-go@v5 - with: - go-version: 1.22.x - cache: false + + - uses: ./.github/common-steps/install-go-with-cache + - name: Static Code Analysis uses: golangci/golangci-lint-action@v4 with: @@ -59,11 +48,9 @@ jobs: steps: - name: Checkout Source uses: actions/checkout@v4 - - name: Setup Go - uses: actions/setup-go@v5 - with: - go-version: 1.22.x - cache: false + + - uses: ./.github/common-steps/install-go-with-cache + - name: Run Gosec Security Scanner uses: securego/gosec@master with: diff --git a/.github/workflows/artifactoryTests.yml b/.github/workflows/artifactoryTests.yml index e75f55fc4..e0dab6622 100644 --- a/.github/workflows/artifactoryTests.yml +++ b/.github/workflows/artifactoryTests.yml @@ -23,28 +23,16 @@ jobs: os: [ ubuntu, windows, macos ] runs-on: ${{ matrix.os }}-latest steps: - - name: Setup Go - uses: actions/setup-go@v5 - with: - go-version: 1.22.x - cache: false - name: Checkout code uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.sha }} - - name: Go Cache - uses: actions/cache@v4 + + - uses: ./.github/common-steps/install-go-with-cache + + - uses: ./.github/common-steps/install-local-artifactory with: - path: ~/go/pkg/mod - key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} - restore-keys: ${{ runner.os }}-go- - - name: Setup Artifactory - run: | - go install github.com/jfrog/jfrog-testing-infra/local-rt-setup@latest - ~/go/bin/local-rt-setup - env: - RTLIC: ${{secrets.RTLIC}} - GOPROXY: direct + RTLIC: ${{ secrets.RTLIC }} - name: Run Artifactory tests run: go test -v github.com/jfrog/jfrog-cli --timeout 0 --test.artifactory diff --git a/.github/workflows/distributionTests.yml b/.github/workflows/distributionTests.yml index 81235bbce..59aaaf6d8 100644 --- a/.github/workflows/distributionTests.yml +++ b/.github/workflows/distributionTests.yml @@ -22,20 +22,12 @@ jobs: os: [ ubuntu, windows, macos ] runs-on: ${{ matrix.os }}-latest steps: - - name: Setup Go - uses: actions/setup-go@v5 - with: - go-version: 1.22.x - cache: false - - name: Go Cache - uses: actions/cache@v4 - with: - path: ~/go/pkg/mod - key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} - restore-keys: ${{ runner.os }}-go- + - uses: ./.github/common-steps/install-go-with-cache + - name: Checkout code uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.sha }} + - name: Run Distribution tests run: go test -v github.com/jfrog/jfrog-cli --timeout 0 --test.distribution --jfrog.url=${{ secrets.PLATFORM_URL }} --jfrog.adminToken=${{ secrets.PLATFORM_ADMIN_TOKEN }} --jfrog.user=${{ secrets.PLATFORM_USER }} --ci.runId=${{ runner.os }}-distribution diff --git a/.github/workflows/dockerTests.yml b/.github/workflows/dockerTests.yml index 9f48c2ff0..c716332f3 100644 --- a/.github/workflows/dockerTests.yml +++ b/.github/workflows/dockerTests.yml @@ -18,21 +18,13 @@ jobs: name: ubuntu-latest runs-on: ubuntu-latest steps: - - name: Setup Go - uses: actions/setup-go@v5 - with: - go-version: 1.22.x - cache: false - name: Checkout code uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.sha }} - - name: Go Cache - uses: actions/cache@v4 - with: - path: ~/go/pkg/mod - key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} - restore-keys: ${{ runner.os }}-go- + + - uses: ./.github/common-steps/install-go-with-cache + - name: Containerize Artifactory run: | cd ./testdata/docker/artifactory/ @@ -40,6 +32,7 @@ jobs: env: RTLIC: ${{secrets.RTLIC}} GOPROXY: direct + - name: Wait for Artifactory to finish loading uses: nev7n/wait_for_response@v1 with: @@ -47,5 +40,6 @@ jobs: responseCode: 200 timeout: 600000 interval: 500 + - name: Run Docker tests run: go test -v -timeout 0 --test.docker diff --git a/.github/workflows/frogbot-scan-pull-request.yml b/.github/workflows/frogbot-scan-pull-request.yml index 66c14f5bc..da90683ec 100644 --- a/.github/workflows/frogbot-scan-pull-request.yml +++ b/.github/workflows/frogbot-scan-pull-request.yml @@ -12,11 +12,8 @@ jobs: # "frogbot" GitHub environment can approve the pull request to be scanned. environment: frogbot steps: - - name: Setup Go - uses: actions/setup-go@v5 - with: - go-version: 1.22.x - cache: false + - uses: ./.github/common-steps/install-go-with-cache + - uses: jfrog/frogbot@v2 env: JFROG_CLI_LOG_LEVEL: "DEBUG" diff --git a/.github/workflows/frogbot-scan-repository.yml b/.github/workflows/frogbot-scan-repository.yml index 7d80466a3..05099f3ed 100644 --- a/.github/workflows/frogbot-scan-repository.yml +++ b/.github/workflows/frogbot-scan-repository.yml @@ -17,11 +17,8 @@ jobs: # The repository scanning will be triggered periodically on the following branches. branch: [ "dev" ] steps: - - name: Setup Go - uses: actions/setup-go@v5 - with: - go-version: 1.22.x - cache: false + - uses: ./.github/common-steps/install-go-with-cache + - uses: jfrog/frogbot@v2 env: JFROG_CLI_LOG_LEVEL: "DEBUG" diff --git a/.github/workflows/goTests.yml b/.github/workflows/goTests.yml index 2748fa8a8..911b2d8cb 100644 --- a/.github/workflows/goTests.yml +++ b/.github/workflows/goTests.yml @@ -23,20 +23,12 @@ jobs: os: [ ubuntu, windows, macos ] runs-on: ${{ matrix.os }}-latest steps: - - name: Setup Go - uses: actions/setup-go@v5 - with: - go-version: 1.22.x - cache: false - name: Checkout code uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.sha }} - - name: Go Cache - uses: actions/cache@v4 - with: - path: ~/go/pkg/mod - key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} - restore-keys: ${{ runner.os }}-go- + + - uses: ./.github/common-steps/install-go-with-cache + - name: Run Go tests run: go test -v -timeout 0 --test.go --jfrog.url=${{ secrets.PLATFORM_URL }} --jfrog.adminToken=${{ secrets.PLATFORM_ADMIN_TOKEN }} --ci.runId=${{ runner.os }}-go diff --git a/.github/workflows/gradleTests.yml b/.github/workflows/gradleTests.yml index a626ea213..515a26e3a 100644 --- a/.github/workflows/gradleTests.yml +++ b/.github/workflows/gradleTests.yml @@ -25,36 +25,27 @@ jobs: env: GRADLE_OPTS: -Dorg.gradle.daemon=false steps: - - name: Setup Go - uses: actions/setup-go@v5 + - name: Checkout code + uses: actions/checkout@v4 with: - go-version: 1.22.x - cache: false + ref: ${{ github.event.pull_request.head.sha }} + - name: Setup Java uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: '11' + - name: Setup Gradle uses: gradle/gradle-build-action@v2 with: gradle-version: ${{ matrix.gradle-version }} - - name: Checkout code - uses: actions/checkout@v4 - with: - ref: ${{ github.event.pull_request.head.sha }} - - name: Go Cache - uses: actions/cache@v4 + + - uses: ./.github/common-steps/install-go-with-cache + + - uses: ./.github/common-steps/install-local-artifactory with: - path: ~/go/pkg/mod - key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} - restore-keys: ${{ runner.os }}-go- - - name: Setup Artifactory - run: | - go install github.com/jfrog/jfrog-testing-infra/local-rt-setup@latest - ~/go/bin/local-rt-setup - env: - RTLIC: ${{secrets.RTLIC}} - GOPROXY: direct + RTLIC: ${{ secrets.RTLIC }} + - name: Run Gradle tests run: go test -v github.com/jfrog/jfrog-cli --timeout 0 --test.gradle diff --git a/.github/workflows/lifecycleTests.yml b/.github/workflows/lifecycleTests.yml index e00bd8730..d305ce4bd 100644 --- a/.github/workflows/lifecycleTests.yml +++ b/.github/workflows/lifecycleTests.yml @@ -22,24 +22,12 @@ jobs: os: [ ubuntu, windows, macos ] runs-on: ${{ matrix.os }}-latest steps: - - name: Setup Go - uses: actions/setup-go@v5 - with: - go-version: 1.22.x - cache: false - - name: Checkout code - uses: actions/checkout@v4 - with: - ref: ${{ github.event.pull_request.head.sha }} - - name: Go Cache - uses: actions/cache@v4 - with: - path: ~/go/pkg/mod - key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} - restore-keys: ${{ runner.os }}-go- - name: Checkout code uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.sha }} + + - uses: ./.github/common-steps/install-go-with-cache + - name: Run Lifecycle tests run: go test -v github.com/jfrog/jfrog-cli --timeout 0 --test.lifecycle --jfrog.url=${{ secrets.PLATFORM_URL }} --jfrog.adminToken=${{ secrets.PLATFORM_ADMIN_TOKEN }} --jfrog.user=${{ secrets.PLATFORM_USER }} --ci.runId=${{ runner.os }}-lifecycle diff --git a/.github/workflows/mavenTests.yml b/.github/workflows/mavenTests.yml index 27d9f678e..03e051b93 100644 --- a/.github/workflows/mavenTests.yml +++ b/.github/workflows/mavenTests.yml @@ -22,32 +22,22 @@ jobs: os: [ ubuntu, windows, macos ] runs-on: ${{ matrix.os }}-latest steps: - - name: Setup Go - uses: actions/setup-go@v5 - with: - go-version: 1.22.x - cache: false - name: Checkout code uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.sha }} - - name: Go Cache - uses: actions/cache@v4 - with: - path: ~/go/pkg/mod - key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} - restore-keys: ${{ runner.os }}-go- + + - uses: ./.github/common-steps/install-go-with-cache + - name: Setup Maven v3.8.8 for macOS uses: stCarolas/setup-maven@v4.5 with: maven-version: 3.8.8 if: runner.os == 'macOS' - - name: Setup Artifactory - run: | - go install github.com/jfrog/jfrog-testing-infra/local-rt-setup@latest - ~/go/bin/local-rt-setup - env: - RTLIC: ${{secrets.RTLIC}} - GOPROXY: direct + + - uses: ./.github/common-steps/install-local-artifactory + with: + RTLIC: ${{ secrets.RTLIC }} + - name: Run Maven tests run: go test -v github.com/jfrog/jfrog-cli --timeout 0 --test.maven diff --git a/.github/workflows/npmTests.yml b/.github/workflows/npmTests.yml index 7c94dc7c9..935837a18 100644 --- a/.github/workflows/npmTests.yml +++ b/.github/workflows/npmTests.yml @@ -22,31 +22,21 @@ jobs: os: [ ubuntu, windows, macos ] runs-on: ${{ matrix.os }}-latest steps: - - name: Setup Go - uses: actions/setup-go@v5 + - name: Checkout code + uses: actions/checkout@v4 with: - go-version: 1.22.x - cache: false + ref: ${{ github.event.pull_request.head.sha }} + - name: Install npm uses: actions/setup-node@v3 with: node-version: "16" - - name: Checkout code - uses: actions/checkout@v4 - with: - ref: ${{ github.event.pull_request.head.sha }} - - name: Go Cache - uses: actions/cache@v4 + + - uses: ./.github/common-steps/install-go-with-cache + + - uses: ./.github/common-steps/install-local-artifactory with: - path: ~/go/pkg/mod - key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} - restore-keys: ${{ runner.os }}-go- - - name: Setup Artifactory - run: | - go install github.com/jfrog/jfrog-testing-infra/local-rt-setup@latest - ~/go/bin/local-rt-setup - env: - RTLIC: ${{secrets.RTLIC}} - GOPROXY: direct + RTLIC: ${{ secrets.RTLIC }} + - name: Run npm tests run: go test -v github.com/jfrog/jfrog-cli --timeout 0 --test.npm diff --git a/.github/workflows/nugetTests.yml b/.github/workflows/nugetTests.yml index 72562047b..38bf95726 100644 --- a/.github/workflows/nugetTests.yml +++ b/.github/workflows/nugetTests.yml @@ -22,35 +22,27 @@ jobs: os: [ ubuntu, windows, macos ] runs-on: ${{ matrix.os }}-latest steps: - - name: Setup Go - uses: actions/setup-go@v5 + - name: Checkout code + uses: actions/checkout@v4 with: - go-version: 1.22.x - cache: false + ref: ${{ github.event.pull_request.head.sha }} + - name: Install NuGet uses: nuget/setup-nuget@v2 with: nuget-version: 6.x + - name: Install dotnet uses: actions/setup-dotnet@v4 with: dotnet-version: "6.x" - - name: Checkout code - uses: actions/checkout@v4 - with: - ref: ${{ github.event.pull_request.head.sha }} - - name: Go Cache - uses: actions/cache@v4 + + + - uses: ./.github/common-steps/install-go-with-cache + + - uses: ./.github/common-steps/install-local-artifactory with: - path: ~/go/pkg/mod - key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} - restore-keys: ${{ runner.os }}-go- - - name: Setup Artifactory - run: | - go install github.com/jfrog/jfrog-testing-infra/local-rt-setup@latest - ~/go/bin/local-rt-setup - env: - RTLIC: ${{secrets.RTLIC}} - GOPROXY: direct + RTLIC: ${{ secrets.RTLIC }} + - name: Run NuGet tests run: go test -v github.com/jfrog/jfrog-cli --timeout 0 --test.nuget diff --git a/.github/workflows/pluginsTests.yml b/.github/workflows/pluginsTests.yml index 4d452fa99..6cb139773 100644 --- a/.github/workflows/pluginsTests.yml +++ b/.github/workflows/pluginsTests.yml @@ -22,27 +22,16 @@ jobs: os: [ ubuntu, windows, macos ] runs-on: ${{ matrix.os }}-latest steps: - - name: Setup Go - uses: actions/setup-go@v5 - with: - go-version: 1.22.x - cache: false - name: Checkout code uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.sha }} - - name: Go Cache - uses: actions/cache@v4 + + - uses: ./.github/common-steps/install-go-with-cache + + - uses: ./.github/common-steps/install-local-artifactory with: - path: ~/go/pkg/mod - key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} - restore-keys: ${{ runner.os }}-go- - - name: Setup Artifactory - run: | - go install github.com/jfrog/jfrog-testing-infra/local-rt-setup@latest - ~/go/bin/local-rt-setup - env: - RTLIC: ${{secrets.RTLIC}} - GOPROXY: direct + RTLIC: ${{ secrets.RTLIC }} + - name: Run plugins tests run: go test -v github.com/jfrog/jfrog-cli --timeout 0 --test.plugins diff --git a/.github/workflows/podmanTests.yml b/.github/workflows/podmanTests.yml index ef6660317..1f27b788a 100644 --- a/.github/workflows/podmanTests.yml +++ b/.github/workflows/podmanTests.yml @@ -18,20 +18,12 @@ jobs: name: ubuntu-latest runs-on: ubuntu-latest steps: - - name: Setup Go - uses: actions/setup-go@v5 - with: - go-version: 1.22.x - cache: false - name: Checkout code uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.sha }} - - name: Go Cache - uses: actions/cache@v4 - with: - path: ~/go/pkg/mod - key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} - restore-keys: ${{ runner.os }}-go- + + - uses: ./.github/common-steps/install-go-with-cache + - name: Run podman tests run: go test -v -timeout 0 --test.podman --jfrog.url=${{ secrets.PLATFORM_URL }} --jfrog.adminToken=${{ secrets.PLATFORM_ADMIN_TOKEN }} --test.containerRegistry=${{ secrets.CONTAINER_REGISTRY }} diff --git a/.github/workflows/pythonTests.yml b/.github/workflows/pythonTests.yml index cfad39e35..e62b91754 100644 --- a/.github/workflows/pythonTests.yml +++ b/.github/workflows/pythonTests.yml @@ -23,35 +23,26 @@ jobs: os: [ ubuntu, windows, macos ] runs-on: ${{ matrix.os }}-latest steps: - - name: Setup Go - uses: actions/setup-go@v5 + - name: Checkout code + uses: actions/checkout@v4 with: - go-version: 1.22.x - cache: false + ref: ${{ github.event.pull_request.head.sha }} + # Due to a bug in Python 3.12.0 we temporarily use version 3.11.5 - name: Setup Python3 uses: actions/setup-python@v5 with: python-version: "3.11.5" + - name: Setup Pipenv if: ${{ matrix.suite == 'pipenv' }} run: python -m pip install pipenv - - name: Checkout code - uses: actions/checkout@v4 - with: - ref: ${{ github.event.pull_request.head.sha }} - - name: Go Cache - uses: actions/cache@v4 + + - uses: ./.github/common-steps/install-go-with-cache + + - uses: ./.github/common-steps/install-local-artifactory with: - path: ~/go/pkg/mod - key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} - restore-keys: ${{ runner.os }}-go- - - name: Setup Artifactory - run: | - go install github.com/jfrog/jfrog-testing-infra/local-rt-setup@latest - ~/go/bin/local-rt-setup - env: - RTLIC: ${{secrets.RTLIC}} - GOPROXY: direct + RTLIC: ${{ secrets.RTLIC }} + - name: Run Python tests run: go test -v github.com/jfrog/jfrog-cli --timeout 0 --test.${{ matrix.suite }} diff --git a/.github/workflows/scriptTests.yml b/.github/workflows/scriptTests.yml index 8d0b466ca..65d8df7cb 100644 --- a/.github/workflows/scriptTests.yml +++ b/.github/workflows/scriptTests.yml @@ -35,23 +35,12 @@ jobs: osSuffix: ".exe" runs-on: ${{ matrix.suite.os }} steps: - - name: Setup Go - uses: actions/setup-go@v5 - with: - go-version: 1.22.x - cache: false - - name: Checkout code uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.sha }} - - name: Go Cache - uses: actions/cache@v4 - with: - path: ~/go/pkg/mod - key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} - restore-keys: ${{ runner.os }}-go- + - uses: ./.github/common-steps/install-go-with-cache - name: Test install CLI - jf run: | diff --git a/.github/workflows/transferTests.yml b/.github/workflows/transferTests.yml index 4d72090ed..c04f55152 100644 --- a/.github/workflows/transferTests.yml +++ b/.github/workflows/transferTests.yml @@ -26,25 +26,14 @@ jobs: uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.sha }} - - name: Setup Go - uses: actions/setup-go@v5 - with: - go-version: 1.22.x - cache: false - - name: Go Cache - uses: actions/cache@v4 + + - uses: ./.github/common-steps/install-go-with-cache + + - uses: ./.github/common-steps/install-local-artifactory with: - path: ~/go/pkg/mod - key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} - restore-keys: ${{ runner.os }}-go- - - name: Setup Artifactory - run: | - go install github.com/jfrog/jfrog-testing-infra/local-rt-setup@latest - ~/go/bin/local-rt-setup - env: - RTLIC: ${{secrets.RTLIC}} - GOPROXY: direct + RTLIC: ${{ secrets.RTLIC }} JFROG_HOME: ${{ runner.temp }} + - name: Run transfer tests run: go test -v github.com/jfrog/jfrog-cli --timeout 0 --test.transfer --test.installDataTransferPlugin --jfrog.targetUrl=${{ secrets.PLATFORM_URL }} --jfrog.targetAdminToken=${{ secrets.PLATFORM_ADMIN_TOKEN }} --jfrog.home=${{ runner.temp }} --ci.runId=${{ runner.os }}-transfer-7 @@ -57,24 +46,13 @@ jobs: uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.sha }} - - name: Setup Go - uses: actions/setup-go@v5 - with: - go-version: 1.22.x - cache: false - - name: Go Cache - uses: actions/cache@v4 + + - uses: ./.github/common-steps/install-go-with-cache + + - uses: ./.github/common-steps/install-local-artifactory with: - path: ~/go/pkg/mod - key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} - restore-keys: ${{ runner.os }}-go- - - name: Setup Artifactory 6 - run: | - go install github.com/jfrog/jfrog-testing-infra/local-rt-setup@latest - ~/go/bin/local-rt-setup --rt-version=6.23.21 - env: - RTLIC: ${{secrets.RTLIC}} - GOPROXY: direct + RTLIC: ${{ secrets.RTLIC }} JFROG_HOME: ${{ runner.temp }} + - name: Run transfer tests run: go test -v github.com/jfrog/jfrog-cli --timeout 0 --test.transfer --test.installDataTransferPlugin --jfrog.targetUrl=${{ secrets.PLATFORM_URL }} --jfrog.targetAdminToken=${{ secrets.PLATFORM_ADMIN_TOKEN }} --jfrog.home=${{ runner.temp }} --ci.runId=${{ runner.os }}-transfer-6 From f710a2db09fa9b4dc999d44041db0489df749025 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Tue, 16 Jul 2024 17:41:39 +0300 Subject: [PATCH 02/17] Fix npm script Signed-off-by: Michael Sverdlov --- .github/workflows/analysis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml index 666bf3046..3015f2fe0 100644 --- a/.github/workflows/analysis.yml +++ b/.github/workflows/analysis.yml @@ -18,12 +18,13 @@ jobs: os: [ ubuntu, windows, macos ] runs-on: ${{ matrix.os }}-latest steps: - - uses: ./.github/common-steps/install-go-with-cache - name: Checkout code uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.sha }} + - uses: ./.github/common-steps/install-go-with-cache + - name: Run Go vet run: go vet -v ./... From a6503458e1bc08f183cdda994183b9cbd95e8b20 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Tue, 16 Jul 2024 18:48:18 +0300 Subject: [PATCH 03/17] unite actions Signed-off-by: Michael Sverdlov --- .../install-go-with-cache/action.yml | 19 -------------- .../install-local-artifactory/action.yml | 22 ---------------- .github/workflows/accessTests.yml | 2 +- .github/workflows/analysis.yml | 21 ++++++---------- .github/workflows/artifactoryTests.yml | 4 +-- .github/workflows/cla.yml | 25 +++---------------- .github/workflows/distributionTests.yml | 2 +- .github/workflows/dockerTests.yml | 2 +- .../workflows/frogbot-scan-pull-request.yml | 2 +- .github/workflows/frogbot-scan-repository.yml | 2 +- .github/workflows/goTests.yml | 2 +- .github/workflows/gradleTests.yml | 4 +-- .github/workflows/lifecycleTests.yml | 2 +- .github/workflows/mavenTests.yml | 4 +-- .github/workflows/npmTests.yml | 4 +-- .github/workflows/nugetTests.yml | 4 +-- .github/workflows/pluginsTests.yml | 4 +-- .github/workflows/podmanTests.yml | 2 +- .github/workflows/pythonTests.yml | 4 +-- .github/workflows/scriptTests.yml | 2 +- .github/workflows/transferTests.yml | 8 +++--- 21 files changed, 39 insertions(+), 102 deletions(-) delete mode 100644 .github/common-steps/install-go-with-cache/action.yml delete mode 100644 .github/common-steps/install-local-artifactory/action.yml diff --git a/.github/common-steps/install-go-with-cache/action.yml b/.github/common-steps/install-go-with-cache/action.yml deleted file mode 100644 index 1695db418..000000000 --- a/.github/common-steps/install-go-with-cache/action.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: 'Setup and Cache Go and Configure Private' -description: 'Setup and Cache Go 1.22' - -runs: - using: 'composite' - steps: - - name: Go Cache - uses: actions/cache@v4 - with: - path: ~/go/pkg/mod - key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} - restore-keys: | - ${{ runner.os }}-go- - - - name: Setup Go - uses: actions/setup-go@v5 - with: - go-version: 1.22.4 - cache: false \ No newline at end of file diff --git a/.github/common-steps/install-local-artifactory/action.yml b/.github/common-steps/install-local-artifactory/action.yml deleted file mode 100644 index 43dd78562..000000000 --- a/.github/common-steps/install-local-artifactory/action.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: 'Setup Local Artifactory' -description: 'Setup Local Artifactory' -inputs: - RTLIC: - description: 'Local Artifactory License' - required: true - JFROG_HOME: - description: 'JFrog Home' - required: false - -runs: - using: 'composite' - steps: - - name: Install Local Artifactory - run: | - go install github.com/jfrog/jfrog-testing-infra/local-rt-setup@latest - ~/go/bin/local-rt-setup - shell: bash - env: - RTLIC: ${{ inputs.RTLIC }} - GOPROXY: direct - JFROG_HOME: ${{ inputs.JFROG_HOME }} \ No newline at end of file diff --git a/.github/workflows/accessTests.yml b/.github/workflows/accessTests.yml index 484b35b35..9831cb69f 100644 --- a/.github/workflows/accessTests.yml +++ b/.github/workflows/accessTests.yml @@ -27,7 +27,7 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - - uses: ./.github/common-steps/install-go-with-cache + - uses: jfrog/.github/.github/actions/install-go-with-cache - name: Run Access tests run: go test -v github.com/jfrog/jfrog-cli --timeout 0 --test.access --jfrog.url=${{ secrets.PLATFORM_URL }} --jfrog.adminToken=${{ secrets.PLATFORM_ADMIN_TOKEN }} --jfrog.user=${{ secrets.PLATFORM_USER }} --ci.runId=${{ runner.os }}-access diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml index 3015f2fe0..27ecd4b48 100644 --- a/.github/workflows/analysis.yml +++ b/.github/workflows/analysis.yml @@ -23,7 +23,7 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - - uses: ./.github/common-steps/install-go-with-cache + - uses: jfrog/.github/.github/actions/install-go-with-cache - name: Run Go vet run: go vet -v ./... @@ -35,14 +35,12 @@ jobs: - name: Checkout Source uses: actions/checkout@v4 - - uses: ./.github/common-steps/install-go-with-cache + - uses: jfrog/.github/.github/actions/install-go-with-cache - - name: Static Code Analysis - uses: golangci/golangci-lint-action@v4 - with: - args: | - --timeout 5m --out-${NO_FUTURE}format colored-line-number --enable errcheck,gosimple,govet,ineffassign,staticcheck,typecheck,unused,gocritic,asasalint,asciicheck,errchkjson,exportloopref,forcetypeassert,makezero,nilerr,unparam,unconvert,wastedassign,usestdlibvars + - uses: jfrog/.github/.github/actions/install-go-with-cache + - uses: jfrog/.github/.github/actions/golangci-lint + Go-Sec: name: Go-Sec ubuntu-latest runs-on: ubuntu-latest @@ -50,12 +48,9 @@ jobs: - name: Checkout Source uses: actions/checkout@v4 - - uses: ./.github/common-steps/install-go-with-cache - - - name: Run Gosec Security Scanner - uses: securego/gosec@master - with: - args: -exclude G204,G301,G302,G304,G306 -tests -exclude-dir \.*test\.* ./... + - uses: jfrog/.github/.github/actions/install-go-with-cache + + - uses: jfrog/.github/.github/actions/gosec-scanner ShellCheck: name: Shellcheck diff --git a/.github/workflows/artifactoryTests.yml b/.github/workflows/artifactoryTests.yml index e0dab6622..b5adbfd1b 100644 --- a/.github/workflows/artifactoryTests.yml +++ b/.github/workflows/artifactoryTests.yml @@ -28,9 +28,9 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - - uses: ./.github/common-steps/install-go-with-cache + - uses: jfrog/.github/.github/actions/install-go-with-cache - - uses: ./.github/common-steps/install-local-artifactory + - uses: jfrog/.github/.github/actions/install-local-artifactory with: RTLIC: ${{ secrets.RTLIC }} diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml index 6813343d7..c61c0be91 100644 --- a/.github/workflows/cla.yml +++ b/.github/workflows/cla.yml @@ -10,26 +10,9 @@ jobs: CLAssistant: runs-on: ubuntu-latest steps: - - uses: actions-ecosystem/action-regex-match@v2 - id: sign-or-recheck + - uses: jfrog/.github/.github/actions/cla with: - text: ${{ github.event.comment.body }} - regex: '\s*(I have read the CLA Document and I hereby sign the CLA)|(recheck)\s*' - - - name: "CLA Assistant" - if: ${{ steps.sign-or-recheck.outputs.match != '' || github.event_name == 'pull_request_target' }} - # Alpha Release - uses: cla-assistant/github-action@v2.3.0 - env: - # Generated and maintained by GitHub + event_comment_body: ${{ github.event.comment.body }} + event_name: ${{ github.event_name }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # JFrog organization secret - PERSONAL_ACCESS_TOKEN: ${{ secrets.CLA_SIGN_TOKEN }} - with: - path-to-signatures: "signed_clas.json" - path-to-document: "https://jfrog.com/cla/" - remote-organization-name: "jfrog" - remote-repository-name: "jfrog-signed-clas" - # branch should not be protected - branch: "master" - allowlist: bot* + CLA_SIGN_TOKEN: ${{ secrets.CLA_SIGN_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/distributionTests.yml b/.github/workflows/distributionTests.yml index 59aaaf6d8..e1c950382 100644 --- a/.github/workflows/distributionTests.yml +++ b/.github/workflows/distributionTests.yml @@ -22,7 +22,7 @@ jobs: os: [ ubuntu, windows, macos ] runs-on: ${{ matrix.os }}-latest steps: - - uses: ./.github/common-steps/install-go-with-cache + - uses: jfrog/.github/.github/actions/install-go-with-cache - name: Checkout code uses: actions/checkout@v4 diff --git a/.github/workflows/dockerTests.yml b/.github/workflows/dockerTests.yml index c716332f3..2c428aa20 100644 --- a/.github/workflows/dockerTests.yml +++ b/.github/workflows/dockerTests.yml @@ -23,7 +23,7 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - - uses: ./.github/common-steps/install-go-with-cache + - uses: jfrog/.github/.github/actions/install-go-with-cache - name: Containerize Artifactory run: | diff --git a/.github/workflows/frogbot-scan-pull-request.yml b/.github/workflows/frogbot-scan-pull-request.yml index da90683ec..d2b6d18b7 100644 --- a/.github/workflows/frogbot-scan-pull-request.yml +++ b/.github/workflows/frogbot-scan-pull-request.yml @@ -12,7 +12,7 @@ jobs: # "frogbot" GitHub environment can approve the pull request to be scanned. environment: frogbot steps: - - uses: ./.github/common-steps/install-go-with-cache + - uses: jfrog/.github/.github/actions/install-go-with-cache - uses: jfrog/frogbot@v2 env: diff --git a/.github/workflows/frogbot-scan-repository.yml b/.github/workflows/frogbot-scan-repository.yml index 05099f3ed..54ff06794 100644 --- a/.github/workflows/frogbot-scan-repository.yml +++ b/.github/workflows/frogbot-scan-repository.yml @@ -17,7 +17,7 @@ jobs: # The repository scanning will be triggered periodically on the following branches. branch: [ "dev" ] steps: - - uses: ./.github/common-steps/install-go-with-cache + - uses: jfrog/.github/.github/actions/install-go-with-cache - uses: jfrog/frogbot@v2 env: diff --git a/.github/workflows/goTests.yml b/.github/workflows/goTests.yml index 911b2d8cb..9d83f25c2 100644 --- a/.github/workflows/goTests.yml +++ b/.github/workflows/goTests.yml @@ -28,7 +28,7 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - - uses: ./.github/common-steps/install-go-with-cache + - uses: jfrog/.github/.github/actions/install-go-with-cache - name: Run Go tests run: go test -v -timeout 0 --test.go --jfrog.url=${{ secrets.PLATFORM_URL }} --jfrog.adminToken=${{ secrets.PLATFORM_ADMIN_TOKEN }} --ci.runId=${{ runner.os }}-go diff --git a/.github/workflows/gradleTests.yml b/.github/workflows/gradleTests.yml index 515a26e3a..2a9156e78 100644 --- a/.github/workflows/gradleTests.yml +++ b/.github/workflows/gradleTests.yml @@ -41,9 +41,9 @@ jobs: with: gradle-version: ${{ matrix.gradle-version }} - - uses: ./.github/common-steps/install-go-with-cache + - uses: jfrog/.github/.github/actions/install-go-with-cache - - uses: ./.github/common-steps/install-local-artifactory + - uses: jfrog/.github/.github/actions/install-local-artifactory with: RTLIC: ${{ secrets.RTLIC }} diff --git a/.github/workflows/lifecycleTests.yml b/.github/workflows/lifecycleTests.yml index d305ce4bd..4da2c8586 100644 --- a/.github/workflows/lifecycleTests.yml +++ b/.github/workflows/lifecycleTests.yml @@ -27,7 +27,7 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - - uses: ./.github/common-steps/install-go-with-cache + - uses: jfrog/.github/.github/actions/install-go-with-cache - name: Run Lifecycle tests run: go test -v github.com/jfrog/jfrog-cli --timeout 0 --test.lifecycle --jfrog.url=${{ secrets.PLATFORM_URL }} --jfrog.adminToken=${{ secrets.PLATFORM_ADMIN_TOKEN }} --jfrog.user=${{ secrets.PLATFORM_USER }} --ci.runId=${{ runner.os }}-lifecycle diff --git a/.github/workflows/mavenTests.yml b/.github/workflows/mavenTests.yml index 03e051b93..e67badeb9 100644 --- a/.github/workflows/mavenTests.yml +++ b/.github/workflows/mavenTests.yml @@ -27,7 +27,7 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - - uses: ./.github/common-steps/install-go-with-cache + - uses: jfrog/.github/.github/actions/install-go-with-cache - name: Setup Maven v3.8.8 for macOS uses: stCarolas/setup-maven@v4.5 @@ -35,7 +35,7 @@ jobs: maven-version: 3.8.8 if: runner.os == 'macOS' - - uses: ./.github/common-steps/install-local-artifactory + - uses: jfrog/.github/.github/actions/install-local-artifactory with: RTLIC: ${{ secrets.RTLIC }} diff --git a/.github/workflows/npmTests.yml b/.github/workflows/npmTests.yml index 935837a18..33103f8be 100644 --- a/.github/workflows/npmTests.yml +++ b/.github/workflows/npmTests.yml @@ -32,9 +32,9 @@ jobs: with: node-version: "16" - - uses: ./.github/common-steps/install-go-with-cache + - uses: jfrog/.github/.github/actions/install-go-with-cache - - uses: ./.github/common-steps/install-local-artifactory + - uses: jfrog/.github/.github/actions/install-local-artifactory with: RTLIC: ${{ secrets.RTLIC }} diff --git a/.github/workflows/nugetTests.yml b/.github/workflows/nugetTests.yml index 38bf95726..714a053b3 100644 --- a/.github/workflows/nugetTests.yml +++ b/.github/workflows/nugetTests.yml @@ -38,9 +38,9 @@ jobs: dotnet-version: "6.x" - - uses: ./.github/common-steps/install-go-with-cache + - uses: jfrog/.github/.github/actions/install-go-with-cache - - uses: ./.github/common-steps/install-local-artifactory + - uses: jfrog/.github/.github/actions/install-local-artifactory with: RTLIC: ${{ secrets.RTLIC }} diff --git a/.github/workflows/pluginsTests.yml b/.github/workflows/pluginsTests.yml index 6cb139773..78e311b59 100644 --- a/.github/workflows/pluginsTests.yml +++ b/.github/workflows/pluginsTests.yml @@ -27,9 +27,9 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - - uses: ./.github/common-steps/install-go-with-cache + - uses: jfrog/.github/.github/actions/install-go-with-cache - - uses: ./.github/common-steps/install-local-artifactory + - uses: jfrog/.github/.github/actions/install-local-artifactory with: RTLIC: ${{ secrets.RTLIC }} diff --git a/.github/workflows/podmanTests.yml b/.github/workflows/podmanTests.yml index 1f27b788a..9e2f2773e 100644 --- a/.github/workflows/podmanTests.yml +++ b/.github/workflows/podmanTests.yml @@ -23,7 +23,7 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - - uses: ./.github/common-steps/install-go-with-cache + - uses: jfrog/.github/.github/actions/install-go-with-cache - name: Run podman tests run: go test -v -timeout 0 --test.podman --jfrog.url=${{ secrets.PLATFORM_URL }} --jfrog.adminToken=${{ secrets.PLATFORM_ADMIN_TOKEN }} --test.containerRegistry=${{ secrets.CONTAINER_REGISTRY }} diff --git a/.github/workflows/pythonTests.yml b/.github/workflows/pythonTests.yml index e62b91754..f7ea33c63 100644 --- a/.github/workflows/pythonTests.yml +++ b/.github/workflows/pythonTests.yml @@ -38,9 +38,9 @@ jobs: if: ${{ matrix.suite == 'pipenv' }} run: python -m pip install pipenv - - uses: ./.github/common-steps/install-go-with-cache + - uses: jfrog/.github/.github/actions/install-go-with-cache - - uses: ./.github/common-steps/install-local-artifactory + - uses: jfrog/.github/.github/actions/install-local-artifactory with: RTLIC: ${{ secrets.RTLIC }} diff --git a/.github/workflows/scriptTests.yml b/.github/workflows/scriptTests.yml index 65d8df7cb..d8f2c8bd0 100644 --- a/.github/workflows/scriptTests.yml +++ b/.github/workflows/scriptTests.yml @@ -40,7 +40,7 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - - uses: ./.github/common-steps/install-go-with-cache + - uses: jfrog/.github/.github/actions/install-go-with-cache - name: Test install CLI - jf run: | diff --git a/.github/workflows/transferTests.yml b/.github/workflows/transferTests.yml index c04f55152..458eaedde 100644 --- a/.github/workflows/transferTests.yml +++ b/.github/workflows/transferTests.yml @@ -27,9 +27,9 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - - uses: ./.github/common-steps/install-go-with-cache + - uses: jfrog/.github/.github/actions/install-go-with-cache - - uses: ./.github/common-steps/install-local-artifactory + - uses: jfrog/.github/.github/actions/install-local-artifactory with: RTLIC: ${{ secrets.RTLIC }} JFROG_HOME: ${{ runner.temp }} @@ -47,9 +47,9 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - - uses: ./.github/common-steps/install-go-with-cache + - uses: jfrog/.github/.github/actions/install-go-with-cache - - uses: ./.github/common-steps/install-local-artifactory + - uses: jfrog/.github/.github/actions/install-local-artifactory with: RTLIC: ${{ secrets.RTLIC }} JFROG_HOME: ${{ runner.temp }} From 0c2f5e7c1daee4de6a618f691035175a05e575d3 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Tue, 16 Jul 2024 23:21:47 +0300 Subject: [PATCH 04/17] unite actions Signed-off-by: Michael Sverdlov --- .github/workflows/accessTests.yml | 3 ++- .github/workflows/analysis.yml | 17 ++++++++++------- .github/workflows/artifactoryTests.yml | 6 ++++-- .github/workflows/cla.yml | 3 ++- .github/workflows/distributionTests.yml | 3 ++- .github/workflows/dockerTests.yml | 3 ++- .github/workflows/frogbot-scan-pull-request.yml | 3 ++- .github/workflows/frogbot-scan-repository.yml | 3 ++- .github/workflows/goTests.yml | 3 ++- .github/workflows/gradleTests.yml | 6 ++++-- .github/workflows/lifecycleTests.yml | 3 ++- .github/workflows/mavenTests.yml | 6 ++++-- .github/workflows/npmTests.yml | 6 ++++-- .github/workflows/nugetTests.yml | 6 ++++-- .github/workflows/pluginsTests.yml | 6 ++++-- .github/workflows/podmanTests.yml | 3 ++- .github/workflows/pythonTests.yml | 6 ++++-- .github/workflows/scriptTests.yml | 3 ++- .github/workflows/transferTests.yml | 12 ++++++++---- 19 files changed, 66 insertions(+), 35 deletions(-) diff --git a/.github/workflows/accessTests.yml b/.github/workflows/accessTests.yml index 9831cb69f..b0c463786 100644 --- a/.github/workflows/accessTests.yml +++ b/.github/workflows/accessTests.yml @@ -27,7 +27,8 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - - uses: jfrog/.github/.github/actions/install-go-with-cache + - name: Setup Go with cache + uses: jfrog/.github/.github/actions/install-go-with-cache - name: Run Access tests run: go test -v github.com/jfrog/jfrog-cli --timeout 0 --test.access --jfrog.url=${{ secrets.PLATFORM_URL }} --jfrog.adminToken=${{ secrets.PLATFORM_ADMIN_TOKEN }} --jfrog.user=${{ secrets.PLATFORM_USER }} --ci.runId=${{ runner.os }}-access diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml index 27ecd4b48..e05cdbf05 100644 --- a/.github/workflows/analysis.yml +++ b/.github/workflows/analysis.yml @@ -23,7 +23,8 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - - uses: jfrog/.github/.github/actions/install-go-with-cache + - name: Setup Go with cache + uses: jfrog/.github/.github/actions/install-go-with-cache - name: Run Go vet run: go vet -v ./... @@ -35,11 +36,11 @@ jobs: - name: Checkout Source uses: actions/checkout@v4 - - uses: jfrog/.github/.github/actions/install-go-with-cache + - name: Setup Go with cache + uses: jfrog/.github/.github/actions/install-go-with-cache - - uses: jfrog/.github/.github/actions/install-go-with-cache - - - uses: jfrog/.github/.github/actions/golangci-lint + - name: Run golangci linter + uses: jfrog/.github/.github/actions/golangci-lint Go-Sec: name: Go-Sec ubuntu-latest @@ -48,9 +49,11 @@ jobs: - name: Checkout Source uses: actions/checkout@v4 - - uses: jfrog/.github/.github/actions/install-go-with-cache + - name: Setup Go with cache + uses: jfrog/.github/.github/actions/install-go-with-cache - - uses: jfrog/.github/.github/actions/gosec-scanner + - name: Run Go-Sec scanner + uses: jfrog/.github/.github/actions/gosec-scanner ShellCheck: name: Shellcheck diff --git a/.github/workflows/artifactoryTests.yml b/.github/workflows/artifactoryTests.yml index b5adbfd1b..21c22b9c7 100644 --- a/.github/workflows/artifactoryTests.yml +++ b/.github/workflows/artifactoryTests.yml @@ -28,9 +28,11 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - - uses: jfrog/.github/.github/actions/install-go-with-cache + - name: Setup Go with cache + uses: jfrog/.github/.github/actions/install-go-with-cache - - uses: jfrog/.github/.github/actions/install-local-artifactory + - name: Install local Artifactory + uses: jfrog/.github/.github/actions/install-local-artifactory with: RTLIC: ${{ secrets.RTLIC }} diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml index c61c0be91..f5c43500f 100644 --- a/.github/workflows/cla.yml +++ b/.github/workflows/cla.yml @@ -10,7 +10,8 @@ jobs: CLAssistant: runs-on: ubuntu-latest steps: - - uses: jfrog/.github/.github/actions/cla + - name: Run CLA Check + uses: jfrog/.github/.github/actions/cla with: event_comment_body: ${{ github.event.comment.body }} event_name: ${{ github.event_name }} diff --git a/.github/workflows/distributionTests.yml b/.github/workflows/distributionTests.yml index e1c950382..4e1bda871 100644 --- a/.github/workflows/distributionTests.yml +++ b/.github/workflows/distributionTests.yml @@ -22,7 +22,8 @@ jobs: os: [ ubuntu, windows, macos ] runs-on: ${{ matrix.os }}-latest steps: - - uses: jfrog/.github/.github/actions/install-go-with-cache + - name: Setup Go with cache + uses: jfrog/.github/.github/actions/install-go-with-cache - name: Checkout code uses: actions/checkout@v4 diff --git a/.github/workflows/dockerTests.yml b/.github/workflows/dockerTests.yml index 2c428aa20..006ea38e6 100644 --- a/.github/workflows/dockerTests.yml +++ b/.github/workflows/dockerTests.yml @@ -23,7 +23,8 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - - uses: jfrog/.github/.github/actions/install-go-with-cache + - name: Setup Go with cache + uses: jfrog/.github/.github/actions/install-go-with-cache - name: Containerize Artifactory run: | diff --git a/.github/workflows/frogbot-scan-pull-request.yml b/.github/workflows/frogbot-scan-pull-request.yml index d2b6d18b7..5bdb61eb9 100644 --- a/.github/workflows/frogbot-scan-pull-request.yml +++ b/.github/workflows/frogbot-scan-pull-request.yml @@ -12,7 +12,8 @@ jobs: # "frogbot" GitHub environment can approve the pull request to be scanned. environment: frogbot steps: - - uses: jfrog/.github/.github/actions/install-go-with-cache + - name: Setup Go with cache + uses: jfrog/.github/.github/actions/install-go-with-cache - uses: jfrog/frogbot@v2 env: diff --git a/.github/workflows/frogbot-scan-repository.yml b/.github/workflows/frogbot-scan-repository.yml index 54ff06794..3abbd5ea3 100644 --- a/.github/workflows/frogbot-scan-repository.yml +++ b/.github/workflows/frogbot-scan-repository.yml @@ -17,7 +17,8 @@ jobs: # The repository scanning will be triggered periodically on the following branches. branch: [ "dev" ] steps: - - uses: jfrog/.github/.github/actions/install-go-with-cache + - name: Setup Go with cache + uses: jfrog/.github/.github/actions/install-go-with-cache - uses: jfrog/frogbot@v2 env: diff --git a/.github/workflows/goTests.yml b/.github/workflows/goTests.yml index 9d83f25c2..50c439c10 100644 --- a/.github/workflows/goTests.yml +++ b/.github/workflows/goTests.yml @@ -28,7 +28,8 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - - uses: jfrog/.github/.github/actions/install-go-with-cache + - name: Setup Go with cache + uses: jfrog/.github/.github/actions/install-go-with-cache - name: Run Go tests run: go test -v -timeout 0 --test.go --jfrog.url=${{ secrets.PLATFORM_URL }} --jfrog.adminToken=${{ secrets.PLATFORM_ADMIN_TOKEN }} --ci.runId=${{ runner.os }}-go diff --git a/.github/workflows/gradleTests.yml b/.github/workflows/gradleTests.yml index 2a9156e78..75f271140 100644 --- a/.github/workflows/gradleTests.yml +++ b/.github/workflows/gradleTests.yml @@ -41,9 +41,11 @@ jobs: with: gradle-version: ${{ matrix.gradle-version }} - - uses: jfrog/.github/.github/actions/install-go-with-cache + - name: Setup Go with cache + uses: jfrog/.github/.github/actions/install-go-with-cache - - uses: jfrog/.github/.github/actions/install-local-artifactory + - name: Install local Artifactory + uses: jfrog/.github/.github/actions/install-local-artifactory with: RTLIC: ${{ secrets.RTLIC }} diff --git a/.github/workflows/lifecycleTests.yml b/.github/workflows/lifecycleTests.yml index 4da2c8586..c0fc87758 100644 --- a/.github/workflows/lifecycleTests.yml +++ b/.github/workflows/lifecycleTests.yml @@ -27,7 +27,8 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - - uses: jfrog/.github/.github/actions/install-go-with-cache + - name: Setup Go with cache + uses: jfrog/.github/.github/actions/install-go-with-cache - name: Run Lifecycle tests run: go test -v github.com/jfrog/jfrog-cli --timeout 0 --test.lifecycle --jfrog.url=${{ secrets.PLATFORM_URL }} --jfrog.adminToken=${{ secrets.PLATFORM_ADMIN_TOKEN }} --jfrog.user=${{ secrets.PLATFORM_USER }} --ci.runId=${{ runner.os }}-lifecycle diff --git a/.github/workflows/mavenTests.yml b/.github/workflows/mavenTests.yml index e67badeb9..5ad691efb 100644 --- a/.github/workflows/mavenTests.yml +++ b/.github/workflows/mavenTests.yml @@ -27,7 +27,8 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - - uses: jfrog/.github/.github/actions/install-go-with-cache + - name: Setup Go with cache + uses: jfrog/.github/.github/actions/install-go-with-cache - name: Setup Maven v3.8.8 for macOS uses: stCarolas/setup-maven@v4.5 @@ -35,7 +36,8 @@ jobs: maven-version: 3.8.8 if: runner.os == 'macOS' - - uses: jfrog/.github/.github/actions/install-local-artifactory + - name: Install local Artifactory + uses: jfrog/.github/.github/actions/install-local-artifactory with: RTLIC: ${{ secrets.RTLIC }} diff --git a/.github/workflows/npmTests.yml b/.github/workflows/npmTests.yml index 33103f8be..9522202ff 100644 --- a/.github/workflows/npmTests.yml +++ b/.github/workflows/npmTests.yml @@ -32,9 +32,11 @@ jobs: with: node-version: "16" - - uses: jfrog/.github/.github/actions/install-go-with-cache + - name: Setup Go with cache + uses: jfrog/.github/.github/actions/install-go-with-cache - - uses: jfrog/.github/.github/actions/install-local-artifactory + - name: Install local Artifactory + uses: jfrog/.github/.github/actions/install-local-artifactory with: RTLIC: ${{ secrets.RTLIC }} diff --git a/.github/workflows/nugetTests.yml b/.github/workflows/nugetTests.yml index 714a053b3..9f3925e97 100644 --- a/.github/workflows/nugetTests.yml +++ b/.github/workflows/nugetTests.yml @@ -38,9 +38,11 @@ jobs: dotnet-version: "6.x" - - uses: jfrog/.github/.github/actions/install-go-with-cache + - name: Setup Go with cache + uses: jfrog/.github/.github/actions/install-go-with-cache - - uses: jfrog/.github/.github/actions/install-local-artifactory + - name: Install local Artifactory + uses: jfrog/.github/.github/actions/install-local-artifactory with: RTLIC: ${{ secrets.RTLIC }} diff --git a/.github/workflows/pluginsTests.yml b/.github/workflows/pluginsTests.yml index 78e311b59..00af58310 100644 --- a/.github/workflows/pluginsTests.yml +++ b/.github/workflows/pluginsTests.yml @@ -27,9 +27,11 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - - uses: jfrog/.github/.github/actions/install-go-with-cache + - name: Setup Go with cache + uses: jfrog/.github/.github/actions/install-go-with-cache - - uses: jfrog/.github/.github/actions/install-local-artifactory + - name: Install local Artifactory + uses: jfrog/.github/.github/actions/install-local-artifactory with: RTLIC: ${{ secrets.RTLIC }} diff --git a/.github/workflows/podmanTests.yml b/.github/workflows/podmanTests.yml index 9e2f2773e..9ba67b0d8 100644 --- a/.github/workflows/podmanTests.yml +++ b/.github/workflows/podmanTests.yml @@ -23,7 +23,8 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - - uses: jfrog/.github/.github/actions/install-go-with-cache + - name: Setup Go with cache + uses: jfrog/.github/.github/actions/install-go-with-cache - name: Run podman tests run: go test -v -timeout 0 --test.podman --jfrog.url=${{ secrets.PLATFORM_URL }} --jfrog.adminToken=${{ secrets.PLATFORM_ADMIN_TOKEN }} --test.containerRegistry=${{ secrets.CONTAINER_REGISTRY }} diff --git a/.github/workflows/pythonTests.yml b/.github/workflows/pythonTests.yml index f7ea33c63..b1650965a 100644 --- a/.github/workflows/pythonTests.yml +++ b/.github/workflows/pythonTests.yml @@ -38,9 +38,11 @@ jobs: if: ${{ matrix.suite == 'pipenv' }} run: python -m pip install pipenv - - uses: jfrog/.github/.github/actions/install-go-with-cache + - name: Setup Go with cache + uses: jfrog/.github/.github/actions/install-go-with-cache - - uses: jfrog/.github/.github/actions/install-local-artifactory + - name: Install local Artifactory + uses: jfrog/.github/.github/actions/install-local-artifactory with: RTLIC: ${{ secrets.RTLIC }} diff --git a/.github/workflows/scriptTests.yml b/.github/workflows/scriptTests.yml index d8f2c8bd0..58f7ff219 100644 --- a/.github/workflows/scriptTests.yml +++ b/.github/workflows/scriptTests.yml @@ -40,7 +40,8 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - - uses: jfrog/.github/.github/actions/install-go-with-cache + - name: Setup Go with cache + uses: jfrog/.github/.github/actions/install-go-with-cache - name: Test install CLI - jf run: | diff --git a/.github/workflows/transferTests.yml b/.github/workflows/transferTests.yml index 458eaedde..ccdb0eaca 100644 --- a/.github/workflows/transferTests.yml +++ b/.github/workflows/transferTests.yml @@ -27,9 +27,11 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - - uses: jfrog/.github/.github/actions/install-go-with-cache + - name: Setup Go with cache + uses: jfrog/.github/.github/actions/install-go-with-cache - - uses: jfrog/.github/.github/actions/install-local-artifactory + - name: Install local Artifactory + uses: jfrog/.github/.github/actions/install-local-artifactory with: RTLIC: ${{ secrets.RTLIC }} JFROG_HOME: ${{ runner.temp }} @@ -47,9 +49,11 @@ jobs: with: ref: ${{ github.event.pull_request.head.sha }} - - uses: jfrog/.github/.github/actions/install-go-with-cache + - name: Setup Go with cache + uses: jfrog/.github/.github/actions/install-go-with-cache - - uses: jfrog/.github/.github/actions/install-local-artifactory + - name: Install local Artifactory + uses: jfrog/.github/.github/actions/install-local-artifactory with: RTLIC: ${{ secrets.RTLIC }} JFROG_HOME: ${{ runner.temp }} From 6f58e322f92cc72072a47eb450b3b8a3437de35d Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Wed, 17 Jul 2024 01:02:27 +0300 Subject: [PATCH 05/17] unite actions Signed-off-by: Michael Sverdlov --- .github/workflows/accessTests.yml | 2 +- .github/workflows/analysis.yml | 10 +++++----- .github/workflows/artifactoryTests.yml | 4 ++-- .github/workflows/cla.yml | 2 +- .github/workflows/distributionTests.yml | 2 +- .github/workflows/dockerTests.yml | 2 +- .github/workflows/frogbot-scan-pull-request.yml | 2 +- .github/workflows/frogbot-scan-repository.yml | 2 +- .github/workflows/goTests.yml | 2 +- .github/workflows/gradleTests.yml | 4 ++-- .github/workflows/lifecycleTests.yml | 2 +- .github/workflows/mavenTests.yml | 4 ++-- .github/workflows/npmTests.yml | 4 ++-- .github/workflows/nugetTests.yml | 4 ++-- .github/workflows/pluginsTests.yml | 4 ++-- .github/workflows/podmanTests.yml | 2 +- .github/workflows/pythonTests.yml | 4 ++-- .github/workflows/scriptTests.yml | 2 +- .github/workflows/transferTests.yml | 8 ++++---- 19 files changed, 33 insertions(+), 33 deletions(-) diff --git a/.github/workflows/accessTests.yml b/.github/workflows/accessTests.yml index b0c463786..c4e863b4d 100644 --- a/.github/workflows/accessTests.yml +++ b/.github/workflows/accessTests.yml @@ -28,7 +28,7 @@ jobs: ref: ${{ github.event.pull_request.head.sha }} - name: Setup Go with cache - uses: jfrog/.github/.github/actions/install-go-with-cache + uses: jfrog/.github/actions/install-go-with-cache@main - name: Run Access tests run: go test -v github.com/jfrog/jfrog-cli --timeout 0 --test.access --jfrog.url=${{ secrets.PLATFORM_URL }} --jfrog.adminToken=${{ secrets.PLATFORM_ADMIN_TOKEN }} --jfrog.user=${{ secrets.PLATFORM_USER }} --ci.runId=${{ runner.os }}-access diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml index e05cdbf05..5d2fba797 100644 --- a/.github/workflows/analysis.yml +++ b/.github/workflows/analysis.yml @@ -24,7 +24,7 @@ jobs: ref: ${{ github.event.pull_request.head.sha }} - name: Setup Go with cache - uses: jfrog/.github/.github/actions/install-go-with-cache + uses: jfrog/.github/actions/install-go-with-cache@main - name: Run Go vet run: go vet -v ./... @@ -37,10 +37,10 @@ jobs: uses: actions/checkout@v4 - name: Setup Go with cache - uses: jfrog/.github/.github/actions/install-go-with-cache + uses: jfrog/.github/actions/install-go-with-cache@main - name: Run golangci linter - uses: jfrog/.github/.github/actions/golangci-lint + uses: jfrog/.github/actions/golangci-lint@main Go-Sec: name: Go-Sec ubuntu-latest @@ -50,10 +50,10 @@ jobs: uses: actions/checkout@v4 - name: Setup Go with cache - uses: jfrog/.github/.github/actions/install-go-with-cache + uses: jfrog/.github/actions/install-go-with-cache@main - name: Run Go-Sec scanner - uses: jfrog/.github/.github/actions/gosec-scanner + uses: jfrog/.github/actions/gosec-scanner@main ShellCheck: name: Shellcheck diff --git a/.github/workflows/artifactoryTests.yml b/.github/workflows/artifactoryTests.yml index 21c22b9c7..304ffebb9 100644 --- a/.github/workflows/artifactoryTests.yml +++ b/.github/workflows/artifactoryTests.yml @@ -29,10 +29,10 @@ jobs: ref: ${{ github.event.pull_request.head.sha }} - name: Setup Go with cache - uses: jfrog/.github/.github/actions/install-go-with-cache + uses: jfrog/.github/actions/install-go-with-cache@main - name: Install local Artifactory - uses: jfrog/.github/.github/actions/install-local-artifactory + uses: jfrog/.github/actions/install-local-artifactory@main with: RTLIC: ${{ secrets.RTLIC }} diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml index f5c43500f..92a57a439 100644 --- a/.github/workflows/cla.yml +++ b/.github/workflows/cla.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Run CLA Check - uses: jfrog/.github/.github/actions/cla + uses: jfrog/.github/actions/cla@main with: event_comment_body: ${{ github.event.comment.body }} event_name: ${{ github.event_name }} diff --git a/.github/workflows/distributionTests.yml b/.github/workflows/distributionTests.yml index 4e1bda871..595ef011d 100644 --- a/.github/workflows/distributionTests.yml +++ b/.github/workflows/distributionTests.yml @@ -23,7 +23,7 @@ jobs: runs-on: ${{ matrix.os }}-latest steps: - name: Setup Go with cache - uses: jfrog/.github/.github/actions/install-go-with-cache + uses: jfrog/.github/actions/install-go-with-cache@main - name: Checkout code uses: actions/checkout@v4 diff --git a/.github/workflows/dockerTests.yml b/.github/workflows/dockerTests.yml index 006ea38e6..34d313326 100644 --- a/.github/workflows/dockerTests.yml +++ b/.github/workflows/dockerTests.yml @@ -24,7 +24,7 @@ jobs: ref: ${{ github.event.pull_request.head.sha }} - name: Setup Go with cache - uses: jfrog/.github/.github/actions/install-go-with-cache + uses: jfrog/.github/actions/install-go-with-cache@main - name: Containerize Artifactory run: | diff --git a/.github/workflows/frogbot-scan-pull-request.yml b/.github/workflows/frogbot-scan-pull-request.yml index 5bdb61eb9..b2aaf5295 100644 --- a/.github/workflows/frogbot-scan-pull-request.yml +++ b/.github/workflows/frogbot-scan-pull-request.yml @@ -13,7 +13,7 @@ jobs: environment: frogbot steps: - name: Setup Go with cache - uses: jfrog/.github/.github/actions/install-go-with-cache + uses: jfrog/.github/actions/install-go-with-cache@main - uses: jfrog/frogbot@v2 env: diff --git a/.github/workflows/frogbot-scan-repository.yml b/.github/workflows/frogbot-scan-repository.yml index 3abbd5ea3..d43ada249 100644 --- a/.github/workflows/frogbot-scan-repository.yml +++ b/.github/workflows/frogbot-scan-repository.yml @@ -18,7 +18,7 @@ jobs: branch: [ "dev" ] steps: - name: Setup Go with cache - uses: jfrog/.github/.github/actions/install-go-with-cache + uses: jfrog/.github/actions/install-go-with-cache@main - uses: jfrog/frogbot@v2 env: diff --git a/.github/workflows/goTests.yml b/.github/workflows/goTests.yml index 50c439c10..984103cd6 100644 --- a/.github/workflows/goTests.yml +++ b/.github/workflows/goTests.yml @@ -29,7 +29,7 @@ jobs: ref: ${{ github.event.pull_request.head.sha }} - name: Setup Go with cache - uses: jfrog/.github/.github/actions/install-go-with-cache + uses: jfrog/.github/actions/install-go-with-cache@main - name: Run Go tests run: go test -v -timeout 0 --test.go --jfrog.url=${{ secrets.PLATFORM_URL }} --jfrog.adminToken=${{ secrets.PLATFORM_ADMIN_TOKEN }} --ci.runId=${{ runner.os }}-go diff --git a/.github/workflows/gradleTests.yml b/.github/workflows/gradleTests.yml index 75f271140..3f5d6a21a 100644 --- a/.github/workflows/gradleTests.yml +++ b/.github/workflows/gradleTests.yml @@ -42,10 +42,10 @@ jobs: gradle-version: ${{ matrix.gradle-version }} - name: Setup Go with cache - uses: jfrog/.github/.github/actions/install-go-with-cache + uses: jfrog/.github/actions/install-go-with-cache@main - name: Install local Artifactory - uses: jfrog/.github/.github/actions/install-local-artifactory + uses: jfrog/.github/actions/install-local-artifactory@main with: RTLIC: ${{ secrets.RTLIC }} diff --git a/.github/workflows/lifecycleTests.yml b/.github/workflows/lifecycleTests.yml index c0fc87758..e37ffe009 100644 --- a/.github/workflows/lifecycleTests.yml +++ b/.github/workflows/lifecycleTests.yml @@ -28,7 +28,7 @@ jobs: ref: ${{ github.event.pull_request.head.sha }} - name: Setup Go with cache - uses: jfrog/.github/.github/actions/install-go-with-cache + uses: jfrog/.github/actions/install-go-with-cache@main - name: Run Lifecycle tests run: go test -v github.com/jfrog/jfrog-cli --timeout 0 --test.lifecycle --jfrog.url=${{ secrets.PLATFORM_URL }} --jfrog.adminToken=${{ secrets.PLATFORM_ADMIN_TOKEN }} --jfrog.user=${{ secrets.PLATFORM_USER }} --ci.runId=${{ runner.os }}-lifecycle diff --git a/.github/workflows/mavenTests.yml b/.github/workflows/mavenTests.yml index 5ad691efb..dd6f6af29 100644 --- a/.github/workflows/mavenTests.yml +++ b/.github/workflows/mavenTests.yml @@ -28,7 +28,7 @@ jobs: ref: ${{ github.event.pull_request.head.sha }} - name: Setup Go with cache - uses: jfrog/.github/.github/actions/install-go-with-cache + uses: jfrog/.github/actions/install-go-with-cache@main - name: Setup Maven v3.8.8 for macOS uses: stCarolas/setup-maven@v4.5 @@ -37,7 +37,7 @@ jobs: if: runner.os == 'macOS' - name: Install local Artifactory - uses: jfrog/.github/.github/actions/install-local-artifactory + uses: jfrog/.github/actions/install-local-artifactory@main with: RTLIC: ${{ secrets.RTLIC }} diff --git a/.github/workflows/npmTests.yml b/.github/workflows/npmTests.yml index 9522202ff..d42d313c8 100644 --- a/.github/workflows/npmTests.yml +++ b/.github/workflows/npmTests.yml @@ -33,10 +33,10 @@ jobs: node-version: "16" - name: Setup Go with cache - uses: jfrog/.github/.github/actions/install-go-with-cache + uses: jfrog/.github/actions/install-go-with-cache@main - name: Install local Artifactory - uses: jfrog/.github/.github/actions/install-local-artifactory + uses: jfrog/.github/actions/install-local-artifactory@main with: RTLIC: ${{ secrets.RTLIC }} diff --git a/.github/workflows/nugetTests.yml b/.github/workflows/nugetTests.yml index 9f3925e97..13499d3a4 100644 --- a/.github/workflows/nugetTests.yml +++ b/.github/workflows/nugetTests.yml @@ -39,10 +39,10 @@ jobs: - name: Setup Go with cache - uses: jfrog/.github/.github/actions/install-go-with-cache + uses: jfrog/.github/actions/install-go-with-cache@main - name: Install local Artifactory - uses: jfrog/.github/.github/actions/install-local-artifactory + uses: jfrog/.github/actions/install-local-artifactory@main with: RTLIC: ${{ secrets.RTLIC }} diff --git a/.github/workflows/pluginsTests.yml b/.github/workflows/pluginsTests.yml index 00af58310..e3c1fcca6 100644 --- a/.github/workflows/pluginsTests.yml +++ b/.github/workflows/pluginsTests.yml @@ -28,10 +28,10 @@ jobs: ref: ${{ github.event.pull_request.head.sha }} - name: Setup Go with cache - uses: jfrog/.github/.github/actions/install-go-with-cache + uses: jfrog/.github/actions/install-go-with-cache@main - name: Install local Artifactory - uses: jfrog/.github/.github/actions/install-local-artifactory + uses: jfrog/.github/actions/install-local-artifactory@main with: RTLIC: ${{ secrets.RTLIC }} diff --git a/.github/workflows/podmanTests.yml b/.github/workflows/podmanTests.yml index 9ba67b0d8..73858c716 100644 --- a/.github/workflows/podmanTests.yml +++ b/.github/workflows/podmanTests.yml @@ -24,7 +24,7 @@ jobs: ref: ${{ github.event.pull_request.head.sha }} - name: Setup Go with cache - uses: jfrog/.github/.github/actions/install-go-with-cache + uses: jfrog/.github/actions/install-go-with-cache@main - name: Run podman tests run: go test -v -timeout 0 --test.podman --jfrog.url=${{ secrets.PLATFORM_URL }} --jfrog.adminToken=${{ secrets.PLATFORM_ADMIN_TOKEN }} --test.containerRegistry=${{ secrets.CONTAINER_REGISTRY }} diff --git a/.github/workflows/pythonTests.yml b/.github/workflows/pythonTests.yml index b1650965a..ccedde64d 100644 --- a/.github/workflows/pythonTests.yml +++ b/.github/workflows/pythonTests.yml @@ -39,10 +39,10 @@ jobs: run: python -m pip install pipenv - name: Setup Go with cache - uses: jfrog/.github/.github/actions/install-go-with-cache + uses: jfrog/.github/actions/install-go-with-cache@main - name: Install local Artifactory - uses: jfrog/.github/.github/actions/install-local-artifactory + uses: jfrog/.github/actions/install-local-artifactory@main with: RTLIC: ${{ secrets.RTLIC }} diff --git a/.github/workflows/scriptTests.yml b/.github/workflows/scriptTests.yml index 58f7ff219..1849e4cc5 100644 --- a/.github/workflows/scriptTests.yml +++ b/.github/workflows/scriptTests.yml @@ -41,7 +41,7 @@ jobs: ref: ${{ github.event.pull_request.head.sha }} - name: Setup Go with cache - uses: jfrog/.github/.github/actions/install-go-with-cache + uses: jfrog/.github/actions/install-go-with-cache@main - name: Test install CLI - jf run: | diff --git a/.github/workflows/transferTests.yml b/.github/workflows/transferTests.yml index ccdb0eaca..32cc3d2ce 100644 --- a/.github/workflows/transferTests.yml +++ b/.github/workflows/transferTests.yml @@ -28,10 +28,10 @@ jobs: ref: ${{ github.event.pull_request.head.sha }} - name: Setup Go with cache - uses: jfrog/.github/.github/actions/install-go-with-cache + uses: jfrog/.github/actions/install-go-with-cache@main - name: Install local Artifactory - uses: jfrog/.github/.github/actions/install-local-artifactory + uses: jfrog/.github/actions/install-local-artifactory@main with: RTLIC: ${{ secrets.RTLIC }} JFROG_HOME: ${{ runner.temp }} @@ -50,10 +50,10 @@ jobs: ref: ${{ github.event.pull_request.head.sha }} - name: Setup Go with cache - uses: jfrog/.github/.github/actions/install-go-with-cache + uses: jfrog/.github/actions/install-go-with-cache@main - name: Install local Artifactory - uses: jfrog/.github/.github/actions/install-local-artifactory + uses: jfrog/.github/actions/install-local-artifactory@main with: RTLIC: ${{ secrets.RTLIC }} JFROG_HOME: ${{ runner.temp }} From bc0c1ed83ed877eb30a5920104cea560976dfa0b Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Sun, 21 Jul 2024 14:54:37 +0300 Subject: [PATCH 06/17] unite actions Signed-off-by: Michael Sverdlov --- .github/workflows/scriptTests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scriptTests.yml b/.github/workflows/scriptTests.yml index 1849e4cc5..916d25562 100644 --- a/.github/workflows/scriptTests.yml +++ b/.github/workflows/scriptTests.yml @@ -26,7 +26,7 @@ jobs: - os: "macos-latest" - - os: "macos-11" + - os: "macos-12" - os: "windows-latest" osSuffix: ".exe" From 4039b6164de5e30835887d29dfc9dc9f9cad89ef Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Wed, 24 Jul 2024 11:27:15 +0300 Subject: [PATCH 07/17] unite actions Signed-off-by: Michael Sverdlov --- go.mod | 8 ++++---- go.sum | 25 +++++++++++++------------ 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index 223d61f93..db9c08f25 100644 --- a/go.mod +++ b/go.mod @@ -13,21 +13,21 @@ replace ( require ( github.com/agnivade/levenshtein v1.1.1 github.com/buger/jsonparser v1.1.1 - github.com/docker/docker v27.0.3+incompatible + github.com/docker/docker v27.1.1+incompatible github.com/gocarina/gocsv v0.0.0-20240520201108-78e41c74b4b1 github.com/jfrog/archiver/v3 v3.6.1 github.com/jfrog/build-info-go v1.9.30 github.com/jfrog/gofrog v1.7.4 github.com/jfrog/jfrog-cli-core/v2 v2.53.4 github.com/jfrog/jfrog-cli-platform-services v1.3.0 - github.com/jfrog/jfrog-cli-security v1.6.1 + github.com/jfrog/jfrog-cli-security v1.6.2 github.com/jfrog/jfrog-client-go v1.43.0 github.com/jszwec/csvutil v1.10.0 github.com/stretchr/testify v1.9.0 github.com/testcontainers/testcontainers-go v0.32.0 github.com/urfave/cli v1.22.15 github.com/xeipuuv/gojsonschema v1.2.0 - golang.org/x/exp v0.0.0-20240707233637-46b078467d37 + golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 gopkg.in/yaml.v2 v2.4.0 ) @@ -80,7 +80,7 @@ require ( github.com/gookit/color v1.5.4 // indirect github.com/grokify/mogo v0.62.6 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect - github.com/hashicorp/go-retryablehttp v0.7.7 // indirect + github.com/hashicorp/go-retryablehttp v0.7.2 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect github.com/jedib0t/go-pretty/v6 v6.5.9 // indirect diff --git a/go.sum b/go.sum index dd33e6a5a..382ce958e 100644 --- a/go.sum +++ b/go.sum @@ -711,8 +711,8 @@ github.com/dgryski/trifles v0.0.0-20200323201526-dd97f9abfb48 h1:fRzb/w+pyskVMQ+ github.com/dgryski/trifles v0.0.0-20200323201526-dd97f9abfb48/go.mod h1:if7Fbed8SFyPtHLHbg49SI7NAdJiC5WIA09pe59rfAA= github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= -github.com/docker/docker v27.0.3+incompatible h1:aBGI9TeQ4MPlhquTQKq9XbK79rKFVwXNUAYz9aXyEBE= -github.com/docker/docker v27.0.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v27.1.1+incompatible h1:hO/M4MtV36kzKldqnA37IWhebRA+LnqqcqDja6kVaKY= +github.com/docker/docker v27.1.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= @@ -741,8 +741,8 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7 github.com/envoyproxy/protoc-gen-validate v0.6.7/go.mod h1:dyJXwwfPK2VSqiB9Klm1J6romD608Ba7Hij42vrOBCo= github.com/envoyproxy/protoc-gen-validate v0.9.1/go.mod h1:OKNgG7TCp5pF4d6XftA0++PMirau2/yoOwVac3AbF2w= github.com/envoyproxy/protoc-gen-validate v0.10.0/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss= -github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= -github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= +github.com/fatih/color v1.14.1 h1:qfhVLaG5s+nCROl1zJsZRxFeYrHLqWroPOQ8BWiNb4w= +github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8WlgGZGg= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= @@ -919,10 +919,11 @@ github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rH github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg= github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= -github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB11/k= -github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= -github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISHxT2Q8+VepXU= -github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk= +github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= +github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+13c= +github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= +github.com/hashicorp/go-retryablehttp v0.7.2 h1:AcYqCvkpalPnPF2pn0KamgwamS42TqUDDYFRKq/RAd0= +github.com/hashicorp/go-retryablehttp v0.7.2/go.mod h1:Jy/gPYAdjqffZ/yFGCFV2doI5wjtH1ewM9u8iYVjtX8= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= @@ -948,8 +949,8 @@ github.com/jfrog/jfrog-cli-core/v2 v2.53.4 h1:A9lAYJMkqH9lZyu6ahJ2puzlYGXg9upopr github.com/jfrog/jfrog-cli-core/v2 v2.53.4/go.mod h1:thaQcvQDTHV2jOumb+m2OBfqRSW4JYtLez5Qsi1dovk= github.com/jfrog/jfrog-cli-platform-services v1.3.0 h1:IblSDZFBjL7WLRi37Ni2DmHrXJJ6ysSMxx7t41AvyDA= github.com/jfrog/jfrog-cli-platform-services v1.3.0/go.mod h1:Ky4SDXuMeaiNP/5zMT1YSzIuXG+cNYYOl8BaEA7Awbc= -github.com/jfrog/jfrog-cli-security v1.6.1 h1:ktrOQUI4ZWtWgtQ/rtRAivRbsqaKmuJ2lTVxB6Wwy9Y= -github.com/jfrog/jfrog-cli-security v1.6.1/go.mod h1:BUxn63vLGtAoQS8m6DzrQr9zR1I3qcRaHeeZRriwo2g= +github.com/jfrog/jfrog-cli-security v1.6.2 h1:C2tlCEGA+HxOhgYe5llI4XtamKxFVXNAMfAKaYzECSQ= +github.com/jfrog/jfrog-cli-security v1.6.2/go.mod h1:lNcLT+lH7xvZaC+eSjvz1kGpVvkL9ZthYyBZy7O4aCA= github.com/jfrog/jfrog-client-go v1.43.0 h1:0A4zT8ZIpAwtEUICNhKPx1bwM1LocJN9C38IGycS7UY= github.com/jfrog/jfrog-client-go v1.43.0/go.mod h1:1RklAq1rNS3HmIsJ+BM3tEn9XHZuTAs37JtVUpefUk4= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= @@ -1247,8 +1248,8 @@ golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= golang.org/x/exp v0.0.0-20220827204233-334a2380cb91/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE= -golang.org/x/exp v0.0.0-20240707233637-46b078467d37 h1:uLDX+AfeFCct3a2C7uIWBKMJIR3CJMhcgfrUAqjRK6w= -golang.org/x/exp v0.0.0-20240707233637-46b078467d37/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= +golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8= +golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= From edaa8390387499c004a2f738243b84e939dc501a Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Wed, 24 Jul 2024 11:50:13 +0300 Subject: [PATCH 08/17] unite actions Signed-off-by: Michael Sverdlov --- go.mod | 2 +- go.sum | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index db9c08f25..9af8c0592 100644 --- a/go.mod +++ b/go.mod @@ -80,7 +80,7 @@ require ( github.com/gookit/color v1.5.4 // indirect github.com/grokify/mogo v0.62.6 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect - github.com/hashicorp/go-retryablehttp v0.7.2 // indirect + github.com/hashicorp/go-retryablehttp v0.7.7 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect github.com/jedib0t/go-pretty/v6 v6.5.9 // indirect diff --git a/go.sum b/go.sum index 382ce958e..1d1e3f690 100644 --- a/go.sum +++ b/go.sum @@ -741,8 +741,8 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7 github.com/envoyproxy/protoc-gen-validate v0.6.7/go.mod h1:dyJXwwfPK2VSqiB9Klm1J6romD608Ba7Hij42vrOBCo= github.com/envoyproxy/protoc-gen-validate v0.9.1/go.mod h1:OKNgG7TCp5pF4d6XftA0++PMirau2/yoOwVac3AbF2w= github.com/envoyproxy/protoc-gen-validate v0.10.0/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss= -github.com/fatih/color v1.14.1 h1:qfhVLaG5s+nCROl1zJsZRxFeYrHLqWroPOQ8BWiNb4w= -github.com/fatih/color v1.14.1/go.mod h1:2oHN61fhTpgcxD3TSWCgKDiH1+x4OiDVVGH8WlgGZGg= +github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= +github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= @@ -919,11 +919,10 @@ github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rH github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg= github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= -github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= -github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+13c= -github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= -github.com/hashicorp/go-retryablehttp v0.7.2 h1:AcYqCvkpalPnPF2pn0KamgwamS42TqUDDYFRKq/RAd0= -github.com/hashicorp/go-retryablehttp v0.7.2/go.mod h1:Jy/gPYAdjqffZ/yFGCFV2doI5wjtH1ewM9u8iYVjtX8= +github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB11/k= +github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= +github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISHxT2Q8+VepXU= +github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= From 88d82b33ce607970deaff8889666f8e49ec0b737 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Wed, 24 Jul 2024 13:55:46 +0300 Subject: [PATCH 09/17] unite actions Signed-off-by: Michael Sverdlov --- artifactory/cli.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/artifactory/cli.go b/artifactory/cli.go index 8f10541a1..dd4026cb5 100644 --- a/artifactory/cli.go +++ b/artifactory/cli.go @@ -1148,7 +1148,7 @@ func BuildDockerCreateCmd(c *cli.Context) error { return err } buildDockerCreateCommand := container.NewBuildDockerCreateCommand() - if err := buildDockerCreateCommand.SetImageNameWithDigest(imageNameWithDigestFile); err != nil { + if err = buildDockerCreateCommand.SetImageNameWithDigest(imageNameWithDigestFile); err != nil { return err } buildDockerCreateCommand.SetRepo(sourceRepo).SetServerDetails(artDetails).SetBuildConfiguration(buildConfiguration) From 6a982293e67cba37d306a27df4d34d5867f1126f Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Thu, 25 Jul 2024 22:13:42 +0300 Subject: [PATCH 10/17] improve Signed-off-by: Michael Sverdlov --- general/ai/cli.go | 6 ++++-- plugins/commands/install.go | 3 ++- utils/cliutils/utils.go | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/general/ai/cli.go b/general/ai/cli.go index 25a0de0db..2a3d2b6fd 100644 --- a/general/ai/cli.go +++ b/general/ai/cli.go @@ -133,9 +133,11 @@ func sendRequestToCliAiServer(content interface{}, apiCommand ApiCommand) (respo } if err = errorutils.CheckResponseStatus(resp, http.StatusOK); err != nil { if resp.StatusCode == http.StatusInternalServerError { - err = errorutils.CheckErrorf("AI model Endpoint is not available.\n" + err.Error()) + err = errorutils.CheckErrorf("AI model Endpoint is not available. Please try again later.") } else if resp.StatusCode == http.StatusNotFound { - err = errorutils.CheckErrorf("CLI-AI app server is no available. Note that the this command is supported while inside JFrog's internal network only.\n" + err.Error()) + err = errorutils.CheckErrorf("CLI-AI app server is not available. Note that the this command is supported while inside JFrog's internal network only.\n" + err.Error()) + } else if resp.StatusCode == http.StatusNotAcceptable { + err = errorutils.CheckErrorf("CLI-AI app server is not available. Please try again later.") } return } diff --git a/plugins/commands/install.go b/plugins/commands/install.go index a45f3138d..7b5a55f94 100644 --- a/plugins/commands/install.go +++ b/plugins/commands/install.go @@ -170,6 +170,7 @@ func downloadPlugin(pluginsDir, pluginName, downloadUrl string, httpDetails http return } if progressMgr != nil { + progressMgr.SetHeadlineMsg("Downloading") progressMgr.InitProgressReaders() progressMgr.IncGeneralProgressTotalBy(1) defer func() { @@ -268,6 +269,6 @@ func downloadFromArtifactory(downloadDetails *httpclient.DownloadFileDetails, ht if err != nil { return } - log.Info("Downloading: " + downloadDetails.FileName) + log.Info("Downloading:", downloadDetails.FileName) return client.DownloadFileWithProgress(downloadDetails, "", httpDetails, false, false, progressMgr) } diff --git a/utils/cliutils/utils.go b/utils/cliutils/utils.go index 5894d023a..630a4c525 100644 --- a/utils/cliutils/utils.go +++ b/utils/cliutils/utils.go @@ -257,7 +257,7 @@ func CreateBuildInfoSummaryReportString(success, failed int, sha256 string, err func CreateDownloadConfiguration(c *cli.Context) (downloadConfiguration *artifactoryUtils.DownloadConfiguration, err error) { downloadConfiguration = new(artifactoryUtils.DownloadConfiguration) - downloadConfiguration.MinSplitSize, err = getMinSplit(c, DownloadMinSplitKb) + downloadConfiguration.MinSplitSizeKb, err = getMinSplit(c, DownloadMinSplitKb) if err != nil { return nil, err } From 8b833d8a614adec2619a3576c8215e7672dc2bad Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Thu, 25 Jul 2024 22:19:41 +0300 Subject: [PATCH 11/17] improve Signed-off-by: Michael Sverdlov --- go.mod | 6 +++--- go.sum | 14 ++++++-------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index 5557735fa..d95fac8d6 100644 --- a/go.mod +++ b/go.mod @@ -139,7 +139,7 @@ require ( github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/ulikunitz/xz v0.5.12 // indirect - github.com/vbauerster/mpb/v7 v7.5.3 // indirect + github.com/vbauerster/mpb/v8 v8.7.4 // indirect github.com/xanzy/go-gitlab v0.95.2 // indirect github.com/xanzy/ssh-agent v0.3.3 // indirect github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect @@ -170,9 +170,9 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -// replace github.com/jfrog/jfrog-cli-core/v2 => github.com/eyalbe4/jfrog-cli-core/v2 v2.31.1-0.20240723145911-300a4683d485 +replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20240725185936-980acf0adf54 -// replace github.com/jfrog/jfrog-client-go => github.com/eyalbe4/jfrog-client-go v1.28.1-0.20240723132744-93aab0ffffb1 +replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20240725183511-4d539d3a7a99 // replace github.com/jfrog/jfrog-cli-security => github.com/jfrog/jfrog-cli-security v1.1.1-0.20240522121307-3e9fe2dc5e81 diff --git a/go.sum b/go.sum index c7461e643..447394d11 100644 --- a/go.sum +++ b/go.sum @@ -946,14 +946,14 @@ github.com/jfrog/jfrog-apps-config v1.0.1 h1:mtv6k7g8A8BVhlHGlSveapqf4mJfonwvXYL github.com/jfrog/jfrog-apps-config v1.0.1/go.mod h1:8AIIr1oY9JuH5dylz2S6f8Ym2MaadPLR6noCBO4C22w= github.com/jfrog/jfrog-cli-artifactory v0.1.1 h1:3HfowB29TBEtr6BgAezdqTRVFhBFa5XasxARLh+1HDE= github.com/jfrog/jfrog-cli-artifactory v0.1.1/go.mod h1:Jyv0OecV8k8JOT5C5m/UmS1KCsR1xkog1OjKJeDuMcY= -github.com/jfrog/jfrog-cli-core/v2 v2.53.4 h1:A9lAYJMkqH9lZyu6ahJ2puzlYGXg9upopretVVfDqzc= -github.com/jfrog/jfrog-cli-core/v2 v2.53.4/go.mod h1:thaQcvQDTHV2jOumb+m2OBfqRSW4JYtLez5Qsi1dovk= +github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20240725185936-980acf0adf54 h1:BBbrrW0dm0kDkIM3BS9AVvvLmw/dJbiiSh5/vQJK9v0= +github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20240725185936-980acf0adf54/go.mod h1:qF+g5F4ImRlyCYoFbeWtksaDGhneQSB27t2/6/H89Hc= github.com/jfrog/jfrog-cli-platform-services v1.3.0 h1:IblSDZFBjL7WLRi37Ni2DmHrXJJ6ysSMxx7t41AvyDA= github.com/jfrog/jfrog-cli-platform-services v1.3.0/go.mod h1:Ky4SDXuMeaiNP/5zMT1YSzIuXG+cNYYOl8BaEA7Awbc= github.com/jfrog/jfrog-cli-security v1.6.2 h1:C2tlCEGA+HxOhgYe5llI4XtamKxFVXNAMfAKaYzECSQ= github.com/jfrog/jfrog-cli-security v1.6.2/go.mod h1:lNcLT+lH7xvZaC+eSjvz1kGpVvkL9ZthYyBZy7O4aCA= -github.com/jfrog/jfrog-client-go v1.43.0 h1:0A4zT8ZIpAwtEUICNhKPx1bwM1LocJN9C38IGycS7UY= -github.com/jfrog/jfrog-client-go v1.43.0/go.mod h1:1RklAq1rNS3HmIsJ+BM3tEn9XHZuTAs37JtVUpefUk4= +github.com/jfrog/jfrog-client-go v1.28.1-0.20240725183511-4d539d3a7a99 h1:jCfJV5FXOIclSGhRbrTNNFteF27CSb+etW246mewVAk= +github.com/jfrog/jfrog-client-go v1.28.1-0.20240725183511-4d539d3a7a99/go.mod h1:1RklAq1rNS3HmIsJ+BM3tEn9XHZuTAs37JtVUpefUk4= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jszwec/csvutil v1.10.0 h1:upMDUxhQKqZ5ZDCs/wy+8Kib8rZR8I8lOR34yJkdqhI= @@ -1013,7 +1013,6 @@ github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D github.com/mattn/go-runewidth v0.0.6/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= -github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U= github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/mattn/go-sqlite3 v1.14.14/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= @@ -1158,8 +1157,8 @@ github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc= github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/urfave/cli v1.22.15 h1:nuqt+pdC/KqswQKhETJjo7pvn/k4xMUxgW6liI7XpnM= github.com/urfave/cli v1.22.15/go.mod h1:wSan1hmo5zeyLGBjRJbzRTNk8gwoYa2B9n4q9dmRIc0= -github.com/vbauerster/mpb/v7 v7.5.3 h1:BkGfmb6nMrrBQDFECR/Q7RkKCw7ylMetCb4079CGs4w= -github.com/vbauerster/mpb/v7 v7.5.3/go.mod h1:i+h4QY6lmLvBNK2ah1fSreiw3ajskRlBp9AhY/PnuOE= +github.com/vbauerster/mpb/v8 v8.7.4 h1:p4f16iMfUt3PkAC73SCzAtgtSf8TYDqEbJUT3odPrPo= +github.com/vbauerster/mpb/v8 v8.7.4/go.mod h1:r1B5k2Ljj5KJFCekfihbiqyV4VaaRTANYmvWA2btufI= github.com/vmihailenco/msgpack/v4 v4.3.12/go.mod h1:gborTTJjAo/GWTqqRjrLCn9pgNN+NXzzngzBKDPIqw4= github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI= github.com/xanzy/go-gitlab v0.95.2 h1:4p0IirHqEp5f0baK/aQqr4TR57IsD+8e4fuyAA1yi88= @@ -1495,7 +1494,6 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220909162455-aba9fc2a8ff2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= From 4f1bd8899645e65474c8842ef9cf997f468d6798 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Thu, 25 Jul 2024 22:26:13 +0300 Subject: [PATCH 12/17] improve Signed-off-by: Michael Sverdlov --- general/ai/cli.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/general/ai/cli.go b/general/ai/cli.go index 2a3d2b6fd..b1dd74cfc 100644 --- a/general/ai/cli.go +++ b/general/ai/cli.go @@ -132,14 +132,16 @@ func sendRequestToCliAiServer(content interface{}, apiCommand ApiCommand) (respo return } if err = errorutils.CheckResponseStatus(resp, http.StatusOK); err != nil { - if resp.StatusCode == http.StatusInternalServerError { + switch resp.StatusCode { + case http.StatusInternalServerError: err = errorutils.CheckErrorf("AI model Endpoint is not available. Please try again later.") - } else if resp.StatusCode == http.StatusNotFound { + case http.StatusNotFound: err = errorutils.CheckErrorf("CLI-AI app server is not available. Note that the this command is supported while inside JFrog's internal network only.\n" + err.Error()) - } else if resp.StatusCode == http.StatusNotAcceptable { + case http.StatusNotAcceptable: err = errorutils.CheckErrorf("CLI-AI app server is not available. Please try again later.") + default: + return } - return } if apiCommand == questionApi { defer func() { From 37a8cb6dad1e684937d614b25b0ae0e49466e6fe Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Mon, 29 Jul 2024 13:42:37 +0300 Subject: [PATCH 13/17] revert minsplitsize Signed-off-by: Michael Sverdlov --- utils/cliutils/utils.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/cliutils/utils.go b/utils/cliutils/utils.go index 630a4c525..5894d023a 100644 --- a/utils/cliutils/utils.go +++ b/utils/cliutils/utils.go @@ -257,7 +257,7 @@ func CreateBuildInfoSummaryReportString(success, failed int, sha256 string, err func CreateDownloadConfiguration(c *cli.Context) (downloadConfiguration *artifactoryUtils.DownloadConfiguration, err error) { downloadConfiguration = new(artifactoryUtils.DownloadConfiguration) - downloadConfiguration.MinSplitSizeKb, err = getMinSplit(c, DownloadMinSplitKb) + downloadConfiguration.MinSplitSize, err = getMinSplit(c, DownloadMinSplitKb) if err != nil { return nil, err } From 6fab51ce7e5953710f2ceb14481566a9c5999925 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Mon, 29 Jul 2024 13:49:57 +0300 Subject: [PATCH 14/17] revert minsplitsize Signed-off-by: Michael Sverdlov --- go.mod | 8 +++++--- go.sum | 16 ++++++++-------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index d95fac8d6..24fadf4bb 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/gocarina/gocsv v0.0.0-20240520201108-78e41c74b4b1 github.com/jfrog/archiver/v3 v3.6.1 github.com/jfrog/build-info-go v1.9.30 - github.com/jfrog/gofrog v1.7.4 + github.com/jfrog/gofrog v1.7.5 github.com/jfrog/jfrog-cli-artifactory v0.1.1 github.com/jfrog/jfrog-cli-core/v2 v2.53.4 github.com/jfrog/jfrog-cli-platform-services v1.3.0 @@ -170,9 +170,11 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20240725185936-980acf0adf54 +replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20240729104836-9c1dae33c595 -replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20240725183511-4d539d3a7a99 +replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20240729103741-f6c521eb9a40 + +replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20240729055355-5b51bf71e756 // replace github.com/jfrog/jfrog-cli-security => github.com/jfrog/jfrog-cli-security v1.1.1-0.20240522121307-3e9fe2dc5e81 diff --git a/go.sum b/go.sum index 447394d11..9bc475745 100644 --- a/go.sum +++ b/go.sum @@ -936,24 +936,24 @@ github.com/jedib0t/go-pretty/v6 v6.5.9 h1:ACteMBRrrmm1gMsXe9PSTOClQ63IXDUt03H5U+ github.com/jedib0t/go-pretty/v6 v6.5.9/go.mod h1:zbn98qrYlh95FIhwwsbIip0LYpwSG8SUOScs+v9/t0E= github.com/jfrog/archiver/v3 v3.6.1 h1:LOxnkw9pOn45DzCbZNFV6K0+6dCsQ0L8mR3ZcujO5eI= github.com/jfrog/archiver/v3 v3.6.1/go.mod h1:VgR+3WZS4N+i9FaDwLZbq+jeU4B4zctXL+gL4EMzfLw= -github.com/jfrog/build-info-go v1.9.30 h1:RmK3NuDGUoyCjCNJJBlHaCm4vWzO8BLjkuAkMzj6PGE= -github.com/jfrog/build-info-go v1.9.30/go.mod h1:fxSfpp+kQ8qln/0y7pgV3tg2exWe5OM1np5FF2LlSDg= +github.com/jfrog/build-info-go v1.8.9-0.20240729055355-5b51bf71e756 h1:xyZEZDZvg/sLS5PH5b8zFnj6b2XBW4aYHXey0sv+F9I= +github.com/jfrog/build-info-go v1.8.9-0.20240729055355-5b51bf71e756/go.mod h1:fxSfpp+kQ8qln/0y7pgV3tg2exWe5OM1np5FF2LlSDg= github.com/jfrog/froggit-go v1.16.1 h1:FBIM1qevX/ag9unfmpGzfmZ36D8ulOJ+DPTSFUk3l5U= github.com/jfrog/froggit-go v1.16.1/go.mod h1:TEJSzgiV+3D/GVGE8Y6j46ut1jrBLD1FL6WdMdKwwCE= -github.com/jfrog/gofrog v1.7.4 h1:on4AeWef5LJUhGCigSjTS4Ez3n9l8+NiZlXH6UYp05c= -github.com/jfrog/gofrog v1.7.4/go.mod h1:jyGiCgiqSSR7k86hcUSu67XVvmvkkgWTmPsH25wI298= +github.com/jfrog/gofrog v1.7.5 h1:dFgtEDefJdlq9cqTRoe09RLxS5Bxbe1Ev5+E6SmZHcg= +github.com/jfrog/gofrog v1.7.5/go.mod h1:jyGiCgiqSSR7k86hcUSu67XVvmvkkgWTmPsH25wI298= github.com/jfrog/jfrog-apps-config v1.0.1 h1:mtv6k7g8A8BVhlHGlSveapqf4mJfonwvXYLipdsOFMY= github.com/jfrog/jfrog-apps-config v1.0.1/go.mod h1:8AIIr1oY9JuH5dylz2S6f8Ym2MaadPLR6noCBO4C22w= github.com/jfrog/jfrog-cli-artifactory v0.1.1 h1:3HfowB29TBEtr6BgAezdqTRVFhBFa5XasxARLh+1HDE= github.com/jfrog/jfrog-cli-artifactory v0.1.1/go.mod h1:Jyv0OecV8k8JOT5C5m/UmS1KCsR1xkog1OjKJeDuMcY= -github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20240725185936-980acf0adf54 h1:BBbrrW0dm0kDkIM3BS9AVvvLmw/dJbiiSh5/vQJK9v0= -github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20240725185936-980acf0adf54/go.mod h1:qF+g5F4ImRlyCYoFbeWtksaDGhneQSB27t2/6/H89Hc= +github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20240729104836-9c1dae33c595 h1:jOCvoCoWaUZTJK4SkgamSCUgA6U5E4YWV6scS9U0Z2c= +github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20240729104836-9c1dae33c595/go.mod h1:h1IMa3Fp1pqn37HJTimnMDoxcVlTpWiO7hC3dd9tNdE= github.com/jfrog/jfrog-cli-platform-services v1.3.0 h1:IblSDZFBjL7WLRi37Ni2DmHrXJJ6ysSMxx7t41AvyDA= github.com/jfrog/jfrog-cli-platform-services v1.3.0/go.mod h1:Ky4SDXuMeaiNP/5zMT1YSzIuXG+cNYYOl8BaEA7Awbc= github.com/jfrog/jfrog-cli-security v1.6.2 h1:C2tlCEGA+HxOhgYe5llI4XtamKxFVXNAMfAKaYzECSQ= github.com/jfrog/jfrog-cli-security v1.6.2/go.mod h1:lNcLT+lH7xvZaC+eSjvz1kGpVvkL9ZthYyBZy7O4aCA= -github.com/jfrog/jfrog-client-go v1.28.1-0.20240725183511-4d539d3a7a99 h1:jCfJV5FXOIclSGhRbrTNNFteF27CSb+etW246mewVAk= -github.com/jfrog/jfrog-client-go v1.28.1-0.20240725183511-4d539d3a7a99/go.mod h1:1RklAq1rNS3HmIsJ+BM3tEn9XHZuTAs37JtVUpefUk4= +github.com/jfrog/jfrog-client-go v1.28.1-0.20240729103741-f6c521eb9a40 h1:zmh1NwYtbS3GE7jCPWtQpGsTakMo5DHl73BRkZTn6Ag= +github.com/jfrog/jfrog-client-go v1.28.1-0.20240729103741-f6c521eb9a40/go.mod h1:BJqDxNVbs34kuCx9ct6ge3/M39Pf/m5L5IYgZ9p8ap4= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jszwec/csvutil v1.10.0 h1:upMDUxhQKqZ5ZDCs/wy+8Kib8rZR8I8lOR34yJkdqhI= From 9e0f58947b1ef01aa694d5475ed9f16f3e43c075 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Mon, 29 Jul 2024 13:51:01 +0300 Subject: [PATCH 15/17] revert minsplitsize Signed-off-by: Michael Sverdlov --- utils/cliutils/utils.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/cliutils/utils.go b/utils/cliutils/utils.go index 630a4c525..5894d023a 100644 --- a/utils/cliutils/utils.go +++ b/utils/cliutils/utils.go @@ -257,7 +257,7 @@ func CreateBuildInfoSummaryReportString(success, failed int, sha256 string, err func CreateDownloadConfiguration(c *cli.Context) (downloadConfiguration *artifactoryUtils.DownloadConfiguration, err error) { downloadConfiguration = new(artifactoryUtils.DownloadConfiguration) - downloadConfiguration.MinSplitSizeKb, err = getMinSplit(c, DownloadMinSplitKb) + downloadConfiguration.MinSplitSize, err = getMinSplit(c, DownloadMinSplitKb) if err != nil { return nil, err } From 45a3c2faaa384b85154e5f775fd6d2fd6adc6f5b Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Mon, 29 Jul 2024 14:00:10 +0300 Subject: [PATCH 16/17] revert minsplitsize Signed-off-by: Michael Sverdlov --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 24fadf4bb..6c178665a 100644 --- a/go.mod +++ b/go.mod @@ -176,7 +176,7 @@ replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1. replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20240729055355-5b51bf71e756 -// replace github.com/jfrog/jfrog-cli-security => github.com/jfrog/jfrog-cli-security v1.1.1-0.20240522121307-3e9fe2dc5e81 +replace github.com/jfrog/jfrog-cli-security => github.com/jfrog/jfrog-cli-security v1.6.3-0.20240729081816-371509c205d6 // replace github.com/jfrog/build-info-go => github.com/eyalbe4/build-info-go v1.8.9-0.20240723132035-980d2c84b738 diff --git a/go.sum b/go.sum index 9bc475745..2e1dcf030 100644 --- a/go.sum +++ b/go.sum @@ -950,8 +950,8 @@ github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20240729104836-9c1dae33c595 h1:jOCv github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20240729104836-9c1dae33c595/go.mod h1:h1IMa3Fp1pqn37HJTimnMDoxcVlTpWiO7hC3dd9tNdE= github.com/jfrog/jfrog-cli-platform-services v1.3.0 h1:IblSDZFBjL7WLRi37Ni2DmHrXJJ6ysSMxx7t41AvyDA= github.com/jfrog/jfrog-cli-platform-services v1.3.0/go.mod h1:Ky4SDXuMeaiNP/5zMT1YSzIuXG+cNYYOl8BaEA7Awbc= -github.com/jfrog/jfrog-cli-security v1.6.2 h1:C2tlCEGA+HxOhgYe5llI4XtamKxFVXNAMfAKaYzECSQ= -github.com/jfrog/jfrog-cli-security v1.6.2/go.mod h1:lNcLT+lH7xvZaC+eSjvz1kGpVvkL9ZthYyBZy7O4aCA= +github.com/jfrog/jfrog-cli-security v1.6.3-0.20240729081816-371509c205d6 h1:U61knfgV/WZ4ZOhEEKKlnXQ8Y1BlKVPyVjTaERymIk0= +github.com/jfrog/jfrog-cli-security v1.6.3-0.20240729081816-371509c205d6/go.mod h1:0m+jdJgsLF2QHl4f/t9JHuJ9E0Oqf9kK24UWsjAtvsE= github.com/jfrog/jfrog-client-go v1.28.1-0.20240729103741-f6c521eb9a40 h1:zmh1NwYtbS3GE7jCPWtQpGsTakMo5DHl73BRkZTn6Ag= github.com/jfrog/jfrog-client-go v1.28.1-0.20240729103741-f6c521eb9a40/go.mod h1:BJqDxNVbs34kuCx9ct6ge3/M39Pf/m5L5IYgZ9p8ap4= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= From 5357b53e8328fbe259d8fa5c6b3a924fb836c208 Mon Sep 17 00:00:00 2001 From: Michael Sverdlov Date: Mon, 29 Jul 2024 15:46:32 +0300 Subject: [PATCH 17/17] revert minsplitsize Signed-off-by: Michael Sverdlov --- testdata/docker/artifactory/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testdata/docker/artifactory/Dockerfile b/testdata/docker/artifactory/Dockerfile index c47054915..eb1508233 100644 --- a/testdata/docker/artifactory/Dockerfile +++ b/testdata/docker/artifactory/Dockerfile @@ -7,4 +7,5 @@ ENV JFROG_HOME=/jfrog_home WORKDIR /jfrog_home EXPOSE 8082 EXPOSE 8081 -CMD ["sh","-c","local-rt-setup; sleep infinity"] \ No newline at end of file +# Temporarily use version 7.84.17 due to an issue with the automatic token generation mechanism in 7.90 +CMD ["sh","-c","local-rt-setup --rt-version 7.84.17; sleep infinity"]