fix: fixing lint issues

Author: nipunaudemy

.golangci.yml

@@ -2,24 +2,16 @@ run:
   timeout: 5m
   issues-exit-code: 1
   tests: true
-  skip-dirs:
-    - vendor
-  skip-files:
-    - ".*\\.pb\\.go$"
 
 linters:
   enable:
     - gofmt
-    - golint
     - govet
     - errcheck
     - staticcheck
     - unused
     - gosimple
-    - structcheck
-    - varcheck
     - ineffassign
-    - deadcode
     - typecheck
     - gosec
     - misspell
@@ -28,11 +20,17 @@ linters:
     - goconst
     - goimports
     - revive
-    - exportloopref
     - noctx
     - rowserrcheck
     - sqlclosecheck
     - unparam
+    - gocritic
+    - gci
+    - whitespace
+    - wsl
+  disable: []
+  # Note: Deprecated linters (golint, structcheck, varcheck, deadcode, scopelint, exportloopref)
+  # are automatically disabled by golangci-lint
 
 linters-settings:
   gocyclo:
@@ -53,8 +51,20 @@ linters-settings:
       - G204 # Subprocess launched with variable
       - G301 # Expect directory permissions to be 0750 or less
       - G302 # Expect file permissions to be 0600 or less
+  revive:
+    rules:
+      - name: exported
+        arguments: ["sayRepetitiveInsteadOfStutters"]
+      - name: package-comments
+        disabled: true
+      - name: var-naming
+        arguments: [["ID"], ["VM"]]
 
 issues:
+  exclude-dirs:
+    - vendor
+  exclude-files:
+    - ".*\\.pb\\.go$"
   exclude-rules:
     # Exclude some linters from running on tests files.
     - path: _test\.go
@@ -63,6 +73,7 @@ issues:
         - errcheck
         - dupl
         - gosec
+        - gocritic
     # Exclude known linters from partially hard-to-fix issues
     - linters:
         - errcheck
@@ -73,11 +84,21 @@ issues:
     - linters:
         - gosec
       text: "G204: Subprocess launched with function call as argument or cmd arguments"
+    # Ignore some gocritic checks that are too strict
+    - linters:
+        - gocritic
+      text: "commentedOutCode"
+    # Exclude some wsl (whitespace) checks that are too strict
+    - linters:
+        - wsl
+      text: "(return statements should not be cuddled|assignments should only be cuddled|only one cuddle assignment allowed)"
 
   max-issues-per-linter: 0
   max-same-issues: 0
 
 output:
-  format: colored-line-number
+  formats:
+    - format: colored-line-number
   print-issued-lines: true
   print-linter-name: true
+  sort-results: true