Skip to content

Commit

Permalink
Merge pull request #1194 from 99designs/bump-golangci-lint
Browse files Browse the repository at this point in the history
Update golangci-lint
  • Loading branch information
mtibben committed Mar 19, 2023
2 parents af6df83 + 7d54709 commit 5e0a968
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ jobs:
- name: golangci-lint
uses: golangci/[email protected]
with:
version: v1.51.2
version: v1.52.0
6 changes: 1 addition & 5 deletions cli/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -184,9 +184,5 @@ func ListCommand(input ListCommandInput, awsConfigFile *vault.ConfigFile, keyrin
fmt.Fprintf(w, "-\t-\t%s\t\n", s)
}

if err = w.Flush(); err != nil {
return err
}

return nil
return w.Flush()
}
2 changes: 1 addition & 1 deletion cli/proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/alecthomas/kingpin/v2"
)

func ConfigureProxyCommand(app *kingpin.Application, a *AwsVault) {
func ConfigureProxyCommand(app *kingpin.Application) {
stop := false

cmd := app.Command("proxy", "Start a proxy for the ec2 instance role server locally.").
Expand Down
2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func main() {
cli.ConfigureExportCommand(app, a)
cli.ConfigureClearCommand(app, a)
cli.ConfigureLoginCommand(app, a)
cli.ConfigureProxyCommand(app, a)
cli.ConfigureProxyCommand(app)

kingpin.MustParse(app.Parse(os.Args[1:]))
}
4 changes: 2 additions & 2 deletions vault/credentialprocessprovider_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ import (
ststypes "github.com/aws/aws-sdk-go-v2/service/sts/types"
)

func executeFail(process string) (string, error) {
func executeFail(_ string) (string, error) {
return "", errors.New("executing process failed")
}

func executeGetBadJSON(process string) (string, error) {
func executeGetBadJSON(_ string) (string, error) {
return "Junk", nil
}

Expand Down
2 changes: 1 addition & 1 deletion vault/keyringprovider.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ type KeyringProvider struct {
CredentialsName string
}

func (p *KeyringProvider) Retrieve(ctx context.Context) (aws.Credentials, error) {
func (p *KeyringProvider) Retrieve(_ context.Context) (aws.Credentials, error) {
log.Printf("Looking up keyring for '%s'", p.CredentialsName)
return p.Keyring.Get(p.CredentialsName)
}

0 comments on commit 5e0a968

Please sign in to comment.