- fix lints for new version

.golangci.yml

@@ -41,3 +41,4 @@ linters:
   disable:
     - exhaustivestruct
     - wrapcheck
+    - ireturn

go.mod

@@ -25,6 +25,7 @@ require (
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/go-cmp v0.5.6 // indirect
+	github.com/google/uuid v1.3.0 // indirect
 	github.com/googleapis/gax-go/v2 v2.1.1 // indirect
 	github.com/googleapis/google-cloud-go-testing v0.0.0-20210719221736-1c9a4c676720 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect

go.sum

@@ -221,8 +221,9 @@ github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLe
 github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
-github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
+github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0=

internal/io/io.go

@@ -27,7 +27,7 @@ func WriteSSHKey(fileName string, data []byte) error {
 
 	if _, err = os.Stat(sshDirectory); os.IsNotExist(err) {
 		//nolint:gomnd // change this later.
-		err = os.Mkdir(sshDirectory, os.FileMode(0777))
+		err = os.Mkdir(sshDirectory, os.FileMode(0o777))
 		if err != nil {
 			return err
 		}
@@ -36,7 +36,7 @@ func WriteSSHKey(fileName string, data []byte) error {
 	sshPath := filepath.Join(sshDirectory, fileName)
 
 	//nolint:gomnd // change this later.
-	err = ioutil.WriteFile(sshPath, data, os.FileMode(0600))
+	err = ioutil.WriteFile(sshPath, data, os.FileMode(0o600))
 	if err != nil {
 		return err
 	}

internal/provider/bw.go

@@ -43,7 +43,7 @@ func (b Bitwarden) GetName() string {
 func (b Bitwarden) Add(item *Item) error {
 	_, err := b.Get(item.Name)
 	if err == nil {
-		return ItemAlreadyExists{Name: item.Name}
+		return ItemAlreadyExistsError{Name: item.Name}
 	}
 
 	encodedValues, err := item.EncodeValues()

internal/provider/bw_test.go

@@ -26,7 +26,7 @@ func TestBitwarden_Add(t *testing.T) {
 		},
 	}
 
-	bw := provider.Bitwarden{
+	bitw := provider.Bitwarden{
 		Commander: internal.Commander{Executor: test.NewExecutor(expectedCommands)},
 	}
 
@@ -44,7 +44,7 @@ func TestBitwarden_Add(t *testing.T) {
 		},
 	}
 
-	err := bw.Add(&item)
+	err := bitw.Add(&item)
 
 	assert.NoError(t, err)
 }

internal/provider/error.go

@@ -2,12 +2,12 @@ package provider
 
 import "fmt"
 
-// NotFound occurs when no provider found.
-type NotFound struct {
+// NotFoundError occurs when no provider found.
+type NotFoundError struct {
 	Name *string
 }
 
-func (e NotFound) Error() string {
+func (e NotFoundError) Error() string {
 	return fmt.Sprintf("no provider found for %s", *e.Name)
 }
 
@@ -21,11 +21,11 @@ func (e ExecutionFailedError) Error() string {
 	return fmt.Sprintf("'%s': Execution failed: %s", e.Command, e.Message)
 }
 
-// ItemAlreadyExists occurs when given item is not found in the provder.
-type ItemAlreadyExists struct {
+// ItemAlreadyExistsError occurs when given item is not found in the provder.
+type ItemAlreadyExistsError struct {
 	Name string
 }
 
-func (e ItemAlreadyExists) Error() string {
+func (e ItemAlreadyExistsError) Error() string {
 	return fmt.Sprintf("item %s already exists", e.Name)
 }

internal/provider/op.go

@@ -52,7 +52,7 @@ func (o OnePassword) GetName() string {
 func (o OnePassword) Add(item *Item) error {
 	_, err := o.Get(item.Name)
 	if err == nil {
-		return ItemAlreadyExists{Name: item.Name}
+		return ItemAlreadyExistsError{Name: item.Name}
 	}
 
 	encodedValues, err := item.EncodeValues()

internal/provider/op_test.go

@@ -34,7 +34,7 @@ func TestOnePassword_Add(t *testing.T) {
 		},
 	}
 
-	op := provider.OnePassword{
+	onep := provider.OnePassword{
 		Commander: internal.Commander{Executor: test.NewExecutor(expectedCommands)},
 	}
 
@@ -52,7 +52,7 @@ func TestOnePassword_Add(t *testing.T) {
 		},
 	}
 
-	err := op.Add(&item)
+	err := onep.Add(&item)
 
 	assert.NoError(t, err)
 }

main.go

@@ -17,7 +17,7 @@ func main() {
 		SilenceUsage: true,
 	}
 
-	c := commander.NewCommander(root).
+	comm := commander.NewCommander(root).
 		SetCommand(
 			cmd.Version(),
 			cmd.Get(),
@@ -26,7 +26,7 @@ func main() {
 		).
 		Init()
 
-	if err := c.Execute(); err != nil {
+	if err := comm.Execute(); err != nil {
 		os.Exit(1)
 	}
 }

test/error.go

@@ -2,12 +2,12 @@ package test
 
 import "fmt"
 
-// FixtureFileNotFound occurs when the requested fixture file does not exist.
-type FixtureFileNotFound struct {
+// FixtureFileNotFoundError occurs when the requested fixture file does not exist.
+type FixtureFileNotFoundError struct {
 	Path string
 	Name string
 }
 
-func (e FixtureFileNotFound) Error() string {
+func (e FixtureFileNotFoundError) Error() string {
 	return fmt.Sprintf("Fixture file does not exist: %s/fixtures/%s", e.Path, e.Name)
 }

test/fixture.go

@@ -12,7 +12,7 @@ func LoadFixture(name string) ([]byte, error) {
 	if err != nil {
 		path, _ := os.Getwd()
 
-		return []byte{}, FixtureFileNotFound{Path: path, Name: name}
+		return []byte{}, FixtureFileNotFoundError{Path: path, Name: name}
 	}
 
 	return content, nil

test/fixture_test.go

@@ -35,5 +35,5 @@ func TestMust_hasError(t *testing.T) {
 		}
 	}()
 
-	_ = Must([]byte{}, FixtureFileNotFound{Path: "/path", Name: "file"})
+	_ = Must([]byte{}, FixtureFileNotFoundError{Path: "/path", Name: "file"})
 }