Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion commands/sast_server/sast_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@ package sast_server
import (
"fmt"
"io"
"os"

"github.com/jfrog/jfrog-cli-core/v2/utils/config"
"github.com/jfrog/jfrog-cli-security/jas"
"github.com/jfrog/jfrog-cli-security/utils"
"github.com/jfrog/jfrog-cli-security/utils/xray"
)

Expand All @@ -27,6 +29,7 @@ func (sastCmd *SastServerCommand) runWithTimeout(timeout int, envVars map[string

func (sastCmd *SastServerCommand) Run() (err error) {
amEnv, err := jas.GetAnalyzerManagerEnvVariables(sastCmd.ServerDetails)
allEnvVars := utils.MergeMaps(utils.ToEnvVarsMap(os.Environ()), amEnv)
if err != nil {
return err
}
Expand All @@ -35,7 +38,7 @@ func (sastCmd *SastServerCommand) Run() (err error) {
} else if !entitled {
return fmt.Errorf("it appears your current license doesn't include this feature.\nTo enable this functionality, an upgraded license is required. Please contact your JFrog representative for more details")
}
return sastCmd.runWithTimeout(0, amEnv)
return sastCmd.runWithTimeout(0, allEnvVars)
}

func isEntitledForSastServer(serverDetails *config.ServerDetails) (entitled bool, err error) {
Expand Down
Loading