chore: update linter (go-acme#1367)

.github/workflows/main.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       GO_VERSION: 1.16
-      GOLANGCI_LINT_VERSION: v1.36.0
+      GOLANGCI_LINT_VERSION: v1.38.0
       HUGO_VERSION: 0.54.0
       SEIHON_VERSION: v0.5.1
       CGO_ENABLED: 0

.golangci.toml

@@ -20,10 +20,32 @@
   [linters-settings.misspell]
     locale = "US"
 
+  [linters-settings.depguard]
+    list-type = "blacklist"
+    include-go-root = false
+    packages = ["github.com/pkg/errors"]
+
+  [linters-settings.godox]
+    keywords = ["FIXME"]
+
+  [linters-settings.gocritic]
+    enabled-tags = ["diagnostic", "style", "performance"]
+    disabled-checks= [
+      "paramTypeCombine", # already handle by gofumpt.extra-rules
+      "whyNoLint", # already handle by nonolint
+      "unnamedResult",
+      "hugeParam",
+      "sloppyReassign",
+      "rangeValCopy",
+      "octalLiteral",
+      "ptrToRefParam",
+    ]
+
 [linters]
   enable-all = true
   disable = [
-    "maligned",
+    "interfacer", # deprecated
+    "maligned", # deprecated
     "lll",
     "gas",
     "dupl",
@@ -32,7 +54,6 @@
     "bodyclose",
     "wsl",
     "stylecheck",
-    "godox",
     "gomnd",
     "testpackage", # not relevant
     "nestif", # too many false-positive
@@ -46,6 +67,9 @@
     "makezero", # not relevant
     "forbidigo", # not relevant
     "ifshort", # not relevant
+    "cyclop", # duplicate of gocyclo
+    "wastedassign", # false-positive https://github.com/sanposhiho/wastedassign/issues/21
+    "forcetypeassert",
   ]
 
 [issues]
@@ -139,4 +163,7 @@
     linters = ["thelper"]
   [[issues.exclude-rules]]
     path = "providers/dns/oraclecloud/oraclecloud_test.go"
-    text = "SA1019: x509.EncryptPEMBlock is deprecated:"
+    text = "SA1019: x509.EncryptPEMBlock has been deprecated since Go 1.16"
+  [[issues.exclude-rules]]
+    path = "challenge/http01/domain_matcher.go"
+    text = "yodaStyleExpr"

acme/api/account.go

@@ -46,7 +46,7 @@ func (a *AccountService) NewEAB(accMsg acme.Account, kid, hmacEncoded string) (a
 
 // Get Retrieves an account.
 func (a *AccountService) Get(accountURL string) (acme.Account, error) {
-	if len(accountURL) == 0 {
+	if accountURL == "" {
 		return acme.Account{}, errors.New("account[get]: empty URL")
 	}
 
@@ -60,7 +60,7 @@ func (a *AccountService) Get(accountURL string) (acme.Account, error) {
 
 // Update Updates an account.
 func (a *AccountService) Update(accountURL string, req acme.Account) (acme.Account, error) {
-	if len(accountURL) == 0 {
+	if accountURL == "" {
 		return acme.Account{}, errors.New("account[update]: empty URL")
 	}
 
@@ -75,7 +75,7 @@ func (a *AccountService) Update(accountURL string, req acme.Account) (acme.Accou
 
 // Deactivate Deactivates an account.
 func (a *AccountService) Deactivate(accountURL string) error {
-	if len(accountURL) == 0 {
+	if accountURL == "" {
 		return errors.New("account[deactivate]: empty URL")
 	}
 

acme/api/authorization.go

@@ -10,7 +10,7 @@ type AuthorizationService service
 
 // Get Gets an authorization.
 func (c *AuthorizationService) Get(authzURL string) (acme.Authorization, error) {
-	if len(authzURL) == 0 {
+	if authzURL == "" {
 		return acme.Authorization{}, errors.New("authorization[get]: empty URL")
 	}
 
@@ -24,7 +24,7 @@ func (c *AuthorizationService) Get(authzURL string) (acme.Authorization, error)
 
 // Deactivate Deactivates an authorization.
 func (c *AuthorizationService) Deactivate(authzURL string) error {
-	if len(authzURL) == 0 {
+	if authzURL == "" {
 		return errors.New("authorization[deactivate]: empty URL")
 	}
 

acme/api/certificate.go

@@ -62,7 +62,7 @@ func (c *CertificateService) Revoke(req acme.RevokeCertMessage) error {
 
 // get Returns the certificate and the "up" link.
 func (c *CertificateService) get(certURL string, bundle bool) (*acme.RawCertificate, http.Header, error) {
-	if len(certURL) == 0 {
+	if certURL == "" {
 		return nil, nil, errors.New("certificate[get]: empty URL")
 	}
 
@@ -112,7 +112,7 @@ func (c *CertificateService) getCertificateChain(cert []byte, headers http.Heade
 
 // getIssuerFromLink requests the issuer certificate.
 func (c *CertificateService) getIssuerFromLink(up string) ([]byte, error) {
-	if len(up) == 0 {
+	if up == "" {
 		return nil, nil
 	}
 

acme/api/challenge.go

@@ -10,7 +10,7 @@ type ChallengeService service
 
 // New Creates a challenge.
 func (c *ChallengeService) New(chlgURL string) (acme.ExtendedChallenge, error) {
-	if len(chlgURL) == 0 {
+	if chlgURL == "" {
 		return acme.ExtendedChallenge{}, errors.New("challenge[new]: empty URL")
 	}
 
@@ -29,7 +29,7 @@ func (c *ChallengeService) New(chlgURL string) (acme.ExtendedChallenge, error) {
 
 // Get Gets a challenge.
 func (c *ChallengeService) Get(chlgURL string) (acme.ExtendedChallenge, error) {
-	if len(chlgURL) == 0 {
+	if chlgURL == "" {
 		return acme.ExtendedChallenge{}, errors.New("challenge[get]: empty URL")
 	}
 

acme/api/order.go

@@ -32,7 +32,7 @@ func (o *OrderService) New(domains []string) (acme.ExtendedOrder, error) {
 
 // Get Gets an order.
 func (o *OrderService) Get(orderURL string) (acme.ExtendedOrder, error) {
-	if len(orderURL) == 0 {
+	if orderURL == "" {
 		return acme.ExtendedOrder{}, errors.New("order[get]: empty URL")
 	}
 

acme/errors.go

@@ -35,7 +35,7 @@ type SubProblem struct {
 
 func (p ProblemDetails) Error() string {
 	msg := fmt.Sprintf("acme: error: %d", p.HTTPStatus)
-	if len(p.Method) != 0 || len(p.URL) != 0 {
+	if p.Method != "" || p.URL != "" {
 		msg += fmt.Sprintf(" :: %s :: %s", p.Method, p.URL)
 	}
 	msg += fmt.Sprintf(" :: %s :: %s", p.Type, p.Detail)
@@ -44,7 +44,7 @@ func (p ProblemDetails) Error() string {
 		msg += fmt.Sprintf(", problem: %q :: %s", sub.Type, sub.Detail)
 	}
 
-	if len(p.Instance) != 0 {
+	if p.Instance != "" {
 		msg += ", url: " + p.Instance
 	}
 

certcrypto/crypto.go

@@ -173,8 +173,8 @@ func pemDecode(data []byte) (*pem.Block, error) {
 	return pemBlock, nil
 }
 
-func PemDecodeTox509CSR(pem []byte) (*x509.CertificateRequest, error) {
-	pemBlock, err := pemDecode(pem)
+func PemDecodeTox509CSR(data []byte) (*x509.CertificateRequest, error) {
+	pemBlock, err := pemDecode(data)
 	if pemBlock == nil {
 		return nil, err
 	}

cmd/cmd_before.go

@@ -6,7 +6,7 @@ import (
 )
 
 func Before(ctx *cli.Context) error {
-	if len(ctx.GlobalString("path")) == 0 {
+	if ctx.GlobalString("path") == "" {
 		log.Fatal("Could not determine current working directory. Please pass --path.")
 	}
 
@@ -15,7 +15,7 @@ func Before(ctx *cli.Context) error {
 		log.Fatalf("Could not check/create path: %v", err)
 	}
 
-	if len(ctx.GlobalString("server")) == 0 {
+	if ctx.GlobalString("server") == "" {
 		log.Fatal("Could not determine current working server. Please pass --server.")
 	}
 

cmd/setup.go

@@ -82,7 +82,7 @@ func getKeyType(ctx *cli.Context) certcrypto.KeyType {
 
 func getEmail(ctx *cli.Context) string {
 	email := ctx.GlobalString("email")
-	if len(email) == 0 {
+	if email == "" {
 		log.Fatal("You have to pass an account (email address) to the program using --email or -m")
 	}
 	return email

platform/config/env/env.go

@@ -66,7 +66,7 @@ func GetWithFallback(groups ...[]string) (map[string]string, error) {
 		}
 
 		value, envVar := getOneWithFallback(names[0], names[1:]...)
-		if len(value) == 0 {
+		if value == "" {
 			missingEnvVars = append(missingEnvVars, envVar)
 			continue
 		}
@@ -122,7 +122,7 @@ func GetOrDefaultSecond(envVar string, defaultValue time.Duration) time.Duration
 // Returns the default if the envvar cannot be find.
 func GetOrDefaultString(envVar, defaultValue string) string {
 	v := GetOrFile(envVar)
-	if len(v) == 0 {
+	if v == "" {
 		return defaultValue
 	}
 

platform/tester/env.go

@@ -87,7 +87,7 @@ func (e *EnvTest) IsLiveTest() bool {
 
 	liveTest = liveTest && len(e.values) == len(e.keys)
 
-	if liveTest && len(e.domainKey) > 0 && len(e.domain) == 0 {
+	if liveTest && e.domainKey != "" && e.domain == "" {
 		return false
 	}
 
@@ -129,7 +129,7 @@ func (e *EnvTest) Apply(envVars map[string]string) {
 			panic(fmt.Sprintf("Unauthorized action, the env var %s is not managed.", key))
 		}
 
-		if len(value) == 0 {
+		if value == "" {
 			os.Unsetenv(key)
 		} else {
 			os.Setenv(key, value)

platform/tester/env_test.go

@@ -24,7 +24,7 @@ func TestMain(m *testing.M) {
 
 func applyEnv(envVars map[string]string) {
 	for key, value := range envVars {
-		if len(value) == 0 {
+		if value == "" {
 			os.Unsetenv(key)
 		} else {
 			os.Setenv(key, value)

providers/dns/alidns/alidns.go

@@ -86,7 +86,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) {
 		return nil, fmt.Errorf("alicloud: credentials missing")
 	}
 
-	if len(config.RegionID) == 0 {
+	if config.RegionID == "" {
 		config.RegionID = defaultRegionID
 	}
 

providers/dns/alidns/alidns_test.go

@@ -63,7 +63,7 @@ func TestNewDNSProvider(t *testing.T) {
 
 			p, err := NewDNSProvider()
 
-			if len(test.expected) == 0 {
+			if test.expected == "" {
 				require.NoError(t, err)
 				require.NotNil(t, p)
 				require.NotNil(t, p.config)
@@ -111,7 +111,7 @@ func TestNewDNSProviderConfig(t *testing.T) {
 
 			p, err := NewDNSProviderConfig(config)
 
-			if len(test.expected) == 0 {
+			if test.expected == "" {
 				require.NoError(t, err)
 				require.NotNil(t, p)
 				require.NotNil(t, p.config)

providers/dns/arvancloud/arvancloud_test.go

@@ -43,7 +43,7 @@ func TestNewDNSProvider(t *testing.T) {
 
 			p, err := NewDNSProvider()
 
-			if len(test.expected) == 0 {
+			if test.expected == "" {
 				require.NoError(t, err)
 				require.NotNil(t, p)
 				require.NotNil(t, p.config)
@@ -87,7 +87,7 @@ func TestNewDNSProviderConfig(t *testing.T) {
 
 			p, err := NewDNSProviderConfig(config)
 
-			if len(test.expected) == 0 {
+			if test.expected == "" {
 				require.NoError(t, err)
 				require.NotNil(t, p)
 				require.NotNil(t, p.config)

providers/dns/auroradns/auroradns_test.go

@@ -81,7 +81,7 @@ func TestNewDNSProvider(t *testing.T) {
 
 			p, err := NewDNSProvider()
 
-			if len(test.expected) == 0 {
+			if test.expected == "" {
 				require.NoError(t, err)
 				require.NotNil(t, p)
 				require.NotNil(t, p.config)
@@ -133,7 +133,7 @@ func TestNewDNSProviderConfig(t *testing.T) {
 
 			p, err := NewDNSProviderConfig(config)
 
-			if len(test.expected) == 0 {
+			if test.expected == "" {
 				require.NoError(t, err)
 				require.NotNil(t, p)
 				require.NotNil(t, p.config)

providers/dns/autodns/autodns_test.go

@@ -64,7 +64,7 @@ func TestNewDNSProvider(t *testing.T) {
 
 			p, err := NewDNSProvider()
 
-			if len(test.expected) == 0 {
+			if test.expected == "" {
 				require.NoError(t, err)
 				require.NotNil(t, p)
 				require.NotNil(t, p.config)
@@ -115,7 +115,7 @@ func TestNewDNSProviderConfig(t *testing.T) {
 
 			p, err := NewDNSProviderConfig(config)
 
-			if len(test.expected) == 0 {
+			if test.expected == "" {
 				require.NoError(t, err)
 				require.NotNil(t, p)
 				require.NotNil(t, p.config)

providers/dns/azure/azure.go

@@ -291,7 +291,7 @@ func getAuthorizer(config *Config) (autorest.Authorizer, error) {
 // borrowed from https://github.com/Microsoft/azureimds/blob/master/imdssample.go
 func getMetadata(config *Config, field string) (string, error) {
 	metadataEndpoint := config.MetadataEndpoint
-	if len(metadataEndpoint) == 0 {
+	if metadataEndpoint == "" {
 		metadataEndpoint = defaultMetadataEndpoint
 	}
 

providers/dns/azure/azure_test.go

@@ -59,7 +59,7 @@ func TestNewDNSProvider(t *testing.T) {
 
 			p, err := NewDNSProvider()
 
-			if len(test.expected) == 0 {
+			if test.expected == "" {
 				require.NoError(t, err)
 				require.NotNil(t, p)
 				require.NotNil(t, p.config)
@@ -144,7 +144,7 @@ func TestNewDNSProviderConfig(t *testing.T) {
 
 			p, err := NewDNSProviderConfig(config)
 
-			if len(test.expected) == 0 {
+			if test.expected == "" {
 				require.NoError(t, err)
 				require.NotNil(t, p)
 				require.NotNil(t, p.config)

providers/dns/bindman/bindman_test.go

@@ -53,7 +53,7 @@ func TestNewDNSProvider(t *testing.T) {
 
 			p, err := NewDNSProvider()
 
-			if len(test.expected) == 0 {
+			if test.expected == "" {
 				require.NoError(t, err)
 				require.NotNil(t, p)
 				require.NotNil(t, p.config)
@@ -95,7 +95,7 @@ func TestNewDNSProviderConfig(t *testing.T) {
 		t.Run(test.desc, func(t *testing.T) {
 			p, err := NewDNSProviderConfig(test.config)
 
-			if len(test.expected) == 0 {
+			if test.expected == "" {
 				require.NoError(t, err)
 				require.NotNil(t, p)
 				require.NotNil(t, p.config)