diff --git a/.github/workflows/release-gate.yml b/.github/workflows/release-gate.yml index 5f53b5029..f6507c653 100644 --- a/.github/workflows/release-gate.yml +++ b/.github/workflows/release-gate.yml @@ -107,7 +107,7 @@ jobs: run: go generate ./... - name: Run Tests - run: go test github.com/jfrog/frogbot/v2/${{ matrix.suite.package }} -v -race -timeout 50m -cover + run: go test github.com/jfrog/frogbot/v3/${{ matrix.suite.package }} -v -race -timeout 50m -cover env: JF_URL: ${{ secrets.PLATFORM_URL }} JF_ACCESS_TOKEN: ${{ secrets.PLATFORM_ADMIN_TOKEN }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bc205cf29..430e35006 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -177,7 +177,7 @@ jobs: - name: Run Tests if: ${{ matrix.suite.name != 'GitHub Integration' || matrix.os == 'ubuntu' }} - run: go test github.com/jfrog/frogbot/v2/${{ matrix.suite.package }} -v -race -timeout 50m -cover + run: go test github.com/jfrog/frogbot/v3/${{ matrix.suite.package }} -v -race -timeout 50m -cover env: JF_URL: ${{ secrets.PLATFORM_URL }} JF_ACCESS_TOKEN: ${{ secrets.PLATFORM_ADMIN_TOKEN }} diff --git a/azure_test.go b/azure_test.go index 5688eb9b6..319af68d9 100644 --- a/azure_test.go +++ b/azure_test.go @@ -1,7 +1,7 @@ package main import ( - "github.com/jfrog/frogbot/v2/utils" + "github.com/jfrog/frogbot/v3/utils" "github.com/jfrog/froggit-go/vcsclient" "github.com/jfrog/froggit-go/vcsutils" "github.com/stretchr/testify/assert" diff --git a/bitbucket_server_test.go b/bitbucket_server_test.go index 9dde83703..349f48e31 100644 --- a/bitbucket_server_test.go +++ b/bitbucket_server_test.go @@ -3,7 +3,7 @@ package main import ( "errors" "fmt" - "github.com/jfrog/frogbot/v2/utils" + "github.com/jfrog/frogbot/v3/utils" "github.com/jfrog/froggit-go/vcsclient" "github.com/jfrog/froggit-go/vcsutils" "github.com/jfrog/jfrog-client-go/utils/log" diff --git a/buildscripts/getFrogbot.sh b/buildscripts/getFrogbot.sh index 366fbf587..aa55cab56 100644 --- a/buildscripts/getFrogbot.sh +++ b/buildscripts/getFrogbot.sh @@ -25,7 +25,7 @@ setFrogbotRemoteRepositoryIfNeeded() { setWindowsProperties() { FROGBOT_OS="windows" - URL="${PLATFORM_URL}/artifactory/${REMOTE_PATH}frogbot/v2/${VERSION}/frogbot-windows-amd64/frogbot.exe" + URL="${PLATFORM_URL}/artifactory/${REMOTE_PATH}frogbot/v3/${VERSION}/frogbot-windows-amd64/frogbot.exe" FILE_NAME="frogbot.exe" } @@ -40,7 +40,7 @@ setMacProperties() { ARCH="386" ;; esac - URL="${PLATFORM_URL}/artifactory/${REMOTE_PATH}frogbot/v2/${VERSION}/frogbot-${FROGBOT_OS}-${ARCH}/frogbot" + URL="${PLATFORM_URL}/artifactory/${REMOTE_PATH}frogbot/v3/${VERSION}/frogbot-${FROGBOT_OS}-${ARCH}/frogbot" FILE_NAME="frogbot" } @@ -74,7 +74,7 @@ setLinuxProperties() { exit 1 ;; esac - URL="${PLATFORM_URL}/artifactory/${REMOTE_PATH}frogbot/v2/${VERSION}/frogbot-${FROGBOT_OS}-${ARCH}/frogbot" + URL="${PLATFORM_URL}/artifactory/${REMOTE_PATH}frogbot/v3/${VERSION}/frogbot-${FROGBOT_OS}-${ARCH}/frogbot" FILE_NAME="frogbot" } diff --git a/commands.go b/commands.go index 8854f22e2..821f005e3 100644 --- a/commands.go +++ b/commands.go @@ -10,9 +10,9 @@ import ( "github.com/jfrog/jfrog-client-go/utils/io/fileutils" "github.com/jfrog/jfrog-client-go/utils/log" - "github.com/jfrog/frogbot/v2/scanpullrequest" - "github.com/jfrog/frogbot/v2/scanrepository" - "github.com/jfrog/frogbot/v2/utils" + "github.com/jfrog/frogbot/v3/scanpullrequest" + "github.com/jfrog/frogbot/v3/scanrepository" + "github.com/jfrog/frogbot/v3/utils" "github.com/jfrog/jfrog-cli-security/utils/xsc" clitool "github.com/urfave/cli/v2" ) diff --git a/github_test.go b/github_test.go index c66a6eef6..7266aa72c 100644 --- a/github_test.go +++ b/github_test.go @@ -1,7 +1,7 @@ package main import ( - "github.com/jfrog/frogbot/v2/utils" + "github.com/jfrog/frogbot/v3/utils" "github.com/jfrog/froggit-go/vcsclient" "github.com/jfrog/froggit-go/vcsutils" "github.com/stretchr/testify/assert" diff --git a/gitlab_test.go b/gitlab_test.go index 2cce4d35f..3e7266c2d 100644 --- a/gitlab_test.go +++ b/gitlab_test.go @@ -1,7 +1,7 @@ package main import ( - "github.com/jfrog/frogbot/v2/utils" + "github.com/jfrog/frogbot/v3/utils" "github.com/jfrog/froggit-go/vcsclient" "github.com/jfrog/froggit-go/vcsutils" "github.com/stretchr/testify/assert" diff --git a/go.mod b/go.mod index 695c09c84..112d91930 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/jfrog/frogbot/v2 +module github.com/jfrog/frogbot/v3 go 1.25.7 diff --git a/integrationutils.go b/integrationutils.go index a9ac65bec..e7631d618 100644 --- a/integrationutils.go +++ b/integrationutils.go @@ -16,10 +16,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/jfrog/frogbot/v2/scanpullrequest" - "github.com/jfrog/frogbot/v2/scanrepository" - "github.com/jfrog/frogbot/v2/utils" - "github.com/jfrog/frogbot/v2/utils/outputwriter" + "github.com/jfrog/frogbot/v3/scanpullrequest" + "github.com/jfrog/frogbot/v3/scanrepository" + "github.com/jfrog/frogbot/v3/utils" + "github.com/jfrog/frogbot/v3/utils/outputwriter" ) const ( diff --git a/main.go b/main.go index 469b88ab1..d04ea605c 100644 --- a/main.go +++ b/main.go @@ -1,7 +1,7 @@ package main import ( - "github.com/jfrog/frogbot/v2/utils" + "github.com/jfrog/frogbot/v3/utils" "os" "github.com/jfrog/jfrog-cli-core/v2/utils/coreutils" diff --git a/main_test.go b/main_test.go index da8565aca..a9dda373c 100644 --- a/main_test.go +++ b/main_test.go @@ -2,7 +2,7 @@ package main import ( "fmt" - "github.com/jfrog/frogbot/v2/utils" + "github.com/jfrog/frogbot/v3/utils" "github.com/jfrog/jfrog-client-go/utils/log" clientTests "github.com/jfrog/jfrog-client-go/utils/tests" "io" @@ -14,10 +14,10 @@ import ( ) var IntegrationTestPackages = []string{ - "github.com/jfrog/frogbot/v2", - "github.com/jfrog/frogbot/v2/scanrepository", - "github.com/jfrog/frogbot/v2/scanpullrequest", - "github.com/jfrog/frogbot/v2/packageupdaters", + "github.com/jfrog/frogbot/v3", + "github.com/jfrog/frogbot/v3/scanrepository", + "github.com/jfrog/frogbot/v3/scanpullrequest", + "github.com/jfrog/frogbot/v3/packageupdaters", } func TestUnitTests(t *testing.T) { diff --git a/packageupdaters/commonpackageupdater.go b/packageupdaters/commonpackageupdater.go index 00d36aa7a..d5b3949bd 100644 --- a/packageupdaters/commonpackageupdater.go +++ b/packageupdaters/commonpackageupdater.go @@ -18,7 +18,7 @@ import ( "github.com/tidwall/sjson" "golang.org/x/exp/slices" - "github.com/jfrog/frogbot/v2/utils" + "github.com/jfrog/frogbot/v3/utils" ) // Node diff --git a/packageupdaters/commonpackageupdater_test.go b/packageupdaters/commonpackageupdater_test.go index 441d68660..45958ab4f 100644 --- a/packageupdaters/commonpackageupdater_test.go +++ b/packageupdaters/commonpackageupdater_test.go @@ -16,7 +16,7 @@ import ( "github.com/jfrog/jfrog-client-go/utils/io/fileutils" "github.com/stretchr/testify/assert" - "github.com/jfrog/frogbot/v2/utils" + "github.com/jfrog/frogbot/v3/utils" ) type dependencyFixTest struct { diff --git a/packageupdaters/conanpackageupdater.go b/packageupdaters/conanpackageupdater.go index 6bb5e6ff2..3337d35f0 100644 --- a/packageupdaters/conanpackageupdater.go +++ b/packageupdaters/conanpackageupdater.go @@ -5,7 +5,7 @@ import ( "os" "strings" - "github.com/jfrog/frogbot/v2/utils" + "github.com/jfrog/frogbot/v3/utils" "github.com/jfrog/jfrog-client-go/utils/log" ) diff --git a/packageupdaters/gopackageupdater.go b/packageupdaters/gopackageupdater.go index 7abe7768a..3f4c63a3c 100644 --- a/packageupdaters/gopackageupdater.go +++ b/packageupdaters/gopackageupdater.go @@ -8,7 +8,7 @@ import ( "path/filepath" "strings" - "github.com/jfrog/frogbot/v2/utils" + "github.com/jfrog/frogbot/v3/utils" "github.com/jfrog/jfrog-client-go/utils/log" ) diff --git a/packageupdaters/gradlepackageupdater.go b/packageupdaters/gradlepackageupdater.go index 7b8b80d4f..7bec5984a 100644 --- a/packageupdaters/gradlepackageupdater.go +++ b/packageupdaters/gradlepackageupdater.go @@ -2,7 +2,7 @@ package packageupdaters import ( "fmt" - "github.com/jfrog/frogbot/v2/utils" + "github.com/jfrog/frogbot/v3/utils" "os" "regexp" "strings" diff --git a/packageupdaters/mavenpackageupdater.go b/packageupdaters/mavenpackageupdater.go index 3d9d446fb..75adc88eb 100644 --- a/packageupdaters/mavenpackageupdater.go +++ b/packageupdaters/mavenpackageupdater.go @@ -11,7 +11,7 @@ import ( "github.com/jfrog/jfrog-client-go/utils/log" - "github.com/jfrog/frogbot/v2/utils" + "github.com/jfrog/frogbot/v3/utils" ) const ( diff --git a/packageupdaters/mavenpackageupdater_test.go b/packageupdaters/mavenpackageupdater_test.go index 53bfa1171..d0c0397d2 100644 --- a/packageupdaters/mavenpackageupdater_test.go +++ b/packageupdaters/mavenpackageupdater_test.go @@ -12,7 +12,7 @@ import ( "github.com/jfrog/jfrog-client-go/utils/io/fileutils" "github.com/stretchr/testify/assert" - "github.com/jfrog/frogbot/v2/utils" + "github.com/jfrog/frogbot/v3/utils" ) func TestMavenUpdateDependency(t *testing.T) { diff --git a/packageupdaters/npmpackageupdater.go b/packageupdaters/npmpackageupdater.go index 8b9b5ea5c..67427c026 100644 --- a/packageupdaters/npmpackageupdater.go +++ b/packageupdaters/npmpackageupdater.go @@ -11,7 +11,7 @@ import ( "github.com/jfrog/jfrog-client-go/utils/log" - "github.com/jfrog/frogbot/v2/utils" + "github.com/jfrog/frogbot/v3/utils" ) const ( diff --git a/packageupdaters/nugetpackageupdater.go b/packageupdaters/nugetpackageupdater.go index 2100aa8f0..fa62da1bf 100644 --- a/packageupdaters/nugetpackageupdater.go +++ b/packageupdaters/nugetpackageupdater.go @@ -3,7 +3,7 @@ package packageupdaters import ( "errors" "fmt" - "github.com/jfrog/frogbot/v2/utils" + "github.com/jfrog/frogbot/v3/utils" "os" "path" "regexp" diff --git a/packageupdaters/pnpmpackageupdater.go b/packageupdaters/pnpmpackageupdater.go index e07b900b9..9aeacd9cb 100644 --- a/packageupdaters/pnpmpackageupdater.go +++ b/packageupdaters/pnpmpackageupdater.go @@ -11,7 +11,7 @@ import ( "github.com/jfrog/jfrog-client-go/utils/log" - "github.com/jfrog/frogbot/v2/utils" + "github.com/jfrog/frogbot/v3/utils" ) const ( diff --git a/packageupdaters/pythonpackageupdater.go b/packageupdaters/pythonpackageupdater.go index 7327fa0f5..f634a678d 100644 --- a/packageupdaters/pythonpackageupdater.go +++ b/packageupdaters/pythonpackageupdater.go @@ -10,7 +10,7 @@ import ( "github.com/jfrog/jfrog-cli-security/utils/techutils" - "github.com/jfrog/frogbot/v2/utils" + "github.com/jfrog/frogbot/v3/utils" ) const ( diff --git a/packageupdaters/unsupportedpackageupdater.go b/packageupdaters/unsupportedpackageupdater.go index 81526b04b..d1fe66cb1 100644 --- a/packageupdaters/unsupportedpackageupdater.go +++ b/packageupdaters/unsupportedpackageupdater.go @@ -2,7 +2,7 @@ package packageupdaters import ( "errors" - "github.com/jfrog/frogbot/v2/utils" + "github.com/jfrog/frogbot/v3/utils" ) type UnsupportedPackageUpdater struct { diff --git a/packageupdaters/yarnpackageupdater.go b/packageupdaters/yarnpackageupdater.go index 6d8c44904..f3e831a72 100644 --- a/packageupdaters/yarnpackageupdater.go +++ b/packageupdaters/yarnpackageupdater.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" biUtils "github.com/jfrog/build-info-go/build/utils" - "github.com/jfrog/frogbot/v2/utils" + "github.com/jfrog/frogbot/v3/utils" "github.com/jfrog/gofrog/version" "github.com/jfrog/jfrog-client-go/utils/io/fileutils" "github.com/jfrog/jfrog-client-go/utils/log" diff --git a/scanpullrequest/scanpullrequest.go b/scanpullrequest/scanpullrequest.go index 347c313ab..286acb511 100644 --- a/scanpullrequest/scanpullrequest.go +++ b/scanpullrequest/scanpullrequest.go @@ -17,8 +17,8 @@ import ( "github.com/jfrog/jfrog-cli-security/utils/xsc" "github.com/jfrog/jfrog-client-go/utils/log" - "github.com/jfrog/frogbot/v2/utils" - "github.com/jfrog/frogbot/v2/utils/issues" + "github.com/jfrog/frogbot/v3/utils" + "github.com/jfrog/frogbot/v3/utils/issues" ) const ( diff --git a/scanpullrequest/scanpullrequest_test.go b/scanpullrequest/scanpullrequest_test.go index a3dd8f917..a8c8932b6 100644 --- a/scanpullrequest/scanpullrequest_test.go +++ b/scanpullrequest/scanpullrequest_test.go @@ -24,7 +24,7 @@ import ( "github.com/jfrog/jfrog-client-go/xray/services" "github.com/owenrumney/go-sarif/v3/pkg/report/v210/sarif" - "github.com/jfrog/frogbot/v2/testdata" + "github.com/jfrog/frogbot/v3/testdata" "github.com/jfrog/froggit-go/vcsclient" "github.com/jfrog/froggit-go/vcsutils" @@ -33,9 +33,9 @@ import ( "github.com/jfrog/jfrog-cli-security/utils/results" "github.com/stretchr/testify/assert" - "github.com/jfrog/frogbot/v2/utils" - "github.com/jfrog/frogbot/v2/utils/issues" - "github.com/jfrog/frogbot/v2/utils/outputwriter" + "github.com/jfrog/frogbot/v3/utils" + "github.com/jfrog/frogbot/v3/utils/issues" + "github.com/jfrog/frogbot/v3/utils/outputwriter" ) //go:generate go run github.com/golang/mock/mockgen@v1.6.0 -destination=../testdata/vcsclientmock.go -package=testdata github.com/jfrog/froggit-go/vcsclient VcsClient diff --git a/scanrepository/scanrepository.go b/scanrepository/scanrepository.go index 36b92eae3..42249ee7b 100644 --- a/scanrepository/scanrepository.go +++ b/scanrepository/scanrepository.go @@ -9,7 +9,7 @@ import ( "regexp" "strings" - "github.com/jfrog/frogbot/v2/packageupdaters" + "github.com/jfrog/frogbot/v3/packageupdaters" "github.com/go-git/go-git/v5" biutils "github.com/jfrog/build-info-go/utils" @@ -29,8 +29,8 @@ import ( "golang.org/x/exp/maps" "golang.org/x/exp/slices" - "github.com/jfrog/frogbot/v2/utils" - "github.com/jfrog/frogbot/v2/utils/outputwriter" + "github.com/jfrog/frogbot/v3/utils" + "github.com/jfrog/frogbot/v3/utils/outputwriter" ) const ( diff --git a/scanrepository/scanrepository_test.go b/scanrepository/scanrepository_test.go index 8f42c4c1a..9191cbb0b 100644 --- a/scanrepository/scanrepository_test.go +++ b/scanrepository/scanrepository_test.go @@ -37,8 +37,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/jfrog/frogbot/v2/utils" - "github.com/jfrog/frogbot/v2/utils/outputwriter" + "github.com/jfrog/frogbot/v3/utils" + "github.com/jfrog/frogbot/v3/utils/outputwriter" ) const rootTestDir = "scanrepository" diff --git a/utils/comment.go b/utils/comment.go index b3381cd01..9c9d0dd3d 100644 --- a/utils/comment.go +++ b/utils/comment.go @@ -16,8 +16,8 @@ import ( "github.com/jfrog/jfrog-cli-security/utils/results" "github.com/jfrog/jfrog-client-go/utils/log" - "github.com/jfrog/frogbot/v2/utils/issues" - "github.com/jfrog/frogbot/v2/utils/outputwriter" + "github.com/jfrog/frogbot/v3/utils/issues" + "github.com/jfrog/frogbot/v3/utils/outputwriter" ) type ReviewCommentType string diff --git a/utils/comment_test.go b/utils/comment_test.go index 81beecf03..10abfa51f 100644 --- a/utils/comment_test.go +++ b/utils/comment_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/jfrog/frogbot/v2/utils/issues" - "github.com/jfrog/frogbot/v2/utils/outputwriter" + "github.com/jfrog/frogbot/v3/utils/issues" + "github.com/jfrog/frogbot/v3/utils/outputwriter" ) func TestGetFrogbotReviewComments(t *testing.T) { diff --git a/utils/consts.go b/utils/consts.go index d7d886fd2..3eceff636 100644 --- a/utils/consts.go +++ b/utils/consts.go @@ -1,7 +1,7 @@ package utils import ( - "github.com/jfrog/frogbot/v2/utils/outputwriter" + "github.com/jfrog/frogbot/v3/utils/outputwriter" ) type vcsProvider string diff --git a/utils/getconfiguration.go b/utils/getconfiguration.go index 8f20520a3..84d0a7e0a 100644 --- a/utils/getconfiguration.go +++ b/utils/getconfiguration.go @@ -15,7 +15,7 @@ import ( "github.com/jfrog/jfrog-cli-security/utils/xsc" "github.com/jfrog/jfrog-client-go/xsc/services" - "github.com/jfrog/frogbot/v2/utils/outputwriter" + "github.com/jfrog/frogbot/v3/utils/outputwriter" "github.com/jfrog/froggit-go/vcsclient" "github.com/jfrog/froggit-go/vcsutils" diff --git a/utils/getconfiguration_test.go b/utils/getconfiguration_test.go index 4d4979e2d..8ac029cac 100644 --- a/utils/getconfiguration_test.go +++ b/utils/getconfiguration_test.go @@ -11,7 +11,7 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" - "github.com/jfrog/frogbot/v2/testdata" + "github.com/jfrog/frogbot/v3/testdata" "github.com/jfrog/froggit-go/vcsclient" "github.com/jfrog/jfrog-cli-core/v2/utils/config" diff --git a/utils/outputwriter/outputcontent.go b/utils/outputwriter/outputcontent.go index 984523dc8..bb75a89b8 100644 --- a/utils/outputwriter/outputcontent.go +++ b/utils/outputwriter/outputcontent.go @@ -13,7 +13,7 @@ import ( "github.com/jfrog/jfrog-cli-security/utils/severityutils" "golang.org/x/exp/maps" - "github.com/jfrog/frogbot/v2/utils/issues" + "github.com/jfrog/frogbot/v3/utils/issues" ) const ( diff --git a/utils/outputwriter/outputcontent_test.go b/utils/outputwriter/outputcontent_test.go index b7bd7ccf8..417249b3e 100644 --- a/utils/outputwriter/outputcontent_test.go +++ b/utils/outputwriter/outputcontent_test.go @@ -13,7 +13,7 @@ import ( xrayApi "github.com/jfrog/jfrog-client-go/xray/services/utils" "github.com/stretchr/testify/assert" - "github.com/jfrog/frogbot/v2/utils/issues" + "github.com/jfrog/frogbot/v3/utils/issues" ) func TestGetMainCommentContent(t *testing.T) { diff --git a/utils/utils.go b/utils/utils.go index 6553934dd..ec88f6262 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -31,8 +31,8 @@ import ( "github.com/jfrog/jfrog-client-go/utils/io/fileutils" "github.com/jfrog/jfrog-client-go/utils/log" - "github.com/jfrog/frogbot/v2/utils/gitlabreport" - "github.com/jfrog/frogbot/v2/utils/issues" + "github.com/jfrog/frogbot/v3/utils/gitlabreport" + "github.com/jfrog/frogbot/v3/utils/issues" ) const ( diff --git a/utils/utils_test.go b/utils/utils_test.go index 8c3f0a952..2fc3784f5 100644 --- a/utils/utils_test.go +++ b/utils/utils_test.go @@ -19,8 +19,8 @@ import ( "github.com/jfrog/jfrog-cli-security/utils/techutils" "github.com/stretchr/testify/assert" - "github.com/jfrog/frogbot/v2/utils/gitlabreport" - "github.com/jfrog/frogbot/v2/utils/outputwriter" + "github.com/jfrog/frogbot/v3/utils/gitlabreport" + "github.com/jfrog/frogbot/v3/utils/outputwriter" ) const (