[WIP] cascades the maintainers team from the configuration

cache/helper.go

@@ -75,9 +75,9 @@ func GetPerm(c context.Context, user *model.User, owner, name string) (*model.Pe
 }
 
 // GetMembers returns the team members from the cache.
-func GetMembers(c context.Context, user *model.User, team string) ([]*model.Member, error) {
+func GetMembers(c context.Context, user *model.User, owner string, maintainers string) ([]*model.Member, error) {
 	key := fmt.Sprintf("members:%s",
-		team,
+		owner,
 	)
 	// if we fetch from the cache we can return immediately
 	val, err := FromContext(c).Get(key)
@@ -86,7 +86,7 @@ func GetMembers(c context.Context, user *model.User, team string) ([]*model.Memb
 	}
 	// else we try to grab from the remote system and
 	// populate our cache.
-	members, err := remote.GetMembers(c, user, team)
+	members, err := remote.GetMembers(c, user, owner, maintainers)
 	if err != nil {
 		return nil, err
 	}

cache/helper_test.go

@@ -112,8 +112,8 @@ func TestHelper(t *testing.T) {
 		})
 
 		g.It("Should set and get members", func() {
-			r.On("GetMembers", fakeUser, "drone").Return(fakeMembers, nil).Once()
-			p, err := GetMembers(c, fakeUser, "drone")
+			r.On("GetMembers", fakeUser, "drone", "maintainers").Return(fakeMembers, nil).Once()
+			p, err := GetMembers(c, fakeUser, "drone", "maintainers")
 			g.Assert(p).Equal(fakeMembers)
 			g.Assert(err).Equal(nil)
 		})
@@ -122,15 +122,15 @@ func TestHelper(t *testing.T) {
 			key := "members:drone"
 
 			Set(c, key, fakeMembers)
-			r.On("GetMembers", fakeUser, "drone").Return(nil, fakeErr).Once()
-			p, err := GetMembers(c, fakeUser, "drone")
+			r.On("GetMembers", fakeUser, "drone", "maintainers").Return(nil, fakeErr).Once()
+			p, err := GetMembers(c, fakeUser, "drone", "maintainers")
 			g.Assert(p).Equal(fakeMembers)
 			g.Assert(err).Equal(nil)
 		})
 
 		g.It("Should get member error", func() {
-			r.On("GetMembers", fakeUser, "drone").Return(nil, fakeErr).Once()
-			p, err := GetMembers(c, fakeUser, "drone")
+			r.On("GetMembers", fakeUser, "drone", "maintainers").Return(nil, fakeErr).Once()
+			p, err := GetMembers(c, fakeUser, "drone", "maintainers")
 			g.Assert(p == nil).IsTrue()
 			g.Assert(err).Equal(fakeErr)
 		})

remote/github/github.go

@@ -93,15 +93,15 @@ func (g *Github) GetTeams(user *model.User) ([]*model.Team, error) {
 	return teams, nil
 }
 
-func (g *Github) GetMembers(user *model.User, team string) ([]*model.Member, error) {
+func (g *Github) GetMembers(user *model.User, owner string, maintainers string) ([]*model.Member, error) {
 	client := setupClient(g.API, user.Token)
-	teams, _, err := client.Organizations.ListTeams(team, &github.ListOptions{PerPage: 100})
+	teams, _, err := client.Organizations.ListTeams(owner, &github.ListOptions{PerPage: 100})
 	if err != nil {
 		return nil, fmt.Errorf("Error accessing team list. %s", err)
 	}
 	var id int
 	for _, team := range teams {
-		if strings.ToLower(*team.Name) == "maintainers" {
+		if strings.ToLower(*team.Name) == strings.ToLower(maintainers) {
 			id = *team.ID
 			break
 		}

remote/mock/remote.go

@@ -96,21 +96,21 @@ func (_m *Remote) GetHook(r *http.Request) (*model.Hook, error) {
 }
 
 // GetMembers provides a mock function with given fields: _a0, _a1
-func (_m *Remote) GetMembers(_a0 *model.User, _a1 string) ([]*model.Member, error) {
-	ret := _m.Called(_a0, _a1)
+func (_m *Remote) GetMembers(_a0 *model.User, _a1 string, _a2 string) ([]*model.Member, error) {
+	ret := _m.Called(_a0, _a1, _a2)
 
 	var r0 []*model.Member
-	if rf, ok := ret.Get(0).(func(*model.User, string) []*model.Member); ok {
-		r0 = rf(_a0, _a1)
+	if rf, ok := ret.Get(0).(func(*model.User, string, string) []*model.Member); ok {
+		r0 = rf(_a0, _a1, _a2)
 	} else {
 		if ret.Get(0) != nil {
 			r0 = ret.Get(0).([]*model.Member)
 		}
 	}
 
 	var r1 error
-	if rf, ok := ret.Get(1).(func(*model.User, string) error); ok {
-		r1 = rf(_a0, _a1)
+	if rf, ok := ret.Get(1).(func(*model.User, string, string) error); ok {
+		r1 = rf(_a0, _a1, _a2)
 	} else {
 		r1 = ret.Error(1)
 	}

web/hook.go

@@ -49,7 +49,7 @@ func Hook(c *gin.Context) {
 	file, err := remote.GetContents(c, user, repo, "MAINTAINERS")
 	if err != nil {
 		log.Debugf("no MAINTAINERS file for %s. Checking for team members.", repo.Slug)
-		members, merr := cache.GetMembers(c, user, repo.Owner)
+		members, merr := cache.GetMembers(c, user, repo.Owner, rcfile.Team)
 		if merr != nil {
 			log.Errorf("Error getting repository %s. %s", repo.Slug, err)
 			log.Errorf("Error getting org members %s. %s", repo.Owner, merr)