diff --git a/xray/commands/audit/audit.go b/xray/commands/audit/audit.go index ea9d68807..2eb7cd490 100644 --- a/xray/commands/audit/audit.go +++ b/xray/commands/audit/audit.go @@ -8,7 +8,6 @@ import ( "github.com/jfrog/jfrog-cli-core/v2/utils/coreutils" "github.com/jfrog/jfrog-cli-core/v2/xray/scangraph" clientutils "github.com/jfrog/jfrog-client-go/utils" - "github.com/jfrog/jfrog-client-go/utils/log" "github.com/jfrog/jfrog-client-go/xray" "github.com/jfrog/jfrog-client-go/xray/services" "golang.org/x/sync/errgroup" @@ -157,7 +156,7 @@ func RunAudit(auditParams *AuditParams) (results *xrayutils.Results, err error) return } results.XrayVersion = auditParams.xrayVersion - results.ExtendedScanResults.EntitledForJas, err = isEntitledForJas(xrayManager, auditParams.xrayVersion) + results.ExtendedScanResults.EntitledForJas, err = xrayutils.IsEntitledForJas(xrayManager, auditParams.xrayVersion) if err != nil { return } @@ -182,12 +181,3 @@ func RunAudit(auditParams *AuditParams) (results *xrayutils.Results, err error) } return } - -func isEntitledForJas(xrayManager *xray.XrayServicesManager, xrayVersion string) (entitled bool, err error) { - if e := clientutils.ValidateMinimumVersion(clientutils.Xray, xrayVersion, xrayutils.EntitlementsMinVersion); e != nil { - log.Debug(e) - return - } - entitled, err = xrayManager.IsEntitled(xrayutils.ApplicabilityFeatureId) - return -} diff --git a/xray/utils/jasutils.go b/xray/utils/jasutils.go new file mode 100644 index 000000000..0aa92ea2f --- /dev/null +++ b/xray/utils/jasutils.go @@ -0,0 +1,16 @@ +package utils + +import ( + clientutils "github.com/jfrog/jfrog-client-go/utils" + "github.com/jfrog/jfrog-client-go/utils/log" + "github.com/jfrog/jfrog-client-go/xray" +) + +func IsEntitledForJas(xrayManager *xray.XrayServicesManager, xrayVersion string) (entitled bool, err error) { + if e := clientutils.ValidateMinimumVersion(clientutils.Xray, xrayVersion, EntitlementsMinVersion); e != nil { + log.Debug(e) + return + } + entitled, err = xrayManager.IsEntitled(ApplicabilityFeatureId) + return +}