Merge pull request mackerelio#720 from wafuwafu13/remove-disable-lint

fix gosimple, ineffassign

Author: lufia

.golangci.yml

@@ -3,8 +3,6 @@ linters:
   # TODO remove this rule.
   disable:
     - errcheck
-    - gosimple
-    - ineffassign
     - staticcheck
 linters-settings:
   govet:
@@ -19,7 +17,5 @@ issues:
     - path: _test\.go
       linters:
         - errcheck
-        - gosimple
         - staticcheck
         - ineffassign
-

check-elasticsearch/lib/check_elasticsearch.go

@@ -57,7 +57,7 @@ func run(args []string) *checkers.Checker {
 	var health healthStat
 	dec.Decode(&health)
 
-	checkSt := checkers.UNKNOWN
+	var checkSt checkers.Status
 	switch health.Status {
 	case "green":
 		checkSt = checkers.OK

check-log/lib/check-log_test.go

@@ -59,7 +59,7 @@ func TestGetInode(t *testing.T) {
 
 	i, err = getInode(f)
 	assert.Equal(t, err, nil, "err should be nil")
-	assert.Equal(t, state.Inode, uint(150))
+	assert.Equal(t, i, uint(150))
 }
 
 func TestGetBytesToSkip(t *testing.T) {

check-log/lib/check-log_unix_test.go

@@ -21,6 +21,7 @@ func TestFindFileByInode(t *testing.T) {
 
 	testFileExist := func() {
 		logfi, err := os.Stat(logf)
+		assert.Equal(t, err, nil, "err should be nil")
 		inode := detectInode(logfi)
 		f, err := findFileByInode(inode, dir)
 		assert.Equal(t, err, nil, "err should be nil")

check-masterha/lib/check_masterha_status.go

@@ -29,7 +29,7 @@ func (c statusChecker) MakeCommandArgs() []string {
 
 func (c statusChecker) Parse(out string) (checkers.Status, string) {
 	lines := strings.Split(out, "\n")
-	errors := make([]string, 0, 0)
+	var errors []string
 
 	for _, line := range lines {
 		if line != "" && !strings.Contains(line, "running(0:PING_OK)") {

check-ssh/lib/check-ssh.go

@@ -136,7 +136,7 @@ func (opts *sshOpts) run() *checkers.Checker {
 	if err != nil {
 		if addrerr, ok := err.(*net.AddrError); ok {
 			if addrerr.Timeout() {
-				elapsed := time.Now().Sub(start)
+				elapsed := time.Since(start)
 				return opts.checkTimeoutError(elapsed, err)
 			} else if addrerr.Temporary() {
 				return checkers.Warning(err.Error())
@@ -152,7 +152,7 @@ func (opts *sshOpts) run() *checkers.Checker {
 	if err != nil {
 		return checkers.Unknown(err.Error())
 	}
-	elapsed := time.Now().Sub(start)
+	elapsed := time.Since(start)
 	return opts.checkTimeout(elapsed)
 }
 

check-ssl-cert/lib/check-ssl-cert.go

@@ -47,7 +47,7 @@ func Run(args []string) *checkers.Checker {
 		return checkers.Critical(err.Error())
 	}
 	expiry := cert.NotAfter
-	dur := expiry.Sub(time.Now())
+	dur := time.Until(expiry)
 
 	chkSt := checkers.OK
 	days := int(dur.Hours() / 24)

check-tcp/lib/check-tcp.go

@@ -223,7 +223,7 @@ func (opts *tcpOpts) run() *checkers.Checker {
 			return checkers.Critical(err.Error())
 		}
 	}
-	elapsedSeconds := float64(time.Now().Sub(start)) / float64(time.Second)
+	elapsedSeconds := float64(time.Since(start)) / float64(time.Second)
 
 	chkSt := checkers.OK
 	if opts.Warning > 0 && elapsedSeconds > opts.Warning {