Resolve conflicts

jfrog · Sep 1, 2023 · 066a573 · 066a573
2 parents ac5629d + aa56aa9
commit 066a573
Show file tree

Hide file tree

Showing 76 changed files with 1,035 additions and 262 deletions.
diff --git a/.github/workflows/accessTests.yml b/.github/workflows/accessTests.yml
@@ -15,12 +15,12 @@ concurrency:
 jobs:
  Access-Tests:
  if: contains(github.event.pull_request.labels.*.name, 'safe to test') || github.event_name == 'push'
- name: ${{ matrix.os }}
+ name: Access tests (${{ matrix.os }})
  strategy:
  fail-fast: false
  matrix:
- os: [ ubuntu-latest, macos-latest, windows-latest ]
- runs-on: ${{ matrix.os }}
+ os: [ ubuntu, windows, macos ]
+ runs-on: ${{ matrix.os }}-latest
  steps:
  - name: Install Go
  uses: actions/setup-go@v3

diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml
@@ -15,8 +15,8 @@ jobs:
  strategy:
  fail-fast: false
  matrix:
- os: [ubuntu-latest, macos-latest, windows-latest]
- runs-on: ${{ matrix.os }}
+ os: [ ubuntu, windows, macos ]
+ runs-on: ${{ matrix.os }}-latest
  steps:
  - name: Install Go
  uses: actions/setup-go@v3

diff --git a/.github/workflows/artifactoryTests.yml b/.github/workflows/artifactoryTests.yml
@@ -20,8 +20,8 @@ jobs:
  fail-fast: false
  matrix:
  suite: [ artifactory, artifactoryProject ]
- os: [ ubuntu-latest, macos-latest, windows-latest ]
- runs-on: ${{ matrix.os }}
+ os: [ ubuntu, windows, macos ]
+ runs-on: ${{ matrix.os }}-latest
  steps:
  - name: Install Go
  uses: actions/setup-go@v3

diff --git a/.github/workflows/distributionTests.yml b/.github/workflows/distributionTests.yml
@@ -15,12 +15,12 @@ concurrency:
 jobs:
  Distribution-Tests:
  if: contains(github.event.pull_request.labels.*.name, 'safe to test') || github.event_name == 'push'
- name: ${{ matrix.os }}
+ name: Distribution tests (${{ matrix.os }})
  strategy:
  fail-fast: false
  matrix:
- os: [ubuntu-latest, macos-latest, windows-latest]
- runs-on: ${{ matrix.os }}
+ os: [ ubuntu, windows, macos ]
+ runs-on: ${{ matrix.os }}-latest
  steps:
  - name: Install Go
  uses: actions/setup-go@v3

diff --git a/.github/workflows/frogbot-scan-pull-request.yml b/.github/workflows/frogbot-scan-pull-request.yml
@@ -14,6 +14,8 @@ jobs:
  steps:
  - uses: jfrog/frogbot@v2
  env:
+ JFROG_CLI_LOG_LEVEL: "DEBUG"
+
  # [Mandatory]
  # JFrog platform URL (This functionality requires version 3.29.0 or above of Xray)
  JF_URL: ${{ secrets.FROGBOT_URL }}
@@ -22,14 +24,6 @@ jobs:
  # JFrog access token with 'read' permissions on Xray service
  JF_ACCESS_TOKEN: ${{ secrets.FROGBOT_ACCESS_TOKEN }}
 
- # [Mandatory if JF_ACCESS_TOKEN is not provided]
- # JFrog username with 'read' permissions for Xray. Must be provided with JF_PASSWORD
- # JF_USER: ${{ secrets.JF_USER }}
-
- # [Mandatory if JF_ACCESS_TOKEN is not provided]
- # JFrog password. Must be provided with JF_USER
- # JF_PASSWORD: ${{ secrets.JF_PASSWORD }}
-
  # [Mandatory]
  # The GitHub token is automatically generated for the job
  JF_GIT_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -57,15 +51,21 @@ jobs:
  # [Optional]
  # Configure the SMTP server to enable Frogbot to send emails with detected secrets in pull request scans.
  # SMTP server URL including should the relevant port: (Example: smtp.server.com:8080)
