Merge pull request #26 from gomicro/errors

errors

Author: dan9186

client/client.go

@@ -84,7 +84,8 @@ func (c *Client) Apply() error {
 	for _, fn := range c.stack {
 		err := fn()
 		if err != nil {
-			return err
+			report.PrintError(err.Error())
+			report.Println()
 		}
 	}
 

client/repos.go

@@ -192,7 +192,7 @@ func (c *Client) AddRepoToTeam(ctx context.Context, org, team, repo, perm string
 				return ErrRepoNotFound
 			}
 
-			return fmt.Errorf("add repo to team: %w", err)
+			return fmt.Errorf("%s/%s: add repo to team: %w", org, repo, err)
 		}
 
 		if relationExists {
@@ -225,7 +225,7 @@ func (c *Client) RemoveRepoFromTeam(ctx context.Context, org, team, repo string)
 				return ErrRepoNotFound
 			}
 
-			return fmt.Errorf("remove repo from team: %w", err)
+			return fmt.Errorf("%s/%s: remove repo from team: %w", org, repo, err)
 		}
 
 		cs.PrintPost()
@@ -336,7 +336,7 @@ func (c *Client) CreateRepo(ctx context.Context, org string, repo *github.Reposi
 				return fmt.Errorf("github: hit rate limit")
 			}
 
-			return fmt.Errorf("create repo: %w", err)
+			return fmt.Errorf("%s/%s: create repo: %w", org, repo, err)
 		}
 
 		cs.PrintPost()
@@ -389,7 +389,11 @@ func (c *Client) UpdateRepo(ctx context.Context, org, repo string, edits *github
 				return ErrRepoNotFound
 			}
 
-			return fmt.Errorf("update repo: %w", err)
+			if resp.StatusCode == http.StatusForbidden && strings.Contains(err.Error(), "was archived so is read-only") {
+				return fmt.Errorf("%s/%s: update repo: repo is archived", org, repo)
+			}
+
+			return fmt.Errorf("%s/%s: update repo: %w", org, repo, err)
 		}
 
 		cs.PrintPost()
@@ -416,7 +420,7 @@ func (c *Client) SetRepoTopics(ctx context.Context, org, repo string, topics []s
 				return ErrRepoNotFound
 			}
 
-			return fmt.Errorf("set repo topics: %w", err)
+			return fmt.Errorf("%s/%s: set repo topics: %w", org, repo, err)
 		}
 
 		cs.PrintPost()
@@ -489,7 +493,11 @@ func (c *Client) ProtectBranch(ctx context.Context, org, repo, branch string, pr
 				return ErrBranchProtectionNotFound
 			}
 
-			return fmt.Errorf("protect branch: %w", err)
+			if resp.StatusCode == http.StatusForbidden && strings.Contains(err.Error(), "was archived so is read-only") {
+				return fmt.Errorf("%s/%s: protect branch: repo is archived", org, repo)
+			}
+
+			return fmt.Errorf("%s/%s: protect branch: %w", org, repo, err)
 		}
 
 		cs.PrintPost()
@@ -536,7 +544,11 @@ func (c *Client) SetRequireSignedCommits(ctx context.Context, org, repo, branch
 				return ErrBranchProtectionNotFound
 			}
 
-			return fmt.Errorf("protect branch: set signature required: %w", err)
+			if resp.StatusCode == http.StatusForbidden && strings.Contains(err.Error(), "was archived so is read-only") {
+				return fmt.Errorf("%s/%s: protect branch: set signature required: repo is archived", org, repo)
+			}
+
+			return fmt.Errorf("%s/%s: protect branch: set signature required: %w", org, repo, err)
 		}
 
 		cs.PrintPost()

cmd/apply_repos.go

@@ -126,7 +126,7 @@ func reposRun(cmd *cobra.Command, args []string) error {
 
 			err := ensureRepo(ctx, org.Name, r)
 			if err != nil {
-				return handleError(cmd, err)
+				report.PrintError(err.Error())
 			}
 		}
 	}