fix updating group members

Author: xrstf

pkg/config/conversion.go

@@ -317,11 +317,18 @@ func ToConfigGroup(gsuiteGroup *directoryv1.Group, settings *groupssettingsv1.Gr
 	return group, nil
 }
 
-func ToGSuiteGroupMember(member *Member) *directoryv1.Member {
-	return &directoryv1.Member{
+func ToGSuiteGroupMember(member *Member, gsuiteMember *directoryv1.Member) *directoryv1.Member {
+	result := &directoryv1.Member{
 		Email: member.Email,
 		Role:  member.Role,
 	}
+
+	if gsuiteMember != nil {
+		result.Id = gsuiteMember.Id
+		result.Etag = gsuiteMember.Etag
+	}
+
+	return result
 }
 
 func ToConfigGroupMember(gsuiteMember *directoryv1.Member) Member {

pkg/glib/directory_groups.go

@@ -131,7 +131,7 @@ func (ds *DirectoryService) RemoveMember(ctx context.Context, group *directoryv1
 // UpdateMembership changes the role of the member
 func (ds *DirectoryService) UpdateMembership(ctx context.Context, group *directoryv1.Group, member *directoryv1.Member) error {
 	// do NOT use the member email here, as it will lead to "Error 404: Resource Not Found: email, notFound." errors
-	if _, err := ds.Members.Update(group.Email, member.Id, member).Context(ctx).Do(); err != nil {
+	if _, err := ds.Members.Update(group.Id, member.Id, member).Context(ctx).Do(); err != nil {
 		return err
 	}
 

pkg/sync/groups.go

@@ -20,6 +20,7 @@ import (
 	"context"
 	"fmt"
 	"log"
+	"sort"
 
 	directoryv1 "google.golang.org/api/admin/directory/v1"
 	"k8s.io/apimachinery/pkg/util/sets"
@@ -46,6 +47,10 @@ func SyncGroups(
 
 	liveGroupEmails := sets.NewString()
 
+	sort.Slice(liveGroups, func(i, j int) bool {
+		return liveGroups[i].Email < liveGroups[j].Email
+	})
+
 	for _, liveGroup := range liveGroups {
 		liveGroupEmails.Insert(liveGroup.Email)
 
@@ -171,7 +176,7 @@ func syncGroupMembers(
 			log.Printf("    ✎ %s", liveMember.Email)
 
 			if confirm {
-				member := config.ToGSuiteGroupMember(expectedMember)
+				member := config.ToGSuiteGroupMember(expectedMember, liveMember)
 				if err := directorySrv.UpdateMembership(ctx, liveGroup, member); err != nil {
 					return fmt.Errorf("unable to update membership: %v", err)
 				}
@@ -184,7 +189,7 @@ func syncGroupMembers(
 			log.Printf("    + %s", expectedMember.Email)
 
 			if confirm {
-				member := config.ToGSuiteGroupMember(&expectedMember)
+				member := config.ToGSuiteGroupMember(&expectedMember, nil)
 				if err := directorySrv.AddNewMember(ctx, liveGroup, member); err != nil {
 					return fmt.Errorf("unable to add member: %v", err)
 				}

pkg/sync/users.go

@@ -20,6 +20,7 @@ import (
 	"context"
 	"fmt"
 	"log"
+	"sort"
 
 	directoryv1 "google.golang.org/api/admin/directory/v1"
 	"k8s.io/apimachinery/pkg/util/sets"
@@ -48,6 +49,10 @@ func SyncUsers(
 
 	liveEmails := sets.NewString()
 
+	sort.Slice(liveUsers, func(i, j int) bool {
+		return liveUsers[i].PrimaryEmail < liveUsers[j].PrimaryEmail
+	})
+
 	for _, liveUser := range liveUsers {
 		liveEmails.Insert(liveUser.PrimaryEmail)