Merge pull request #1429 from smallstep/herman/fix-some-linter-issues

Fix linter issues by updating linters and ignoring some issues

Author: hslatman

cmd/step/main.go

@@ -139,7 +139,7 @@ func newApp(stdout, stderr io.Writer) *cli.App {
 				return plugin.Run(ctx, file)
 			}
 			if u := plugin.GetURL(name); u != "" {
-				//nolint:stylecheck // this is a top level error - capitalization is ok
+				//nolint:staticcheck // this is a top level error - capitalization is ok
 				return fmt.Errorf("The plugin %q was not found on this system.\nDownload it from %s", name, u)
 			}
 			return cli.ShowCommandHelp(ctx, name)

command/ca/provisioner/add.go

@@ -385,7 +385,7 @@ func addAction(ctx *cli.Context) (err error) {
 		Ssh: &linkedca.SSHClaims{
 			UserDurations: &linkedca.Durations{},
 			HostDurations: &linkedca.Durations{},
-			Enabled:       !(ctx.IsSet("ssh") && !ctx.Bool("ssh")),
+			Enabled:       !(ctx.IsSet("ssh") && !ctx.Bool("ssh")), //nolint:staticcheck // TODO(hs): fix this
 		},
 		DisableRenewal:             ctx.Bool("disable-renewal"),
 		AllowRenewalAfterExpiry:    ctx.Bool("allow-renewal-after-expiry"),

command/context/remove.go

@@ -81,7 +81,7 @@ func removeAction(ctx *cli.Context) error {
 		}
 	}
 
-	if !ctx.Bool("force") && !(saveAuthority && saveProfile) {
+	if !ctx.Bool("force") && !(saveAuthority && saveProfile) { //nolint:staticcheck // TODO(hs): fix this
 		ui.Printf("The following directories will be removed:\n")
 		ui.Println()
 		if !saveAuthority {

integration/command.go

@@ -1,3 +1,4 @@
+//nolint:unused // will be fixed with new integration tests
 package integration
 
 import (

pkg/bcrypt_pbkdf/bcrypt_pbkdf.go

@@ -4,7 +4,7 @@
 
 // Package bcrypt_pbkdf implements password-based key derivation function based
 // on bcrypt compatible with bcrypt_pbkdf(3) from OpenBSD.
-package bcrypt_pbkdf //nolint:revive,stylecheck // keep compatible with existing importers
+package bcrypt_pbkdf //nolint:revive,staticcheck // keep compatible with existing importers
 
 import (
 	"crypto/sha512"

pkg/bcrypt_pbkdf/bcrypt_pbkdf_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-package bcrypt_pbkdf //nolint:stylecheck // keep compatible with existing importers
+package bcrypt_pbkdf //nolint:staticcheck // keep compatible with existing importers
 
 import (
 	"bytes"