Skip to content

Commit 9e1ddaa

Browse files
attiasasattiasas
authored
Update Dependencies (#249)
1 parent ac30b34 commit 9e1ddaa

File tree

7 files changed

+20
-25
lines changed

7 files changed

+20
-25
lines changed

‎.github/actions/install-and-setup/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ runs:
88
- name: Setup Go
99
uses: actions/setup-go@v5
1010
with:
11-
go-version: 1.22.x
11+
go-version: 1.23.x
1212
# - name: Setup Go with cache
1313
# uses: jfrog/.github/actions/install-go-with-cache@main
1414

‎audit_test.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -756,9 +756,7 @@ func TestXrayAuditJasSimpleJsonWithXrayUrl(t *testing.T) {
756756
// custom excluded folders
757757

758758
func TestXrayAuditJasSimpleJsonWithCustomExclusions(t *testing.T) {
759-
cliToRun := integration.GetTestCli(cli.GetJfrogCliSecurityApp(), true)
760-
761-
output := testXrayAuditJas(t, cliToRun, filepath.Join("jas", "jas"), "3", false, false, false, "non_existing_folder")
759+
output := testXrayAuditJas(t, securityTests.PlatformCli, filepath.Join("jas", "jas"), "3", false, false, false, "non_existing_folder")
762760
validations.VerifySimpleJsonResults(t, output, validations.ValidationParams{
763761
Sast: 2,
764762
Iac: 9,

‎commands/audit/sca/nuget/nuget.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ func restoreInTempDirAndGetBuildInfo(params utils.AuditParams, wd string, exclus
9393
}
9494

9595
log.Info("Dependencies sources were not detected nor 'install' command provided. Running 'restore' command")
96-
sol, err := runDotnetRestoreAndLoadSolution(params, tmpWd, exclusionPattern)
96+
sol, err := runDotnetRestoreAndLoadSolution(params, tmpWd, exclusionPattern, params.InsecureTls())
9797
if err != nil {
9898
return
9999
}
@@ -116,7 +116,7 @@ func isInstallRequired(params utils.AuditParams, sol solution.Solution, skipAuto
116116
return installRequired, nil
117117
}
118118

119-
func runDotnetRestoreAndLoadSolution(params utils.AuditParams, tmpWd, exclusionPattern string) (sol solution.Solution, err error) {
119+
func runDotnetRestoreAndLoadSolution(params utils.AuditParams, tmpWd, exclusionPattern string, allowInsecureConnections bool) (sol solution.Solution, err error) {
120120
toolName := params.InstallCommandName()
121121
if toolName == "" {
122122
// Determine if the project is a NuGet or .NET project
@@ -148,7 +148,7 @@ func runDotnetRestoreAndLoadSolution(params utils.AuditParams, tmpWd, exclusionP
148148
log.Info(fmt.Sprintf("Resolving dependencies from '%s' from repo '%s'", serverDetails.Url, depsRepo))
149149

150150
var configFile *os.File
151-
configFile, err = dotnet.InitNewConfig(tmpWd, depsRepo, serverDetails, false)
151+
configFile, err = dotnet.InitNewConfig(tmpWd, depsRepo, serverDetails, false, allowInsecureConnections)
152152
if err != nil {
153153
err = fmt.Errorf("failed while attempting to generate a configuration file for setting up Artifactory as a resolution server")
154154
return

‎commands/audit/sca/nuget/nuget_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ func TestRunDotnetRestoreAndLoadSolution(t *testing.T) {
141141
assert.Empty(t, sol.GetDependenciesSources())
142142

143143
params := &xrayUtils2.AuditBasicParams{}
144-
sol, err = runDotnetRestoreAndLoadSolution(params, tempDirPath, "")
144+
sol, err = runDotnetRestoreAndLoadSolution(params, tempDirPath, "", true)
145145
assert.NoError(t, err)
146146
assert.NotEmpty(t, sol.GetProjects())
147147
assert.NotEmpty(t, sol.GetDependenciesSources())

‎commands/curation/curationaudit_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -507,6 +507,8 @@ func createCurationCmdAndRun(tt testCase) (cmdResults map[string]*CurationReport
507507
curationCmd := NewCurationAuditCommand()
508508
curationCmd.SetIsCurationCmd(true)
509509
curationCmd.parallelRequests = 3
510+
// For tests, we use localhost http server (nuget have issues without setting insecureTls)
511+
curationCmd.SetInsecureTls(true)
510512
curationCmd.SetIgnoreConfigFile(tt.shouldIgnoreConfigFile)
511513
cmdResults = map[string]*CurationReport{}
512514
err = curationCmd.doCurateAudit(cmdResults)

‎go.mod‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
module github.com/jfrog/jfrog-cli-security
22

3-
go 1.22.9
4-
5-
toolchain go1.23.3
3+
go 1.23.3
64

75
require (
86
github.com/beevik/etree v1.4.0
97
github.com/google/go-github/v56 v56.0.0
108
github.com/gookit/color v1.5.4
11-
github.com/jfrog/build-info-go v1.10.5
9+
github.com/jfrog/build-info-go v1.10.6
1210
github.com/jfrog/froggit-go v1.16.2
1311
github.com/jfrog/gofrog v1.7.6
1412
github.com/jfrog/jfrog-apps-config v1.0.1
15-
github.com/jfrog/jfrog-cli-core/v2 v2.56.7
16-
github.com/jfrog/jfrog-client-go v1.47.6
13+
github.com/jfrog/jfrog-cli-core/v2 v2.57.0
14+
github.com/jfrog/jfrog-client-go v1.48.1
1715
github.com/magiconair/properties v1.8.7
1816
github.com/owenrumney/go-sarif/v2 v2.3.0
1917
github.com/stretchr/testify v1.9.0
@@ -113,13 +111,10 @@ require (
113111
gopkg.in/warnings.v0 v0.1.2 // indirect
114112
)
115113

116-
// replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 dev
117-
118-
replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20241124172451-50bd3e54f1e0
114+
// replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go dev
119115

120-
// replace github.com/jfrog/jfrog-client-go => ../cli-projects/jfrog-client-go
116+
// replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 dev
121117

122-
// replace github.com/jfrog/jfrog-client-go => github.com/attiasas/jfrog-client-go v0.0.0-20241118103817-1d4e8d19de4f
123118

124119
// replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go dev
125120

‎go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,18 +119,18 @@ github.com/jedib0t/go-pretty/v6 v6.6.1 h1:iJ65Xjb680rHcikRj6DSIbzCex2huitmc7bDtx
119119
github.com/jedib0t/go-pretty/v6 v6.6.1/go.mod h1:zbn98qrYlh95FIhwwsbIip0LYpwSG8SUOScs+v9/t0E=
120120
github.com/jfrog/archiver/v3 v3.6.1 h1:LOxnkw9pOn45DzCbZNFV6K0+6dCsQ0L8mR3ZcujO5eI=
121121
github.com/jfrog/archiver/v3 v3.6.1/go.mod h1:VgR+3WZS4N+i9FaDwLZbq+jeU4B4zctXL+gL4EMzfLw=
122-
github.com/jfrog/build-info-go v1.10.5 h1:cW03JlPlKv7RMUU896uLUxyLWXAmCgR5Y5QX0fwgz0Q=
123-
github.com/jfrog/build-info-go v1.10.5/go.mod h1:JcISnovFXKx3wWf3p1fcMmlPdt6adxScXvoJN4WXqIE=
122+
github.com/jfrog/build-info-go v1.10.6 h1:zH1ZhXlVfi5DlFyunygHjrdOcnv5qxfeLqmsfD4+lc4=
123+
github.com/jfrog/build-info-go v1.10.6/go.mod h1:JcISnovFXKx3wWf3p1fcMmlPdt6adxScXvoJN4WXqIE=
124124
github.com/jfrog/froggit-go v1.16.2 h1:F//S83iXH14qsCwYzv0zB2JtjS2pJVEsUoEmYA+37dQ=
125125
github.com/jfrog/froggit-go v1.16.2/go.mod h1:5VpdQfAcbuyFl9x/x8HGm7kVk719kEtW/8YJFvKcHPA=
126126
github.com/jfrog/gofrog v1.7.6 h1:QmfAiRzVyaI7JYGsB7cxfAJePAZTzFz0gRWZSE27c6s=
127127
github.com/jfrog/gofrog v1.7.6/go.mod h1:ntr1txqNOZtHplmaNd7rS4f8jpA5Apx8em70oYEe7+4=
128128
github.com/jfrog/jfrog-apps-config v1.0.1 h1:mtv6k7g8A8BVhlHGlSveapqf4mJfonwvXYLipdsOFMY=
129129
github.com/jfrog/jfrog-apps-config v1.0.1/go.mod h1:8AIIr1oY9JuH5dylz2S6f8Ym2MaadPLR6noCBO4C22w=
130-
github.com/jfrog/jfrog-cli-core/v2 v2.56.7 h1:pB4ronzVk60k/lf9bUL9HxBZ8PbMW6LhbIFld9NXNNc=
131-
github.com/jfrog/jfrog-cli-core/v2 v2.56.7/go.mod h1:puLwWcnXYCJqUOvhscXRJiKNzPdj0adP+zadKy6A/gU=
132-
github.com/jfrog/jfrog-client-go v1.28.1-0.20241124172451-50bd3e54f1e0 h1:YROG+bJY4QJEz9KdKUbBlbOHXY1vnDhhi0/cXrEgu9E=
133-
github.com/jfrog/jfrog-client-go v1.28.1-0.20241124172451-50bd3e54f1e0/go.mod h1:1a7bmQHkRmPEza9wva2+WVrYzrGbosrMymq57kyG5gU=
130+
github.com/jfrog/jfrog-cli-core/v2 v2.57.0 h1:3ON0J6Sjc2+4HZrzh4eSbdciXx3sJsJUIJ3TPQXh/5c=
131+
github.com/jfrog/jfrog-cli-core/v2 v2.57.0/go.mod h1:SThaC/fniC96oN8YgCsHjvOxp5rBM7IppuIybn1oxT0=
132+
github.com/jfrog/jfrog-client-go v1.48.1 h1:R6x6gazy0F196XXDhDdRAxmNplSJ5SrJfEmmNBgks/8=
133+
github.com/jfrog/jfrog-client-go v1.48.1/go.mod h1:1a7bmQHkRmPEza9wva2+WVrYzrGbosrMymq57kyG5gU=
134134
github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k=
135135
github.com/k0kubun/pp v3.0.1+incompatible/go.mod h1:GWse8YhT0p8pT4ir3ZgBbfZild3tgzSScAn6HmfYukg=
136136
github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=

0 commit comments

Comments
 (0)