@@ -103,47 +103,57 @@ func main() {
103103 go func () {
104104 defer wg .Done ()
105105
106- baseRefReadmeFiles , err := aggregateCoderResourceReadmeFiles ("modules" )
107- if err != nil {
108- errChan <- err
109- return
110- }
111- fmt .Printf ("------ got %d back\n " , len (baseRefReadmeFiles ))
112-
113- repo , err := git .PlainOpenWithOptions ("." , & git.PlainOpenOptions {
114- DetectDotGit : false ,
115- EnableDotGitCommonDir : false ,
116- })
117- if err != nil {
118- errChan <- err
119- return
120- }
121-
122- head , err := repo .Head ()
123- if err != nil {
124- errChan <- err
125- return
106+ refactorLater := func () error {
107+ baseRefReadmeFiles , err := aggregateCoderResourceReadmeFiles ("modules" )
108+ if err != nil {
109+ return err
110+ }
111+ fmt .Printf ("------ got %d back\n " , len (baseRefReadmeFiles ))
112+
113+ repo , err := git .PlainOpenWithOptions ("." , & git.PlainOpenOptions {
114+ DetectDotGit : false ,
115+ EnableDotGitCommonDir : false ,
116+ })
117+ if err != nil {
118+ return err
119+ }
120+
121+ head , err := repo .Head ()
122+ if err != nil {
123+ return err
124+ }
125+ activeBranchName := head .Name ().Short ()
126+ fmt .Println ("yeah..." )
127+
128+ tree , err := repo .Worktree ()
129+ if err != nil {
130+ return err
131+ }
132+ err = tree .Checkout (& git.CheckoutOptions {
133+ Branch : plumbing .NewBranchReferenceName (activeBranchName ),
134+ Create : false ,
135+ Force : false ,
136+ Keep : true ,
137+ })
138+ if err != nil {
139+ return err
140+ }
141+
142+ fmt .Println ("Got here!" )
143+ files , _ := tree .Filesystem .ReadDir ("." )
144+ for _ , f := range files {
145+ if f .IsDir () {
146+ fmt .Println (f .Name ())
147+ }
148+ }
149+
150+ return nil
126151 }
127- activeBranchName := head .Name ().Short ()
128- fmt .Println ("Found " , activeBranchName )
129152
130- wt , err := repo .Worktree ()
131- if err != nil {
132- errChan <- err
133- return
134- }
135- err = wt .Checkout (& git.CheckoutOptions {
136- Branch : plumbing .ReferenceName (activeBranchName ),
137- Create : false ,
138- Force : false ,
139- Keep : true ,
140- })
141- if err != nil {
142- errChan <- err
143- return
153+ if err := refactorLater (); err != nil {
154+ errChan <- fmt .Errorf ("module validation: %v" , err )
144155 }
145156
146- fmt .Println ("Got here!" )
147157 }()
148158
149159 // Validate templates
@@ -161,7 +171,8 @@ func main() {
161171 return
162172 }
163173
164- fmt .Println ("---\n Encountered the following problems" )
174+ fmt .Println ("---" )
175+ fmt .Println ("Encountered the following problems" )
165176 for _ , err := range readmeValidationErrors {
166177 log .Println (err )
167178 }
0 commit comments