mirror of
https://github.com/grdl/git-get.git
synced 2026-02-04 15:04:44 +00:00
Fix issues found by goerrcheck linter
This commit is contained in:
@@ -21,6 +21,13 @@ linters:
|
|||||||
- wrapcheck # Adds too much bloat, many of the errors are contextual enough and don't need wrapping
|
- wrapcheck # Adds too much bloat, many of the errors are contextual enough and don't need wrapping
|
||||||
|
|
||||||
exclusions:
|
exclusions:
|
||||||
|
# Typical presets to exclude: https://golangci-lint.run/docs/linters/false-positives/#exclusion-presets
|
||||||
|
presets:
|
||||||
|
- comments
|
||||||
|
- common-false-positives
|
||||||
|
- legacy
|
||||||
|
- std-error-handling
|
||||||
|
|
||||||
rules:
|
rules:
|
||||||
- path: _test.go
|
- path: _test.go
|
||||||
linters:
|
linters:
|
||||||
|
|||||||
10
cmd/get.go
10
cmd/get.go
@@ -1,6 +1,7 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"fmt"
|
||||||
"git-get/pkg"
|
"git-get/pkg"
|
||||||
"git-get/pkg/cfg"
|
"git-get/pkg/cfg"
|
||||||
"git-get/pkg/git"
|
"git-get/pkg/git"
|
||||||
@@ -35,12 +36,9 @@ func newGetCommand() *cobra.Command {
|
|||||||
cmd.PersistentFlags().BoolP("help", "h", false, "Print this help and exit.")
|
cmd.PersistentFlags().BoolP("help", "h", false, "Print this help and exit.")
|
||||||
cmd.PersistentFlags().BoolP("version", "v", false, "Print version and exit.")
|
cmd.PersistentFlags().BoolP("version", "v", false, "Print version and exit.")
|
||||||
|
|
||||||
viper.BindPFlag(cfg.KeyBranch, cmd.PersistentFlags().Lookup(cfg.KeyBranch))
|
if err := viper.BindPFlags(cmd.PersistentFlags()); err != nil {
|
||||||
viper.BindPFlag(cfg.KeyDefaultHost, cmd.PersistentFlags().Lookup(cfg.KeyDefaultHost))
|
panic(fmt.Sprintf("failed to bind flags: %v", err))
|
||||||
viper.BindPFlag(cfg.KeyDefaultScheme, cmd.PersistentFlags().Lookup(cfg.KeyDefaultScheme))
|
}
|
||||||
viper.BindPFlag(cfg.KeyDump, cmd.PersistentFlags().Lookup(cfg.KeyDump))
|
|
||||||
viper.BindPFlag(cfg.KeyReposRoot, cmd.PersistentFlags().Lookup(cfg.KeyReposRoot))
|
|
||||||
viper.BindPFlag(cfg.KeySkipHost, cmd.PersistentFlags().Lookup(cfg.KeySkipHost))
|
|
||||||
|
|
||||||
return cmd
|
return cmd
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,9 +28,9 @@ func newListCommand() *cobra.Command {
|
|||||||
cmd.PersistentFlags().BoolP("help", "h", false, "Print this help and exit.")
|
cmd.PersistentFlags().BoolP("help", "h", false, "Print this help and exit.")
|
||||||
cmd.PersistentFlags().BoolP("version", "v", false, "Print version and exit.")
|
cmd.PersistentFlags().BoolP("version", "v", false, "Print version and exit.")
|
||||||
|
|
||||||
viper.BindPFlag(cfg.KeyFetch, cmd.PersistentFlags().Lookup(cfg.KeyFetch))
|
if err := viper.BindPFlags(cmd.PersistentFlags()); err != nil {
|
||||||
viper.BindPFlag(cfg.KeyOutput, cmd.PersistentFlags().Lookup(cfg.KeyOutput))
|
panic(fmt.Sprintf("failed to bind flags: %v", err))
|
||||||
viper.BindPFlag(cfg.KeyReposRoot, cmd.PersistentFlags().Lookup(cfg.KeyReposRoot))
|
}
|
||||||
|
|
||||||
return cmd
|
return cmd
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -92,7 +92,11 @@ func readGitconfig(cfg Gitconfig) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
viper.SetConfigType("env")
|
viper.SetConfigType("env")
|
||||||
viper.ReadConfig(bytes.NewBuffer([]byte(strings.Join(lines, "\n"))))
|
|
||||||
|
if err := viper.ReadConfig(bytes.NewBuffer([]byte(strings.Join(lines, "\n")))); err != nil {
|
||||||
|
// Log error but don't fail - configuration is optional
|
||||||
|
fmt.Fprintf(os.Stderr, "Warning: failed to read git config: %v\n", err)
|
||||||
|
}
|
||||||
|
|
||||||
// TODO: A hacky way to read boolean flag from gitconfig. Find a cleaner way.
|
// TODO: A hacky way to read boolean flag from gitconfig. Find a cleaner way.
|
||||||
if val := cfg.Get(fmt.Sprintf("%s.%s", GitgetPrefix, KeySkipHost)); strings.ToLower(val) == "true" {
|
if val := cfg.Get(fmt.Sprintf("%s.%s", GitgetPrefix, KeySkipHost)); strings.ToLower(val) == "true" {
|
||||||
|
|||||||
@@ -95,22 +95,28 @@ func testConfigOnlyInGitconfig(t *testing.T) {
|
|||||||
|
|
||||||
func testConfigOnlyInEnvVar(t *testing.T) {
|
func testConfigOnlyInEnvVar(t *testing.T) {
|
||||||
Init(&gitconfigEmpty{})
|
Init(&gitconfigEmpty{})
|
||||||
os.Setenv(envVarName, fromEnv)
|
t.Setenv(envVarName, fromEnv)
|
||||||
}
|
}
|
||||||
|
|
||||||
func testConfigInGitconfigAndEnvVar(t *testing.T) {
|
func testConfigInGitconfigAndEnvVar(t *testing.T) {
|
||||||
Init(&gitconfigValid{})
|
Init(&gitconfigValid{})
|
||||||
os.Setenv(envVarName, fromEnv)
|
t.Setenv(envVarName, fromEnv)
|
||||||
}
|
}
|
||||||
|
|
||||||
func testConfigInFlag(t *testing.T) {
|
func testConfigInFlag(t *testing.T) {
|
||||||
Init(&gitconfigValid{})
|
Init(&gitconfigValid{})
|
||||||
os.Setenv(envVarName, fromEnv)
|
t.Setenv(envVarName, fromEnv)
|
||||||
|
|
||||||
cmd := cobra.Command{}
|
cmd := cobra.Command{}
|
||||||
cmd.PersistentFlags().String(KeyDefaultHost, Defaults[KeyDefaultHost], "")
|
cmd.PersistentFlags().String(KeyDefaultHost, Defaults[KeyDefaultHost], "")
|
||||||
viper.BindPFlag(KeyDefaultHost, cmd.PersistentFlags().Lookup(KeyDefaultHost))
|
|
||||||
|
if err := viper.BindPFlag(KeyDefaultHost, cmd.PersistentFlags().Lookup(KeyDefaultHost)); err != nil {
|
||||||
|
t.Fatalf("failed to bind flag: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
cmd.SetArgs([]string{"--" + KeyDefaultHost, fromFlag})
|
cmd.SetArgs([]string{"--" + KeyDefaultHost, fromFlag})
|
||||||
cmd.Execute()
|
|
||||||
|
if err := cmd.Execute(); err != nil {
|
||||||
|
t.Fatalf("failed to execute command: %v", err)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -39,7 +39,11 @@ func TestFinder(t *testing.T) {
|
|||||||
root := test.reposMaker(t)
|
root := test.reposMaker(t)
|
||||||
|
|
||||||
finder := NewRepoFinder(root)
|
finder := NewRepoFinder(root)
|
||||||
finder.Find()
|
|
||||||
|
err := finder.Find()
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("finder.Find() failed: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
assert.Len(t, finder.repos, test.want)
|
assert.Len(t, finder.repos, test.want)
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user