Skip to content

Remove feature flag NEW_2MS_SCORECARD_RESULTS_CLI_ENABLED (AST-111659) #1302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cx-rui-gomes merged 8 commits into from
Oct 10, 2025
Merged

Remove feature flag NEW_2MS_SCORECARD_RESULTS_CLI_ENABLED (AST-111659) #1302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
84d51fe
remove scs feature flag due to deprecation
cx-rui-gomes Sep 10, 2025
a2d36e8
remove no longer relevant tests for scs
cx-rui-gomes Sep 10, 2025
95c170c
Merge branch 'main' into AST-111659-delete-open-feature-flags-for-sscs
cx-rui-gomes Sep 26, 2025
1f7119b
fix missing line
cx-rui-gomes Sep 29, 2025
5c7f168
fixing results printing issue
cx-rui-gomes Oct 2, 2025
e1745e9
fix failing unit tests
cx-rui-gomes Oct 2, 2025
f7526ed
Merge branch 'main' into AST-111659-delete-open-feature-flags-for-sscs
cx-rui-gomes Oct 9, 2025
9495157
trigger ci
cx-rui-gomes Oct 9, 2025
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
66 changes: 25 additions & 41 deletions internal/commands/result.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,11 +603,10 @@ func convertScanToResultsSummary(scanInfo *wrappers.ScanResponseModel, resultsWr
*containersIssues = 0
enginesStatusCode[commonParams.ContainersType] = 0
}
if wrappers.IsSCSEnabled {
scsIssues = new(int)
*scsIssues = 0
enginesStatusCode[commonParams.ScsType] = 0
}

scsIssues = new(int)
*scsIssues = 0
enginesStatusCode[commonParams.ScsType] = 0

