@@ -16,7 +16,6 @@ import (
1616
1717 "github.com/PuerkitoBio/goquery"
1818 "github.com/google/go-github/v52/github"
19- "github.com/pkg/errors"
2019 "golang.org/x/mod/modfile"
2120 "golang.org/x/mod/semver"
2221 "golang.org/x/oauth2"
@@ -31,7 +30,7 @@ import (
3130func Run (githubToken string , limit int , test bool ) error {
3231 f , err := mod .GetModFile ("." )
3332 if err != nil {
34- return errors . Wrap ( err , "could not get mod file" )
33+ return fmt . Errorf ( "could not get mod file: %w" , err )
3534 }
3635 ts := oauth2 .StaticTokenSource (& oauth2.Token {AccessToken : githubToken })
3736 tc := oauth2 .NewClient (oauth2 .NoContext , ts )
@@ -77,34 +76,34 @@ func migrate(path string, gc *github.Client, test bool) error {
7776 fmt .Printf ("git clone %v\n " , path )
7877 tempdir , err := os .MkdirTemp ("" , strings .Replace (path , "/" , "_" , - 1 ))
7978 if err != nil {
80- return errors . Wrap ( err , "tempdir err" )
79+ return fmt . Errorf ( "tempdir err: %w" , err )
8180 }
8281 defer os .RemoveAll (tempdir )
8382 red , err := deduceVanity (path )
8483 if err != nil {
85- return errors . Wrap ( err , "error deducing vanity" )
84+ return fmt . Errorf ( "error deducing vanity: %w" , err )
8685 }
8786 dir , err := gitclone (red .gitURL , tempdir )
8887 if err != nil {
89- return errors . Wrap ( err , "error running git clone" )
88+ return fmt . Errorf ( "error running git clone: %w" , err )
9089 }
9190 if checkMod (dir ) {
9291 fmt .Printf ("%v already migrated to modules\n " , path )
9392 return nil
9493 }
9594 err = modinit (dir , path )
9695 if err != nil {
97- return errors . Wrap ( err , "err running go mod init" )
96+ return fmt . Errorf ( "err running go mod init: %w" , err )
9897 }
9998 fmt .Printf ("downloading dependencies for %v\n " , path )
10099 err = getdeps (dir )
101100 if err != nil {
102- return errors . Wrap ( err , "err running go get ./..." )
101+ return fmt . Errorf ( "err running go get ./...: %w" , err )
103102 }
104103 t := getTag (dir )
105104 fmt .Printf ("upgrading %v to v%v\n " , path , t )
106105 if err := major .Run (dir , "upgrade" , "" , t ); err != nil {
107- return errors . Wrap ( err , "err upgrading import paths" )
106+ return fmt . Errorf ( "err upgrading import paths: %w" , err )
108107 }
109108
110109 err = rewriteGitIgnore (dir )
@@ -121,33 +120,33 @@ func migrate(path string, gc *github.Client, test bool) error {
121120 owner , repo := ss [1 ], ss [2 ]
122121 r , _ , err := gc .Repositories .CreateFork (context .Background (), owner , repo , & github.RepositoryCreateForkOptions {})
123122 if _ , ok := err .(* github.AcceptedError ); ! ok {
124- return errors . Wrap ( err , "error creating a fork" )
123+ return fmt . Errorf ( "error creating a fork: %w" , err )
125124 }
126125 time .Sleep (time .Second * 2 )
127126 remote := r .GetCloneURL ()
128127 err = addRemote (dir , remote )
129128 if err != nil {
130- return errors . Wrap ( err , "error adding remote" )
129+ return fmt . Errorf ( "error adding remote: %w" , err )
131130 }
132131
133132 err = checkout (dir )
134133 if err != nil {
135- return errors . Wrap ( err , "error checking out new branch" )
134+ return fmt . Errorf ( "error checking out new branch: %w" , err )
136135 }
137136
138137 err = add (dir )
139138 if err != nil {
140- errors . Wrap ( err , "error tracking files" )
139+ return fmt . Errorf ( "error tracking files: %w" , err )
141140 }
142141
143142 err = commit (dir )
144143 if err != nil {
145- errors . Wrap ( err , "error committing changes" )
144+ return fmt . Errorf ( "error committing changes: %w" , err )
146145 }
147146
148147 err = push (dir )
149148 if err != nil {
150- errors . Wrap ( err , "error pushing to github" )
149+ return fmt . Errorf ( "error pushing to github: %w" , err )
151150 }
152151
153152 if test {
@@ -344,7 +343,7 @@ func rewriteGitIgnore(dir string) error {
344343 return nil
345344 }
346345 if err != nil {
347- return errors . Wrap ( err , "could not open gitignore" )
346+ return fmt . Errorf ( "could not open gitignore: %w" , err )
348347 }
349348 lines := []string {}
350349 scnr := bufio .NewScanner (f )
@@ -356,7 +355,7 @@ func rewriteGitIgnore(dir string) error {
356355 }
357356 if scnr .Err () != nil {
358357 f .Close ()
359- return errors . Wrap ( err , "error while scanning" )
358+ return fmt . Errorf ( "error while scanning: %w" , err )
360359 }
361360 f .Close ()
362361 return os .WriteFile (p , []byte (strings .Join (lines , "\n " )+ "\n " ), 0o666 )
0 commit comments