Skip to content

Commit 8d96390

Browse files
cx-anurag-dalkecx-anurag-dalke
authored
Merge branch 'main' into fix/AST-100708-sca-resolver-params
2 parents 5bb677d + 0af147c commit 8d96390

File tree

7 files changed

+9
-41
lines changed

7 files changed

+9
-41
lines changed

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/Checkmarx/containers-resolver v1.0.11
77
github.com/Checkmarx/gen-ai-prompts v0.0.0-20240807143411-708ceec12b63
88
github.com/Checkmarx/gen-ai-wrapper v1.0.2
9-
github.com/Checkmarx/manifest-parser v0.0.9
9+
github.com/Checkmarx/manifest-parser v0.1.0
1010
github.com/Checkmarx/secret-detection v0.0.3-0.20250327150305-31c2c3be9edf
1111
github.com/MakeNowJust/heredoc v1.0.0
1212
github.com/bouk/monkey v1.0.0

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ github.com/Checkmarx/gen-ai-prompts v0.0.0-20240807143411-708ceec12b63 h1:SCuTcE
7575
github.com/Checkmarx/gen-ai-prompts v0.0.0-20240807143411-708ceec12b63/go.mod h1:MI6lfLerXU+5eTV/EPTDavgnV3owz3GPT4g/msZBWPo=
7676
github.com/Checkmarx/gen-ai-wrapper v1.0.2 h1:T6X40+4hYnwfDsvkjWs9VIcE6s1O+8DUu0+sDdCY3GI=
7777
github.com/Checkmarx/gen-ai-wrapper v1.0.2/go.mod h1:xwRLefezwNNnRGu1EjGS6wNiR9FVV/eP9D+oXwLViVM=
78-
github.com/Checkmarx/manifest-parser v0.0.9 h1:+H63riEKjhOuneTZ0eYzvwABHia04RZTuojtz2EJKz8=
79-
github.com/Checkmarx/manifest-parser v0.0.9/go.mod h1:hh5FX5FdDieU8CKQEkged4hfOaSylpJzub8PRFXa4kA=
78+
github.com/Checkmarx/manifest-parser v0.1.0 h1:swnzQpBFbJap7dgoj39oI6MaIqUlnVuBp5VJzeLVevQ=
79+
github.com/Checkmarx/manifest-parser v0.1.0/go.mod h1:hh5FX5FdDieU8CKQEkged4hfOaSylpJzub8PRFXa4kA=
8080
github.com/Checkmarx/secret-detection v0.0.3-0.20250327150305-31c2c3be9edf h1:lKiogedU3WzWBc/xI6Xj1BhX2Gp1QBJj8C+czY7CcaE=
8181
github.com/Checkmarx/secret-detection v0.0.3-0.20250327150305-31c2c3be9edf/go.mod h1:mtAHOm1mHGh7MVu6JdYUyitANsLcHNLUTBIh9pTERNI=
8282
github.com/CycloneDX/cyclonedx-go v0.9.2 h1:688QHn2X/5nRezKe2ueIVCt+NRqf7fl3AVQk+vaFcIo=

‎internal/commands/data/manifests/requirements.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ Django>=3.0,<4.0
5959

6060
# Less than or equal
6161

62-
requests<=2.25.1
62+
requests<=2.32.4
6363

6464
# Compatible release (PEP 440)
6565

66-
urllib3\~=1.26.0
66+
urllib3\~=2.5.0
6767

6868
# Not equal
6969

