Skip to content
Merged
Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions internal/params/binds.go
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,5 @@ var EnvVarsBinds = []struct {
{MultipartPresignedPathKey, MultipartPresignedPathEnv, "api/uploads/multipart-presigned"},
{CompleteMultiPartUploadPathKey, CompleteMultipartUploadPathEnv, "api/uploads/complete-multipart-upload"},
{MultipartFileSizeKey, MultipartFileSizeEnv, "2"},
{DisableASCALatestVersionKey, DisableASCALatestVersionEnv, ""},
}
1 change: 1 addition & 0 deletions internal/params/envs.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,4 +88,5 @@ const (
MultipartPresignedPathEnv = "CX_MULTIPART_PRESIGNED_URL_PATH"
CompleteMultipartUploadPathEnv = "CX_COMPLETE_MULTIPART_UPLOAD_PATH"
MultipartFileSizeEnv = "MULTIPART_FILE_SIZE"
DisableASCALatestVersionEnv = "DISABLE_ASCA_UPDATE"
)
1 change: 1 addition & 0 deletions internal/params/keys.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,4 +87,5 @@ var (
MultipartPresignedPathKey = strings.ToLower(MultipartPresignedPathEnv)
CompleteMultiPartUploadPathKey = strings.ToLower(CompleteMultipartUploadPathEnv)
MultipartFileSizeKey = strings.ToLower(MultipartFileSizeEnv)
DisableASCALatestVersionKey = strings.ToLower(DisableASCALatestVersionEnv)
)
5 changes: 3 additions & 2 deletions internal/services/asca.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"os"
"os/exec"
"path/filepath"
"strings"
"time"

"github.com/checkmarx/ast-cli/internal/commands/asca/ascaconfig"
Expand Down Expand Up @@ -158,8 +159,8 @@ func buildAscaIgnoreMap(ignored []grpcs.AscaIgnoreFinding) map[string]bool {

func manageASCAInstallation(ascaParams AscaScanParams, ascaWrappers AscaWrappersParam) error {
ASCAInstalled, _ := osinstaller.FileExists(ascaconfig.Params.ExecutableFilePath())

if !ASCAInstalled || ascaParams.ASCAUpdateVersion {
if !ASCAInstalled || (ascaParams.ASCAUpdateVersion && strings.TrimSpace(strings.ToLower(viper.GetString(params.DisableASCALatestVersionKey))) != "true") {
logger.PrintIfVerbose("Ensuring ASCA is installed or is up to date")
if err := checkLicense(ascaParams.IsDefaultAgent, ascaWrappers); err != nil {
_ = ascaWrappers.ASCAWrapper.ShutDown()
return err
Expand Down
Loading