updated g2g dependencies

go.mod

@@ -2,9 +2,6 @@ module git.paulbsd.com/paulbsd/g2g
 
 go 1.17
 
-require (
-	github.com/gopherjs/gopherjs v0.0.0-20210406100015-1e088ea4ee04 // indirect
-	github.com/smartystreets/assertions v1.2.0 // indirect
-	github.com/smartystreets/goconvey v1.6.4 // indirect
-	gopkg.in/ini.v1 v1.62.0
-)
+require gopkg.in/ini.v1 v1.63.2
+
+require github.com/stretchr/testify v1.7.0 // indirect

go.sum

@@ -1,17 +1,12 @@
-github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/gopherjs/gopherjs v0.0.0-20210406100015-1e088ea4ee04 h1:Enykqupm0u6qiUZAc+SiFkMJVqt4o8knNcKJu8NdlJ0=
-github.com/gopherjs/gopherjs v0.0.0-20210406100015-1e088ea4ee04/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
-github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
-github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
-github.com/smartystreets/assertions v1.2.0 h1:42S6lae5dvLc7BrLu/0ugRtcFVjoJNMC/N3yZFZkDFs=
-github.com/smartystreets/assertions v1.2.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo=
-github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
-github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-gopkg.in/ini.v1 v1.62.0 h1:duBzk771uxoUuOlyRLkHsygud9+5lrlGjdFBb4mSKDU=
-gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/ini.v1 v1.63.2 h1:tGK/CyBg7SMzb60vP1M03vNZ3VDu3wGQJwn7Sxi9r3c=
+gopkg.in/ini.v1 v1.63.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

src/g2g/main.go

@@ -43,7 +43,7 @@ func GetReposFromGitHub(config *config.Config) ([]GitHubRepo, error) {
 		}
 	}
 
-	fmt.Println(fmt.Sprintf("%d repositories fetched from Github", len(repofulllist)))
+	fmt.Printf("%d repositories fetched from Github\n", len(repofulllist))
 	return repofulllist, nil
 }
 
@@ -64,7 +64,7 @@ func GetGitHubResponse(config *config.Config, url string) (*http.Response, error
 	}
 
 	if resp.StatusCode != http.StatusOK {
-		return nil, fmt.Errorf("Error on status code %s", resp.Status)
+		return nil, fmt.Errorf("error on status code %s", resp.Status)
 	}
 
 	return resp, nil
@@ -77,6 +77,9 @@ func CheckGiteaExistingRepo(config *config.Config, repo GitHubRepo) (bool, error
 	gitearepourl := fmt.Sprintf(config.GiteaRepoURLTmpl, config.GiteaDestUsername, repo.Name)
 
 	req, err := http.NewRequest("GET", gitearepourl, nil)
+	if err != nil {
+		return false, err
+	}
 	req.Header.Set("Authorization", config.GiteaAuthToken)
 
 	client := &http.Client{}
@@ -90,7 +93,7 @@ func CheckGiteaExistingRepo(config *config.Config, repo GitHubRepo) (bool, error
 	} else if resp.StatusCode == http.StatusNotFound {
 		isExists = false
 	} else {
-		return false, fmt.Errorf("Can't determine error, cancelling, error %s in gitea webservice", resp.Status)
+		return false, fmt.Errorf("can't determine error, cancelling, error %s in gitea webservice", resp.Status)
 	}
 
 	return isExists, nil
@@ -116,15 +119,18 @@ func GetGiteaUserUID(config *config.Config) error {
 	}
 
 	if resp.StatusCode != 200 {
-		err = errors.New("Error invoking gitea webservice")
+		err = errors.New("error invoking gitea webservice")
 		return err
 	}
 
 	respbody, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return err
+	}
 
 	err = json.Unmarshal(respbody, &giteaorg)
 	if err != nil {
-		err = errors.New("Failed to parse user ID from gitea webservice, check auth")
+		err = errors.New("failed to parse user ID from gitea webservice, check auth")
 		return err
 	}
 
