From 00ec212fbf88be34ed29d5ead66c6fb7ad267ba0 Mon Sep 17 00:00:00 2001 From: asafambar Date: Wed, 27 Sep 2023 20:01:01 +0300 Subject: [PATCH] Remove npm configuration from basic params --- go.mod | 2 +- go.sum | 8 ++------ scan/cli.go | 4 +--- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index 2334f6dd4..78ae4f498 100644 --- a/go.mod +++ b/go.mod @@ -126,7 +126,7 @@ require ( replace github.com/jfrog/build-info-go => github.com/asafambar/build-info-go v1.8.9-0.20230912212926-cf07082371c0 -replace github.com/jfrog/jfrog-cli-core/v2 => github.com/asafambar/jfrog-cli-core/v2 v2.0.0-20230912220401-e8995716e3c2 +replace github.com/jfrog/jfrog-cli-core/v2 => github.com/asafambar/jfrog-cli-core/v2 v2.0.0-20230927165424-79bff2911764 // replace github.com/jfrog/gofrog => github.com/jfrog/gofrog v1.2.6-0.20230418122323-2bf299dd6d27 diff --git a/go.sum b/go.sum index 0a86c7378..95b42dc3c 100644 --- a/go.sum +++ b/go.sum @@ -70,8 +70,8 @@ github.com/arbovm/levenshtein v0.0.0-20160628152529-48b4e1c0c4d0/go.mod h1:t2tdK github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/asafambar/build-info-go v1.8.9-0.20230912212926-cf07082371c0 h1:9zBIe6NHZ8pedSPyRAtQrzC856bztt7M9ndWFZnRNBg= github.com/asafambar/build-info-go v1.8.9-0.20230912212926-cf07082371c0/go.mod h1:ujJ8XQZMdT2tMkLSMJNyDd1pCY+duwHdjV+9or9FLIg= -github.com/asafambar/jfrog-cli-core/v2 v2.0.0-20230912220401-e8995716e3c2 h1:FgvChicTm/MIl82+zxu5sP5DhvNZKwmKS0ISvxdlIF4= -github.com/asafambar/jfrog-cli-core/v2 v2.0.0-20230912220401-e8995716e3c2/go.mod h1:JaxTTnqg4TG0YVJC0/mdpTCD4H89TbKswQtE1XutGyg= +github.com/asafambar/jfrog-cli-core/v2 v2.0.0-20230927165424-79bff2911764 h1:+S+jFUy7WoJei82TIIHI6Iu6k7Sma1pSd7HGPg0uAtk= +github.com/asafambar/jfrog-cli-core/v2 v2.0.0-20230927165424-79bff2911764/go.mod h1:Pq8Xcufp+aNpSl5z6Lgd90wYQwIrjMpcxPY7dgS0sgE= github.com/bradleyjkemp/cupaloy/v2 v2.8.0 h1:any4BmKE+jGIaMpnU8YgH/I2LPiLBufr6oMMlVBbn9M= github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs= github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= @@ -241,12 +241,8 @@ github.com/jedib0t/go-pretty/v6 v6.4.7 h1:lwiTJr1DEkAgzljsUsORmWsVn5MQjt1BPJdPCt github.com/jedib0t/go-pretty/v6 v6.4.7/go.mod h1:Ndk3ase2CkQbXLLNf5QDHoYb6J9WtVfmHZu9n8rk2xs= 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.43.2 h1:ii8fj8tqbGwgU1yxNpfDECtXJe2wC2YzAQrCzIpIVyw= -github.com/jfrog/jfrog-cli-core/v2 v2.43.2/go.mod h1:DKTOX9TsPkyI68GM4XdDTD7XDr+tOBqeK70DZZmu+4Q= github.com/jfrog/jfrog-client-go v1.32.3 h1:B2M8Gu8EMrokbHWPPDgN1b7YRWwf0oe746epvQASK6c= github.com/jfrog/jfrog-client-go v1.32.3/go.mod h1:UewnwkIf/77HzBgwCPzOHZCK6V/Nw5/JwdzN/tRb4aU= -github.com/jfrog/jfrog-client-go v1.32.1 h1:RQmuPSLsF5222vZJzwkgHSZMMJF83ExS7SwIvh4P+H8= -github.com/jfrog/jfrog-client-go v1.32.1/go.mod h1:362+oa7uTTYurzBs1L0dmUTlLo7uhpAU/pwM5Zb9clg= 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= diff --git a/scan/cli.go b/scan/cli.go index 6864700f3..e9342f2b9 100644 --- a/scan/cli.go +++ b/scan/cli.go @@ -229,9 +229,7 @@ func CurationCmd(c *cli.Context) error { SetUseWrapper(c.BoolT(cliutils.UseWrapper)). SetInsecureTls(c.Bool(cliutils.InsecureTls)). SetNpmScope(c.String(cliutils.DepType)). - SetPipRequirementsFile(c.String(cliutils.RequirementsFile)). - SetNpmOverwritePackageLock(true). - SetNpmIgnoreNodeModules(true) + SetPipRequirementsFile(c.String(cliutils.RequirementsFile)) return progressbar.ExecWithProgress(curationAuditCommand) }