- # JF_SMTP_SERVER: ""
+ JF_SMTP_SERVER: ${{ secrets.JF_SMTP_SERVER }}
 
  # [Mandatory if JF_SMTP_SERVER is set]
  # The username required for authenticating with the SMTP server.
- # JF_SMTP_USER: ""
+ JF_SMTP_USER: ${{ secrets.JF_SMTP_USER }}
 
  # [Mandatory if JF_SMTP_SERVER is set]
  # The password associated with the username required for authentication with the SMTP server.
- # JF_SMTP_PASSWORD: ""
+ JF_SMTP_PASSWORD: ${{ secrets.JF_SMTP_PASSWORD }}
+
+ # [Optional]
+ # List of comma separated email addresses to receive email notifications about secrets
+ # detected during pull request scanning. The notification is also sent to the email set
+ # in the committer git profile regardless of whether this variable is set or not.
+ JF_EMAIL_RECEIVERS: "eco-system@jfrog.com"
 
  ##########################################################################
  ## If your project uses a 'frogbot-config.yml' file, you can define ##
@@ -119,8 +119,3 @@ jobs:
  # The following values are accepted: Low, Medium, High or Critical
  # JF_MIN_SEVERITY: ""
 
- # [Optional]
- # List of comma separated email addresses to receive email notifications about secrets
- # detected during pull request scanning. The notification is also sent to the email set
- # in the committer git profile regardless of whether this variable is set or not.
- # JF_EMAIL_RECEIVERS: ""
diff --git a/.github/workflows/frogbot-scan-repository.yml b/.github/workflows/frogbot-scan-repository.yml
@@ -18,6 +18,8 @@ jobs:
  steps:
  - uses: jfrog/frogbot@v2
  env:
+ JFROG_CLI_LOG_LEVEL: "DEBUG"
+
  # [Mandatory]
  # JFrog platform URL (This functionality requires version 3.29.0 or above of Xray)
  JF_URL: ${{ secrets.FROGBOT_URL }}

diff --git a/.github/workflows/goTests.yml b/.github/workflows/goTests.yml
@@ -16,12 +16,12 @@ jobs:
  GO-tests:
  # Go modules doesn't allow passing credentials to a private registry using an HTTP URL. Therefore, the Go tests run against a remote Artifactory server.
  if: contains(github.event.pull_request.labels.*.name, 'safe to test') || github.event_name == 'push'
- name: ${{ matrix.os }}
+ name: Go tests (${{ matrix.os }})
  strategy:
  fail-fast: false
  matrix:
- os: [ubuntu-latest, macos-latest, windows-latest]
- runs-on: ${{ matrix.os }}
+ os: [ ubuntu, windows, macos ]
+ runs-on: ${{ matrix.os }}-latest
  steps:
  - name: Install Go
  uses: actions/setup-go@v3

diff --git a/.github/workflows/gradleTests.yml b/.github/workflows/gradleTests.yml
@@ -15,12 +15,13 @@ concurrency:
 jobs:
  Gradle-Tests:
  if: contains(github.event.pull_request.labels.*.name, 'safe to test') || github.event_name == 'push'
- name: ${{ matrix.os }}
+ name: ${{ matrix.os }}-gradle-${{ matrix.gradle-version }}
  strategy:
  fail-fast: false
  matrix:
- os: [ubuntu-latest, macos-latest, windows-latest]
- runs-on: ${{ matrix.os }}
+ os: [ ubuntu, windows, macos ]
+ gradle-version: [5.6.4, 8.3]
+ runs-on: ${{ matrix.os }}-latest
  env:
  GRADLE_OPTS: -Dorg.gradle.daemon=false
  steps:
@@ -31,7 +32,7 @@ jobs:
  - name: Setup Gradle
  uses: gradle/gradle-build-action@v2
  with:
- gradle-version: 7.6
+ gradle-version: ${{ matrix.gradle-version }}
  - name: Checkout code
  uses: actions/checkout@v3
  with:

