Skip to content

Commit

Permalink
update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
EyalDelarea committed Sep 8, 2023
1 parent 923b231 commit c562e25
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,6 @@ require (

replace github.com/jfrog/jfrog-cli-core/v2 => github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20230908125357-1a8083ec27d6

replace github.com/jfrog/jfrog-client-go => github.com/eyaldelarea/jfrog-client-go v1.28.4-0.20230908115256-d79c6685581d
replace github.com/jfrog/jfrog-client-go => github.com/eyaldelarea/jfrog-client-go v1.28.4-0.20230908125028-d74eec0e77cf

replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20230905120411-62d1bdd4eb38
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -702,8 +702,8 @@ github.com/envoyproxy/protoc-gen-validate v0.9.1/go.mod h1:OKNgG7TCp5pF4d6XftA0+
github.com/envoyproxy/protoc-gen-validate v0.10.0/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss=
github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20230908125357-1a8083ec27d6 h1:oX4BNcFKH6cuMhVV+/0fZJMQPZaMLkL5PYr1yBqzj80=
github.com/eyaldelarea/jfrog-cli-core/v2 v2.0.0-20230908125357-1a8083ec27d6/go.mod h1:SYqc9qeU7PcYBX+FjN3McE1N9rZQkEewOs7K+JRK7dQ=
github.com/eyaldelarea/jfrog-client-go v1.28.4-0.20230908115256-d79c6685581d h1:zar9XhtRzDJhSm61UlILuxivKXBnhZKNJ0yoXMFGOic=
github.com/eyaldelarea/jfrog-client-go v1.28.4-0.20230908115256-d79c6685581d/go.mod h1:soD5VL3X+G+0KKUNSlb0CSdF9nwHsQZCr0xqOGedAHM=
github.com/eyaldelarea/jfrog-client-go v1.28.4-0.20230908125028-d74eec0e77cf h1:uh8eJRKBAY8MtCt5pPC8Wer6KZMnaid0f+pYIh6anA8=
github.com/eyaldelarea/jfrog-client-go v1.28.4-0.20230908125028-d74eec0e77cf/go.mod h1:soD5VL3X+G+0KKUNSlb0CSdF9nwHsQZCr0xqOGedAHM=
github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w=
github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
Expand Down
5 changes: 3 additions & 2 deletions utils/git.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
"github.com/jfrog/froggit-go/vcsutils"
"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
"github.com/jfrog/jfrog-client-go/utils/io/fileutils"
"github.com/jfrog/jfrog-client-go/xray/services"

"net/http"
"strings"
Expand Down Expand Up @@ -441,7 +442,7 @@ func setGoGitCustomClient() {

// CreateGitInfoContext Creates GitInfoContest for XSC scans,this is optional.
// only log warning if fails to get information.
func CreateGitInfoContext(repoName, repoOwner, gitProject string, vcsProvider vcsutils.VcsProvider, client vcsclient.VcsClient, branchName string) (gitInfo *scan.XscGitInfoContext) {
func CreateGitInfoContext(repoName, repoOwner, gitProject string, vcsProvider vcsutils.VcsProvider, client vcsclient.VcsClient, branchName string) (gitInfo *services.XscGitInfoContext) {
latestCommit, err := client.GetLatestCommit(context.Background(), repoOwner, repoName, branchName)
if err != nil {
log.Warn(fmt.Sprintf("failed getting latest commit, repository: %s,branch: %s. error: %s ", repoName, branchName, err.Error()))
Expand All @@ -459,7 +460,7 @@ func CreateGitInfoContext(repoName, repoOwner, gitProject string, vcsProvider vc
if gitProject == "" {
gitProject = repoOwner
}
return &scan.XscGitInfoContext{
return &services.XscGitInfoContext{
GitRepoUrl: repoInfo.CloneInfo.HTTP, // Clone URLs on browsers redirects to repository URLS.
GitRepoName: repoName,
GitProvider: vcsProvider.String(),
Expand Down

0 comments on commit c562e25

Please sign in to comment.