move mod cred helpers to yagu for more general usage

Signed-off-by: Tony Worm <tony@hofstadter.io>
hofstadter-io · Aug 8, 2021 · fe4fbb8 · fe4fbb8
1 parent fce8f52
commit fe4fbb8
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 6 deletions.
diff --git a/lib/mod/cache/fetch.go b/lib/mod/cache/fetch.go
@@ -164,6 +164,7 @@ func fetchGitHubTag(FS billy.Filesystem, lang, owner, repo, tag string) error {
 
 	zReader, err := github.FetchTagZip(client, T)
 	if err != nil {
+		fmt.Printf("Error: %v\n", err)
 		return fmt.Errorf("While fetching tag zipfile\n%w\n", err)
 	}
 

diff --git a/lib/yagu/repos/git/netrc.go → lib/yagu/netrc.go b/lib/yagu/repos/git/netrc.go → lib/yagu/netrc.go
@@ -1,4 +1,4 @@
-package git
+package yagu
 
 import (
 	"fmt"

diff --git a/lib/yagu/repos/git/netrc_test.go → lib/yagu/netrc_test.go b/lib/yagu/repos/git/netrc_test.go → lib/yagu/netrc_test.go
@@ -1,4 +1,4 @@
-package git
+package yagu
 
 import (
 	"reflect"

diff --git a/lib/yagu/repos/git/fetch.go b/lib/yagu/repos/git/fetch.go
@@ -14,6 +14,8 @@ import (
 	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/go-git/go-git/v5/plumbing/transport/http"
 	"github.com/go-git/go-git/v5/storage/memory"
+
+	"github.com/hofstadter-io/hof/lib/yagu"
 )
 
 func NewRemote(srcUrl string) (*GitRepo, error) {
@@ -106,12 +108,12 @@ func FetchGit(FS billy.Filesystem, remote, owner, repo, tag string, private bool
 	}
 
 	if private {
-		if netrc, err := NetrcCredentials(remote); err == nil {
+		if netrc, err := yagu.NetrcCredentials(remote); err == nil {
 			gco.Auth = &http.BasicAuth{
 				Username: netrc.Login,
 				Password: netrc.Password,
 			}
-		} else if ssh, err := SSHCredentials(remote); err == nil {
+		} else if ssh, err := yagu.SSHCredentials(remote); err == nil {
 			gco.Auth = ssh.Keys
 			gco.URL = fmt.Sprintf("%s@%s:%s", ssh.User, remote, srcRepo)
 		} else {

diff --git a/lib/yagu/repos/github/tags.go b/lib/yagu/repos/github/tags.go
@@ -52,6 +52,8 @@ func FetchTagZip(client *github.Client, tag *github.RepositoryTag) (*zip.Reader,
 
 	url := *tag.ZipballURL
 
+	fmt.Println("url:", url)
+
 	req := gorequest.New().Get(url)
 	resp, data, errs := req.EndBytes()
 
@@ -67,7 +69,7 @@ func FetchTagZip(client *github.Client, tag *github.RepositoryTag) (*zip.Reader,
 		return nil, fmt.Errorf("Internal Error: " + string(resp.StatusCode))
 	}
 	if resp.StatusCode >= 400 {
-		return nil, fmt.Errorf("Bad Request: " + string(resp.StatusCode))
+		return nil, fmt.Errorf("Bad Request: %v\n%v\n", resp.StatusCode, errs)
 	}
 
 	r := bytes.NewReader(data)

diff --git a/lib/yagu/repos/git/ssh.go → lib/yagu/ssh.go b/lib/yagu/repos/git/ssh.go → lib/yagu/ssh.go
@@ -1,4 +1,4 @@
-package git
+package yagu
 
 import (
 	"os"