Merge pull request #5 from futuretea/master

fix lint

cmd/docgen/kube-events-docgen.go

@@ -70,7 +70,7 @@ func printAPIDocs(paths []string) {
 
 			fmt.Println("| Field | Description | Scheme | Required |")
 			fmt.Println("| ----- | ----------- | ------ | -------- |")
-			fields := t[1:(len(t))]
+			fields := t[1:]
 			for _, f := range fields {
 				fmt.Println("|", f.Name, "|", f.Doc, "|", f.Type, "|", f.Mandatory, "|")
 			}
@@ -227,20 +227,18 @@ func fieldRequired(field *ast.Field) bool {
 }
 
 func fieldType(typ ast.Expr) string {
-	switch typ.(type) {
+	switch t := typ.(type) {
 	case *ast.Ident:
-		return toLink(typ.(*ast.Ident).Name)
+		return toLink(t.Name)
 	case *ast.StarExpr:
-		return "*" + toLink(fieldType(typ.(*ast.StarExpr).X))
+		return "*" + toLink(fieldType(t.X))
 	case *ast.SelectorExpr:
-		e := typ.(*ast.SelectorExpr)
-		pkg := e.X.(*ast.Ident)
-		t := e.Sel
-		return toLink(pkg.Name + "." + t.Name)
+		pkg := t.X.(*ast.Ident)
+		return toLink(pkg.Name + "." + t.Sel.Name)
 	case *ast.ArrayType:
-		return "[]" + toLink(fieldType(typ.(*ast.ArrayType).Elt))
+		return "[]" + toLink(fieldType(t.Elt))
 	case *ast.MapType:
-		mapType := typ.(*ast.MapType)
+		mapType := t
 		return "map[" + toLink(fieldType(mapType.Key)) + "]" + toLink(fieldType(mapType.Value))
 	default:
 		return ""

cmd/exporter/main.go

@@ -66,9 +66,7 @@ func main() {
 		klog.Info("Config reloaded")
 	})
 	server := &http.Server{Addr: ":8443", Handler: router}
-	wg.Go(func() error {
-		return server.ListenAndServe()
-	})
+	wg.Go(server.ListenAndServe)
 
 	stopCh := util.SignalHandler()
 	go func() {

cmd/operator/main.go

@@ -18,9 +18,10 @@ package main
 
 import (
 	"flag"
-	"github.com/kubesphere/kube-events/pkg/config"
 	"os"
 
+	"github.com/kubesphere/kube-events/pkg/config"
+
 	"k8s.io/apimachinery/pkg/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"

cmd/ruler/main.go

@@ -6,11 +6,12 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
-	v1 "k8s.io/api/core/v1"
 	"net/http"
 	"runtime"
 	"time"
 
+	v1 "k8s.io/api/core/v1"
+
 	"github.com/julienschmidt/httprouter"
 	"github.com/kubesphere/kube-events/pkg/config"
 	"github.com/kubesphere/kube-events/pkg/ruler"
@@ -77,9 +78,7 @@ func main() {
 		}
 	})
 	server := &http.Server{Addr: ":8443", Handler: router}
-	wg.Go(func() error {
-		return server.ListenAndServe()
-	})
+	wg.Go(server.ListenAndServe)
 
 	stopCh := util.SignalHandler()
 	go func() {

pkg/apis/v1alpha1/rule_webhook.go

@@ -18,6 +18,7 @@ package v1alpha1
 
 import (
 	"fmt"
+
 	apierrs "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -121,7 +122,6 @@ func (r *Rule) ValidateDelete() error {
 }
 
 func (r *Rule) validateRule() error {
-
 	var allErrs field.ErrorList
 	if err := r.validateRuleScope(); err != nil {
 		allErrs = append(allErrs, err)
@@ -136,7 +136,6 @@ func (r *Rule) validateRule() error {
 }
 
 func (r *Rule) validateRuleScope() *field.Error {
-
 	rs, ok := r.Labels[_ruleScopeConfig.ScopeLabelKey]
 	labelsFieldPath := field.NewPath("metadata").Child("labels", _ruleScopeConfig.ScopeLabelKey)
 	if !ok {

pkg/config/exporter_config.go

@@ -1,8 +1,9 @@
 package config
 
 import (
-	"github.com/pkg/errors"
 	"io/ioutil"
+
+	"github.com/pkg/errors"
 	"sigs.k8s.io/yaml"
 )
 

pkg/config/ruler_config.go

@@ -2,11 +2,9 @@ package config
 
 import (
 	"io/ioutil"
-	"k8s.io/apimachinery/pkg/labels"
-)
 
-import (
 	"github.com/pkg/errors"
+	"k8s.io/apimachinery/pkg/labels"
 	"sigs.k8s.io/yaml"
 )
 

pkg/controllers/exporter_controller.go

@@ -19,11 +19,12 @@ package controllers
 import (
 	"context"
 	"fmt"
+	"path"
+	"reflect"
+
 	"k8s.io/apimachinery/pkg/api/resource"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/util/workqueue"
-	"path"
-	"reflect"
 	"sigs.k8s.io/controller-runtime/pkg/event"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"

pkg/controllers/ruler_controller.go

@@ -19,6 +19,9 @@ package controllers
 import (
 	"context"
 	"fmt"
+	"path"
+	"reflect"
+
 	"github.com/go-logr/logr"
 	"github.com/kubesphere/kube-events/pkg/config"
 	appsv1 "k8s.io/api/apps/v1"
@@ -31,8 +34,6 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/client-go/util/workqueue"
-	"path"
-	"reflect"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"

pkg/exporter/kube_events_exporter.go

@@ -2,6 +2,7 @@ package exporter
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"sync"
 	"time"
@@ -72,7 +73,7 @@ func (s *K8sEventSource) Run(ctx context.Context) error {
 
 func (s *K8sEventSource) waitForCacheSync(stopc <-chan struct{}) error {
 	if !cache.WaitForCacheSync(stopc, s.inf.HasSynced) {
-		return fmt.Errorf("Failed to sync events cache")
+		return errors.New("failed to sync events cache")
 	}
 	klog.Info("Successfully synced events cache")
 	return nil

pkg/exporter/sinks/stdout.go

@@ -4,7 +4,8 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"k8s.io/api/core/v1"
+
+	v1 "k8s.io/api/core/v1"
 )
 
 type StdoutSinker struct {

pkg/ruler/rule_cache.go

@@ -115,7 +115,6 @@ func (c *RuleCache) GetRules(ctx context.Context, evt *types.Event) (rules []*v1
 	}
 
 	return
-
 }
 
 func (c *RuleCache) ruleAdd(obj interface{}) {
@@ -130,7 +129,6 @@ func (c *RuleCache) ruleAdd(obj interface{}) {
 			m, _ := c.namespaceRules.LoadOrStore(rule.Namespace, &sync.Map{})
 			m.(*sync.Map).Store(c.ruleNameFromNamespaceRule(rule), rule)
 		}
-
 	}
 }
 

pkg/ruler/sinks/alert/alertmanager.go

@@ -13,9 +13,9 @@ type AlertmanagerSinker struct {
 }
 
 func (s *AlertmanagerSinker) SinkAlerts(ctx context.Context, evtAlerts []*types.EventAlert) error {
-	var alerts []*amkit.RawAlert
-	for _, ea := range evtAlerts {
-		alerts = append(alerts, ea.Alert)
+	alerts := make([]*amkit.RawAlert, len(evtAlerts))
+	for i, ea := range evtAlerts {
+		alerts[i] = ea.Alert
 	}
 	if len(alerts) == 0 {
 		return nil

pkg/ruler/sinks/alert/webhook.go

@@ -5,6 +5,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"github.com/kubesphere/kube-events/pkg/util"
 	"net/http"
 
 	"github.com/kubesphere/kube-events/pkg/ruler/types"
@@ -29,8 +30,9 @@ func (s *WebhookSinker) SinkAlerts(ctx context.Context, evtAlerts []*types.Event
 	if err != nil {
 		return fmt.Errorf("error sinking to webhook(%s): %v", s.Url, err)
 	}
+	util.DrainResponse(resp)
 	if resp.StatusCode/100 != 2 {
-		err = fmt.Errorf("error sinking to webhook(%s): bad response status: %s", s.Url, resp.Status)
+		return fmt.Errorf("error sinking to webhook(%s): bad response status: %s", s.Url, resp.Status)
 	}
 	return nil
 }

pkg/ruler/sinks/notification/webhook.go

@@ -5,6 +5,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"github.com/kubesphere/kube-events/pkg/util"
 	"net/http"
 
 	"github.com/kubesphere/kube-events/pkg/ruler/types"
@@ -35,8 +36,9 @@ func (s *WebhookSinker) SinkNotifications(ctx context.Context, evtNotifications
 	if err != nil {
 		return fmt.Errorf("error sinking to webhook(%s): %v", s.Url, err)
 	}
+	util.DrainResponse(resp)
 	if resp.StatusCode/100 != 2 {
-		err = fmt.Errorf("error sinking to webhook(%s): bad response status: %s", s.Url, resp.Status)
+		return fmt.Errorf("error sinking to webhook(%s): bad response status: %s", s.Url, resp.Status)
 	}
 	return nil
 }

pkg/ruler/visitor/eventrule.go

@@ -21,20 +21,20 @@ func NewVisitor(m map[string]interface{}) *Visitor {
 	}
 }
 
-func (l *Visitor) pushValue(i bool) {
-	l.valueStack = append(l.valueStack, i)
+func (v *Visitor) pushValue(i bool) {
+	v.valueStack = append(v.valueStack, i)
 }
 
-func (l *Visitor) popValue() bool {
-	if len(l.valueStack) < 1 {
+func (v *Visitor) popValue() bool {
+	if len(v.valueStack) < 1 {
 		panic("valueStack is empty unable to pop")
 	}
 
 	// Get the last value from the stack.
-	result := l.valueStack[len(l.valueStack)-1]
+	result := v.valueStack[len(v.valueStack)-1]
 
 	// Remove the last element from the stack.
-	l.valueStack = l.valueStack[:len(l.valueStack)-1]
+	v.valueStack = v.valueStack[:len(v.valueStack)-1]
 
 	return result
 }

pkg/util/sysutil.go

@@ -1,10 +1,11 @@
 package util
 
 import (
-	"k8s.io/klog"
 	"os"
 	"os/signal"
 	"syscall"
+
+	"k8s.io/klog"
 )
 
 // SignalHandler setups a signal hander to gracefully exit