Skip to content

CLOUDP-313040: Fix DryRun #2268

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
merged 1 commit into from
Apr 23, 2025
Merged

CLOUDP-313040: Fix DryRun #2268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 11 additions & 4 deletions internal/controller/atlasproject/teams.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
package atlasproject

import (
"errors"

"k8s.io/apimachinery/pkg/types"
controllerruntime "sigs.k8s.io/controller-runtime"

Expand Down Expand Up @@ -94,6 +96,7 @@ func (r *AtlasProjectReconciler) syncAssignedTeams(ctx *workflow.Context, teamsS
}

defer statushandler.Update(ctx, r.Client, r.EventRecorder, project)
var teamErrors error

toDelete := make([]*teams.AssignedTeam, 0, len(atlasAssignedTeams))

Expand All @@ -119,16 +122,18 @@ func (r *AtlasProjectReconciler) syncAssignedTeams(ctx *workflow.Context, teamsS
}

ctx.Log.Debugf("removing team %s from project for later update", atlasAssignedTeam.TeamID)
err := teamsService.Unassign(ctx.Context, projectID, atlasAssignedTeam.TeamID)
err = teamsService.Unassign(ctx.Context, projectID, atlasAssignedTeam.TeamID)
if err != nil {
teamErrors = errors.Join(teamErrors, err)
ctx.Log.Warnf("failed to remove team %s from project: %s", atlasAssignedTeam.TeamID, err.Error())
}
}

for _, atlasAssignedTeam := range toDelete {
ctx.Log.Debugf("removing team %s from project", atlasAssignedTeam.TeamID)
err := teamsService.Unassign(ctx.Context, projectID, atlasAssignedTeam.TeamID)
err = teamsService.Unassign(ctx.Context, projectID, atlasAssignedTeam.TeamID)
if err != nil {
teamErrors = errors.Join(teamErrors, err)
ctx.Log.Warnf("failed to remove team %s from project: %s", atlasAssignedTeam.TeamID, err.Error())
}

Expand All @@ -137,6 +142,7 @@ func (r *AtlasProjectReconciler) syncAssignedTeams(ctx *workflow.Context, teamsS
ctx.Log.Warnf("unable to find team %s status in the project", atlasAssignedTeam.TeamID)
} else {
if err = r.updateTeamState(ctx, project, teamRef, true); err != nil {
teamErrors = errors.Join(teamErrors, err)
ctx.Log.Warnf("failed to update team %s status with removed project: %s", atlasAssignedTeam.TeamID, err.Error())
}
}
Expand All @@ -157,13 +163,14 @@ func (r *AtlasProjectReconciler) syncAssignedTeams(ctx *workflow.Context, teamsS
}

if err = r.updateTeamState(ctx, project, &teamsToAssign[teamID].TeamRef, false); err != nil {
teamErrors = errors.Join(teamErrors, err)
ctx.Log.Warnf("failed to update team %s status with added project: %s", teamID, err.Error())
}
}

err = teamsService.Assign(ctx.Context, &projectTeams, projectID)
if err != nil {
return err
return errors.Join(teamErrors, err)
}
}

Expand All @@ -173,7 +180,7 @@ func (r *AtlasProjectReconciler) syncAssignedTeams(ctx *workflow.Context, teamsS

ctx.EnsureStatusOption(status.AtlasProjectSetTeamsOption(&projectTeamStatus))

return nil
return teamErrors
}

