Add custom role/delivery settings when adding users

Author: mike-gregory-ovo

pkg/adapters/google/group/group.go

@@ -45,6 +45,10 @@ type Group struct {
 	name           string
 	logger         types.Logger
 
+	// Custom configuration for adding emails.
+	deliverySettings string
+	role             string
+
 	callList   func(ctx context.Context, call *admin.MembersListCall, pageToken string) (*admin.Members, error)
 	callInsert func(ctx context.Context, call *admin.MembersInsertCall) (*admin.Member, error)
 	callDelete func(ctx context.Context, call *admin.MembersDeleteCall) error
@@ -57,6 +61,20 @@ func OptionLogger(logger types.Logger) func(*Group) {
 	}
 }
 
+// WithRole sets a custom role for new emails being added.
+func WithRole(role string) func(*Group) {
+	return func(group *Group) {
+		group.role = role
+	}
+}
+
+// WithDeliverySettings sets custom deliver settings when adding emails.
+func WithDeliverySettings(deliverySettings string) func(*Group) {
+	return func(group *Group) {
+		group.deliverySettings = deliverySettings
+	}
+}
+
 // New instantiates a new Google Group adapter.
 func New(client *admin.Service, name string, optsFn ...func(*Group)) *Group {
 	group := &Group{
@@ -112,7 +130,11 @@ func (g *Group) Add(ctx context.Context, emails []string) error {
 	g.logger.Printf("Adding %s to Google Group %s", emails, g.name)
 
 	for _, email := range emails {
-		_, err := g.callInsert(ctx, g.membersService.Insert(g.name, &admin.Member{Email: email}))
+		_, err := g.callInsert(ctx, g.membersService.Insert(g.name, &admin.Member{
+			Email:            email,
+			DeliverySettings: g.deliverySettings,
+			Role:             g.role,
+		}))
 		if err != nil {
 			return fmt.Errorf("google.group.add(%s, %s) -> %w", g.name, email, err)
 		}

pkg/adapters/google/group/group_internal_test.go

@@ -116,3 +116,49 @@ func TestGroups_Remove(t *testing.T) {
 
 	assert.NoError(t, err)
 }
+
+func TestWithRole(t *testing.T) {
+	t.Parallel()
+
+	ctx := context.TODO()
+
+	mockMembersService := mocks.NewIMembersService(t)
+	mockMembersService.EXPECT().Insert("test", &admin.Member{
+		Email: "foo@email",
+		Role:  "test-role",
+	}).Return(nil)
+
+	mockCall := new(mockCalls)
+	mockCall.On("callInsert", ctx, mock.Anything).Return(&admin.Member{}, nil)
+
+	group := New(&admin.Service{}, "test", WithRole("test-role"))
+	group.membersService = mockMembersService
+	group.callInsert = mockCall.callInsert
+
+	err := group.Add(ctx, []string{"foo@email"})
+
+	assert.NoError(t, err)
+}
+
+func TestWithDeliverySettings(t *testing.T) {
+	t.Parallel()
+
+	ctx := context.TODO()
+
+	mockMembersService := mocks.NewIMembersService(t)
+	mockMembersService.EXPECT().Insert("test", &admin.Member{
+		Email:            "foo@email",
+		DeliverySettings: "test-delivery-settings",
+	}).Return(nil)
+
+	mockCall := new(mockCalls)
+	mockCall.On("callInsert", ctx, mock.Anything).Return(&admin.Member{}, nil)
+
+	group := New(&admin.Service{}, "test", WithDeliverySettings("test-delivery-settings"))
+	group.membersService = mockMembersService
+	group.callInsert = mockCall.callInsert
+
+	err := group.Add(ctx, []string{"foo@email"})
+
+	assert.NoError(t, err)
+}