From b98fda6f34d6648156b25f0ddf7a016a3c924df9 Mon Sep 17 00:00:00 2001
From: sonata <sonatard12@gmail.com>
Date: Fri, 10 Jul 2020 10:50:06 +0900
Subject: [PATCH] Enable linters for golangci-lint (#1221)

* Enable linters for golangci-lint

* Remove unused nolint

* Fix lint
---
 .golangci.yml       | 4 ++--
 pkg/commands/run.go | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.golangci.yml b/.golangci.yml
index 3d9c7b405fc6..e8fe940feb23 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -73,6 +73,7 @@ linters:
     - dogsled
     - dupl
     - errcheck
+    - exhaustive
     - funlen
     - gochecknoinits
     - goconst
@@ -91,6 +92,7 @@ linters:
     - lll
     - misspell
     - nakedret
+    - noctx
     - nolintlint
     - rowserrcheck
     - scopelint
@@ -106,7 +108,6 @@ linters:
 
   # don't enable:
   # - asciicheck
-  # - exhaustive (TODO: enable after next release; current release at time of writing is v1.27)
   # - gochecknoglobals
   # - gocognit
   # - godot
@@ -114,7 +115,6 @@ linters:
   # - goerr113
   # - maligned
   # - nestif
-  # - noctx (TODO: enable after next release; current release at time of writing is v1.27)
   # - prealloc
   # - testpackage
   # - wsl
diff --git a/pkg/commands/run.go b/pkg/commands/run.go
index e4887d587a50..c1ccf86f31c4 100644
--- a/pkg/commands/run.go
+++ b/pkg/commands/run.go
@@ -446,8 +446,8 @@ func (e *Executor) executeRun(_ *cobra.Command, args []string) {
 
 // to be removed when deadline is finally decommissioned
 func (e *Executor) setTimeoutToDeadlineIfOnlyDeadlineIsSet() {
-	//lint:ignore SA1019 We want to promoted the deprecated config value when needed
-	deadlineValue := e.cfg.Run.Deadline // nolint:staticcheck
+	// nolint:staticcheck
+	deadlineValue := e.cfg.Run.Deadline
 	if deadlineValue != 0 && e.cfg.Run.Timeout == defaultTimeout {
 		e.cfg.Run.Timeout = deadlineValue
 	}