refactor(repo): whenever possible, use github.Repo

Author: nobe4

internal/cmd/combine_prs.go

@@ -17,36 +17,36 @@ func CombinePRs(ctx context.Context, graphQlClient *api.GraphQLClient, restClien
 	workingBranchName := combineBranchName + workingBranchSuffix
 
 	// Get the default branch of the repository
-	repoDefaultBranch, err := getDefaultBranch(ctx, restClient, repo.Owner, repo.Repo)
+	repoDefaultBranch, err := getDefaultBranch(ctx, restClient, repo)
 	if err != nil {
 		return fmt.Errorf("failed to get default branch: %w", err)
 	}
 
-	baseBranchSHA, err := getBranchSHA(ctx, restClient, repo.Owner, repo.Repo, repoDefaultBranch)
+	baseBranchSHA, err := getBranchSHA(ctx, restClient, repo, repoDefaultBranch)
 	if err != nil {
 		return fmt.Errorf("failed to get SHA of main branch: %w", err)
 	}
 
 	// Delete any pre-existing working branch
-	err = deleteBranch(ctx, restClient, repo.Owner, repo.Repo, workingBranchName)
+	err = deleteBranch(ctx, restClient, repo, workingBranchName)
 	if err != nil {
 		Logger.Debug("Working branch not found, continuing", "branch", workingBranchName)
 	}
 
 	// Delete any pre-existing combined branch
-	err = deleteBranch(ctx, restClient, repo.Owner, repo.Repo, combineBranchName)
+	err = deleteBranch(ctx, restClient, repo, combineBranchName)
 	if err != nil {
 		Logger.Debug("Combined branch not found, continuing", "branch", combineBranchName)
 	}
 
 	// Create the combined branch
-	err = createBranch(ctx, restClient, repo.Owner, repo.Repo, combineBranchName, baseBranchSHA)
+	err = createBranch(ctx, restClient, repo, combineBranchName, baseBranchSHA)
 	if err != nil {
 		return fmt.Errorf("failed to create combined branch: %w", err)
 	}
 
 	// Create the working branch
-	err = createBranch(ctx, restClient, repo.Owner, repo.Repo, workingBranchName, baseBranchSHA)
+	err = createBranch(ctx, restClient, repo, workingBranchName, baseBranchSHA)
 	if err != nil {
 		return fmt.Errorf("failed to create working branch: %w", err)
 	}
@@ -55,7 +55,7 @@ func CombinePRs(ctx context.Context, graphQlClient *api.GraphQLClient, restClien
 	var combinedPRs []string
 	var mergeFailedPRs []string
 	for _, pr := range pulls {
-		err := mergeBranch(ctx, restClient, repo.Owner, repo.Repo, workingBranchName, pr.Head.Ref)
+		err := mergeBranch(ctx, restClient, repo, workingBranchName, pr.Head.Ref)
 		if err != nil {
 			// Check if the error is a 409 merge conflict
 			if isMergeConflictError(err) {
@@ -73,21 +73,21 @@ func CombinePRs(ctx context.Context, graphQlClient *api.GraphQLClient, restClien
 	}
 
 	// Update the combined branch to the latest commit of the working branch
-	err = updateRef(ctx, restClient, repo.Owner, repo.Repo, combineBranchName, workingBranchName)
+	err = updateRef(ctx, restClient, repo, combineBranchName, workingBranchName)
 	if err != nil {
 		return fmt.Errorf("failed to update combined branch: %w", err)
 	}
 
 	// Delete the temporary working branch
-	err = deleteBranch(ctx, restClient, repo.Owner, repo.Repo, workingBranchName)
+	err = deleteBranch(ctx, restClient, repo, workingBranchName)
 	if err != nil {
 		Logger.Warn("Failed to delete working branch", "branch", workingBranchName, "error", err)
 	}
 
 	// Create the combined PR
 	prBody := generatePRBody(combinedPRs, mergeFailedPRs)
 	prTitle := "Combined PRs"
-	err = createPullRequest(ctx, restClient, repo.Owner, repo.Repo, prTitle, combineBranchName, repoDefaultBranch, prBody)
+	err = createPullRequest(ctx, restClient, repo, prTitle, combineBranchName, repoDefaultBranch, prBody)
 	if err != nil {
 		return fmt.Errorf("failed to create combined PR: %w", err)
 	}
@@ -102,11 +102,11 @@ func isMergeConflictError(err error) bool {
 }
 
 // Find the default branch of a repository
-func getDefaultBranch(ctx context.Context, client *api.RESTClient, owner, repo string) (string, error) {
+func getDefaultBranch(ctx context.Context, client *api.RESTClient, repo github.Repo) (string, error) {
 	var repoInfo struct {
 		DefaultBranch string `json:"default_branch"`
 	}
-	endpoint := fmt.Sprintf("repos/%s/%s", owner, repo)
+	endpoint := fmt.Sprintf("repos/%s/%s", repo.Owner, repo.Repo)
 	err := client.Get(endpoint, &repoInfo)
 	if err != nil {
 		return "", fmt.Errorf("failed to get default branch: %w", err)
@@ -115,13 +115,13 @@ func getDefaultBranch(ctx context.Context, client *api.RESTClient, owner, repo s
 }
 
 // Get the SHA of a given branch
-func getBranchSHA(ctx context.Context, client *api.RESTClient, owner, repo, branch string) (string, error) {
+func getBranchSHA(ctx context.Context, client *api.RESTClient, repo github.Repo, branch string) (string, error) {
 	var ref struct {
 		Object struct {
 			SHA string `json:"sha"`
 		} `json:"object"`
 	}
-	endpoint := fmt.Sprintf("repos/%s/%s/git/ref/heads/%s", owner, repo, branch)
+	endpoint := fmt.Sprintf("repos/%s/%s/git/ref/heads/%s", repo.Owner, repo.Repo, branch)
 	err := client.Get(endpoint, &ref)
 	if err != nil {
 		return "", fmt.Errorf("failed to get SHA of branch %s: %w", branch, err)
@@ -148,14 +148,14 @@ func generatePRBody(combinedPRs, mergeFailedPRs []string) string {
 }
 
 // deleteBranch deletes a branch in the repository
-func deleteBranch(ctx context.Context, client *api.RESTClient, owner, repo, branch string) error {
-	endpoint := fmt.Sprintf("repos/%s/%s/git/refs/heads/%s", owner, repo, branch)
+func deleteBranch(ctx context.Context, client *api.RESTClient, repo github.Repo, branch string) error {
+	endpoint := fmt.Sprintf("repos/%s/%s/git/refs/heads/%s", repo.Owner, repo.Repo, branch)
 	return client.Delete(endpoint, nil)
 }
 
 // createBranch creates a new branch in the repository
-func createBranch(ctx context.Context, client *api.RESTClient, owner, repo, branch, sha string) error {
-	endpoint := fmt.Sprintf("repos/%s/%s/git/refs", owner, repo)
+func createBranch(ctx context.Context, client *api.RESTClient, repo github.Repo, branch, sha string) error {
+	endpoint := fmt.Sprintf("repos/%s/%s/git/refs", repo.Owner, repo.Repo)
 	payload := map[string]string{
 		"ref": "refs/heads/" + branch,
 		"sha": sha,
@@ -168,8 +168,8 @@ func createBranch(ctx context.Context, client *api.RESTClient, owner, repo, bran
 }
 
 // mergeBranch merges a branch into the base branch
-func mergeBranch(ctx context.Context, client *api.RESTClient, owner, repo, base, head string) error {
-	endpoint := fmt.Sprintf("repos/%s/%s/merges", owner, repo)
+func mergeBranch(ctx context.Context, client *api.RESTClient, repo github.Repo, base, head string) error {
+	endpoint := fmt.Sprintf("repos/%s/%s/merges", repo.Owner, repo.Repo)
 	payload := map[string]string{
 		"base": base,
 		"head": head,
@@ -182,21 +182,21 @@ func mergeBranch(ctx context.Context, client *api.RESTClient, owner, repo, base,
 }
 
 // updateRef updates a branch to point to the latest commit of another branch
-func updateRef(ctx context.Context, client *api.RESTClient, owner, repo, branch, sourceBranch string) error {
+func updateRef(ctx context.Context, client *api.RESTClient, repo github.Repo, branch, sourceBranch string) error {
 	// Get the SHA of the source branch
 	var ref struct {
 		Object struct {
 			SHA string `json:"sha"`
 		} `json:"object"`
 	}
-	endpoint := fmt.Sprintf("repos/%s/%s/git/ref/heads/%s", owner, repo, sourceBranch)
+	endpoint := fmt.Sprintf("repos/%s/%s/git/ref/heads/%s", repo.Owner, repo.Repo, sourceBranch)
 	err := client.Get(endpoint, &ref)
 	if err != nil {
 		return fmt.Errorf("failed to get SHA of source branch: %w", err)
 	}
 
 	// Update the branch to point to the new SHA
-	endpoint = fmt.Sprintf("repos/%s/%s/git/refs/heads/%s", owner, repo, branch)
+	endpoint = fmt.Sprintf("repos/%s/%s/git/refs/heads/%s", repo.Owner, repo.Repo, branch)
 	payload := map[string]interface{}{
 		"sha":   ref.Object.SHA,
 		"force": true,
@@ -209,8 +209,8 @@ func updateRef(ctx context.Context, client *api.RESTClient, owner, repo, branch,
 }
 
 // createPullRequest creates a new pull request
-func createPullRequest(ctx context.Context, client *api.RESTClient, owner, repo, title, head, base, body string) error {
-	endpoint := fmt.Sprintf("repos/%s/%s/pulls", owner, repo)
+func createPullRequest(ctx context.Context, client *api.RESTClient, repo github.Repo, title, head, base, body string) error {
+	endpoint := fmt.Sprintf("repos/%s/%s/pulls", repo.Owner, repo.Repo)
 	payload := map[string]string{
 		"title": title,
 		"head":  head,