diff --git a/.github/workflows/lifecycleTests.yml b/.github/workflows/lifecycleTests.yml
@@ -0,0 +1,44 @@
+name: Lifecycle Tests
+on:
+ push:
+ branches:
+ - '**'
+ tags-ignore:
+ - '**'
+ # Triggers the workflow on labeled PRs only.
+ pull_request_target:
+ types: [labeled]
+# Ensures that only the latest commit is running for each PR at a time.
+concurrency:
+ group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}-${{ github.ref }}
+ cancel-in-progress: true
+jobs:
+ Lifecycle-Tests:
+ if: contains(github.event.pull_request.labels.*.name, 'safe to test') || github.event_name == 'push'
+ name: Lifecycle tests (${{ matrix.os }})
+ strategy:
+ fail-fast: false
+ matrix:
+ os: [ ubuntu, windows, macos ]
+ runs-on: ${{ matrix.os }}-latest
+ steps:
+ - name: Install Go
+ uses: actions/setup-go@v3
+ with:
+ go-version: 1.20.x
+ - name: Checkout code
+ uses: actions/checkout@v3
+ with:
+ ref: ${{ github.event.pull_request.head.sha }}
+ - name: Go Cache
+ uses: actions/cache@v3
+ with:
+ path: ~/go/pkg/mod
+ key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+ restore-keys: ${{ runner.os }}-go-
+ - name: Checkout code
+ uses: actions/checkout@v3
+ with:
+ ref: ${{ github.event.pull_request.head.sha }}
+ - 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
@@ -15,12 +15,12 @@ concurrency:
 jobs:
  Maven-Tests:
  if: contains(github.event.pull_request.labels.*.name, 'safe to test') || github.event_name == 'push'
- name: ${{ matrix.os }}
+ name: Maven tests (${{ matrix.os }})
  strategy:
  fail-fast: false
  matrix:
- os: [ ubuntu-latest, macos-latest, windows-latest ]
- runs-on: ${{ matrix.os }}
+ os: [ ubuntu, windows, macos ]
+ runs-on: ${{ matrix.os }}-latest
  steps:
  - name: Install Go
  uses: actions/setup-go@v3

diff --git a/.github/workflows/npmTests.yml b/.github/workflows/npmTests.yml
@@ -15,12 +15,12 @@ concurrency:
 jobs:
  npm-Tests:
  if: contains(github.event.pull_request.labels.*.name, 'safe to test') || github.event_name == 'push'
- name: ${{ matrix.os }}
+ name: npm tests (${{ matrix.os }})
  strategy:
  fail-fast: false
  matrix:
- os: [ubuntu-latest, macos-latest, windows-latest]
- runs-on: ${{ matrix.os }}
+ os: [ ubuntu, windows, macos ]
+ runs-on: ${{ matrix.os }}-latest
  steps:
  - name: Install Go
  uses: actions/setup-go@v3

diff --git a/.github/workflows/nugetTests.yml b/.github/workflows/nugetTests.yml
@@ -15,12 +15,12 @@ concurrency:
 jobs:
  NuGet-Tests:
  if: contains(github.event.pull_request.labels.*.name, 'safe to test') || github.event_name == 'push'
- name: ${{ matrix.os }}
+ name: NuGet tests (${{ matrix.os }})
  strategy:
  fail-fast: false
  matrix:
- os: [ ubuntu-latest, macos-latest, windows-latest ]
- runs-on: ${{ matrix.os }}
+ os: [ ubuntu, windows, macos ]
+ runs-on: ${{ matrix.os }}-latest
  steps:
  - name: Install Go
  uses: actions/setup-go@v3

diff --git a/.github/workflows/pluginsTests.yml b/.github/workflows/pluginsTests.yml
@@ -15,12 +15,12 @@ concurrency:
 jobs:
  Plugins-Tests:
  if: contains(github.event.pull_request.labels.*.name, 'safe to test') || github.event_name == 'push'
- name: ${{ matrix.os }}
+ name: Plugins tests (${{ matrix.os }})
  strategy:
  fail-fast: false
  matrix:
