Skip to content
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
4 changes: 2 additions & 2 deletions internal/commands/scan.go
Original file line number Diff line number Diff line change
Expand Up @@ -788,8 +788,8 @@ func scanCreateSubCommand(
commonParams.Branch, commonParams.BranchFlagUsage,
)
createScanCmd.PersistentFlags().String(commonParams.SastFilterFlag, "", commonParams.SastFilterUsage)
createScanCmd.PersistentFlags().String(commonParams.IacsFilterFlag, "", commonParams.IacsFilterUsage)
createScanCmd.PersistentFlags().String(commonParams.KicsFilterFlag, "", commonParams.KicsFilterUsage)
createScanCmd.PersistentFlags().StringSlice(commonParams.IacsFilterFlag, []string{}, commonParams.IacsFilterUsage)
createScanCmd.PersistentFlags().StringSlice(commonParams.KicsFilterFlag, []string{}, commonParams.KicsFilterUsage)

err = createScanCmd.PersistentFlags().MarkDeprecated(commonParams.KicsFilterFlag, "please use the replacement flag --iac-security-filter")
if err != nil {
Expand Down
49 changes: 49 additions & 0 deletions internal/commands/scan_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1198,6 +1198,55 @@ func TestAddKicsScan(t *testing.T) {
}
}

func TestAddKicsScanWithIacsFilter(t *testing.T) {
var resubmitConfig []wrappers.Config

cmdCommand := &cobra.Command{
Use: "scan",
Short: "Scan a project",
Long: `Scan a project`,
}

cmdCommand.PersistentFlags().StringSlice(
commonParams.KicsFilterFlag,
[]string{},
"Filter for KICS scan",
)

cmdCommand.PersistentFlags().StringSlice(
commonParams.IacsFilterFlag,
[]string{},
"IaC filter",
)

cmdCommand.PersistentFlags().StringSlice(
commonParams.IacsPlatformsFlag,
[]string{},
"IaC platforms",
)

_ = cmdCommand.Execute()

// Set the new --iac-security-filter flag (not the deprecated --kics-filter)
_ = cmdCommand.Flags().Set(commonParams.IacsFilterFlag, "!docker-compose.yaml")

result := addKicsScan(cmdCommand, resubmitConfig)

expectedConfig := wrappers.KicsConfig{
Filter: "!docker-compose.yaml",
}

if result[resultsMapType] != commonParams.KicsType {
t.Errorf("Expected type %s, got %v", commonParams.KicsType, result[resultsMapType])
}

actualConfig := result[resultsMapValue].(*wrappers.KicsConfig)

if !reflect.DeepEqual(actualConfig, &expectedConfig) {
t.Errorf("--iac-security-filter value was not propagated to scan config: expected %+v, got %+v", expectedConfig, actualConfig)
}
}

func TestCreateScanProjectTagsCheckResendToScan(t *testing.T) {
baseArgs := []string{"scan", "create", "--project-name", "sastFilterMock", "-b", "dummy_branch", "-s", dummyRepo, "--project-tags", "SEG", "--debug"}
cmd := createASTTestCommand()
Expand Down