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
2 changes: 1 addition & 1 deletion internal/commands/secrets-realtime.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ func RunScanSecretsRealtimeCommand(

err = printer.Print(cmd.OutOrStdout(), results, printer.FormatJSON)
if err != nil {
return errorconstants.NewRealtimeEngineError("failed to return secrets").Error()
return errorconstants.NewRealtimeEngineError(err.Error()).Error()
}

return nil
Expand Down
2 changes: 1 addition & 1 deletion internal/constants/errors/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ const (
NoPermissionToUpdateApplication = "you do not have permission to update the application"
FailedToUpdateApplication = "failed to update application"
ApplicationNotFound = "Application not found"
ErrMissingAIFeatureLicense = "User does not have the required license for AI-assisted functionality."

// asca Engine
FileExtensionIsRequired = "file must have an extension"

// Realtime
Expand Down
2 changes: 1 addition & 1 deletion internal/services/realtimeengine/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func EnsureLicense(jwtWrapper wrappers.JWTWrapper) error {
if aiAllowed || assistAllowed {
return nil
}
return errors.Wrap(err, errorconstants.NoASCALicense)
return errors.New(errorconstants.ErrMissingAIFeatureLicense)
}

// ValidateFilePath validates that the file path exists and is accessible.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ func (c *ContainersRealtimeService) RunContainersRealtimeScan(filePath, ignoredF
return nil, errorconstants.NewRealtimeEngineError(errorconstants.RealtimeEngineNotAvailable).Error()
}
if err := realtimeengine.EnsureLicense(c.JwtWrapper); err != nil {
return nil, errorconstants.NewRealtimeEngineError("failed to ensure license").Error()
return nil, errorconstants.NewRealtimeEngineError(err.Error()).Error()
}
if err := realtimeengine.ValidateFilePath(filePath); err != nil {
return nil, errorconstants.NewRealtimeEngineError("invalid file path").Error()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func TestRunContainersRealtimeScan_InvalidLicense_Fails(t *testing.T) {
result, err := service.RunContainersRealtimeScan("../../../commands/data/containers/testdata/Dockerfile", "")
assert.Error(t, err)
assert.Nil(t, result)
assert.Contains(t, err.Error(), "realtime engine error: failed to ensure license")
assert.Contains(t, err.Error(), "JWT wrapper is not initialized, cannot ensure license")
}

func TestRunContainersRealtimeScan_FeatureFlagDisabled_Fails(t *testing.T) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func (o *OssRealtimeService) RunOssRealtimeScan(filePath, ignoredFilePath string
}

if err := realtimeengine.EnsureLicense(o.JwtWrapper); err != nil {
return nil, errorconstants.NewRealtimeEngineError("failed to ensure license").Error()
return nil, errorconstants.NewRealtimeEngineError(err.Error()).Error()
}

if err := realtimeengine.ValidateFilePath(filePath); err != nil {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ func (s *SecretsRealtimeService) RunSecretsRealtimeScan(filePath, ignoredFilePat
}

if err := realtimeengine.EnsureLicense(s.JwtWrapper); err != nil {
return nil, errorconstants.NewRealtimeEngineError("failed to ensure license").Error()
return nil, errorconstants.NewRealtimeEngineError(err.Error()).Error()
}

if err := realtimeengine.ValidateFilePath(filePath); err != nil {
Expand Down
Loading