From b344adaea57b971829b24a74b83249fd12333bb1 Mon Sep 17 00:00:00 2001 From: Igor Zhalkin Date: Wed, 28 Aug 2024 12:56:14 +0300 Subject: [PATCH] XRAY-43991 - Fix static analysis --- commands/curation/curationaudit.go | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/commands/curation/curationaudit.go b/commands/curation/curationaudit.go index ee877d25..a876a4df 100644 --- a/commands/curation/curationaudit.go +++ b/commands/curation/curationaudit.go @@ -33,6 +33,7 @@ import ( "github.com/jfrog/jfrog-cli-core/v2/utils/config" "github.com/jfrog/jfrog-cli-core/v2/utils/coreutils" + "github.com/jfrog/jfrog-cli-security/commands/audit" "github.com/jfrog/jfrog-cli-security/commands/audit/sca/python" "github.com/jfrog/jfrog-cli-security/formats" @@ -73,21 +74,21 @@ var CurationOutputFormats = []string{string(outFormat.Table), string(outFormat.J var supportedTech = map[techutils.Technology]func(ca *CurationAuditCommand) (bool, error){ techutils.Npm: func(ca *CurationAuditCommand) (bool, error) { return true, nil }, techutils.Pip: func(ca *CurationAuditCommand) (bool, error) { - return ca.checkSupportByVersionOrEnv(techutils.Pip, utils.CurationSupportFlag, MinArtiPassThroughSupport) + return ca.checkSupportByVersionOrEnv(techutils.Pip, MinArtiPassThroughSupport) }, techutils.Maven: func(ca *CurationAuditCommand) (bool, error) { - return ca.checkSupportByVersionOrEnv(techutils.Maven, utils.CurationSupportFlag, MinArtiPassThroughSupport) + return ca.checkSupportByVersionOrEnv(techutils.Maven, MinArtiPassThroughSupport) }, techutils.Go: func(ca *CurationAuditCommand) (bool, error) { - return ca.checkSupportByVersionOrEnv(techutils.Go, utils.CurationSupportFlag, MinArtiGolangSupport) + return ca.checkSupportByVersionOrEnv(techutils.Go, MinArtiGolangSupport) }, techutils.Nuget: func(ca *CurationAuditCommand) (bool, error) { - return ca.checkSupportByVersionOrEnv(techutils.Nuget, utils.CurationSupportFlag, MinArtiNuGetSupport) + return ca.checkSupportByVersionOrEnv(techutils.Nuget, MinArtiNuGetSupport) }, } -func (ca *CurationAuditCommand) checkSupportByVersionOrEnv(tech techutils.Technology, envName string, minArtiVersion string) (bool, error) { - if flag, err := clientutils.GetBoolEnvValue(envName, false); flag { +func (ca *CurationAuditCommand) checkSupportByVersionOrEnv(tech techutils.Technology, minArtiVersion string) (bool, error) { + if flag, err := clientutils.GetBoolEnvValue(utils.CurationSupportFlag, false); flag { return true, nil } else if err != nil { log.Error(err)