Merge branch 'refine-golangci-yaml' into 'master'

Refine golangci yaml

See merge request gitlab-org/gitlab-build-images!257

assets/.golangci.yml

@@ -49,7 +49,6 @@ run:
   # the dependency descriptions in go.mod.
   # modules-download-mode: readonly|release|vendor
 
-
 # output configuration options
 output:
   # colored-line-number|line-number|json|tab|checkstyle|code-climate, default is "colored-line-number"
@@ -61,7 +60,6 @@ output:
   # print linter name in the end of issue text, default is true
   print-linter-name: true
 
-
 # all available settings of specific linters
 linters-settings:
   errcheck:
@@ -204,6 +202,9 @@ linters-settings:
     # report any comments starting with keywords, this is useful for TODO or FIXME comments that
     # might be left in the code accidentally and should be resolved before merging
     keywords: # default keywords are TODO, BUG, and FIXME, these can be overwritten by this setting
+      - TODO
+      - BUG
+      - FIXME
       - NOTE
       - OPTIMIZE # marks code that should be optimized before merging
       - HACK # marks hack-arounds that should be removed before merging
@@ -236,7 +237,6 @@ linters:
   disable-all: true
   enable:
     - bodyclose
-    - deadcode
     - depguard
     - dogsled
     - dupl
@@ -245,6 +245,7 @@ linters:
     - gocognit
     - goconst
     - gocritic
+    - godox
     - gofmt
     - goimports
     - golint
@@ -263,17 +264,16 @@ linters:
     - unconvert
     - unparam
     - unused
-    - varcheck
     - whitespace
   # don't enable:
+  # - deadcode
   # - gochecknoglobals
   # - gochecknoinits
   # - gocyclo
-  # - godox
   # - lll
   # - maligned
   # - prealloc
-
+  # - varcheck
 
 issues:
   # List of regexps of issue texts to exclude, empty list by default.