From fafdb1336ea49082458168ec1f12618909512267 Mon Sep 17 00:00:00 2001 From: rsteube Date: Sat, 17 Oct 2020 19:46:51 +0200 Subject: [PATCH] staticcheck --- .circleci/config.yml | 3 +++ completers/docker_completer/cmd/action/action.go | 2 +- completers/git_completer/cmd/action/action.go | 2 +- completers/mkdir_completer/cmd/root.go | 2 +- completers/mvn_completer/cmd/action/action.go | 8 ++++---- pkg/actions/net/net.go | 3 ++- staticcheck.conf | 2 ++ 7 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 staticcheck.conf diff --git a/.circleci/config.yml b/.circleci/config.yml index aeca6e64..37cbab00 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -41,6 +41,9 @@ jobs: - run: name: "Check formatting" command: diff -u <(echo -n) <(gofmt -d -s .) + - run: + name: "staticcheck" + command: go get honnef.co/go/tools/cmd/staticcheck && staticcheck ./... release: docker: - image: circleci/golang:1.15 diff --git a/completers/docker_completer/cmd/action/action.go b/completers/docker_completer/cmd/action/action.go index 65b4021e..556a58db 100644 --- a/completers/docker_completer/cmd/action/action.go +++ b/completers/docker_completer/cmd/action/action.go @@ -74,8 +74,8 @@ func ActionRepositoryTags() carapace.Action { }) } -// TODO not yet working - also needs multiple characters to split on `:` `/` func ActionContainerPath() carapace.Action { + // TODO not yet working - also needs multiple characters to split on `:` `/` return carapace.ActionMultiParts(":", func(args []string, parts []string) carapace.Action { switch len(parts) { case 0: diff --git a/completers/git_completer/cmd/action/action.go b/completers/git_completer/cmd/action/action.go index 9b8b552b..f4772870 100644 --- a/completers/git_completer/cmd/action/action.go +++ b/completers/git_completer/cmd/action/action.go @@ -184,8 +184,8 @@ func ActionRefs(refOption RefOption) carapace.Action { }) } -// TODO multiparts action to complete step by step func ActionUnstagedChanges() carapace.Action { + // TODO multiparts action to complete step by step return carapace.ActionCallback(func(args []string) carapace.Action { if output, err := exec.Command("git", "status", "--porcelain").Output(); err != nil { return carapace.ActionMessage(err.Error()) diff --git a/completers/mkdir_completer/cmd/root.go b/completers/mkdir_completer/cmd/root.go index c609190c..3ade21e2 100644 --- a/completers/mkdir_completer/cmd/root.go +++ b/completers/mkdir_completer/cmd/root.go @@ -34,8 +34,8 @@ func init() { ) } -// TODO bit hacky as empty delimiter not yet implemented (carapce should support multiple delimiters anyway: []rune) func ActionMode() carapace.Action { + // TODO bit hacky as empty delimiter not yet implemented (carapce should support multiple delimiters anyway: []rune) return carapace.ActionMultiParts("", func(args, parts []string) carapace.Action { current := carapace.CallbackValue vals := []string{} diff --git a/completers/mvn_completer/cmd/action/action.go b/completers/mvn_completer/cmd/action/action.go index e6369f34..7ac648c5 100644 --- a/completers/mvn_completer/cmd/action/action.go +++ b/completers/mvn_completer/cmd/action/action.go @@ -45,9 +45,9 @@ func (a Artifact) Location(repository string) string { return fmt.Sprintf("%v/%v/%v/%v/%v-%v.jar", repository, strings.Replace(a.GroupId, ".", "/", -1), a.ArtifactId, a.Version, a.ArtifactId, a.Version) } -// TODO parent pom plugins -// TODO plugins locatad in pluginmanagement and profiles type Project struct { + // TODO parent pom plugins + // TODO plugins locatad in pluginmanagement and profiles XMLName xml.Name `xml:"project"` Plugins []Artifact `xml:"build>plugins>plugin"` Profiles []string `xml:"profiles>profile>id"` @@ -61,8 +61,8 @@ func repositoryLocation() string { return "" // TODO handle error } -// TODO caching func ActionGoalsAndPhases(file string) carapace.Action { + // TODO caching return carapace.ActionCallback(func(args []string) carapace.Action { if project, err := loadProject(file); err != nil { return carapace.ActionMessage(err.Error()) @@ -188,7 +188,7 @@ func loadPlugin(file string) (plugin *Plugin) { if pluginFile, err := f.Open(); err == nil { defer pluginFile.Close() if content, err := ioutil.ReadAll(pluginFile); err == nil { - err = xml.Unmarshal(content, &plugin) + _ = xml.Unmarshal(content, &plugin) } } } diff --git a/pkg/actions/net/net.go b/pkg/actions/net/net.go index 385cef25..fe12c33c 100644 --- a/pkg/actions/net/net.go +++ b/pkg/actions/net/net.go @@ -129,8 +129,9 @@ func ActionDevices(includedDevices IncludedDevices) carapace.Action { return carapace.ActionMessage(err.Error()) } else { interfaces := []string{} + r := regexp.MustCompile("^[0-9a-zA-Z]") for _, line := range strings.Split(string(output), "\n") { - if matches, _ := regexp.MatchString("^[0-9a-zA-Z]", line); matches { + if matches := r.MatchString(line); matches { interfaces = append(interfaces, strings.Split(line, ":")[0]) } } diff --git a/staticcheck.conf b/staticcheck.conf new file mode 100644 index 00000000..b84ecb5a --- /dev/null +++ b/staticcheck.conf @@ -0,0 +1,2 @@ +# vi: set ft=toml : +checks = ["all", "-ST1000", "-ST1003"]