Upgrade go-github.

Author: gotgenes

cmd/getignore/common.go

@@ -35,6 +35,11 @@ var commonFlags = []cli.Flag{
 		Usage:   "The suffix to use to identify ignore files",
 		Value:   github.Suffix,
 	},
+	&cli.IntFlag{
+		Name:  "max-redirects",
+		Usage: "The maximum number of redirects to follow",
+		Value: github.MaxRedirects,
+	},
 }
 
 var stringFlagsToOptions = map[string]func(string) github.GetterOption{

go.mod

@@ -3,7 +3,7 @@ module github.com/gotgenes/getignore
 go 1.21
 
 require (
-	github.com/google/go-github/v48 v48.1.0
+	github.com/google/go-github/v58 v58.0.0
 	github.com/onsi/ginkgo/v2 v2.15.0
 	github.com/onsi/gomega v1.31.1
 	github.com/urfave/cli/v2 v2.27.1
@@ -19,7 +19,6 @@ require (
 	github.com/google/pprof v0.0.0-20240125082051-42cd04596328 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/xrash/smetrics v0.0.0-20231213231151-1d8dd44e695e // indirect
-	golang.org/x/crypto v0.18.0 // indirect
 	golang.org/x/net v0.20.0 // indirect
 	golang.org/x/sys v0.16.0 // indirect
 	golang.org/x/text v0.14.0 // indirect

go.sum

@@ -14,8 +14,8 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/go-github/v48 v48.1.0 h1:nqPqq+0oRY2AMR/SRskGrrP4nnewPB7e/m2+kbT/UvM=
-github.com/google/go-github/v48 v48.1.0/go.mod h1:dDlehKBDo850ZPvCTK0sEqTCVWcrGl2LcDiajkYi89Y=
+github.com/google/go-github/v58 v58.0.0 h1:Una7GGERlF/37XfkPwpzYJe0Vp4dt2k1kCjlxwjIvzw=
+github.com/google/go-github/v58 v58.0.0/go.mod h1:k4hxDKEfoWpSqFlc8LTpGd9fu2KrV1YAa6Hi6FmDNY4=
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
 github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
 github.com/google/pprof v0.0.0-20240125082051-42cd04596328 h1:oI+lCI2DY1BsRrdzMJBhIMxBBdlZJl31YNQC11EiyvA=
@@ -35,8 +35,6 @@ github.com/urfave/cli/v2 v2.27.1 h1:8xSQ6szndafKVRmfyeUMxkNUJQMjL1F2zmsZ+qHpfho=
 github.com/urfave/cli/v2 v2.27.1/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ=
 github.com/xrash/smetrics v0.0.0-20231213231151-1d8dd44e695e h1:+SOyEddqYF09QP7vr7CgJ1eti3pY9Fn3LHO1M1r/0sI=
 github.com/xrash/smetrics v0.0.0-20231213231151-1d8dd44e695e/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
-golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc=
-golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
 golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
 golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
 golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=

pkg/github/constants.go

@@ -7,4 +7,5 @@ const (
 	Suffix     = ".gitignore"
 
 	userAgentTemplate = "getignore/%s"
+	MaxRedirects      = 3
 )

pkg/github/getter.go

@@ -11,7 +11,7 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/google/go-github/v48/github"
+	"github.com/google/go-github/v58/github"
 	"github.com/gotgenes/getignore/pkg/getignore"
 )
 
@@ -20,24 +20,26 @@ var DefaultMaxRequests = runtime.NumCPU() - 1
 
 // Getter lists and gets files using the GitHub tree API.
 type Getter struct {
-	client      *github.Client
-	BaseURL     string
-	Owner       string
-	Repository  string
-	Branch      string
-	Suffix      string
-	MaxRequests int
+	client       *github.Client
+	BaseURL      string
+	Owner        string
+	Repository   string
+	Branch       string
+	Suffix       string
+	MaxRequests  int
+	MaxRedirects int
 }
 
 // getterParams holds parameters for instantiating a Getter
 type getterParams struct {
-	client      *http.Client
-	baseURL     string
-	owner       string
-	repository  string
-	branch      string
-	suffix      string
-	maxRequests int
+	client       *http.Client
+	baseURL      string
+	owner        string
+	repository   string
+	branch       string
+	suffix       string
+	maxRequests  int
+	maxRedirects int
 }
 
 func NewGetter(options ...GetterOption) (Getter, error) {
@@ -55,13 +57,12 @@ func NewGetter(options ...GetterOption) (Getter, error) {
 		ghClient *github.Client
 		err      error
 	)
+	ghClient = github.NewClient(params.client)
 	if params.baseURL != "" {
-		ghClient, err = github.NewEnterpriseClient(params.baseURL, params.baseURL, params.client)
+		ghClient, err = ghClient.WithEnterpriseURLs(params.baseURL, params.baseURL)
 		if err != nil {
 			return Getter{}, err
 		}
-	} else {
-		ghClient = github.NewClient(params.client)
 	}
 	userAgentString := fmt.Sprintf(userAgentTemplate, getignore.Version)
 	ghClient.UserAgent = userAgentString
@@ -127,6 +128,13 @@ func WithMaxRequests(max int) GetterOption {
 	}
 }
 
+// WithMaxRedirects sets the number of maximum redirects to follow
+func WithMaxRedirects(max int) GetterOption {
+	return func(p *getterParams) {
+		p.maxRedirects = max
+	}
+}
+
 // List returns an array of files filtered by the provided suffix.
 func (g Getter) List(ctx context.Context) ([]string, error) {
 	tree, err := g.getTree(ctx)
@@ -229,7 +237,7 @@ func (g Getter) newGetError(err error) error {
 }
 
 func (g Getter) getTree(ctx context.Context) (*github.Tree, error) {
-	branch, _, err := g.client.Repositories.GetBranch(ctx, g.Owner, g.Repository, g.Branch, true)
+	branch, _, err := g.client.Repositories.GetBranch(ctx, g.Owner, g.Repository, g.Branch, g.MaxRedirects)
 	if err != nil {
 		return nil, errors.New("unable to get branch information")
 	}