Skip to content

Project Creation Flow With AM Phase-2 (AST-72966) #932

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-miryam-foifer merged 5 commits into from
Nov 14, 2024
Merged

Project Creation Flow With AM Phase-2 (AST-72966) #932

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
61b93dd
Project Creation flow with AM Phase 2 (AST-72966)
cx-miryam-foifer Nov 11, 2024
9ce4f3a
fix for linter: adding a space in comment
cx-miryam-foifer Nov 11, 2024
c0ce1c7
support same case in scan create flow
cx-miryam-foifer Nov 12, 2024
bc049de
Merge branch 'main' into feature/MiryamFoifer/ProjectCreationWithGroups
cx-miryam-foifer Nov 13, 2024
3e38269
Merge branch 'main' into feature/MiryamFoifer/ProjectCreationWithGroups
cx-miryam-foifer Nov 14, 2024
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
17 changes: 8 additions & 9 deletions internal/commands/groups.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,24 @@ package commands
import (
"encoding/json"

featureFlagsConstants "github.com/checkmarx/ast-cli/internal/constants/feature-flags"
commonParams "github.com/checkmarx/ast-cli/internal/params"
"github.com/checkmarx/ast-cli/internal/services"
"github.com/checkmarx/ast-cli/internal/wrappers"
"github.com/spf13/cobra"
)

func updateGroupValues(input *[]byte, cmd *cobra.Command, groupsWrapper wrappers.GroupsWrapper, featureFlagsWrapper wrappers.FeatureFlagsWrapper) ([]*wrappers.Group, error) {
func updateGroupValues(input *[]byte, cmd *cobra.Command, groupsWrapper wrappers.GroupsWrapper) ([]*wrappers.Group, error) {
groupListStr, _ := cmd.Flags().GetString(commonParams.GroupList)
groups, err := services.CreateGroupsMap(groupListStr, groupsWrapper)
if err != nil {
return groups, err
}
flagResponse, _ := wrappers.GetSpecificFeatureFlag(featureFlagsWrapper, featureFlagsConstants.AccessManagementEnabled)
if !flagResponse.Status {
var info map[string]interface{}
_ = json.Unmarshal(*input, &info)
info["groups"] = services.GetGroupIds(groups)
*input, _ = json.Marshal(info)
}

// we're not checking here status of the feature flag, because of refactoring in AM
var info map[string]interface{}
_ = json.Unmarshal(*input, &info)
info["groups"] = services.GetGroupIds(groups)
*input, _ = json.Marshal(info)

return groups, nil
}
2 changes: 1 addition & 1 deletion internal/commands/project.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ func runCreateProjectCommand(
if err != nil {
return err
}
groups, err := updateGroupValues(&input, cmd, groupsWrapper, featureFlagsWrapper)
groups, err := updateGroupValues(&input, cmd, groupsWrapper)
if err != nil {
return err
}
Expand Down