Merge pull request #96 from stlaz/group_annotations_nil

Bug 2038691: groupsync: create annotations if not present before writing to them
openshift · Jan 11, 2022 · 245b95f · 245b95f
2 parents e633393 + b5790c9
commit 245b95f
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/pkg/groupmapper/groupmapper.go b/pkg/groupmapper/groupmapper.go
@@ -189,6 +189,10 @@ func (m *UserGroupsMapper) addUserToGroup(idpName, username, group string) error
 		return err
 	}
 
+	if updatedGroup.Annotations == nil {
+		updatedGroup.Annotations = map[string]string{}
+	}
+
 	var onlyAddAnnotation bool
 	for _, u := range updatedGroup.Users {
 		if u == username {

diff --git a/pkg/groupmapper/groupmapper_test.go b/pkg/groupmapper/groupmapper_test.go
@@ -287,6 +287,20 @@ func TestUserGroupsMapper_addUserToGroup(t *testing.T) {
 			expectedGroup: createGroupWithUsers(testGroupName, "user1"),
 			expectEvent:   true,
 		},
+		{
+			name:          "group with no annotations yet - user missng",
+			username:      "user2",
+			group:         removeGroupAnnotations(createGroupWithUsers(testGroupName, "user1", "user2", "user3", "user4")),
+			expectedGroup: removeGeneratedKeyFromGroup(createGroupWithUsers(testGroupName, "user1", "user2", "user3", "user4")),
+			expectEvent:   true,
+		},
+		{
+			name:          "group with no annotations yet - user present",
+			username:      "user2",
+			group:         removeGroupAnnotations(createGroupWithUsers(testGroupName, "user1", "user3", "user4")),
+			expectedGroup: removeGeneratedKeyFromGroup(createGroupWithUsers(testGroupName, "user1", "user3", "user4", "user2")),
+			expectEvent:   true,
+		},
 		{
 			name:          "user already in group",
 			username:      "user3",
@@ -378,6 +392,11 @@ func removeSyncedKeyFromGroup(g *userv1.Group, idpName string) *userv1.Group {
 	return g
 }
 
+func removeGroupAnnotations(g *userv1.Group) *userv1.Group {
+	g.Annotations = nil
+	return g
+}
+
 func watchForGroupEvents(
 	groupWatcher watch.Interface,
 	expectedGroup *userv1.Group,