@@ -158,46 +164,21 @@ func MigrateReposToGitea(config *config.Config, wg *sync.WaitGroup, jobs chan Gi
 	for {
 		elem, more := <-jobs
 		if more {
-			client := &http.Client{}
-
 			existingrepo, err := CheckGiteaExistingRepo(config, elem)
 			if err != nil {
 				return err
 			}
 			if !existingrepo {
-				repo := GiteaRepo{
-					UID:       config.GiteaUID,
-					RepoName:  elem.Name,
-					Mirror:    true,
-					CloneAddr: elem.CloneURL}
-				jsondata, err := json.Marshal(repo)
-
-				req, err := http.NewRequest("POST", config.GiteaMigrateURL, bytes.NewBufferString(string(jsondata)))
+				err = MigrateRepo(elem, config)
 				if err != nil {
-					return err
-				}
-
-				req.Header.Add("Content-Type", "application/json")
-				req.Header.Set("Authorization", config.GiteaAuthToken)
-
-				client.Timeout = config.G2gRequestTimeout
-
-				fmt.Println(fmt.Sprintf("Migrating repo %s to gitea rest api", elem.Name))
-
-				resp, err := client.Do(req)
-				if err != nil {
-					return err
-				}
-
-				if resp.StatusCode != 201 {
-					err = fmt.Errorf("Error when migrating repo %s to gitea with status code %d on gitea webservice", elem.Name, resp.StatusCode)
 					log.Println(err)
+					continue
 				}
 			} else {
-				fmt.Println(fmt.Sprintf("Not migrating, %s exists in gitea", elem.Name))
+				fmt.Printf("Not migrating, %s exists in gitea\n", elem.Name)
 			}
 		} else {
-			fmt.Println(fmt.Sprintf("All repo migrated on thread num %d", thr))
+			fmt.Printf("All repo migrated on thread num %d\n", thr)
 			wg.Done()
 			done <- true
 			return nil
@@ -205,6 +186,40 @@ func MigrateReposToGitea(config *config.Config, wg *sync.WaitGroup, jobs chan Gi
 	}
 }
 
+func MigrateRepo(elem GitHubRepo, config *config.Config) (err error) {
+	client := &http.Client{}
+	repo := GiteaRepo{
+		UID:       config.GiteaUID,
+		RepoName:  elem.Name,
+		Mirror:    true,
+		CloneAddr: elem.CloneURL}
+	jsondata, err := json.Marshal(repo)
+	if err != nil {
+		return err
+	}
+	req, err := http.NewRequest("POST", config.GiteaMigrateURL, bytes.NewBufferString(string(jsondata)))
+	if err != nil {
+		return err
+	}
+
+	req.Header.Add("Content-Type", "application/json")
+	req.Header.Set("Authorization", config.GiteaAuthToken)
+
+	client.Timeout = config.G2gRequestTimeout
+
+	fmt.Printf("Migrating repo %s to gitea rest api\n", elem.Name)
+	resp, err := client.Do(req)
+	if err != nil {
+		return err
+	}
+
+	if resp.StatusCode != 201 {
+		err = fmt.Errorf("error when migrating repo %s to gitea with status code %d on gitea webservice", elem.Name, resp.StatusCode)
+		log.Println(err)
+	}
+	return err
+}
+
 // GitHubRepo githubrepo struct
 type GitHubRepo struct {
 	Name     string `json:"name"`

vendor/gopkg.in/ini.v1/.golangci.yml

@@ -0,0 +1,21 @@
+linters-settings:
+  nakedret:
+    max-func-lines: 0 # Disallow any unnamed return statement
+
+linters:
+  enable:
+    - deadcode
+    - errcheck
+    - gosimple
+    - govet
+    - ineffassign
+    - staticcheck
+    - structcheck
+    - typecheck
+    - unused
+    - varcheck
+    - nakedret
+    - gofmt
+    - rowserrcheck
+    - unconvert
+    - goimports

vendor/gopkg.in/ini.v1/codecov.yml

@@ -6,4 +6,4 @@ coverage:
         threshold: 1%
 
 comment:
-  layout: 'diff, files'
+  layout: 'diff'

vendor/gopkg.in/ini.v1/ini.go

@@ -1,5 +1,3 @@
-// +build go1.6
-
 // Copyright 2014 Unknwon
 //
 // Licensed under the Apache License, Version 2.0 (the "License"): you may
@@ -125,6 +123,8 @@ type LoadOptions struct {
 	ReaderBufferSize int
 	// AllowNonUniqueSections indicates whether to allow sections with the same name multiple times.
 	AllowNonUniqueSections bool
+	// AllowDuplicateShadowValues indicates whether values for shadowed keys should be deduplicated.
+	AllowDuplicateShadowValues bool
 }
 
 // DebugFunc is the type of function called to log parse events.

vendor/gopkg.in/ini.v1/key.go

@@ -54,14 +54,16 @@ func (k *Key) addShadow(val string) error {
 		return errors.New("cannot add shadow to auto-increment or boolean key")
 	}
 
-	// Deduplicate shadows based on their values.
-	if k.value == val {
-		return nil
-	}
-	for i := range k.shadows {
-		if k.shadows[i].value == val {
+	if !k.s.f.options.AllowDuplicateShadowValues {
+		// Deduplicate shadows based on their values.
+		if k.value == val {
 			return nil
 		}
+		for i := range k.shadows {
+			if k.shadows[i].value == val {
+				return nil
+			}
+		}
 	}
 
 	shadow := newKey(k.s, k.name, val)
@@ -781,10 +783,8 @@ func (k *Key) parseUint64s(strs []string, addInvalid, returnOnInvalid bool) ([]u
 	return vals, err
 }
 
-
 type Parser func(str string) (interface{}, error)
 
-
 // parseTimesFormat transforms strings to times in given format.
 func (k *Key) parseTimesFormat(format string, strs []string, addInvalid, returnOnInvalid bool) ([]time.Time, error) {
 	vals := make([]time.Time, 0, len(strs))
@@ -801,7 +801,6 @@ func (k *Key) parseTimesFormat(format string, strs []string, addInvalid, returnO
 	return vals, err
 }
 
-
 // doParse transforms strings to different types
 func (k *Key) doParse(strs []string, addInvalid, returnOnInvalid bool, parser Parser) ([]interface{}, error) {
 	vals := make([]interface{}, 0, len(strs))

vendor/gopkg.in/ini.v1/parser.go

@@ -131,7 +131,7 @@ func readKeyName(delimiters string, in []byte) (string, int, error) {
 	// Check if key name surrounded by quotes.
 	var keyQuote string
 	if line[0] == '"' {
-		if len(line) > 6 && string(line[0:3]) == `"""` {
+		if len(line) > 6 && line[0:3] == `"""` {
 			keyQuote = `"""`
 		} else {
 			keyQuote = `"`
@@ -232,7 +232,7 @@ func (p *parser) readValue(in []byte, bufferSize int) (string, error) {
 	}
 
 	var valQuote string
-	if len(line) > 3 && string(line[0:3]) == `"""` {
+	if len(line) > 3 && line[0:3] == `"""` {
 		valQuote = `"""`
 	} else if line[0] == '`' {
 		valQuote = "`"
@@ -289,12 +289,8 @@ func (p *parser) readValue(in []byte, bufferSize int) (string, error) {
 		hasSurroundedQuote(line, '"')) && !p.options.PreserveSurroundedQuote {
 		line = line[1 : len(line)-1]
 	} else if len(valQuote) == 0 && p.options.UnescapeValueCommentSymbols {
-		if strings.Contains(line, `\;`) {
-			line = strings.Replace(line, `\;`, ";", -1)
-		}
-		if strings.Contains(line, `\#`) {
-			line = strings.Replace(line, `\#`, "#", -1)
-		}
+		line = strings.ReplaceAll(line, `\;`, ";")
+		line = strings.ReplaceAll(line, `\#`, "#")
 	} else if p.options.AllowPythonMultilineValues && lastChar == '\n' {
 		return p.readPythonMultilines(line, bufferSize)
 	}

vendor/gopkg.in/ini.v1/section.go

@@ -217,7 +217,7 @@ func (s *Section) KeysHash() map[string]string {
 		defer s.f.lock.RUnlock()
 	}
 
-	hash := map[string]string{}
+	hash := make(map[string]string, len(s.keysHash))
 	for key, value := range s.keysHash {
 		hash[key] = value
 	}

vendor/modules.txt

@@ -1,9 +1,5 @@
-# github.com/gopherjs/gopherjs v0.0.0-20210406100015-1e088ea4ee04
-## explicit
-# github.com/smartystreets/assertions v1.2.0
-## explicit
-# github.com/smartystreets/goconvey v1.6.4
-## explicit
-# gopkg.in/ini.v1 v1.62.0
+# github.com/stretchr/testify v1.7.0
+## explicit; go 1.13
+# gopkg.in/ini.v1 v1.63.2
 ## explicit
 gopkg.in/ini.v1