Skip to content

Add ff checking and change the unit test (AST-80216) #1044

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-daniel-greenspan merged 5 commits into from
Feb 12, 2025
Merged

Add ff checking and change the unit test (AST-80216) #1044

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5db4546
Add ff checking and change the unit test
cx-itay-paz Feb 11, 2025
9793ed0
Merge branch 'main' into other/Add-ff-for-custom-states-command
cx-itay-paz Feb 11, 2025
ca12ee6
add system states and fix unit test
cx-itay-paz Feb 12, 2025
e58ca80
Merge branch 'main' into other/Add-ff-for-custom-states-command
cx-itay-paz Feb 12, 2025
850bd66
fix system states
cx-itay-paz Feb 12, 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
12 changes: 8 additions & 4 deletions internal/commands/predicates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ func NewResultsPredicatesCommand(resultsPredicatesWrapper wrappers.ResultsPredic
}
triageShowCmd := triageShowSubCommand(resultsPredicatesWrapper)
triageUpdateCmd := triageUpdateSubCommand(resultsPredicatesWrapper, featureFlagsWrapper)
triageGetStatesCmd := triageGetStatesSubCommand(customStatesWrapper)
triageGetStatesCmd := triageGetStatesSubCommand(customStatesWrapper, featureFlagsWrapper)


addFormatFlagToMultipleCommands(
Expand All @@ -32,7 +32,7 @@ func NewResultsPredicatesCommand(resultsPredicatesWrapper wrappers.ResultsPredic
return triageCmd
}

func triageGetStatesSubCommand(customStatesWrapper wrappers.CustomStatesWrapper) *cobra.Command {
func triageGetStatesSubCommand(customStatesWrapper wrappers.CustomStatesWrapper, featureFlagsWrapper wrappers.FeatureFlagsWrapper) *cobra.Command {
triageGetStatesCmd := &cobra.Command{
Use: "get-states",
Short: "Show the custom states that have been configured in your tenant",
Expand All @@ -43,16 +43,20 @@ func triageGetStatesSubCommand(customStatesWrapper wrappers.CustomStatesWrapper)
$ cx triage get-states --all
`,
),
RunE: runTriageGetStates(customStatesWrapper),
RunE: runTriageGetStates(customStatesWrapper, featureFlagsWrapper),
}

triageGetStatesCmd.PersistentFlags().Bool(params.AllStatesFlag, false, "Show all custom states, including the ones that have been deleted")

return triageGetStatesCmd
}

func runTriageGetStates(customStatesWrapper wrappers.CustomStatesWrapper) func(*cobra.Command, []string) error {
func runTriageGetStates(customStatesWrapper wrappers.CustomStatesWrapper, featureFlagsWrapper wrappers.FeatureFlagsWrapper) func(*cobra.Command, []string) error {
return func(cmd *cobra.Command, _ []string) error {
flagResponse, _ := wrappers.GetSpecificFeatureFlag(featureFlagsWrapper, wrappers.CustomStatesFeatureFlag)
if !flagResponse.Status {
return errors.Errorf("%s", "Fetching custom states is not available for your tenant")
}
includeDeleted, _ := cmd.Flags().GetBool(params.AllStatesFlag)
states, err := customStatesWrapper.GetAllCustomStates(includeDeleted)
if err != nil {
Expand Down
11 changes: 9 additions & 2 deletions internal/commands/predicates_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ package commands

import (
"fmt"
"github.com/checkmarx/ast-cli/internal/wrappers"
"github.com/checkmarx/ast-cli/internal/wrappers/mock"
"testing"

Expand Down Expand Up @@ -52,17 +53,23 @@ func TestRunUpdateTriageCommandWithNoInput(t *testing.T) {

func TestTriageGetStatesFlag(t *testing.T) {
mockWrapper := &mock.CustomStatesMockWrapper{}
cmd := triageGetStatesSubCommand(mockWrapper)
featureFlagsWrapper := &mock.FeatureFlagsMockWrapper{}
mock.Flag = wrappers.FeatureFlagResponseModel{Name: wrappers.CustomStatesFeatureFlag, Status: true}
cmd := triageGetStatesSubCommand(mockWrapper, featureFlagsWrapper)
cmd.SetArgs([]string{})
err := cmd.Execute()
assert.NilError(t, err)
states, err := mockWrapper.GetAllCustomStates(false)
assert.NilError(t, err)
assert.Equal(t, len(states), 2)

cmd.SetArgs([]string{"--all"})
err = cmd.Execute()
assert.NilError(t, err)

states, err = mockWrapper.GetAllCustomStates(true)
assert.NilError(t, err)
assert.Equal(t, len(states), 3)
}
}


10 changes: 10 additions & 0 deletions internal/wrappers/feature-flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"github.com/checkmarx/ast-cli/internal/logger"
)

const CustomStatesFeatureFlag = "CUSTOM_STATES_ENABLED"
const tenantIDClaimKey = "tenant_id"
const PackageEnforcementEnabled = "PACKAGE_ENFORCEMENT_ENABLED"
const CVSSV3Enabled = "CVSS_V3_ENABLED"
Expand All @@ -31,6 +32,15 @@ var FeatureFlagsBaseMap = []CommandFlags{
},
},
},
{
CommandName: "cx triage get-states",
FeatureFlags: []FlagBase{
{
Name: CustomStatesFeatureFlag,
Default: false,
},
},
},
{
CommandName: "cx project create",
},
Expand Down
Loading