func (r *AtlasProjectReconciler) updateTeamState(ctx *workflow.Context, project *akov2.AtlasProject, teamRef *common.ResourceRefNamespaced, isRemoval bool) error {
Expand Down
179 changes: 145 additions & 34 deletions internal/controller/atlasproject/teams_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ package atlasproject

import (
"context"
"errors"
"testing"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"go.mongodb.org/atlas-sdk/v20231115008/admin"
"go.uber.org/zap/zaptest"
corev1 "k8s.io/api/core/v1"
Expand All @@ -39,10 +39,116 @@ import (
)

func TestSyncAssignedTeams(t *testing.T) {
ctx := context.Background()

tests := map[string]struct {
teamsToAssign map[string]*akov2.Team
expectedErr error
teamsToAssign map[string]*akov2.Team
teamServiceMock func() teams.TeamsService
expectedErr error
}{
"should error to list teams": {
teamServiceMock: func() teams.TeamsService {
s := translation.NewTeamsServiceMock(t)
s.EXPECT().
ListProjectTeams(ctx, "projectID").
Return(nil, errors.New("error to list teams"))

return s
},
expectedErr: errors.New("error to list teams"),
},
"should error to unassign teams": {
teamServiceMock: func() teams.TeamsService {
s := translation.NewTeamsServiceMock(t)
s.EXPECT().ListProjectTeams(ctx, "projectID").Return([]teams.AssignedTeam{
{
Roles: []string{"GROUP_OWNER"},
TeamID: "teamID_1",
TeamName: "teamName_1",
},
{
Roles: []string{"GROUP_OWNER"},
TeamID: "teamID_2",
TeamName: "teamName_2",
},
{
Roles: []string{"GROUP_READ_ONLY"},
TeamID: "teamID_3",
TeamName: "teamName_3",
},
}, nil)
s.EXPECT().Unassign(ctx, "projectID", "teamID_1").Return(errors.New("error to unassign team 1"))
s.EXPECT().Unassign(ctx, "projectID", "teamID_2").Return(errors.New("error to unassign team 2"))
s.EXPECT().Unassign(ctx, "projectID", "teamID_3").Return(errors.New("error to unassign team 3"))

return s
},
expectedErr: errors.Join(
errors.Join(
errors.Join(
nil,
errors.New("error to unassign team 1"),
),
errors.New("error to unassign team 2"),
),
errors.New("error to unassign team 3"),
),
},
"should error to assign teams": {
teamsToAssign: map[string]*akov2.Team{
"teamID_1": {
TeamRef: common.ResourceRefNamespaced{
Name: "teamName_1",
},
Roles: []akov2.TeamRole{"GROUP_OWNER"},
},
"teamID_2": {
TeamRef: common.ResourceRefNamespaced{
Name: "teamName_2",
},
Roles: []akov2.TeamRole{"GROUP_READ_ONLY"},
},
},
teamServiceMock: func() teams.TeamsService {
s := translation.NewTeamsServiceMock(t)
s.EXPECT().ListProjectTeams(ctx, "projectID").Return([]teams.AssignedTeam{
{
Roles: []string{"GROUP_OWNER"},
TeamID: "teamID_1",
TeamName: "teamName_1",
},
{
Roles: []string{"GROUP_OWNER"},
TeamID: "teamID_2",
TeamName: "teamName_2",
},
{
Roles: []string{"GROUP_READ_ONLY"},
TeamID: "teamID_3",
TeamName: "teamName_3",
},
}, nil)
s.EXPECT().Unassign(ctx, "projectID", "teamID_2").Return(nil)
s.EXPECT().Unassign(ctx, "projectID", "teamID_3").Return(nil)

s.EXPECT().Assign(
ctx,
&[]teams.AssignedTeam{
{
Roles: []string{"GROUP_READ_ONLY"},
TeamID: "teamID_2",
},
},
"projectID",
).Return(errors.New("error to assign team 2"))

return s
},
expectedErr: errors.Join(
nil,
errors.New("error to assign team 2"),
),
},
"should sync teams assigned": {
teamsToAssign: map[string]*akov2.Team{
"teamID_1": {
Expand All @@ -58,6 +164,41 @@ func TestSyncAssignedTeams(t *testing.T) {
Roles: []akov2.TeamRole{"GROUP_READ_ONLY"},
},
},
teamServiceMock: func() teams.TeamsService {
s := translation.NewTeamsServiceMock(t)
s.EXPECT().ListProjectTeams(ctx, "projectID").Return([]teams.AssignedTeam{
{
Roles: []string{"GROUP_OWNER"},
TeamID: "teamID_1",
TeamName: "teamName_1",
},
{
Roles: []string{"GROUP_OWNER"},
TeamID: "teamID_2",
TeamName: "teamName_2",
},
{
Roles: []string{"GROUP_READ_ONLY"},
TeamID: "teamID_3",
TeamName: "teamName_3",
},
}, nil)
s.EXPECT().Unassign(ctx, "projectID", "teamID_2").Return(nil)
s.EXPECT().Unassign(ctx, "projectID", "teamID_3").Return(nil)
s.EXPECT().Assign(
ctx,
&[]teams.AssignedTeam{
{
Roles: []string{"GROUP_READ_ONLY"},
TeamID: "teamID_2",
},
},
"projectID",
).
Return(nil)

return s
},
},
}

Expand Down Expand Up @@ -174,42 +315,12 @@ func TestSyncAssignedTeams(t *testing.T) {
},
Context: context.Background(),
}
teamService := func() teams.TeamsService {
service := translation.NewTeamsServiceMock(t)
service.EXPECT().ListProjectTeams(mock.Anything, "projectID").Return([]teams.AssignedTeam{
{
Roles: []string{"GROUP_OWNER"},
TeamID: team1.Status.ID,
TeamName: "teamName_1",
},
{
Roles: []string{"GROUP_OWNER"},
TeamID: team2.Status.ID,
TeamName: "teamName_2",
},
{
Roles: []string{"GROUP_READ_ONLY"},
TeamID: team3.Status.ID,
TeamName: "teamName_3",
},
}, nil)
service.EXPECT().Unassign(mock.Anything, "projectID", "teamID_2").Return(nil)
service.EXPECT().Unassign(mock.Anything, "projectID", "teamID_3").Return(nil)
service.EXPECT().Assign(mock.Anything,
&[]teams.AssignedTeam{
{
Roles: []string{"GROUP_READ_ONLY"},
TeamID: "teamID_2",
},
}, "projectID").Return(nil)
return service
}
r := &AtlasProjectReconciler{
Client: k8sClient,
EventRecorder: record.NewFakeRecorder(10),
Log: logger,
}
err := r.syncAssignedTeams(ctx, teamService(), "projectID", project, tt.teamsToAssign)
err := r.syncAssignedTeams(ctx, tt.teamServiceMock(), "projectID", project, tt.teamsToAssign)
assert.Equal(t, tt.expectedErr, err)
})
}
Expand Down
Loading