Skip to content

Commit

Permalink
Promote version to '1.36.1' (#892)
Browse files Browse the repository at this point in the history
  • Loading branch information
attiasas committed Jan 29, 2024
1 parent 4f0f4b7 commit e249dfe
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion utils/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
const (
Development = "development"
Agent = "jfrog-client-go"
Version = "1.36.0"
Version = "1.36.1"
)

type MinVersionProduct string
Expand Down
5 changes: 5 additions & 0 deletions xray/services/scan.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ const (

XscGraphAPI = "api/v1/sca/scan/graph"

multiScanIdParam = "multi_scan_id="

scanTechQueryParam = "tech="

XscVersionAPI = "api/v1/system/version"
Expand Down Expand Up @@ -83,6 +85,7 @@ func createScanGraphQueryParams(scanParams XrayGraphScanParams) string {
}

if scanParams.XscVersion != "" {
params = append(params, multiScanIdParam+scanParams.MultiScanId)
gitInfoContext := scanParams.XscGitInfoContext
if gitInfoContext != nil {
if len(gitInfoContext.Technologies) > 0 {
Expand All @@ -108,6 +111,7 @@ func (ss *ScanService) ScanGraph(scanParams XrayGraphScanParams) (string, error)
if err != nil {
return "", fmt.Errorf("failed sending Git Info to XSC service, error: %s ", err.Error())
}
scanParams.MultiScanId = multiScanId
if err = os.Setenv("JF_MSI", multiScanId); err != nil {
// Not a fatal error, if not set the scan will not be shown at the XSC UI, should not fail the scan.
log.Debug(fmt.Sprintf("failed setting MSI as environment variable. Cause: %s", err.Error()))
Expand Down Expand Up @@ -281,6 +285,7 @@ type XrayGraphScanParams struct {
IncludeLicenses bool
XscGitInfoContext *XscGitInfoContext
XscVersion string
MultiScanId string
}

type RequestScanResponse struct {
Expand Down

0 comments on commit e249dfe

Please sign in to comment.