Skip to content

Commit 6408e9e

Browse files
cx-rui-gomescx-rui-gomes
authored
Merge pull request #1302 from Checkmarx/AST-111659-delete-open-feature-flags-for-sscs
Remove feature flag NEW_2MS_SCORECARD_RESULTS_CLI_ENABLED (AST-111659)
2 parents 90a5789 + 9495157 commit 6408e9e

4 files changed

Lines changed: 40 additions & 189 deletions

File tree

‎internal/commands/result.go‎

Lines changed: 25 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -603,11 +603,10 @@ func convertScanToResultsSummary(scanInfo *wrappers.ScanResponseModel, resultsWr
603603
*containersIssues = 0
604604
enginesStatusCode[commonParams.ContainersType] = 0
605605
}
606-
if wrappers.IsSCSEnabled {
607-
scsIssues = new(int)
608-
*scsIssues = 0
609-
enginesStatusCode[commonParams.ScsType] = 0
610-
}
606+
607+
scsIssues = new(int)
608+
*scsIssues = 0
609+
enginesStatusCode[commonParams.ScsType] = 0
611610

612611
if len(scanInfo.StatusDetails) > 0 {
613612
for _, statusDetailItem := range scanInfo.StatusDetails {
@@ -618,7 +617,7 @@ func convertScanToResultsSummary(scanInfo *wrappers.ScanResponseModel, resultsWr
618617
scaIssues = notAvailableNumber
619618
} else if statusDetailItem.Name == commonParams.KicsType {
620619
kicsIssues = notAvailableNumber
621-
} else if statusDetailItem.Name == commonParams.ScsType && wrappers.IsSCSEnabled {
620+
} else if statusDetailItem.Name == commonParams.ScsType {
622621
*scsIssues = notAvailableNumber
623622
} else if statusDetailItem.Name == commonParams.ContainersType && wrappers.IsContainersEnabled {
624623
*containersIssues = notAvailableNumber
@@ -664,9 +663,9 @@ func convertScanToResultsSummary(scanInfo *wrappers.ScanResponseModel, resultsWr
664663
if wrappers.IsContainersEnabled {
665664
summary.EnginesResult[commonParams.ContainersType] = &wrappers.EngineResultSummary{StatusCode: enginesStatusCode[commonParams.ContainersType]}
666665
}
667-
if wrappers.IsSCSEnabled {
668-
summary.EnginesResult[commonParams.ScsType] = &wrappers.EngineResultSummary{StatusCode: enginesStatusCode[commonParams.ScsType]}
669-
}
666+
667+
summary.EnginesResult[commonParams.ScsType] = &wrappers.EngineResultSummary{StatusCode: enginesStatusCode[commonParams.ScsType]}
668+
670669
baseURI, err := resultsWrapper.GetResultsURL(summary.ProjectID)
671670
if err != nil {
672671
return nil, err
@@ -703,7 +702,7 @@ func summaryReport(
703702
summary.APISecurity = *apiSecRisks
704703
}
705704

706-
if summary.HasSCS() && wrappers.IsSCSEnabled {
705+
if summary.HasSCS() {
707706
// Getting the base SCS overview. Results counts are overwritten in enhanceWithScanSummary->countResult
708707
SCSOverview, err := getScanOverviewForSCSScanner(scsScanOverviewWrapper, summary.ScanID)
709708
if err != nil {
@@ -721,12 +720,12 @@ func summaryReport(
721720
setNotAvailableNumberIfZero(summary, &summary.SastIssues, commonParams.SastType)
722721
setNotAvailableNumberIfZero(summary, &summary.ScaIssues, commonParams.ScaType)
723722
setNotAvailableNumberIfZero(summary, &summary.KicsIssues, commonParams.KicsType)
723+
setNotAvailableNumberIfZero(summary, summary.ScsIssues, commonParams.ScsType)
724+
724725
if wrappers.IsContainersEnabled {
725726
setNotAvailableNumberIfZero(summary, summary.ContainersIssues, commonParams.ContainersType)
726727
}
727-
if wrappers.IsSCSEnabled {
728-
setNotAvailableNumberIfZero(summary, summary.ScsIssues, commonParams.ScsType)
729-
}
728+
730729
setRiskMsgAndStyle(summary)
731730
setNotAvailableEnginesStatusCode(summary)
732731

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

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

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

879-
if summary.HasSCS() && wrappers.IsSCSEnabled {
878+
if summary.HasSCS() {
880879
printSCSSummary(summary.SCSOverview.MicroEngineOverviews, featureFlagsWrapper)
881880
}
882881

@@ -991,9 +990,8 @@ func printResultsSummaryTable(summary *wrappers.ResultSummary) {
991990
printTableRow("IAC", summary.EnginesResult[commonParams.KicsType], summary.EnginesResult[commonParams.KicsType].StatusCode)
992991
printTableRow("SAST", summary.EnginesResult[commonParams.SastType], summary.EnginesResult[commonParams.SastType].StatusCode)
993992
printTableRow("SCA", summary.EnginesResult[commonParams.ScaType], summary.EnginesResult[commonParams.ScaType].StatusCode)
994-
if wrappers.IsSCSEnabled {
995-
printTableRow("SCS", summary.EnginesResult[commonParams.ScsType], summary.EnginesResult[commonParams.ScsType].StatusCode)
996-
}
993+
printTableRow("SCS", summary.EnginesResult[commonParams.ScsType], summary.EnginesResult[commonParams.ScsType].StatusCode)
994+
997995
if wrappers.IsContainersEnabled {
998996
printTableRow("CONTAINERS", summary.EnginesResult[commonParams.ContainersType], summary.EnginesResult[commonParams.ContainersType].StatusCode)
999997
}
@@ -1133,11 +1131,6 @@ func runGetCodeBashingCommand(
11331131
}
11341132
}
11351133

1136-
func setIsSCSEnabled(featureFlagsWrapper wrappers.FeatureFlagsWrapper) {
1137-
scsEngineCLIEnabled, _ := wrappers.GetSpecificFeatureFlag(featureFlagsWrapper, wrappers.SCSEngineCLIEnabled)
1138-
wrappers.IsSCSEnabled = scsEngineCLIEnabled.Status
1139-
}
1140-
11411134
func setIsContainersEnabled(agent string) {
11421135
wrappers.IsContainersEnabled = !containsIgnoreCase(containerEngineUnsupportedAgents, agent)
11431136
}
@@ -1199,7 +1192,6 @@ func CreateScanReport(
11991192
) (*wrappers.ScanResultsCollection, error) {
12001193
reportList := strings.Split(reportTypes, ",")
12011194
results := &wrappers.ScanResultsCollection{}
1202-
setIsSCSEnabled(featureFlagsWrapper)
12031195
setIsContainersEnabled(agent)
12041196
summary, err := convertScanToResultsSummary(scan, resultsWrapper)
12051197
if err != nil {
@@ -1255,14 +1247,10 @@ func countResult(summary *wrappers.ResultSummary, result *wrappers.ScanResult) {
12551247
return
12561248
}
12571249
} else if strings.HasPrefix(engineType, commonParams.SscsType) {
1258-
if wrappers.IsSCSEnabled {
1259-
addResultToSCSOverview(summary, result)
1260-
engineType = commonParams.ScsType
1261-
*summary.ScsIssues++
1262-
summary.TotalIssues++
1263-
} else {
1264-
return
1265-
}
1250+
addResultToSCSOverview(summary, result)
1251+
engineType = commonParams.ScsType
1252+
*summary.ScsIssues++
1253+
summary.TotalIssues++
12661254
} else {
12671255
return
12681256
}
@@ -1528,11 +1516,7 @@ func ReadResults(
15281516
}
15291517

15301518
if slices.Contains(scan.Engines, commonParams.ScsType) {
1531-
if !wrappers.IsSCSEnabled {
1532-
resultsModel = removeResultsByType(resultsModel, commonParams.SscsType)
1533-
} else {
1534-
resultsModel = filterScsResultsByAgent(resultsModel, agent)
1535-
}
1519+
resultsModel = filterScsResultsByAgent(resultsModel, agent)
15361520
}
15371521

15381522
resultsModel.ScanID = scan.ID
@@ -2264,7 +2248,7 @@ func parseSonar(results *wrappers.ScanResultsCollection) ([]wrappers.SonarIssues
22642248
} else if wrappers.IsContainersEnabled && engineType == commonParams.ContainersType {
22652249
auxIssue.PrimaryLocation = parseContainersSonar(result)
22662250
sonarIssues = append(sonarIssues, auxIssue)
2267-
} else if wrappers.IsSCSEnabled && strings.HasPrefix(engineType, commonParams.SscsType) {
2251+
} else if strings.HasPrefix(engineType, commonParams.SscsType) {
22682252
sscsSonarIssue := parseSscsSonar(result, &auxIssue)
22692253
sonarIssues = append(sonarIssues, sscsSonarIssue)
22702254
}
@@ -2309,7 +2293,7 @@ func initSonarIssue(result *wrappers.ScanResult) wrappers.SonarIssues {
23092293
sonarIssue.RuleID = result.ID
23102294
} else if wrappers.IsContainersEnabled && engineType == commonParams.ContainersType {
23112295
sonarIssue.RuleID = result.ID
2312-
} else if wrappers.IsSCSEnabled && strings.HasPrefix(engineType, commonParams.SscsType) {
2296+
} else if strings.HasPrefix(engineType, commonParams.SscsType) {
23132297
sonarIssue.RuleID = result.ID
23142298
}
23152299

@@ -2346,7 +2330,7 @@ func initSonarRules(result *wrappers.ScanResult) wrappers.SonarRules {
23462330
sonarRules.Name = result.ScanResultData.ImageTag
23472331
sonarRules.Description = html.UnescapeString(result.Description)
23482332
sonarRules.ID = result.ID
2349-
} else if wrappers.IsSCSEnabled && strings.HasPrefix(engineType, commonParams.SscsType) {
2333+
} else if strings.HasPrefix(engineType, commonParams.SscsType) {
23502334
sonarRules.Name = result.ScanResultData.RuleName
23512335
sonarRules.Description = html.UnescapeString(result.ScanResultData.RuleDescription)
23522336
sonarRules.ID = result.ID
@@ -2584,7 +2568,7 @@ func findResult(result *wrappers.ScanResult) []wrappers.SarifScanResult {
25842568
scanResults = parseSarifResultsSca(result, scanResults)
25852569
} else if result.Type == commonParams.ContainersType && wrappers.IsContainersEnabled {
25862570
scanResults = parseSarifResultsContainers(result, scanResults)
2587-
} else if strings.HasPrefix(result.Type, commonParams.SscsType) && wrappers.IsSCSEnabled {
2571+
} else if strings.HasPrefix(result.Type, commonParams.SscsType) {
25882572
scanResults = parseSarifResultsSscs(result, scanResults)
25892573
}
25902574

0 commit comments

Comments
 (0)