‎internal/commands/result.go‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1787,13 +1787,7 @@ func exportJSONResults(targetFile string, results *wrappers.ScanResultsCollectio
17871787
func exportJSONReportResults(jsonWrapper wrappers.ResultsJSONWrapper, summary *wrappers.ResultSummary, summaryRpt string, featureFlagsWrapper wrappers.FeatureFlagsWrapper) error {
17881788
jsonReportsPayload := &wrappers.JSONReportsPayload{}
17891789
pollingResp := &wrappers.JSONPollingResponse{}
1790-
flagResponse, _ := wrappers.GetSpecificFeatureFlag(featureFlagsWrapper, wrappers.NewScanReportEnabled)
1791-
newScanReportEnabled := flagResponse.Status
1792-
if newScanReportEnabled {
1793-
jsonReportsPayload.ReportName = reportNameImprovedScanReport
1794-
} else {
1795-
jsonReportsPayload.ReportName = reportNameScanReport
1796-
}
1790+
jsonReportsPayload.ReportName = reportNameImprovedScanReport
17971791

17981792
jsonOptionsSections, jsonOptionsEngines := parseJSONOptions(summary.EnginesEnabled, jsonReportsPayload.ReportName)
17991793

@@ -1891,19 +1885,11 @@ func exportPdfResults(pdfWrapper wrappers.ResultsPdfWrapper, summary *wrappers.R
18911885
pdfOptions string, featureFlagsWrapper wrappers.FeatureFlagsWrapper) error {
18921886
pdfReportsPayload := &wrappers.PdfReportsPayload{}
18931887
pollingResp := &wrappers.PdfPollingResponse{}
1894-
flagResponse, _ := wrappers.GetSpecificFeatureFlag(featureFlagsWrapper, wrappers.NewScanReportEnabled)
1895-
newScanReportEnabled := flagResponse.Status
1896-
if newScanReportEnabled {
1897-
pdfReportsPayload.ReportName = reportNameImprovedScanReport
1898-
} else {
1899-
pdfReportsPayload.ReportName = reportNameScanReport
1900-
}
1901-
1888+
pdfReportsPayload.ReportName = reportNameImprovedScanReport
19021889
pdfOptionsSections, pdfOptionsEngines, err := parsePDFOptions(pdfOptions, summary.EnginesEnabled, pdfReportsPayload.ReportName)
19031890
if err != nil {
19041891
return err
19051892
}
1906-
19071893
pdfReportsPayload.ReportType = CliType
19081894
pdfReportsPayload.FileFormat = printer.FormatPDF
19091895
pdfReportsPayload.Data.ScanID = summary.ScanID

‎internal/commands/result_test.go‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,6 @@ func TestRunGetBFLByScanIdAndQueryIdWithFormatList(t *testing.T) {
643643

644644
func TestRunGetResultsGeneratingPdfReportWithInvalidEmail(t *testing.T) {
645645
clearFlags()
646-
mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.NewScanReportEnabled, Status: false}
647646
err := execCmdNotNilAssertion(t,
648647
"results", "show",
649648
"--report-format", "pdf",
@@ -654,7 +653,6 @@ func TestRunGetResultsGeneratingPdfReportWithInvalidEmail(t *testing.T) {
654653

655654
func TestRunGetResultsGeneratingPdfReportWithInvalidOptions(t *testing.T) {
656655
clearFlags()
657-
mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.NewScanReportEnabled, Status: false}
658656
err := execCmdNotNilAssertion(t,
659657
"results", "show",
660658
"--report-format", "pdf",
@@ -665,7 +663,6 @@ func TestRunGetResultsGeneratingPdfReportWithInvalidOptions(t *testing.T) {
665663

666664
func TestRunGetResultsGeneratingPdfReportWithInvalidImprovedOptions(t *testing.T) {
667665
clearFlags()
668-
mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.NewScanReportEnabled, Status: false}
669666
err := execCmdNotNilAssertion(t,
670667
"results", "show",
671668
"--report-format", "pdf",
@@ -676,7 +673,6 @@ func TestRunGetResultsGeneratingPdfReportWithInvalidImprovedOptions(t *testing.T
676673

677674
func TestRunGetResultsGeneratingPdfReportWithEmailAndOptions(t *testing.T) {
678675
clearFlags()
679-
mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.NewScanReportEnabled, Status: false}
680676
cmd := createASTTestCommand()
681677
err := executeTestCommand(cmd,
682678
"results", "show",
@@ -689,7 +685,6 @@ func TestRunGetResultsGeneratingPdfReportWithEmailAndOptions(t *testing.T) {
689685

690686
func TestRunGetResultsGeneratingPdfReportWithOptionsImprovedMappingHappens(t *testing.T) {
691687
clearFlags()
692-
mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.NewScanReportEnabled, Status: true}
693688
cmd := createASTTestCommand()
694689
err := executeTestCommand(cmd,
695690
"results", "show",
@@ -702,7 +697,6 @@ func TestRunGetResultsGeneratingPdfReportWithOptionsImprovedMappingHappens(t *te
702697

703698
func TestRunGetResultsGeneratingPdfReportWithInvalidOptionsImproved(t *testing.T) {
704699
clearFlags()
705-
mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.NewScanReportEnabled, Status: true}
706700
cmd := createASTTestCommand()
707701
err := executeTestCommand(cmd,
708702
"results", "show",
@@ -715,7 +709,6 @@ func TestRunGetResultsGeneratingPdfReportWithInvalidOptionsImproved(t *testing.T
715709

716710
func TestRunGetResultsGeneratingPdfReportWithOptions(t *testing.T) {
717711
clearFlags()
718-
mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.NewScanReportEnabled, Status: false}
719712
cmd := createASTTestCommand()
720713
err := executeTestCommand(cmd,
721714
"results", "show",
@@ -734,7 +727,6 @@ func TestRunGetResultsGeneratingPdfReportWithOptions(t *testing.T) {
734727

735728
func TestRunGetResultsGeneratingJsonV2Report(t *testing.T) {
736729
clearFlags()
737-
mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.NewScanReportEnabled, Status: false}
738730
cmd := createASTTestCommand()
739731
err := executeTestCommand(cmd,
740732
"results", "show",

‎internal/wrappers/feature-flags.go‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ const MinioEnabled = "MINIO_ENABLED"
1414
const SastCustomStateEnabled = "SAST_CUSTOM_STATES_ENABLED"
1515
const ContainerEngineCLIEnabled = "CONTAINER_ENGINE_CLI_ENABLED"
1616
const SCSEngineCLIEnabled = "NEW_2MS_SCORECARD_RESULTS_CLI_ENABLED"
17-
const NewScanReportEnabled = "NEW_SAST_SCAN_REPORT_ENABLED"
1817
const RiskManagementEnabled = "RISK_MANAGEMENT_IDES_PROJECT_RESULTS_SCORES_API_ENABLED"
1918
const OssRealtimeEnabled = "OSS_REALTIME_ENABLED"
2019
const maxRetries = 3
@@ -56,15 +55,6 @@ var FeatureFlagsBaseMap = []CommandFlags{
5655
},
5756
},
5857
},
59-
{
60-
CommandName: "cx results show",
61-
FeatureFlags: []FlagBase{
62-
{
63-
Name: NewScanReportEnabled,
64-
Default: false,
65-
},
66-
},
67-
},
6858
{
6959
CommandName: "cx triage update",
7060
FeatureFlags: []FlagBase{

‎test/integration/data/manifests/requirements.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ Django>=3.0,<4.0
5959

6060
# Less than or equal
6161

62-
requests<=2.25.1
62+
requests<=2.32.4
6363

6464
# Compatible release (PEP 440)
6565

66-
urllib3\~=1.26.0
66+
urllib3\~=2.5.0
6767

6868
# Not equal
6969

0 commit comments

Comments
 (0)