- os: [ubuntu-latest, macos-latest, windows-latest]
- runs-on: ${{ matrix.os }}
+ os: [ ubuntu, windows, macos ]
+ runs-on: ${{ matrix.os }}-latest
  steps:
  - name: Install Go
  uses: actions/setup-go@v3

diff --git a/.github/workflows/pythonTests.yml b/.github/workflows/pythonTests.yml
@@ -20,8 +20,8 @@ jobs:
  fail-fast: false
  matrix:
  suite: [ pip, pipenv, poetry ]
- os: [ ubuntu-latest, macos-latest, windows-latest ]
- runs-on: ${{ matrix.os }}
+ os: [ ubuntu, windows, macos ]
+ runs-on: ${{ matrix.os }}-latest
  steps:
  - name: Install Go
  uses: actions/setup-go@v3

diff --git a/.github/workflows/scriptTests.yml b/.github/workflows/scriptTests.yml
@@ -12,15 +12,15 @@ concurrency:
  cancel-in-progress: true
 jobs:
  Scripts-tests:
- name: ${{ matrix.os }}
+ name: Script tests (${{ matrix.os }})
  defaults:
  run:
  shell: bash
  strategy:
  fail-fast: false
  matrix:
- os: [ubuntu-latest, macos-latest, windows-latest]
- runs-on: ${{ matrix.os }}
+ os: [ ubuntu, windows, macos ]
+ runs-on: ${{ matrix.os }}-latest
  steps:
  - name: Checkout code
  uses: actions/checkout@v3

diff --git a/.github/workflows/transferTests.yml b/.github/workflows/transferTests.yml
@@ -15,12 +15,12 @@ concurrency:
 jobs:
  Transfer-Artifactory-7-Tests:
  if: contains(github.event.pull_request.labels.*.name, 'safe to test') || github.event_name == 'push'
- name: ${{ matrix.os }}
+ name: Transfer tests (${{ matrix.os }})
  strategy:
  fail-fast: false
  matrix:
- os: [ubuntu-latest, macos-latest, windows-latest]
- runs-on: ${{ matrix.os }}
+ os: [ ubuntu, windows, macos ]
+ runs-on: ${{ matrix.os }}-latest
  steps:
  - name: Checkout code
  uses: actions/checkout@v3

diff --git a/.github/workflows/xrayTests.yml b/.github/workflows/xrayTests.yml
@@ -15,12 +15,12 @@ concurrency:
 jobs:
  CLI-Tests:
  if: contains(github.event.pull_request.labels.*.name, 'safe to test') || github.event_name == 'push'
- name: ${{ matrix.os }}
+ name: Xray tests (${{ matrix.os }})
  strategy:
  fail-fast: false
  matrix:
- os: [ ubuntu-latest, macos-latest, windows-latest ]
- runs-on: ${{ matrix.os }}
+ os: [ ubuntu, windows, macos ]
+ runs-on: ${{ matrix.os }}-latest
  env:
  GRADLE_OPTS: -Dorg.gradle.daemon=false
  steps:
@@ -63,7 +63,7 @@ jobs:
  ref: ${{ github.event.pull_request.head.sha }}
  - name: Run Xray tests
  run: go test -v github.com/jfrog/jfrog-cli --timeout 0 --test.xray --jfrog.url=${{ secrets.PLATFORM_URL }} --jfrog.adminToken=${{ secrets.PLATFORM_ADMIN_TOKEN }} --jfrog.user=${{ secrets.PLATFORM_USER }} --test.containerRegistry=${{ secrets.CONTAINER_REGISTRY }}
- if: ${{ matrix.os != 'ubuntu-latest' }}
+ if: ${{ matrix.os != 'ubuntu' }}
  - name: Run Docker scan and Xray tests
  run: go test -v github.com/jfrog/jfrog-cli --timeout 0 --test.xray --test.dockerScan --jfrog.url=${{ secrets.PLATFORM_URL }} --jfrog.adminToken=${{ secrets.PLATFORM_ADMIN_TOKEN }} --test.containerRegistry=${{ secrets.CONTAINER_REGISTRY }}
- if: ${{ matrix.os == 'ubuntu-latest' }}
+ if: ${{ matrix.os == 'ubuntu' }}