From 7bf0e645efe2953684cce5368808e7ec0102767a Mon Sep 17 00:00:00 2001
From: Scott Suarez <ScottMSuarez@gmail.com>
Date: Wed, 26 May 2021 14:17:09 -0700
Subject: [PATCH] fix linter in tpgb

---
 .golangci.yml    | 63 +++++++++++++++++++++++++++++++++++++++++++++---
 staticcheck.conf | 20 ---------------
 2 files changed, 59 insertions(+), 24 deletions(-)
 delete mode 100644 staticcheck.conf

diff --git a/.golangci.yml b/.golangci.yml
index 7b29d5aee33..6f0718a286a 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,10 +1,6 @@
 run:
   deadline: 2m30s
 
-issues:
-  max-per-linter: 0
-  max-same-issues: 0
-
 linters:
   disable-all: true
   enable:
@@ -24,3 +20,62 @@ linters:
 linters-settings:
   errcheck:
     ignore: github.com/hashicorp/terraform-plugin-sdk/helper/schema:ForceNew|Set,fmt:.*,io:Close,github.com/hashicorp/terraform-provider-google/google:Set
+
+issues:
+  max-per-linter: 0
+  max-same-issues: 0
+  exclude-rules:
+    - linters:
+        - gosimple
+      text: "S1002:"
+    - linters:
+        - gosimple
+      text: "S1007:"
+    - linters:
+        - gosimple
+      text: "S1008:"
+    - linters:
+        - gosimple
+      text: "S1009:"
+    - linters:
+        - gosimple
+      text: "S1019:"
+    - linters:
+        - gosimple
+      text: "S1021:"
+    - linters:
+        - gosimple
+      text: "S1025:"
+    - linters:
+        - gosimple
+      text: "S1034:"
+    - linters:
+        - gosimple
+      text: "S1039:"
+    - linters:
+        - stylecheck
+      text: "ST1000:"
+    - linters:
+        - stylecheck
+      text: "ST1003:"
+    - linters:
+        - stylecheck
+      text: "ST1005:"
+    - linters:
+        - stylecheck
+      text: "ST1017:"
+    - linters:
+        - staticcheck
+      text: "SA1019:"
+    - linters:
+        - staticcheck
+      text: "SA4006:"
+    - linters:
+        - staticcheck
+      text: "SA4010:"
+    - linters:
+        - staticcheck
+      text: "SA6000:"
+    - linters:
+        - staticcheck
+      text: "SA6005:"
\ No newline at end of file
diff --git a/staticcheck.conf b/staticcheck.conf
deleted file mode 100644
index 93852eeff57..00000000000
--- a/staticcheck.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-checks = [
-  "all",
-  "-S1002",
-  "-S1007",
-  "-S1008",
-  "-S1009",
-  "-S1019",
-  "-S1021",
-  "-S1025",
-  "-S1034",
-  "-ST1000",
-  "-ST1003",
-  "-ST1005",
-  "-ST1017",
-  "-SA1019",
-  "-SA4006",
-  "-SA4010",
-  "-SA6000",
-  "-SA6005"
-]