Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/release-gate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion azure_test.go
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion bitbucket_server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions buildscripts/getFrogbot.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

Expand All @@ -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"
}

Expand Down Expand Up @@ -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"
}

Expand Down
6 changes: 3 additions & 3 deletions commands.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion github_test.go
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion gitlab_test.go
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/jfrog/frogbot/v2
module github.com/jfrog/frogbot/v3

go 1.25.7

Expand Down
8 changes: 4 additions & 4 deletions integrationutils.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
10 changes: 5 additions & 5 deletions main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion packageupdaters/commonpackageupdater.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packageupdaters/commonpackageupdater_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion packageupdaters/conanpackageupdater.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion packageupdaters/gopackageupdater.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion packageupdaters/gradlepackageupdater.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package packageupdaters

import (
"fmt"
"github.com/jfrog/frogbot/v2/utils"
"github.com/jfrog/frogbot/v3/utils"
"os"
"regexp"
"strings"
Expand Down
2 changes: 1 addition & 1 deletion packageupdaters/mavenpackageupdater.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion packageupdaters/mavenpackageupdater_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion packageupdaters/npmpackageupdater.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion packageupdaters/nugetpackageupdater.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package packageupdaters
import (
"errors"
"fmt"
"github.com/jfrog/frogbot/v2/utils"
"github.com/jfrog/frogbot/v3/utils"
"os"
"path"
"regexp"
Expand Down
2 changes: 1 addition & 1 deletion packageupdaters/pnpmpackageupdater.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion packageupdaters/pythonpackageupdater.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion packageupdaters/unsupportedpackageupdater.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package packageupdaters

import (
"errors"
"github.com/jfrog/frogbot/v2/utils"
"github.com/jfrog/frogbot/v3/utils"
)

type UnsupportedPackageUpdater struct {
Expand Down
2 changes: 1 addition & 1 deletion packageupdaters/yarnpackageupdater.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions scanpullrequest/scanpullrequest.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
8 changes: 4 additions & 4 deletions scanpullrequest/scanpullrequest_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions scanrepository/scanrepository.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions scanrepository/scanrepository_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions utils/comment.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions utils/comment_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion utils/consts.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package utils

import (
"github.com/jfrog/frogbot/v2/utils/outputwriter"
"github.com/jfrog/frogbot/v3/utils/outputwriter"
)

type vcsProvider string
Expand Down
2 changes: 1 addition & 1 deletion utils/getconfiguration.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion utils/getconfiguration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion utils/outputwriter/outputcontent.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion utils/outputwriter/outputcontent_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Loading
Loading