Skip to content

Commit 46b07c7

Browse files
cx-anjali-deorecx-anjali-deore
committed
removed access management flags and code validating it
1 parent 6c92db8 commit 46b07c7

File tree

12 files changed

+114
-276
lines changed

12 files changed

+114
-276
lines changed

‎internal/commands/groups.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ import (
99
"github.com/spf13/cobra"
1010
)
1111

12-
func updateGroupValues(input *[]byte, cmd *cobra.Command, groupsWrapper wrappers.GroupsWrapper) ([]*wrappers.Group, error) {
12+
func updateGroupValues(input *[]byte, cmd *cobra.Command, groupsWrapper wrappers.GroupsWrapper) error {
1313
groupListStr, _ := cmd.Flags().GetString(commonParams.GroupList)
1414
groups, err := services.CreateGroupsMap(groupListStr, groupsWrapper)
1515
if err != nil {
16-
return groups, err
16+
return err
1717
}
1818

1919
// we're not checking here status of the feature flag, because of refactoring in AM
@@ -22,5 +22,5 @@ func updateGroupValues(input *[]byte, cmd *cobra.Command, groupsWrapper wrappers
2222
info["groups"] = services.GetGroupIds(groups)
2323
*input, _ = json.Marshal(info)
2424

25-
return groups, nil
25+
return nil
2626
}

‎internal/commands/groups_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import (
77
"github.com/checkmarx/ast-cli/internal/wrappers/mock"
88
)
99

10+
//todo : need to modify these test cases
11+
1012
func TestCreateScanAndProjectWithGroupFFTrue(t *testing.T) {
1113
mock.Flags = wrappers.FeatureFlagsResponseModel{{Name: "ACCESS_MANAGEMENT_ENABLED", Status: true}}
1214
execCmdNilAssertion(

‎internal/commands/project.go

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ var (
6060
)
6161

6262
func NewProjectCommand(applicationsWrapper wrappers.ApplicationsWrapper, projectsWrapper wrappers.ProjectsWrapper, groupsWrapper wrappers.GroupsWrapper,
63-
accessManagementWrapper wrappers.AccessManagementWrapper, featureFlagsWrapper wrappers.FeatureFlagsWrapper) *cobra.Command {
63+
) *cobra.Command {
6464
projCmd := &cobra.Command{
6565
Use: "project",
6666
Short: "Manage projects",
@@ -90,7 +90,7 @@ func NewProjectCommand(applicationsWrapper wrappers.ApplicationsWrapper, project
9090
`,
9191
),
9292
},
93-
RunE: runCreateProjectCommand(applicationsWrapper, projectsWrapper, groupsWrapper, accessManagementWrapper, featureFlagsWrapper),
93+
RunE: runCreateProjectCommand(applicationsWrapper, projectsWrapper, groupsWrapper),
9494
}
9595
createProjCmd.PersistentFlags().String(commonParams.TagList, "", "List of tags, ex: (tagA,tagB:val,etc)")
9696
createProjCmd.PersistentFlags().String(commonParams.GroupList, "", "List of groups, ex: (PowerUsers,etc)")
@@ -227,8 +227,6 @@ func runCreateProjectCommand(
227227
applicationsWrapper wrappers.ApplicationsWrapper,
228228
projectsWrapper wrappers.ProjectsWrapper,
229229
groupsWrapper wrappers.GroupsWrapper,
230-
accessManagementWrapper wrappers.AccessManagementWrapper,
231-
featureFlagsWrapper wrappers.FeatureFlagsWrapper,
232230
) func(cmd *cobra.Command, args []string) error {
233231
return func(cmd *cobra.Command, args []string) error {
234232
applicationName, _ := cmd.Flags().GetString(commonParams.ApplicationName)
@@ -249,17 +247,11 @@ func runCreateProjectCommand(
249247
if err != nil {
250248
return err
251249
}
252-
groups, err := updateGroupValues(&input, cmd, groupsWrapper)
253-
if err != nil {
254-
return err
255-
}
256-
// Validate groups access before creating the project.
257-
// This validation will only be performed if the ACCESS_MANAGEMENT_PHASE2 flag is ON.
258-
err = services.ValidateGroupsAccessPhase2(groups, accessManagementWrapper, featureFlagsWrapper)
250+
251+
err = updateGroupValues(&input, cmd, groupsWrapper)
259252
if err != nil {
260253
return err
261254
}
262-
263255
setupScanTags(&input, cmd)
264256
err = validateConfiguration(cmd)
265257
if err != nil {
@@ -291,7 +283,6 @@ func runCreateProjectCommand(
291283
return errors.Wrapf(err, "%s", services.FailedCreatingProj)
292284
}
293285
}
294-
err = services.AssignGroupsToProjectNewAccessManagement(projResponseModel.ID, projResponseModel.Name, groups, accessManagementWrapper, featureFlagsWrapper)
295286
if err != nil {
296287
return err
297288
}

‎internal/commands/root.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,12 +162,11 @@ func NewAstCLI(
162162
scaRealTimeWrapper,
163163
policyWrapper,
164164
sastMetadataWrapper,
165-
accessManagementWrapper,
166165
featureFlagsWrapper,
167166
containerResolverWrapper,
168167
realTimeWrapper,
169168
)
170-
projectCmd := NewProjectCommand(applicationsWrapper, projectsWrapper, groupsWrapper, accessManagementWrapper, featureFlagsWrapper)
169+
projectCmd := NewProjectCommand(applicationsWrapper, projectsWrapper, groupsWrapper)
171170

172171
resultsCmd := NewResultsCommand(
173172
resultsWrapper,
@@ -201,7 +200,6 @@ func NewAstCLI(
201200
projectsWrapper,
202201
uploadsWrapper,
203202
groupsWrapper,
204-
accessManagementWrapper,
205203
applicationsWrapper,
206204
byorWrapper,
207205
featureFlagsWrapper,

‎internal/commands/scan.go

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,6 @@ func NewScanCommand(
161161
scaRealTimeWrapper wrappers.ScaRealTimeWrapper,
162162
policyWrapper wrappers.PolicyWrapper,
163163
sastMetadataWrapper wrappers.SastMetadataWrapper,
164-
accessManagementWrapper wrappers.AccessManagementWrapper,
165164
featureFlagsWrapper wrappers.FeatureFlagsWrapper,
166165
containerResolverWrapper wrappers.ContainerResolverWrapper,
167166
realtimeScannerWrapper wrappers.RealtimeScannerWrapper,
@@ -192,7 +191,6 @@ func NewScanCommand(
192191
scsScanOverviewWrapper,
193192
jwtWrapper,
194193
policyWrapper,
195-
accessManagementWrapper,
196194
applicationsWrapper,
197195
featureFlagsWrapper,
198196
)
@@ -550,7 +548,6 @@ func scanCreateSubCommand(
550548
scsScanOverviewWrapper wrappers.ScanOverviewWrapper,
551549
jwtWrapper wrappers.JWTWrapper,
552550
policyWrapper wrappers.PolicyWrapper,
553-
accessManagementWrapper wrappers.AccessManagementWrapper,
554551
applicationsWrapper wrappers.ApplicationsWrapper,
555552
featureFlagsWrapper wrappers.FeatureFlagsWrapper,
556553
) *cobra.Command {
@@ -583,7 +580,6 @@ func scanCreateSubCommand(
583580
scsScanOverviewWrapper,
584581
jwtWrapper,
585582
policyWrapper,
586-
accessManagementWrapper,
587583
applicationsWrapper,
588584
featureFlagsWrapper,
589585
),
@@ -794,7 +790,6 @@ func setupScanTypeProjectAndConfig(
794790
groupsWrapper wrappers.GroupsWrapper,
795791
scansWrapper wrappers.ScansWrapper,
796792
applicationsWrapper wrappers.ApplicationsWrapper,
797-
accessManagementWrapper wrappers.AccessManagementWrapper,
798793
featureFlagsWrapper wrappers.FeatureFlagsWrapper,
799794
jwtWrapper wrappers.JWTWrapper,
800795
) error {
@@ -821,9 +816,7 @@ func setupScanTypeProjectAndConfig(
821816
cmd,
822817
projectsWrapper,
823818
groupsWrapper,
824-
accessManagementWrapper,
825819
applicationsWrapper,
826-
featureFlagsWrapper,
827820
)
828821
if findProjectErr != nil {
829822
return findProjectErr
@@ -1844,7 +1837,6 @@ func runCreateScanCommand(
18441837
scsScanOverviewWrapper wrappers.ScanOverviewWrapper,
18451838
jwtWrapper wrappers.JWTWrapper,
18461839
policyWrapper wrappers.PolicyWrapper,
1847-
accessManagementWrapper wrappers.AccessManagementWrapper,
18481840
applicationsWrapper wrappers.ApplicationsWrapper,
18491841
featureFlagsWrapper wrappers.FeatureFlagsWrapper,
18501842
) func(cmd *cobra.Command, args []string) error {
@@ -1873,7 +1865,6 @@ func runCreateScanCommand(
18731865
projectsWrapper,
18741866
groupsWrapper,
18751867
scansWrapper,
1876-
accessManagementWrapper,
18771868
applicationsWrapper,
18781869
featureFlagsWrapper,
18791870
jwtWrapper,
@@ -1970,15 +1961,14 @@ func createScanModel(
19701961
projectsWrapper wrappers.ProjectsWrapper,
19711962
groupsWrapper wrappers.GroupsWrapper,
19721963
scansWrapper wrappers.ScansWrapper,
1973-
accessManagementWrapper wrappers.AccessManagementWrapper,
19741964
applicationsWrapper wrappers.ApplicationsWrapper,
19751965
featureFlagsWrapper wrappers.FeatureFlagsWrapper,
19761966
jwtWrapper wrappers.JWTWrapper,
19771967
) (*wrappers.Scan, string, error) {
19781968
var input = []byte("{}")
19791969

19801970
// Define type, project and config in scan model
1981-
err := setupScanTypeProjectAndConfig(&input, cmd, projectsWrapper, groupsWrapper, scansWrapper, applicationsWrapper, accessManagementWrapper, featureFlagsWrapper, jwtWrapper)
1971+
err := setupScanTypeProjectAndConfig(&input, cmd, projectsWrapper, groupsWrapper, scansWrapper, applicationsWrapper, featureFlagsWrapper, jwtWrapper)
19821972
if err != nil {
19831973
return nil, "", err
19841974
}

‎internal/commands/util/import.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ func NewImportCommand(
1818
projectsWrapper wrappers.ProjectsWrapper,
1919
uploadsWrapper wrappers.UploadsWrapper,
2020
groupsWrapper wrappers.GroupsWrapper,
21-
accessManagementWrapper wrappers.AccessManagementWrapper,
2221
byorWrapper wrappers.ByorWrapper,
2322
applicationsWrapper wrappers.ApplicationsWrapper,
2423
featureFlagsWrapper wrappers.FeatureFlagsWrapper) *cobra.Command {
@@ -37,7 +36,7 @@ func NewImportCommand(
3736
`,
3837
),
3938
},
40-
RunE: runImportCommand(projectsWrapper, uploadsWrapper, groupsWrapper, accessManagementWrapper, applicationsWrapper, byorWrapper, featureFlagsWrapper),
39+
RunE: runImportCommand(projectsWrapper, uploadsWrapper, groupsWrapper, applicationsWrapper, byorWrapper, featureFlagsWrapper),
4140
}
4241

4342
cmd.PersistentFlags().String(commonParams.ImportFilePath, "", "Path to the import file (sarif file or zip archive containing sarif files)")
@@ -50,7 +49,6 @@ func runImportCommand(
5049
projectsWrapper wrappers.ProjectsWrapper,
5150
uploadsWrapper wrappers.UploadsWrapper,
5251
groupsWrapper wrappers.GroupsWrapper,
53-
accessManagementWrapper wrappers.AccessManagementWrapper,
5452
applicationsWrapper wrappers.ApplicationsWrapper,
5553
byorWrapper wrappers.ByorWrapper,
5654
featureFlagsWrapper wrappers.FeatureFlagsWrapper) func(cmd *cobra.Command, args []string) error {
@@ -65,7 +63,7 @@ func runImportCommand(
6563
return errors.Errorf(errorConstants.ProjectNameIsRequired)
6664
}
6765

68-
projectID, err := services.FindProject(projectName, cmd, projectsWrapper, groupsWrapper, accessManagementWrapper, applicationsWrapper, featureFlagsWrapper)
66+
projectID, err := services.FindProject(projectName, cmd, projectsWrapper, groupsWrapper, applicationsWrapper)
6967
if err != nil {
7068
return err
7169
}

‎internal/commands/util/import_test.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ func TestImport_ImportSarifFileWithCorrectFlags_CreateImportSuccessfully(t *test
1616
&mock.ProjectsMockWrapper{},
1717
&mock.UploadsMockWrapper{},
1818
&mock.GroupsMockWrapper{},
19-
mock.AccessManagementMockWrapper{},
2019
&mock.ByorMockWrapper{},
2120
mock.ApplicationsMockWrapper{},
2221
&mock.FeatureFlagsMockWrapper{},
@@ -32,7 +31,6 @@ func TestImport_ImportSarifFileProjectDoesntExist_CreateImportWithProvidedNewNam
3231
&mock.ProjectsMockWrapper{},
3332
&mock.UploadsMockWrapper{},
3433
&mock.GroupsMockWrapper{},
35-
mock.AccessManagementMockWrapper{},
3634
&mock.ByorMockWrapper{},
3735
mock.ApplicationsMockWrapper{},
3836
&mock.FeatureFlagsMockWrapper{},
@@ -48,7 +46,6 @@ func TestImport_ImportSarifFileMissingImportFilePath_CreateImportReturnsErrorWit
4846
&mock.ProjectsMockWrapper{},
4947
&mock.UploadsMockWrapper{},
5048
&mock.GroupsMockWrapper{},
51-
mock.AccessManagementMockWrapper{},
5249
&mock.ByorMockWrapper{},
5350
mock.ApplicationsMockWrapper{},
5451
&mock.FeatureFlagsMockWrapper{},
@@ -63,7 +60,6 @@ func TestImport_ImportSarifFileEmptyImportFilePathValue_CreateImportReturnsError
6360
&mock.ProjectsMockWrapper{},
6461
&mock.UploadsMockWrapper{},
6562
&mock.GroupsMockWrapper{},
66-
mock.AccessManagementMockWrapper{},
6763
&mock.ByorMockWrapper{},
6864
mock.ApplicationsMockWrapper{},
6965
&mock.FeatureFlagsMockWrapper{},
@@ -78,7 +74,6 @@ func TestImport_ImportSarifFileMissingImportProjectName_CreateImportReturnsError
7874
&mock.ProjectsMockWrapper{},
7975
&mock.UploadsMockWrapper{},
8076
&mock.GroupsMockWrapper{},
81-
mock.AccessManagementMockWrapper{},
8277
&mock.ByorMockWrapper{},
8378
mock.ApplicationsMockWrapper{},
8479
&mock.FeatureFlagsMockWrapper{},
@@ -93,7 +88,6 @@ func TestImport_ImportSarifFileProjectNameNotProvided_CreateImportWithProvidedNe
9388
&mock.ProjectsMockWrapper{},
9489
&mock.UploadsMockWrapper{},
9590
&mock.GroupsMockWrapper{},
96-
mock.AccessManagementMockWrapper{},
9791
&mock.ByorMockWrapper{},
9892
mock.ApplicationsMockWrapper{},
9993
&mock.FeatureFlagsMockWrapper{},
@@ -108,7 +102,6 @@ func TestImport_ImportSarifFileUnacceptedFileExtension_CreateImportReturnsErrorW
108102
&mock.ProjectsMockWrapper{},
109103
&mock.UploadsMockWrapper{},
110104
&mock.GroupsMockWrapper{},
111-
mock.AccessManagementMockWrapper{},
112105
&mock.ByorMockWrapper{},
113106
mock.ApplicationsMockWrapper{},
114107
&mock.FeatureFlagsMockWrapper{},
@@ -123,7 +116,6 @@ func TestImport_ImportSarifFileMissingExtension_CreateImportReturnsErrorWithCorr
123116
&mock.ProjectsMockWrapper{},
124117
&mock.UploadsMockWrapper{},
125118
&mock.GroupsMockWrapper{},
126-
mock.AccessManagementMockWrapper{},
127119
&mock.ByorMockWrapper{},
128120
mock.ApplicationsMockWrapper{},
129121
&mock.FeatureFlagsMockWrapper{},

‎internal/commands/util/utils.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ func NewUtilsCommand(
4141
projectsWrapper wrappers.ProjectsWrapper,
4242
uploadsWrapper wrappers.UploadsWrapper,
4343
groupsWrapper wrappers.GroupsWrapper,
44-
accessManagementWrapper wrappers.AccessManagementWrapper,
4544
applicationsWrapper wrappers.ApplicationsWrapper,
4645
byorWrapper wrappers.ByorWrapper,
4746
featureFlagsWrapper wrappers.FeatureFlagsWrapper,
@@ -64,7 +63,7 @@ func NewUtilsCommand(
6463
},
6564
}
6665

67-
importCmd := NewImportCommand(projectsWrapper, uploadsWrapper, groupsWrapper, accessManagementWrapper, byorWrapper, applicationsWrapper, featureFlagsWrapper)
66+
importCmd := NewImportCommand(projectsWrapper, uploadsWrapper, groupsWrapper, byorWrapper, applicationsWrapper, featureFlagsWrapper)
6867

6968
envCheckCmd := NewEnvCheckCommand()
7069

‎internal/services/groups.go

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package services
33
import (
44
"strings"
55

6-
featureFlagsConstants "github.com/checkmarx/ast-cli/internal/constants/feature-flags"
76
"github.com/checkmarx/ast-cli/internal/wrappers"
87
"github.com/pkg/errors"
98
)
@@ -47,34 +46,6 @@ func CreateGroupsMap(groupsStr string, groupsWrapper wrappers.GroupsWrapper) ([]
4746
}
4847
return groupsMap, nil
4948
}
50-
51-
func AssignGroupsToProjectNewAccessManagement(projectID string, projectName string, groups []*wrappers.Group,
52-
accessManagement wrappers.AccessManagementWrapper, featureFlagsWrapper wrappers.FeatureFlagsWrapper) error {
53-
54-
amEnabledFlag, _ := wrappers.GetSpecificFeatureFlag(featureFlagsWrapper, featureFlagsConstants.AccessManagementEnabled)
55-
amPhase2Flag, _ := wrappers.GetSpecificFeatureFlag(featureFlagsWrapper, featureFlagsConstants.AccessManagementPhase2)
56-
57-
// If ACCESS_MANAGEMENT_PHASE2 flag is ON and if the ACCESS_MANAGEMENT_ENABLED flag is OFF
58-
// In both cases, we do not need to assign groups through the CreateGroupsAssignment call.
59-
if !amEnabledFlag.Status || amPhase2Flag.Status {
60-
return nil
61-
}
62-
groupsAssignedToTheProject, err := accessManagement.GetGroups(projectID)
63-
if err != nil {
64-
return err
65-
}
66-
groupsToAssign := getGroupsToAssign(groups, groupsAssignedToTheProject)
67-
if len(groupsToAssign) == 0 {
68-
return nil
69-
}
70-
71-
err = accessManagement.CreateGroupsAssignment(projectID, projectName, groupsToAssign)
72-
if err != nil {
73-
return err
74-
}
75-
return nil
76-
}
77-
7849
func getGroupsToAssign(receivedGroups, existingGroups []*wrappers.Group) []*wrappers.Group {
7950
var groupsToAssign []*wrappers.Group
8051
var groupsMap = make(map[string]bool)

0 commit comments

Comments
 (0)