From 8ef9253c37e830b83cf4156091e06e107f531c40 Mon Sep 17 00:00:00 2001 From: Felix Kunde Date: Fri, 12 Feb 2021 16:54:10 +0100 Subject: [PATCH] refactor and fix fetching additional members --- pkg/cluster/util.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkg/cluster/util.go b/pkg/cluster/util.go index c48866fde..f2ba85918 100644 --- a/pkg/cluster/util.go +++ b/pkg/cluster/util.go @@ -238,26 +238,27 @@ func (c *Cluster) getTeamMembers(teamID string) ([]string, error) { return nil, fmt.Errorf("no teamId specified") } - c.logger.Debugf("fetching possible additional team members for team %q", teamID) members := []string{} if c.OpConfig.EnablePostgresTeamCRD && c.Config.PgTeamMap != nil { + c.logger.Debugf("fetching possible additional team members for team %q", teamID) additionalMembers := []string{} for team, membership := range *c.Config.PgTeamMap { if team == teamID { additionalMembers = membership.AdditionalMembers + c.logger.Debugf("found %d additional members for team %q", len(members), teamID) } } for _, member := range additionalMembers { members = append(members, member) } + } - if !c.OpConfig.EnableTeamsAPI { - c.logger.Debugf("team API is disabled, only returning %d members for team %q", len(members), teamID) - return members, nil - } + if !c.OpConfig.EnableTeamsAPI { + c.logger.Debugf("team API is disabled") + return members, nil } token, err := c.oauthTokenGetter.getOAuthToken()