From ba904159556d24427c203c5ef339ac5f7d47b989 Mon Sep 17 00:00:00 2001 From: attiasas Date: Sun, 25 Feb 2024 12:04:50 +0200 Subject: [PATCH] Code review changes --- commands/audit/scarunner.go | 8 -------- go.mod | 6 +++--- go.sum | 12 ++++++------ 3 files changed, 9 insertions(+), 17 deletions(-) diff --git a/commands/audit/scarunner.go b/commands/audit/scarunner.go index 5e8e865e..8efb3b18 100644 --- a/commands/audit/scarunner.go +++ b/commands/audit/scarunner.go @@ -105,14 +105,6 @@ func getRequestedDescriptors(params *AuditParams) map[coreutils.Technology][]str return requestedDescriptors } -// func getExcludePattern(params *AuditParams) string { -// exclusions := params.Exclusions() -// if len(exclusions) == 0 { -// exclusions = append(exclusions, sca.DefaultExcludePatterns...) -// } -// return fspatterns.PrepareExcludePathPattern(exclusions, clientutils.WildCardPattern, params.isRecursiveScan) -// } - // Preform the SCA scan for the given scan information. // This method will change the working directory to the scan's working directory. func executeScaScan(serverDetails *config.ServerDetails, params *AuditParams, scan *xrayutils.ScaScanResult) (err error) { diff --git a/go.mod b/go.mod index 3bc8e114..0a90e0b9 100644 --- a/go.mod +++ b/go.mod @@ -98,8 +98,8 @@ require ( gopkg.in/warnings.v0 v0.1.2 // indirect ) -replace github.com/jfrog/jfrog-cli-core/v2 => github.com/attiasas/jfrog-cli-core/v2 v2.0.0-20240221153030-a53a0fc4c06a +replace github.com/jfrog/jfrog-cli-core/v2 => github.com/attiasas/jfrog-cli-core/v2 v2.0.0-20240225091606-845ab6040cbe -// replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go dev +replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20240222155638-e55c7d7acbee -replace github.com/jfrog/build-info-go => github.com/attiasas/build-info-go v0.0.0-20240221152830-441470bb4be3 +replace github.com/jfrog/build-info-go => github.com/attiasas/build-info-go v0.0.0-20240225094129-cd7e7d7429c8 diff --git a/go.sum b/go.sum index 458aa14a..cbc1d980 100644 --- a/go.sum +++ b/go.sum @@ -20,10 +20,10 @@ github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuW github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= -github.com/attiasas/build-info-go v0.0.0-20240221152830-441470bb4be3 h1:504Hru7n7GFJ8aUGRUFn+4iHCghqutb+UoYtV06DVD0= -github.com/attiasas/build-info-go v0.0.0-20240221152830-441470bb4be3/go.mod h1:QHcKuesY4MrBVBuEwwBz4uIsX6mwYuMEDV09ng4AvAU= -github.com/attiasas/jfrog-cli-core/v2 v2.0.0-20240221153030-a53a0fc4c06a h1:UrBblHPcN3vIhwR8Fq4IiDvFrmb+z7RexZo1UoML+2Y= -github.com/attiasas/jfrog-cli-core/v2 v2.0.0-20240221153030-a53a0fc4c06a/go.mod h1:QGUGRiOshazHsDTc1VebCvfa1j3djEURuRU4WV9XAlg= +github.com/attiasas/build-info-go v0.0.0-20240225094129-cd7e7d7429c8 h1:1+QyV8iJNbiCLVl0XFxLlil7X52qtaYT7bC2K6s3+ik= +github.com/attiasas/build-info-go v0.0.0-20240225094129-cd7e7d7429c8/go.mod h1:QHcKuesY4MrBVBuEwwBz4uIsX6mwYuMEDV09ng4AvAU= +github.com/attiasas/jfrog-cli-core/v2 v2.0.0-20240225091606-845ab6040cbe h1:94grWowHLR5/9HqJgCgBp5SaSlnefKOwB8CddVstUV0= +github.com/attiasas/jfrog-cli-core/v2 v2.0.0-20240225091606-845ab6040cbe/go.mod h1:wFFaVzNYcKIuWzGwWxINx6eGCTlVjXEcsovneKk96mM= github.com/bradleyjkemp/cupaloy/v2 v2.8.0 h1:any4BmKE+jGIaMpnU8YgH/I2LPiLBufr6oMMlVBbn9M= github.com/bradleyjkemp/cupaloy/v2 v2.8.0/go.mod h1:bm7JXdkRd4BHJk9HpwqAI8BoAY1lps46Enkdqw6aRX0= github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs= @@ -104,8 +104,8 @@ github.com/jfrog/gofrog v1.6.0 h1:jOwb37nHY2PnxePNFJ6e6279Pgkr3di05SbQQw47Mq8= github.com/jfrog/gofrog v1.6.0/go.mod h1:SZ1EPJUruxrVGndOzHd+LTiwWYKMlHqhKD+eu+v5Hqg= github.com/jfrog/jfrog-apps-config v1.0.1 h1:mtv6k7g8A8BVhlHGlSveapqf4mJfonwvXYLipdsOFMY= github.com/jfrog/jfrog-apps-config v1.0.1/go.mod h1:8AIIr1oY9JuH5dylz2S6f8Ym2MaadPLR6noCBO4C22w= -github.com/jfrog/jfrog-client-go v1.37.1 h1:BqIWGPajC5vhUo5dcQ9KEJr0EVANr/O4cfEqRYvzvRg= -github.com/jfrog/jfrog-client-go v1.37.1/go.mod h1:y+zeO0LeT2uHoHs4/fXHrm5dfF02bg6Dw3cNJxgJ5LY= +github.com/jfrog/jfrog-client-go v1.28.1-0.20240222155638-e55c7d7acbee h1:IrM+wE8WmsSm95vpYSEYle2mPAOVn1FrRTeScSNxgrw= +github.com/jfrog/jfrog-client-go v1.28.1-0.20240222155638-e55c7d7acbee/go.mod h1:jcZYTyo9H4GtZ6eAYIfKm1ulxeTbshcBBA+YUbWlHNc= github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=