Removed access management flags and code validating it(AST-103296)

internal/commands/groups.go

@@ -9,11 +9,11 @@ import (
 	"github.com/spf13/cobra"
 )
 
-func updateGroupValues(input *[]byte, cmd *cobra.Command, groupsWrapper wrappers.GroupsWrapper) ([]*wrappers.Group, error) {
+func updateGroupValues(input *[]byte, cmd *cobra.Command, groupsWrapper wrappers.GroupsWrapper) error {
 	groupListStr, _ := cmd.Flags().GetString(commonParams.GroupList)
 	groups, err := services.CreateGroupsMap(groupListStr, groupsWrapper)
 	if err != nil {
-		return groups, err
+		return err
 	}
 
 	// 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
 	info["groups"] = services.GetGroupIds(groups)
 	*input, _ = json.Marshal(info)
 
-	return groups, nil
+	return nil
 }

internal/commands/groups_test.go

@@ -7,6 +7,8 @@
 	"github.com/checkmarx/ast-cli/internal/wrappers/mock"
 )
 
+//todo : need to modify these test cases
+
 func TestCreateScanAndProjectWithGroupFFTrue(t *testing.T) {
 	mock.Flags = wrappers.FeatureFlagsResponseModel{{Name: "ACCESS_MANAGEMENT_ENABLED", Status: true}}
 	execCmdNilAssertion(

internal/commands/project.go

@@ -60,7 +60,7 @@ var (
 )
 
 func NewProjectCommand(applicationsWrapper wrappers.ApplicationsWrapper, projectsWrapper wrappers.ProjectsWrapper, groupsWrapper wrappers.GroupsWrapper,
-	accessManagementWrapper wrappers.AccessManagementWrapper, featureFlagsWrapper wrappers.FeatureFlagsWrapper) *cobra.Command {
+) *cobra.Command {
 	projCmd := &cobra.Command{
 		Use:   "project",
 		Short: "Manage projects",
@@ -90,7 +90,7 @@ func NewProjectCommand(applicationsWrapper wrappers.ApplicationsWrapper, project
 			`,
 			),
 		},
-		RunE: runCreateProjectCommand(applicationsWrapper, projectsWrapper, groupsWrapper, accessManagementWrapper, featureFlagsWrapper),
+		RunE: runCreateProjectCommand(applicationsWrapper, projectsWrapper, groupsWrapper),
 	}
 	createProjCmd.PersistentFlags().String(commonParams.TagList, "", "List of tags, ex: (tagA,tagB:val,etc)")
 	createProjCmd.PersistentFlags().String(commonParams.GroupList, "", "List of groups, ex: (PowerUsers,etc)")
@@ -227,8 +227,6 @@ func runCreateProjectCommand(
 	applicationsWrapper wrappers.ApplicationsWrapper,
 	projectsWrapper wrappers.ProjectsWrapper,
 	groupsWrapper wrappers.GroupsWrapper,
-	accessManagementWrapper wrappers.AccessManagementWrapper,
-	featureFlagsWrapper wrappers.FeatureFlagsWrapper,
 ) func(cmd *cobra.Command, args []string) error {
 	return func(cmd *cobra.Command, args []string) error {
 		applicationName, _ := cmd.Flags().GetString(commonParams.ApplicationName)
@@ -249,17 +247,11 @@ func runCreateProjectCommand(
 		if err != nil {
 			return err
 		}
-		groups, err := updateGroupValues(&input, cmd, groupsWrapper)
-		if err != nil {
-			return err
-		}
-		// Validate groups access before creating the project.
-		// This validation will only be performed if the ACCESS_MANAGEMENT_PHASE2 flag is ON.
-		err = services.ValidateGroupsAccessPhase2(groups, accessManagementWrapper, featureFlagsWrapper)
+
+		err = updateGroupValues(&input, cmd, groupsWrapper)
 		if err != nil {
 			return err
 		}
-
 		setupScanTags(&input, cmd)
 		err = validateConfiguration(cmd)
 		if err != nil {
@@ -291,7 +283,6 @@ func runCreateProjectCommand(
 				return errors.Wrapf(err, "%s", services.FailedCreatingProj)
 			}
 		}
-		err = services.AssignGroupsToProjectNewAccessManagement(projResponseModel.ID, projResponseModel.Name, groups, accessManagementWrapper, featureFlagsWrapper)
 		if err != nil {
 			return err
 		}

internal/commands/root.go

@@ -175,12 +175,11 @@ func NewAstCLI(
 		scaRealTimeWrapper,
 		policyWrapper,
 		sastMetadataWrapper,
-		accessManagementWrapper,
 		featureFlagsWrapper,
 		containerResolverWrapper,
 		realTimeWrapper,
 	)
-	projectCmd := NewProjectCommand(applicationsWrapper, projectsWrapper, groupsWrapper, accessManagementWrapper, featureFlagsWrapper)
+	projectCmd := NewProjectCommand(applicationsWrapper, projectsWrapper, groupsWrapper)
 
 	resultsCmd := NewResultsCommand(
 		resultsWrapper,
@@ -214,7 +213,6 @@ func NewAstCLI(
 		projectsWrapper,
 		uploadsWrapper,
 		groupsWrapper,
-		accessManagementWrapper,
 		applicationsWrapper,
 		byorWrapper,
 		featureFlagsWrapper,

internal/commands/scan.go

@@ -162,7 +162,6 @@ func NewScanCommand(
 	scaRealTimeWrapper wrappers.ScaRealTimeWrapper,
 	policyWrapper wrappers.PolicyWrapper,
 	sastMetadataWrapper wrappers.SastMetadataWrapper,
-	accessManagementWrapper wrappers.AccessManagementWrapper,
 	featureFlagsWrapper wrappers.FeatureFlagsWrapper,
 	containerResolverWrapper wrappers.ContainerResolverWrapper,
 	realtimeScannerWrapper wrappers.RealtimeScannerWrapper,
@@ -193,7 +192,6 @@ func NewScanCommand(
 		scsScanOverviewWrapper,
 		jwtWrapper,
 		policyWrapper,
-		accessManagementWrapper,
 		applicationsWrapper,
 		featureFlagsWrapper,
 	)
@@ -592,7 +590,6 @@ func scanCreateSubCommand(
 	scsScanOverviewWrapper wrappers.ScanOverviewWrapper,
 	jwtWrapper wrappers.JWTWrapper,
 	policyWrapper wrappers.PolicyWrapper,
-	accessManagementWrapper wrappers.AccessManagementWrapper,
 	applicationsWrapper wrappers.ApplicationsWrapper,
 	featureFlagsWrapper wrappers.FeatureFlagsWrapper,
 ) *cobra.Command {
@@ -625,7 +622,6 @@ func scanCreateSubCommand(
 			scsScanOverviewWrapper,
 			jwtWrapper,
 			policyWrapper,
-			accessManagementWrapper,
 			applicationsWrapper,
 			featureFlagsWrapper,
 		),
@@ -841,7 +837,6 @@ func setupScanTypeProjectAndConfig(
 	groupsWrapper wrappers.GroupsWrapper,
 	scansWrapper wrappers.ScansWrapper,
 	applicationsWrapper wrappers.ApplicationsWrapper,
-	accessManagementWrapper wrappers.AccessManagementWrapper,
 	featureFlagsWrapper wrappers.FeatureFlagsWrapper,
 	jwtWrapper wrappers.JWTWrapper,
 ) error {
@@ -869,9 +864,7 @@ func setupScanTypeProjectAndConfig(
 		cmd,
 		projectsWrapper,
 		groupsWrapper,
-		accessManagementWrapper,
 		applicationsWrapper,
-		featureFlagsWrapper,
 	)
 	if findProjectErr != nil {
 		return findProjectErr
@@ -1892,7 +1885,6 @@ func runCreateScanCommand(
 	scsScanOverviewWrapper wrappers.ScanOverviewWrapper,
 	jwtWrapper wrappers.JWTWrapper,
 	policyWrapper wrappers.PolicyWrapper,
-	accessManagementWrapper wrappers.AccessManagementWrapper,
 	applicationsWrapper wrappers.ApplicationsWrapper,
 	featureFlagsWrapper wrappers.FeatureFlagsWrapper,
 ) func(cmd *cobra.Command, args []string) error {
@@ -1921,7 +1913,6 @@ func runCreateScanCommand(
 			projectsWrapper,
 			groupsWrapper,
 			scansWrapper,
-			accessManagementWrapper,
 			applicationsWrapper,
 			featureFlagsWrapper,
 			jwtWrapper,
@@ -2018,15 +2009,14 @@ func createScanModel(
 	projectsWrapper wrappers.ProjectsWrapper,
 	groupsWrapper wrappers.GroupsWrapper,
 	scansWrapper wrappers.ScansWrapper,
-	accessManagementWrapper wrappers.AccessManagementWrapper,
 	applicationsWrapper wrappers.ApplicationsWrapper,
 	featureFlagsWrapper wrappers.FeatureFlagsWrapper,
 	jwtWrapper wrappers.JWTWrapper,
 ) (*wrappers.Scan, string, error) {
 	var input = []byte("{}")
 
 	// Define type, project and config in scan model
-	err := setupScanTypeProjectAndConfig(&input, cmd, projectsWrapper, groupsWrapper, scansWrapper, applicationsWrapper, accessManagementWrapper, featureFlagsWrapper, jwtWrapper)
+	err := setupScanTypeProjectAndConfig(&input, cmd, projectsWrapper, groupsWrapper, scansWrapper, applicationsWrapper, featureFlagsWrapper, jwtWrapper)
 	if err != nil {
 		return nil, "", err
 	}

internal/commands/util/import.go

@@ -18,7 +18,6 @@ func NewImportCommand(
 	projectsWrapper wrappers.ProjectsWrapper,
 	uploadsWrapper wrappers.UploadsWrapper,
 	groupsWrapper wrappers.GroupsWrapper,
-	accessManagementWrapper wrappers.AccessManagementWrapper,
 	byorWrapper wrappers.ByorWrapper,
 	applicationsWrapper wrappers.ApplicationsWrapper,
 	featureFlagsWrapper wrappers.FeatureFlagsWrapper) *cobra.Command {
@@ -37,7 +36,7 @@ func NewImportCommand(
 			`,
 			),
 		},
-		RunE: runImportCommand(projectsWrapper, uploadsWrapper, groupsWrapper, accessManagementWrapper, applicationsWrapper, byorWrapper, featureFlagsWrapper),
+		RunE: runImportCommand(projectsWrapper, uploadsWrapper, groupsWrapper, applicationsWrapper, byorWrapper, featureFlagsWrapper),
 	}
 
 	cmd.PersistentFlags().String(commonParams.ImportFilePath, "", "Path to the import file (sarif file or zip archive containing sarif files)")
@@ -50,7 +49,6 @@ func runImportCommand(
 	projectsWrapper wrappers.ProjectsWrapper,
 	uploadsWrapper wrappers.UploadsWrapper,
 	groupsWrapper wrappers.GroupsWrapper,
-	accessManagementWrapper wrappers.AccessManagementWrapper,
 	applicationsWrapper wrappers.ApplicationsWrapper,
 	byorWrapper wrappers.ByorWrapper,
 	featureFlagsWrapper wrappers.FeatureFlagsWrapper) func(cmd *cobra.Command, args []string) error {
@@ -65,7 +63,7 @@ func runImportCommand(
 			return errors.Errorf(errorConstants.ProjectNameIsRequired)
 		}
 
-		projectID, err := services.FindProject(projectName, cmd, projectsWrapper, groupsWrapper, accessManagementWrapper, applicationsWrapper, featureFlagsWrapper)
+		projectID, err := services.FindProject(projectName, cmd, projectsWrapper, groupsWrapper, applicationsWrapper)
 		if err != nil {
 			return err
 		}

internal/commands/util/import_test.go

@@ -16,7 +16,6 @@ func TestImport_ImportSarifFileWithCorrectFlags_CreateImportSuccessfully(t *test
 		&mock.ProjectsMockWrapper{},
 		&mock.UploadsMockWrapper{},
 		&mock.GroupsMockWrapper{},
-		mock.AccessManagementMockWrapper{},
 		&mock.ByorMockWrapper{},
 		mock.ApplicationsMockWrapper{},
 		&mock.FeatureFlagsMockWrapper{},
@@ -32,7 +31,6 @@ func TestImport_ImportSarifFileProjectDoesntExist_CreateImportWithProvidedNewNam
 		&mock.ProjectsMockWrapper{},
 		&mock.UploadsMockWrapper{},
 		&mock.GroupsMockWrapper{},
-		mock.AccessManagementMockWrapper{},
 		&mock.ByorMockWrapper{},
 		mock.ApplicationsMockWrapper{},
 		&mock.FeatureFlagsMockWrapper{},
@@ -48,7 +46,6 @@ func TestImport_ImportSarifFileMissingImportFilePath_CreateImportReturnsErrorWit
 		&mock.ProjectsMockWrapper{},
 		&mock.UploadsMockWrapper{},
 		&mock.GroupsMockWrapper{},
-		mock.AccessManagementMockWrapper{},
 		&mock.ByorMockWrapper{},
 		mock.ApplicationsMockWrapper{},
 		&mock.FeatureFlagsMockWrapper{},
@@ -63,7 +60,6 @@ func TestImport_ImportSarifFileEmptyImportFilePathValue_CreateImportReturnsError
 		&mock.ProjectsMockWrapper{},
 		&mock.UploadsMockWrapper{},
 		&mock.GroupsMockWrapper{},
-		mock.AccessManagementMockWrapper{},
 		&mock.ByorMockWrapper{},
 		mock.ApplicationsMockWrapper{},
 		&mock.FeatureFlagsMockWrapper{},
@@ -78,7 +74,6 @@ func TestImport_ImportSarifFileMissingImportProjectName_CreateImportReturnsError
 		&mock.ProjectsMockWrapper{},
 		&mock.UploadsMockWrapper{},
 		&mock.GroupsMockWrapper{},
-		mock.AccessManagementMockWrapper{},
 		&mock.ByorMockWrapper{},
 		mock.ApplicationsMockWrapper{},
 		&mock.FeatureFlagsMockWrapper{},
@@ -93,7 +88,6 @@ func TestImport_ImportSarifFileProjectNameNotProvided_CreateImportWithProvidedNe
 		&mock.ProjectsMockWrapper{},
 		&mock.UploadsMockWrapper{},
 		&mock.GroupsMockWrapper{},
-		mock.AccessManagementMockWrapper{},
 		&mock.ByorMockWrapper{},
 		mock.ApplicationsMockWrapper{},
 		&mock.FeatureFlagsMockWrapper{},
@@ -108,7 +102,6 @@ func TestImport_ImportSarifFileUnacceptedFileExtension_CreateImportReturnsErrorW
 		&mock.ProjectsMockWrapper{},
 		&mock.UploadsMockWrapper{},
 		&mock.GroupsMockWrapper{},
-		mock.AccessManagementMockWrapper{},
 		&mock.ByorMockWrapper{},
 		mock.ApplicationsMockWrapper{},
 		&mock.FeatureFlagsMockWrapper{},
@@ -123,7 +116,6 @@ func TestImport_ImportSarifFileMissingExtension_CreateImportReturnsErrorWithCorr
 		&mock.ProjectsMockWrapper{},
 		&mock.UploadsMockWrapper{},
 		&mock.GroupsMockWrapper{},
-		mock.AccessManagementMockWrapper{},
 		&mock.ByorMockWrapper{},
 		mock.ApplicationsMockWrapper{},
 		&mock.FeatureFlagsMockWrapper{},

internal/commands/util/utils.go

@@ -41,7 +41,6 @@ func NewUtilsCommand(
 	projectsWrapper wrappers.ProjectsWrapper,
 	uploadsWrapper wrappers.UploadsWrapper,
 	groupsWrapper wrappers.GroupsWrapper,
-	accessManagementWrapper wrappers.AccessManagementWrapper,
 	applicationsWrapper wrappers.ApplicationsWrapper,
 	byorWrapper wrappers.ByorWrapper,
 	featureFlagsWrapper wrappers.FeatureFlagsWrapper,
@@ -64,7 +63,7 @@ func NewUtilsCommand(
 		},
 	}
 
-	importCmd := NewImportCommand(projectsWrapper, uploadsWrapper, groupsWrapper, accessManagementWrapper, byorWrapper, applicationsWrapper, featureFlagsWrapper)
+	importCmd := NewImportCommand(projectsWrapper, uploadsWrapper, groupsWrapper, byorWrapper, applicationsWrapper, featureFlagsWrapper)
 
 	envCheckCmd := NewEnvCheckCommand()
 

internal/commands/util/utils_test.go

@@ -28,7 +28,6 @@ func TestNewUtilsCommand(t *testing.T) {
 		&mock.ProjectsMockWrapper{},
 		&mock.UploadsMockWrapper{},
 		&mock.GroupsMockWrapper{},
-		mock.AccessManagementMockWrapper{},
 		mock.ApplicationsMockWrapper{},
 		&mock.ByorMockWrapper{},
 		&mock.FeatureFlagsMockWrapper{})

internal/services/groups.go

@@ -3,7 +3,6 @@ package services
 import (
 	"strings"
 
-	featureFlagsConstants "github.com/checkmarx/ast-cli/internal/constants/feature-flags"
 	"github.com/checkmarx/ast-cli/internal/wrappers"
 	"github.com/pkg/errors"
 )
@@ -47,34 +46,6 @@ func CreateGroupsMap(groupsStr string, groupsWrapper wrappers.GroupsWrapper) ([]
 	}
 	return groupsMap, nil
 }
-
-func AssignGroupsToProjectNewAccessManagement(projectID string, projectName string, groups []*wrappers.Group,
-	accessManagement wrappers.AccessManagementWrapper, featureFlagsWrapper wrappers.FeatureFlagsWrapper) error {
-
-	amEnabledFlag, _ := wrappers.GetSpecificFeatureFlag(featureFlagsWrapper, featureFlagsConstants.AccessManagementEnabled)
-	amPhase2Flag, _ := wrappers.GetSpecificFeatureFlag(featureFlagsWrapper, featureFlagsConstants.AccessManagementPhase2)
-
-	// If ACCESS_MANAGEMENT_PHASE2 flag is ON and if the ACCESS_MANAGEMENT_ENABLED flag is OFF
-	// In both cases, we do not need to assign groups through the CreateGroupsAssignment call.
-	if !amEnabledFlag.Status || amPhase2Flag.Status {
-		return nil
-	}
-	groupsAssignedToTheProject, err := accessManagement.GetGroups(projectID)
-	if err != nil {
-		return err
-	}
-	groupsToAssign := getGroupsToAssign(groups, groupsAssignedToTheProject)
-	if len(groupsToAssign) == 0 {
-		return nil
-	}
-
-	err = accessManagement.CreateGroupsAssignment(projectID, projectName, groupsToAssign)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
 func getGroupsToAssign(receivedGroups, existingGroups []*wrappers.Group) []*wrappers.Group {
 	var groupsToAssign []*wrappers.Group
 	var groupsMap = make(map[string]bool)