Skip to content

Commit

Permalink
Update core dependency (#2181)
Browse files Browse the repository at this point in the history
  • Loading branch information
@sverdlov93
sverdlov93 committed Sep 4, 2023
1 parent aa56aa9 commit 70224ad
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,10 @@ require (

// replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20230828134416-f0db33dd9344

replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20230831153853-3ddf531482e7
replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20230904093105-ce71e69b2f07

// replace github.com/jfrog/gofrog => github.com/jfrog/gofrog v1.2.6-0.20230418122323-2bf299dd6d27

replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20230831152946-6ed2ae1aa57f
replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20230904070427-f3f2a103d9e2

replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go v1.8.9-0.20230831151231-e5e7bd035ddc
8 changes: 4 additions & 4 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -239,10 +239,10 @@ github.com/jfrog/build-info-go v1.8.9-0.20230831151231-e5e7bd035ddc h1:pqu82clhP
github.com/jfrog/build-info-go v1.8.9-0.20230831151231-e5e7bd035ddc/go.mod h1:QEskae5fQpjeY2PBzsjWtUQVskYSNDF2sSmw/Gx44dQ=
github.com/jfrog/gofrog v1.3.0 h1:o4zgsBZE4QyDbz2M7D4K6fXPTBJht+8lE87mS9bw7Gk=
github.com/jfrog/gofrog v1.3.0/go.mod h1:IFMc+V/yf7rA5WZ74CSbXe+Lgf0iApEQLxRZVzKRUR0=
github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20230831153853-3ddf531482e7 h1:G60mVnOYqtVJ0UQpkYS2kmbqYZ59q1g8XivZt9W0tUg=
github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20230831153853-3ddf531482e7/go.mod h1:eQJU+jDTcPVqOeHNheURqkMEMXDVNQFKKjcyVEa0058=
github.com/jfrog/jfrog-client-go v1.28.1-0.20230831152946-6ed2ae1aa57f h1:S6l0o2sKFLRJ+QYVB5U/PJhrnwFSmKFFY7eHpRPRH8A=
github.com/jfrog/jfrog-client-go v1.28.1-0.20230831152946-6ed2ae1aa57f/go.mod h1:uUnMrqHX7Xi+OCaZEE4b3BtsmGeOSCB7XqaEWVXEH/E=
github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20230904093105-ce71e69b2f07 h1:8bqiTnKxyZkqZNXYf+9cFxL7P15qZ5VtP50McAMBKEw=
github.com/jfrog/jfrog-cli-core/v2 v2.31.1-0.20230904093105-ce71e69b2f07/go.mod h1:eQJU+jDTcPVqOeHNheURqkMEMXDVNQFKKjcyVEa0058=
github.com/jfrog/jfrog-client-go v1.28.1-0.20230904070427-f3f2a103d9e2 h1:uPDFvUv+3kAUyTR6gAhROAgsjnPe2jsxzqJSkjbIHmE=
github.com/jfrog/jfrog-client-go v1.28.1-0.20230904070427-f3f2a103d9e2/go.mod h1:uUnMrqHX7Xi+OCaZEE4b3BtsmGeOSCB7XqaEWVXEH/E=
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.8.0 h1:G7vS2LGdpZZDH1HmHeNbxOaJ/ZnJlpwGFvOkTkJzzNk=
Expand Down
2 changes: 1 addition & 1 deletion pip_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
biutils "github.com/jfrog/build-info-go/utils"
"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
coretests "github.com/jfrog/jfrog-cli-core/v2/utils/tests"
"github.com/jfrog/jfrog-cli-core/v2/xray/audit/python"
"github.com/jfrog/jfrog-cli-core/v2/xray/commands/audit/sca/python"
clientTestUtils "github.com/jfrog/jfrog-client-go/utils/tests"
"os"
"path/filepath"
Expand Down
8 changes: 4 additions & 4 deletions scan/cli.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
corecommondocs "github.com/jfrog/jfrog-cli-core/v2/docs/common"
coreconfig "github.com/jfrog/jfrog-cli-core/v2/utils/config"
"github.com/jfrog/jfrog-cli-core/v2/utils/coreutils"
audit "github.com/jfrog/jfrog-cli-core/v2/xray/commands/audit/generic"
"github.com/jfrog/jfrog-cli-core/v2/xray/commands/audit"
"github.com/jfrog/jfrog-cli-core/v2/xray/commands/scan"
"github.com/jfrog/jfrog-cli/docs/common"
auditdocs "github.com/jfrog/jfrog-cli/docs/scan/audit"
Expand Down Expand Up @@ -172,7 +172,7 @@ func GetCommands() []cli.Command {
}

func AuditCmd(c *cli.Context) error {
auditCmd, err := createGenericAuditCmd(c)
auditCmd, err := createAuditCmd(c)
if err != nil {
return err
}
Expand All @@ -198,7 +198,7 @@ func AuditCmd(c *cli.Context) error {

func AuditSpecificCmd(c *cli.Context, technology coreutils.Technology) error {
cliutils.LogNonGenericAuditCommandDeprecation(c.Command.Name)
auditCmd, err := createGenericAuditCmd(c)
auditCmd, err := createAuditCmd(c)
if err != nil {
return err
}
Expand Down Expand Up @@ -234,7 +234,7 @@ func CurationCmd(c *cli.Context) error {
return progressbar.ExecWithProgress(curationAuditCommand)
}

func createGenericAuditCmd(c *cli.Context) (*audit.GenericAuditCommand, error) {
func createAuditCmd(c *cli.Context) (*audit.AuditCommand, error) {
auditCmd := audit.NewGenericAuditCommand()
err := validateXrayContext(c)
if err != nil {
Expand Down
4 changes: 2 additions & 2 deletions xray_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -703,9 +703,9 @@ func verifySimpleJsonJasResults(t *testing.T, content string, minIacViolations,
assert.GreaterOrEqual(t, len(results.Iacs), minIacViolations, "Found less IaC then expected")
var applicableResults, notApplicableResults int
for _, vuln := range results.Vulnerabilities {
if vuln.Applicable == utils.NotApplicableStringValue {
if vuln.Applicable == string(utils.NotApplicable) {
notApplicableResults++
} else if vuln.Applicable == utils.ApplicableStringValue {
} else if vuln.Applicable == string(utils.Applicable) {
applicableResults++
}
}
Expand Down

0 comments on commit 70224ad

Please sign in to comment.