Skip to content

Commit

Permalink
refactor(errors): Use errors.New instead of fmt.Errorf when there is …
Browse files Browse the repository at this point in the history
…no format string
  • Loading branch information
elldritch committed Feb 19, 2018
1 parent 283440e commit 743c35f
Show file tree
Hide file tree
Showing 8 changed files with 36 additions and 25 deletions.
10 changes: 6 additions & 4 deletions build/archive.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"archive/tar"
"compress/gzip"
"encoding/json"
"fmt"
"errors"
"io"
"os"
"path/filepath"
Expand Down Expand Up @@ -38,7 +38,7 @@ func findNodePkgs(path string) []string {

// Build does nothing for VendoredArchives
func (builder *VendoredArchiveBuilder) Build(m module.Module, force bool) error {
return fmt.Errorf("VendoredArchive packages are expected to be pre-built")
return errors.New("VendoredArchive packages are expected to be pre-built")
}

// Analyze scans for archives and inspects them
Expand Down Expand Up @@ -119,10 +119,12 @@ func (builder *VendoredArchiveBuilder) IsBuilt(m module.Module, allowUnresolved
return true, nil
}

// IsModule is not implemented
func (builder *VendoredArchiveBuilder) IsModule(target string) (bool, error) {
return false, fmt.Errorf("IsModule is not implemented for VendoredArchiveBuilder")
return false, errors.New("IsModule is not implemented for VendoredArchiveBuilder")
}

// InferModule is not implemented
func (builder *VendoredArchiveBuilder) InferModule(target string) (module.Module, error) {
return module.Module{}, fmt.Errorf("InferModule is not implemented for VendoredArchiveBuilder")
return module.Module{}, errors.New("InferModule is not implemented for VendoredArchiveBuilder")
}
5 changes: 3 additions & 2 deletions build/bower.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package build

import (
"errors"
"fmt"
"os"
"path/filepath"
Expand Down Expand Up @@ -137,10 +138,10 @@ func (builder *BowerBuilder) IsBuilt(m module.Module, allowUnresolved bool) (boo

// IsModule is not implemented
func (builder *BowerBuilder) IsModule(target string) (bool, error) {
return false, fmt.Errorf("IsModule is not implemented for BowerBuilder")
return false, errors.New("IsModule is not implemented for BowerBuilder")
}

// InferModule is not implemented
func (builder *BowerBuilder) InferModule(target string) (module.Module, error) {
return module.Module{}, fmt.Errorf("InferModule is not implemented for BowerBuilder")
return module.Module{}, errors.New("InferModule is not implemented for BowerBuilder")
}
3 changes: 2 additions & 1 deletion build/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package build
import (
"bytes"
"encoding/json"
"errors"
"fmt"
"io/ioutil"
"os"
Expand Down Expand Up @@ -125,7 +126,7 @@ func whichWithResolver(cmds []string, getVersion versionResolver) (string, strin
}
commonLogger.Debugf("Tried resolving `%s` but did not work: %#v %#v", cmd, err, version)
}
return "", "", fmt.Errorf("could not resolve version")
return "", "", errors.New("could not resolve version")
}

func which(versionFlags string, cmds ...string) (string, string, error) {
Expand Down
5 changes: 3 additions & 2 deletions build/composer.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package build

import (
"encoding/json"
"errors"
"fmt"
"os"
"strings"
Expand Down Expand Up @@ -133,10 +134,10 @@ func (builder *ComposerBuilder) IsBuilt(m module.Module, allowUnresolved bool) (

// IsModule is not implemented
func (builder *ComposerBuilder) IsModule(target string) (bool, error) {
return false, fmt.Errorf("IsModule is not implemented for ComposerBuilder")
return false, errors.New("IsModule is not implemented for ComposerBuilder")
}

// InferModule is not implemented
func (builder *ComposerBuilder) InferModule(target string) (module.Module, error) {
return module.Module{}, fmt.Errorf("InferModule is not implemented for ComposerBuilder")
return module.Module{}, errors.New("InferModule is not implemented for ComposerBuilder")
}
23 changes: 13 additions & 10 deletions build/golang.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package build

import (
"errors"
"fmt"
"io/ioutil"
"os"
Expand Down Expand Up @@ -199,7 +200,7 @@ func (builder *GoBuilder) Build(m module.Module, force bool) error {
return fmt.Errorf("could not find Go project folder: %s", err.Error())
}
if !ok {
return fmt.Errorf("could not find Go project folder (maybe your Go build tool is not supported?)")
return errors.New("could not find Go project folder (maybe your Go build tool is not supported?)")
}
goLogger.Debugf("Found project folder for Go build: %#v", projectFolder)

Expand Down Expand Up @@ -255,13 +256,13 @@ func traceImports(m module.Module, allowUnresolved bool) ([]GoPkg, error) {
var tree depth.Tree
err := tree.Resolve(m.Target)
if err != nil {
return nil, fmt.Errorf("could not resolve dependencies: " + err.Error())
return nil, fmt.Errorf("could not resolve dependencies: %s", err.Error())
}

// Flatten tree (technically a DAG?) into a list.
deps, err := flattenGoDeps(*tree.Root, allowUnresolved)
if err != nil {
return nil, fmt.Errorf("could not resolve dependencies: " + err.Error())
return nil, fmt.Errorf("could not resolve dependencies: %s", err.Error())
}

return deps, nil
Expand All @@ -274,7 +275,7 @@ func flattenGoDeps(pkg depth.Pkg, allowUnresolved bool) ([]GoPkg, error) {
if len(pkg.Deps) == 0 {
return []GoPkg{GoPkg{ImportPath: pkg.Name, isInternal: pkg.Internal}}, nil
}
return nil, fmt.Errorf("dependency of stdlib detected (this should never happen)")
return nil, errors.New("dependency of stdlib detected (this should never happen)")
}

// Get recursively flattened trees of child dependencies.
Expand All @@ -293,7 +294,7 @@ func flattenGoDeps(pkg depth.Pkg, allowUnresolved bool) ([]GoPkg, error) {
}

// Otherwise, fail.
return nil, fmt.Errorf("could not resolve package: " + pkg.Name)
return nil, fmt.Errorf("could not resolve package: %s", pkg.Name)
}

// Lockfile structs for JSON unmarshalling
Expand Down Expand Up @@ -373,7 +374,7 @@ func (builder *GoBuilder) Analyze(m module.Module, allowUnresolved bool) ([]modu
}
return deps, err
}
return nil, fmt.Errorf("could not find project folder")
return nil, errors.New("could not find project folder")
}
goLogger.Debugf("Found project folder: %#v", projectFolder)

Expand Down Expand Up @@ -435,9 +436,11 @@ func (builder *GoBuilder) Analyze(m module.Module, allowUnresolved bool) ([]modu
if ok, err := hasVndrManifest(projectFolder); err == nil && ok {
goLogger.Debugf("Found Vndr manifest")

lockfileContents, err := ioutil.ReadFile(filepath.Join(projectFolder, "vendor.conf"))
lockfile := filepath.Join(projectFolder, "vendor.conf")
lockfileContents, err := ioutil.ReadFile(lockfile)
if err != nil {
return nil, fmt.Errorf("could not read vendor.conf")
goLogger.Debugf("Error reading %s: %s", lockfile, err.Error())
return nil, fmt.Errorf("could not read %s: %s", lockfile, err.Error())
}

lines := strings.Split(string(lockfileContents), "\n")
Expand Down Expand Up @@ -544,10 +547,10 @@ func (builder *GoBuilder) IsBuilt(m module.Module, allowUnresolved bool) (bool,

// IsModule is not implemented
func (builder *GoBuilder) IsModule(target string) (bool, error) {
return false, fmt.Errorf("IsModule is not implemented for GoBuilder")
return false, errors.New("IsModule is not implemented for GoBuilder")
}

// InferModule is not implemented
func (builder *GoBuilder) InferModule(target string) (module.Module, error) {
return module.Module{}, fmt.Errorf("InferModule is not implemented for GoBuilder")
return module.Module{}, errors.New("InferModule is not implemented for GoBuilder")
}
5 changes: 3 additions & 2 deletions build/maven.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package build

import (
"errors"
"fmt"
"os"
"regexp"
Expand Down Expand Up @@ -134,10 +135,10 @@ func (builder *MavenBuilder) IsBuilt(m module.Module, allowUnresolved bool) (boo

// IsModule is not implemented
func (builder *MavenBuilder) IsModule(target string) (bool, error) {
return false, fmt.Errorf("IsModule is not implemented for MavenBuilder")
return false, errors.New("IsModule is not implemented for MavenBuilder")
}

// InferModule is not implemented
func (builder *MavenBuilder) InferModule(target string) (module.Module, error) {
return module.Module{}, fmt.Errorf("InferModule is not implemented for MavenBuilder")
return module.Module{}, errors.New("InferModule is not implemented for MavenBuilder")
}
5 changes: 3 additions & 2 deletions build/nodejs.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package build

import (
"errors"
"fmt"
"os"
"path/filepath"
Expand Down Expand Up @@ -156,10 +157,10 @@ func (builder *NodeJSBuilder) IsBuilt(m module.Module, allowUnresolved bool) (bo

// IsModule is not implemented
func (builder *NodeJSBuilder) IsModule(target string) (bool, error) {
return false, fmt.Errorf("IsModule is not implemented for NodeJSBuilder")
return false, errors.New("IsModule is not implemented for NodeJSBuilder")
}

// InferModule is not implemented
func (builder *NodeJSBuilder) InferModule(target string) (module.Module, error) {
return module.Module{}, fmt.Errorf("InferModule is not implemented for NodeJSBuilder")
return module.Module{}, errors.New("InferModule is not implemented for NodeJSBuilder")
}
5 changes: 3 additions & 2 deletions build/ruby.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package build

import (
"errors"
"fmt"
"os"
"regexp"
Expand Down Expand Up @@ -144,10 +145,10 @@ func (builder *RubyBuilder) IsBuilt(m module.Module, allowUnresolved bool) (bool

// IsModule is not implemented
func (builder *RubyBuilder) IsModule(target string) (bool, error) {
return false, fmt.Errorf("IsModule is not implemented for RubyBuilder")
return false, errors.New("IsModule is not implemented for RubyBuilder")
}

// InferModule is not implemented
func (builder *RubyBuilder) InferModule(target string) (module.Module, error) {
return module.Module{}, fmt.Errorf("InferModule is not implemented for RubyBuilder")
return module.Module{}, errors.New("InferModule is not implemented for RubyBuilder")
}

0 comments on commit 743c35f

Please sign in to comment.