From 931ab3d8bfa8ae0306dceb0295269e228bff1606 Mon Sep 17 00:00:00 2001
From: Fernandez Ludovic <lfernandez.dev@gmail.com>
Date: Mon, 18 Feb 2019 13:28:19 +0100
Subject: [PATCH] chore: update to golangci-lint v1.15.0

---
 .golangci.toml | 55 ++++++++++++++++++++++++++++++++++++--------------
 .travis.yml    |  2 +-
 2 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/.golangci.toml b/.golangci.toml
index 498387ec..52a165a2 100644
--- a/.golangci.toml
+++ b/.golangci.toml
@@ -36,20 +36,45 @@
   max-per-linter = 0
   max-same = 0
   exclude = [
-    "Error return value of (.+) is not checked",
+    "Error return value of .((os\\.)?std(out|err)\\..*|.*Close|.*Flush|os\\.Remove(All)?|.*printf?|os\\.(Un)?Setenv). is not checked",
     "exported (type|method|function) (.+) should have comment or be unexported",
-    "cyclomatic complexity (.+) of func `NewDNSChallengeProviderByName` is high (.+)", # providers/dns/dns_providers.go
-    "string `(lego\\.wtf|manhattan)` has (\\d+) occurrences, make it a constant", #providers/dns/gcloud/googlecloud_test.go
-
-    "(dnsHelp|createRenew\\$1|createRun\\$1|run) - result 0 \\(error\\) is always nil", # cmd/
-    "`(tlsFeatureExtensionOID|ocspMustStapleFeature)` is a global variable", # certcrypto/crypto.go
-    "`(defaultNameservers|recursiveNameservers|dnsTimeout|fqdnToZone|muFqdnToZone)` is a global variable", # challenge/dns01/nameserver.go
-    "`idPeAcmeIdentifierV1` is a global variable", # challenge/tlsalpn01/tls_alpn_challenge.go
-    "`Logger` is a global variable", # log/logger.go
-    "`version` is a global variable", # cli.go
-    "`load` is a global variable", # e2e/challenges_test.go
-    "`envTest` is a global variable", # providers/dns/**/*_test.go
-    "`(tldsMock|testCases)` is a global variable", # providers/dns/namecheap/namecheap_test.go
-    "`(errorClientErr|errorStorageErr|egTestAccount)` is a global variable", # providers/dns/acmedns/acmedns_test.go
-    "`memcachedHosts` is a global variable", # providers/http/memcached/memcached_test.go
   ]
+  [[issues.exclude-rules]]
+    path = "providers/dns/dns_providers.go"
+    linters = ["gocyclo"]
+  [[issues.exclude-rules]]
+    path = "providers/dns/gcloud/googlecloud_test.go"
+    text = "string `(lego\\.wtf|manhattan)` has (\\d+) occurrences, make it a constant"
+  [[issues.exclude-rules]]
+    path = "providers/dns/zoneee/zoneee_test.go"
+    text = "string `(bar|foo)` has (\\d+) occurrences, make it a constant"
+  [[issues.exclude-rules]]
+    path = "certcrypto/crypto.go"
+    text = "`(tlsFeatureExtensionOID|ocspMustStapleFeature)` is a global variable"
+  [[issues.exclude-rules]]
+    path = "challenge/dns01/nameserver.go"
+    text = "`(defaultNameservers|recursiveNameservers|dnsTimeout|fqdnToZone|muFqdnToZone)` is a global variable"
+  [[issues.exclude-rules]]
+    path = "challenge/tlsalpn01/tls_alpn_challenge.go"
+    text = "`idPeAcmeIdentifierV1` is a global variable"
+  [[issues.exclude-rules]]
+    path = "log/logger.go"
+    text = "`Logger` is a global variable"
+  [[issues.exclude-rules]]
+    path = "cmd/lego/main.go"
+    text = "`version` is a global variable"
+  [[issues.exclude-rules]]
+    path = "e2e/(dnschallenge/)?[\\d\\w]+_test.go"
+    text = "`load` is a global variable"
+  [[issues.exclude-rules]]
+    path = "providers/dns/([\\d\\w]+/)*[\\d\\w]+_test.go"
+    text = "`envTest` is a global variable"
+  [[issues.exclude-rules]]
+    path = "providers/dns/namecheap/namecheap_test.go"
+    text = "`(tldsMock|testCases)` is a global variable"
+  [[issues.exclude-rules]]
+    path = "providers/dns/acmedns/acmedns_test.go"
+    text = "`(errorClientErr|errorStorageErr|egTestAccount)` is a global variable"
+  [[issues.exclude-rules]]
+    path = "providers/http/memcached/memcached_test.go"
+    text = "`memcachedHosts` is a global variable"
diff --git a/.travis.yml b/.travis.yml
index cbef55ac..69e3fbd6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,7 +30,7 @@ before_install:
   - go get -u github.com/letsencrypt/pebble/...
 
   # Install linters and misspell
-  - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $GOPATH/bin v1.14.0
+  - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $GOPATH/bin v1.15.0
   - golangci-lint --version
 
 install: