Skip to content

Removed feature flag new-sast-scan-result-enabled(AST-99956) #1197

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.

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
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
18 changes: 2 additions & 16 deletions internal/commands/result.go
Original file line number Diff line number Diff line change
Expand Up @@ -1787,13 +1787,7 @@ func exportJSONResults(targetFile string, results *wrappers.ScanResultsCollectio
func exportJSONReportResults(jsonWrapper wrappers.ResultsJSONWrapper, summary *wrappers.ResultSummary, summaryRpt string, featureFlagsWrapper wrappers.FeatureFlagsWrapper) error {
jsonReportsPayload := &wrappers.JSONReportsPayload{}
pollingResp := &wrappers.JSONPollingResponse{}
flagResponse, _ := wrappers.GetSpecificFeatureFlag(featureFlagsWrapper, wrappers.NewScanReportEnabled)
newScanReportEnabled := flagResponse.Status
if newScanReportEnabled {
jsonReportsPayload.ReportName = reportNameImprovedScanReport
} else {
jsonReportsPayload.ReportName = reportNameScanReport
}
jsonReportsPayload.ReportName = reportNameScanReport

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

Expand Down Expand Up @@ -1891,19 +1885,11 @@ func exportPdfResults(pdfWrapper wrappers.ResultsPdfWrapper, summary *wrappers.R
pdfOptions string, featureFlagsWrapper wrappers.FeatureFlagsWrapper) error {
pdfReportsPayload := &wrappers.PdfReportsPayload{}
pollingResp := &wrappers.PdfPollingResponse{}
flagResponse, _ := wrappers.GetSpecificFeatureFlag(featureFlagsWrapper, wrappers.NewScanReportEnabled)
newScanReportEnabled := flagResponse.Status
if newScanReportEnabled {
pdfReportsPayload.ReportName = reportNameImprovedScanReport
} else {
pdfReportsPayload.ReportName = reportNameScanReport
}

pdfReportsPayload.ReportName = reportNameScanReport
pdfOptionsSections, pdfOptionsEngines, err := parsePDFOptions(pdfOptions, summary.EnginesEnabled, pdfReportsPayload.ReportName)
if err != nil {
return err
}

pdfReportsPayload.ReportType = CliType
pdfReportsPayload.FileFormat = printer.FormatPDF
pdfReportsPayload.Data.ScanID = summary.ScanID
Expand Down
8 changes: 0 additions & 8 deletions internal/commands/result_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -643,7 +643,6 @@ func TestRunGetBFLByScanIdAndQueryIdWithFormatList(t *testing.T) {

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

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

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

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

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

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

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

func TestRunGetResultsGeneratingJsonV2Report(t *testing.T) {
clearFlags()
mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.NewScanReportEnabled, Status: false}
cmd := createASTTestCommand()
err := executeTestCommand(cmd,
"results", "show",
Expand Down
9 changes: 0 additions & 9 deletions internal/wrappers/feature-flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,6 @@ var FeatureFlagsBaseMap = []CommandFlags{
},
},
},
{
CommandName: "cx results show",
FeatureFlags: []FlagBase{
{
Name: NewScanReportEnabled,
Default: false,
},
},
},
{
CommandName: "cx triage update",
FeatureFlags: []FlagBase{
Expand Down
Loading