if len(scanInfo.StatusDetails) > 0 {
for _, statusDetailItem := range scanInfo.StatusDetails {
Expand All @@ -618,7 +617,7 @@ func convertScanToResultsSummary(scanInfo *wrappers.ScanResponseModel, resultsWr
scaIssues = notAvailableNumber
} else if statusDetailItem.Name == commonParams.KicsType {
kicsIssues = notAvailableNumber
} else if statusDetailItem.Name == commonParams.ScsType && wrappers.IsSCSEnabled {
} else if statusDetailItem.Name == commonParams.ScsType {
*scsIssues = notAvailableNumber
} else if statusDetailItem.Name == commonParams.ContainersType && wrappers.IsContainersEnabled {
*containersIssues = notAvailableNumber
Expand Down Expand Up @@ -664,9 +663,9 @@ func convertScanToResultsSummary(scanInfo *wrappers.ScanResponseModel, resultsWr
if wrappers.IsContainersEnabled {
summary.EnginesResult[commonParams.ContainersType] = &wrappers.EngineResultSummary{StatusCode: enginesStatusCode[commonParams.ContainersType]}
}
if wrappers.IsSCSEnabled {
summary.EnginesResult[commonParams.ScsType] = &wrappers.EngineResultSummary{StatusCode: enginesStatusCode[commonParams.ScsType]}
}

summary.EnginesResult[commonParams.ScsType] = &wrappers.EngineResultSummary{StatusCode: enginesStatusCode[commonParams.ScsType]}

baseURI, err := resultsWrapper.GetResultsURL(summary.ProjectID)
if err != nil {
return nil, err
Expand Down Expand Up @@ -703,7 +702,7 @@ func summaryReport(
summary.APISecurity = *apiSecRisks
}

if summary.HasSCS() && wrappers.IsSCSEnabled {
if summary.HasSCS() {
// Getting the base SCS overview. Results counts are overwritten in enhanceWithScanSummary->countResult
SCSOverview, err := getScanOverviewForSCSScanner(scsScanOverviewWrapper, summary.ScanID)
if err != nil {
Expand All @@ -721,12 +720,12 @@ func summaryReport(
setNotAvailableNumberIfZero(summary, &summary.SastIssues, commonParams.SastType)
setNotAvailableNumberIfZero(summary, &summary.ScaIssues, commonParams.ScaType)
setNotAvailableNumberIfZero(summary, &summary.KicsIssues, commonParams.KicsType)
setNotAvailableNumberIfZero(summary, summary.ScsIssues, commonParams.ScsType)

if wrappers.IsContainersEnabled {
setNotAvailableNumberIfZero(summary, summary.ContainersIssues, commonParams.ContainersType)
}
if wrappers.IsSCSEnabled {
setNotAvailableNumberIfZero(summary, summary.ScsIssues, commonParams.ScsType)
}

setRiskMsgAndStyle(summary)
setNotAvailableEnginesStatusCode(summary)

Expand Down Expand Up @@ -783,7 +782,7 @@ func enhanceWithScanSummary(summary *wrappers.ResultSummary, results *wrappers.S

summary.TotalIssues = summary.SastIssues + summary.ScaIssues + summary.KicsIssues + summary.GetAPISecurityDocumentationTotal()

if summary.HasSCS() && wrappers.IsSCSEnabled {
if summary.HasSCS() {
// Special case for SCS where status is partial if any microengines failed
if summary.SCSOverview.Status == scanPartialString {
summary.EnginesResult[commonParams.ScsType].StatusCode = scanPartialNumber
Expand Down Expand Up @@ -876,7 +875,7 @@ func writeConsoleSummary(summary *wrappers.ResultSummary, featureFlagsWrapper wr
printAPIsSecuritySummary(summary)
}

if summary.HasSCS() && wrappers.IsSCSEnabled {
if summary.HasSCS() {
printSCSSummary(summary.SCSOverview.MicroEngineOverviews, featureFlagsWrapper)
}

Expand Down Expand Up @@ -991,9 +990,8 @@ func printResultsSummaryTable(summary *wrappers.ResultSummary) {
printTableRow("IAC", summary.EnginesResult[commonParams.KicsType], summary.EnginesResult[commonParams.KicsType].StatusCode)
printTableRow("SAST", summary.EnginesResult[commonParams.SastType], summary.EnginesResult[commonParams.SastType].StatusCode)
printTableRow("SCA", summary.EnginesResult[commonParams.ScaType], summary.EnginesResult[commonParams.ScaType].StatusCode)
if wrappers.IsSCSEnabled {
printTableRow("SCS", summary.EnginesResult[commonParams.ScsType], summary.EnginesResult[commonParams.ScsType].StatusCode)
}
printTableRow("SCS", summary.EnginesResult[commonParams.ScsType], summary.EnginesResult[commonParams.ScsType].StatusCode)

if wrappers.IsContainersEnabled {
printTableRow("CONTAINERS", summary.EnginesResult[commonParams.ContainersType], summary.EnginesResult[commonParams.ContainersType].StatusCode)
}
Expand Down Expand Up @@ -1133,11 +1131,6 @@ func runGetCodeBashingCommand(
}
}

func setIsSCSEnabled(featureFlagsWrapper wrappers.FeatureFlagsWrapper) {
scsEngineCLIEnabled, _ := wrappers.GetSpecificFeatureFlag(featureFlagsWrapper, wrappers.SCSEngineCLIEnabled)
wrappers.IsSCSEnabled = scsEngineCLIEnabled.Status
}

func setIsContainersEnabled(agent string) {
wrappers.IsContainersEnabled = !containsIgnoreCase(containerEngineUnsupportedAgents, agent)
}
Expand Down Expand Up @@ -1199,7 +1192,6 @@ func CreateScanReport(
) (*wrappers.ScanResultsCollection, error) {
reportList := strings.Split(reportTypes, ",")
results := &wrappers.ScanResultsCollection{}
setIsSCSEnabled(featureFlagsWrapper)
setIsContainersEnabled(agent)
summary, err := convertScanToResultsSummary(scan, resultsWrapper)
if err != nil {
Expand Down Expand Up @@ -1255,14 +1247,10 @@ func countResult(summary *wrappers.ResultSummary, result *wrappers.ScanResult) {
return
}
} else if strings.HasPrefix(engineType, commonParams.SscsType) {
if wrappers.IsSCSEnabled {
addResultToSCSOverview(summary, result)
engineType = commonParams.ScsType
*summary.ScsIssues++
summary.TotalIssues++
} else {
return
}
addResultToSCSOverview(summary, result)
engineType = commonParams.ScsType
*summary.ScsIssues++
summary.TotalIssues++
} else {
return
}
Expand Down Expand Up @@ -1528,11 +1516,7 @@ func ReadResults(
}

if slices.Contains(scan.Engines, commonParams.ScsType) {
if !wrappers.IsSCSEnabled {
resultsModel = removeResultsByType(resultsModel, commonParams.SscsType)
} else {
resultsModel = filterScsResultsByAgent(resultsModel, agent)
}
resultsModel = filterScsResultsByAgent(resultsModel, agent)
}

resultsModel.ScanID = scan.ID
Expand Down Expand Up @@ -2264,7 +2248,7 @@ func parseSonar(results *wrappers.ScanResultsCollection) ([]wrappers.SonarIssues
} else if wrappers.IsContainersEnabled && engineType == commonParams.ContainersType {
auxIssue.PrimaryLocation = parseContainersSonar(result)
sonarIssues = append(sonarIssues, auxIssue)
} else if wrappers.IsSCSEnabled && strings.HasPrefix(engineType, commonParams.SscsType) {
} else if strings.HasPrefix(engineType, commonParams.SscsType) {
sscsSonarIssue := parseSscsSonar(result, &auxIssue)
sonarIssues = append(sonarIssues, sscsSonarIssue)
}
Expand Down Expand Up @@ -2309,7 +2293,7 @@ func initSonarIssue(result *wrappers.ScanResult) wrappers.SonarIssues {
sonarIssue.RuleID = result.ID
} else if wrappers.IsContainersEnabled && engineType == commonParams.ContainersType {
sonarIssue.RuleID = result.ID
} else if wrappers.IsSCSEnabled && strings.HasPrefix(engineType, commonParams.SscsType) {
} else if strings.HasPrefix(engineType, commonParams.SscsType) {
sonarIssue.RuleID = result.ID
}

Expand Down Expand Up @@ -2346,7 +2330,7 @@ func initSonarRules(result *wrappers.ScanResult) wrappers.SonarRules {
sonarRules.Name = result.ScanResultData.ImageTag
sonarRules.Description = html.UnescapeString(result.Description)
sonarRules.ID = result.ID
} else if wrappers.IsSCSEnabled && strings.HasPrefix(engineType, commonParams.SscsType) {
} else if strings.HasPrefix(engineType, commonParams.SscsType) {
sonarRules.Name = result.ScanResultData.RuleName
sonarRules.Description = html.UnescapeString(result.ScanResultData.RuleDescription)
sonarRules.ID = result.ID
Expand Down Expand Up @@ -2584,7 +2568,7 @@ func findResult(result *wrappers.ScanResult) []wrappers.SarifScanResult {
scanResults = parseSarifResultsSca(result, scanResults)
} else if result.Type == commonParams.ContainersType && wrappers.IsContainersEnabled {
scanResults = parseSarifResultsContainers(result, scanResults)
} else if strings.HasPrefix(result.Type, commonParams.SscsType) && wrappers.IsSCSEnabled {
} else if strings.HasPrefix(result.Type, commonParams.SscsType) {
scanResults = parseSarifResultsSscs(result, scanResults)
}

Expand Down
Loading
Loading