Merge pull request #24 from gomicro/fix-fresh-repo-team-error

fix fresh repo team error

Author: dan9186

client/repos.go

@@ -137,11 +137,11 @@ func (c *Client) GetRepoTeams(ctx context.Context, org, repo string) ([]*github.
 			return nil, fmt.Errorf("github: hit rate limit")
 		}
 
-		return nil, fmt.Errorf("get repo teams: %w", err)
-	}
+		if resp.StatusCode == http.StatusNotFound {
+			return nil, ErrRepoNotFound
+		}
 
-	if resp.StatusCode == http.StatusNotFound {
-		return nil, ErrRepoNotFound
+		return nil, fmt.Errorf("get repo teams: %w", err)
 	}
 
 	return teams, nil
@@ -150,7 +150,7 @@ func (c *Client) GetRepoTeams(ctx context.Context, org, repo string) ([]*github.
 func (c *Client) AddRepoToTeam(ctx context.Context, org, team, repo, perm string) error {
 	gts, err := c.GetRepoTeams(ctx, org, repo)
 	if err != nil {
-		return err
+		return fmt.Errorf("add repo team: %w", err)
 	}
 
 	gtps := map[string]string{}

cmd/apply_repos.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"context"
 	"errors"
+	"fmt"
 	"io"
 	"os"
 	"strings"
@@ -205,9 +206,12 @@ func ensureRepo(ctx context.Context, org string, repo *gh_pb.Repository) error {
 		}
 	}
 
-	err = setTeamPermissions(ctx, org, repo, ghr)
-	if err != nil {
-		return err
+	// if repo is fresh, we can't do anything with teams yet
+	if !fresh {
+		err = setTeamPermissions(ctx, org, repo, ghr)
+		if err != nil {
+			return err
+		}
 	}
 
 	err = ensureFiles(ctx, org, repo, ghr)
@@ -301,7 +305,7 @@ func setTeamPermissions(ctx context.Context, org string, repo *gh_pb.Repository,
 
 	gts, err := clt.GetRepoTeams(ctx, org, repo.Name)
 	if err != nil {
-		return err
+		return fmt.Errorf("remove unamaged teams: %w", err)
 	}
 
 	for _, gt := range gts {