Clean up

Author: ChappIO

cmd/git-backup/main.go

@@ -50,4 +50,4 @@ func loadConfig() gitbackup.Config {
 		os.Exit(1)
 	}
 	return config
-}
+}

config.go

@@ -13,9 +13,9 @@ type Config struct {
 func (c *Config) GetSources() []RepositorySource {
 	sources := make([]RepositorySource, len(c.Github))
 
-	offset := 0;
+	offset := 0
 	for i := 0; i < len(c.Github); i++ {
-		sources[i + offset] = c.Github[i]
+		sources[i+offset] = c.Github[i]
 		offset++
 	}
 
@@ -30,7 +30,6 @@ func (c *Config) setDefaults() {
 	}
 }
 
-
 func LoadFile(path string) (out Config, err error) {
 	handle, err := os.Open(path)
 	if err != nil {
@@ -49,4 +48,4 @@ func LoadReader(reader io.Reader) (out Config, err error) {
 	err = dec.Decode(&out)
 	out.setDefaults()
 	return
-}
+}

github.go

@@ -3,13 +3,10 @@ package git_backup
 import (
 	"context"
 	"fmt"
-	"github.com/go-git/go-git/v5"
-	"github.com/go-git/go-git/v5/plumbing/transport"
-	"github.com/go-git/go-git/v5/plumbing/transport/http"
 	"github.com/google/go-github/v43/github"
 	"golang.org/x/oauth2"
+	"log"
 	"net/url"
-	"os"
 )
 
 type GithubConfig struct {
@@ -24,7 +21,7 @@ func (c *GithubConfig) Test() error {
 	if err != nil {
 		return err
 	}
-	fmt.Printf("Authenticated with github as: %s", me.Login)
+	log.Printf("Authenticated with github as: %s", *me.Login)
 	return nil
 }
 
@@ -44,7 +41,10 @@ func (c *GithubConfig) ListRepositories() ([]*Repository, error) {
 			return out, err
 		}
 		gitUrl.User = url.UserPassword("github", c.AccessToken)
-		out[i] = &Repository{GitURL: *gitUrl}
+		out[i] = &Repository{
+			FullName: *repo.FullName,
+			GitURL:   *gitUrl,
+		}
 	}
 	return out, nil
 }
@@ -130,50 +130,3 @@ func (c *GithubConfig) getStarredRepos(page int) ([]*github.Repository, *github.
 	}
 	return repos, response, err
 }
-
-func (c *GithubConfig) CloneInto(repo *github.Repository, path string) error {
-	auth := &http.BasicAuth{
-		Username: "git",
-		Password: c.AccessToken,
-	}
-	gitRepo, err := git.PlainClone(path, false, &git.CloneOptions{
-		URL:      *repo.CloneURL,
-		Auth:     auth,
-		Progress: os.Stdout,
-	})
-	switch err {
-	case transport.ErrEmptyRemoteRepository:
-		return nil
-	default:
-		return err
-	case git.ErrRepositoryAlreadyExists:
-		fallthrough
-	case nil:
-	}
-	if err == git.ErrRepositoryAlreadyExists {
-		if gitRepo, err = git.PlainOpen(path); err != nil {
-			return err
-		} else if w, err := gitRepo.Worktree(); err != nil {
-			return err
-		} else if err := w.Pull(&git.PullOptions{
-			Auth:     auth,
-			Progress: os.Stdout,
-		}); err == git.NoErrAlreadyUpToDate {
-			return nil
-		} else if err != nil {
-			return err
-		}
-	}
-	err = gitRepo.Fetch(&git.FetchOptions{
-		Auth:     auth,
-		Progress: os.Stdout,
-		Tags:     git.AllTags,
-		Force:    true,
-	})
-	switch err {
-	case git.NoErrAlreadyUpToDate:
-		return nil
-	default:
-		return err
-	}
-}

go.mod

@@ -3,30 +3,61 @@ module git-backup
 go 1.17
 
 require (
+	github.com/ChappIO/terraform-encrypt v0.0.0-20190529081821-8d96f6eb70d9
 	github.com/go-git/go-git/v5 v5.4.2
 	github.com/google/go-github/v43 v43.0.0
-	golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be
+	github.com/gorilla/pat v1.0.1
+	github.com/ian-kent/envconf v0.0.0-20141026121121-c19809918c02
+	github.com/ian-kent/go-log v0.0.0-20160113211217-5731446c36ab
+	github.com/influxdata/influxdb v1.9.6
+	github.com/karalabe/hid v1.0.0
+	github.com/mailhog/MailHog v1.0.1
+	github.com/mailhog/MailHog-Server v1.0.1
+	github.com/mailhog/MailHog-UI v1.0.1
+	github.com/mailhog/http v1.0.1
+	github.com/mailhog/mhsendmail v0.2.0
+	github.com/spf13/cobra v1.4.0
+	golang.org/x/crypto v0.0.0-20210817164053-32db794688a5
+	golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c
 	gopkg.in/yaml.v2 v2.4.0
 )
 
 require (
 	github.com/Microsoft/go-winio v0.4.16 // indirect
 	github.com/ProtonMail/go-crypto v0.0.0-20210428141323-04723f9f07d7 // indirect
 	github.com/acomagu/bufpipe v1.0.3 // indirect
+	github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
 	github.com/emirpasic/gods v1.12.0 // indirect
 	github.com/go-git/gcfg v1.5.0 // indirect
 	github.com/go-git/go-billy/v5 v5.3.1 // indirect
-	github.com/golang/protobuf v1.3.2 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
+	github.com/gorilla/context v1.1.1 // indirect
+	github.com/gorilla/mux v1.8.0 // indirect
+	github.com/gorilla/websocket v1.5.0 // indirect
+	github.com/ian-kent/goose v0.0.0-20141221090059-c3541ea826ad // indirect
+	github.com/ian-kent/linkio v0.0.0-20170807205755-97566b872887 // indirect
 	github.com/imdario/mergo v0.3.12 // indirect
+	github.com/inconshreveable/mousetrap v1.0.0 // indirect
 	github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
 	github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect
+	github.com/mailhog/data v1.0.1 // indirect
+	github.com/mailhog/smtp v1.0.1 // indirect
+	github.com/mailhog/storage v1.0.1 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
+	github.com/ogier/pflag v0.0.1 // indirect
+	github.com/philhofer/fwd v1.0.0 // indirect
 	github.com/sergi/go-diff v1.1.0 // indirect
+	github.com/smartystreets/goconvey v1.7.2 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/t-k/fluent-logger-golang v1.0.0 // indirect
+	github.com/tinylib/msgp v1.1.0 // indirect
 	github.com/xanzy/ssh-agent v0.3.0 // indirect
-	golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
-	golang.org/x/net v0.0.0-20210326060303-6b1517762897 // indirect
-	golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect
+	golang.org/x/net v0.0.0-20210614182718-04defd469f4e // indirect
+	golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf // indirect
+	golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/protobuf v1.27.1 // indirect
+	gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 )