Merge pull request #32 from Sh4d1/add_ci

add CI and fix code to pass linting

Author: cheftako

.golangci.yml

@@ -0,0 +1,31 @@
+# taken from https://github.com/kubernetes-sigs/kustomize/blob/master/.golangci.yml
+run:
+  deadline: 5m
+
+linters:
+  disable-all: true
+  enable:
+    - dupl
+    - goconst
+#   - gocyclo
+    - gofmt
+    - golint
+    - govet
+    - ineffassign
+#   - interfacer
+    - lll
+    - misspell
+    - nakedret
+    - structcheck
+#   - unparam
+    - varcheck
+
+linters-settings:
+  dupl:
+    threshold: 400 
+  lll:   
+    line-length: 170
+# gocyclo:
+#   min-complexity: 15
+  golint:
+    min-confidence: 0.85

.travis.yml

@@ -0,0 +1,13 @@
+language: go
+go:
+  - 1.13.x
+git:
+  depth: 1
+install: true
+notifications:
+  email: false
+before_script:
+  - go install github.com/golangci/golangci-lint/cmd/golangci-lint
+script:
+  - golangci-lint run --skip-files ".*.pb.go"
+  - go test -v ./... # go test -v -race ./... is failing, should be fixed

cmd/agent/main.go

@@ -157,7 +157,7 @@ func (a *Agent) run(o *GrpcProxyAgentOptions) error {
 	return nil
 }
 
-func (p *Agent) runProxyConnection(o *GrpcProxyAgentOptions) error {
+func (a *Agent) runProxyConnection(o *GrpcProxyAgentOptions) error {
 	agentCert, err := tls.LoadX509KeyPair(o.agentCert, o.agentKey)
 	if err != nil {
 		return fmt.Errorf("failed to load X509 key pair %s and %s: %v", o.agentCert, o.agentKey, err)
@@ -190,7 +190,7 @@ func (p *Agent) runProxyConnection(o *GrpcProxyAgentOptions) error {
 	return nil
 }
 
-func (p *Agent) runAdminServer(o *GrpcProxyAgentOptions) error {
+func (a *Agent) runAdminServer(o *GrpcProxyAgentOptions) error {
 	livenessHandler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		fmt.Fprintf(w, "ok")
 	})

cmd/proxy/main.go

@@ -25,7 +25,7 @@ import (
 	"net"
 	"net/http"
 	"os"
-	
+
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"

pkg/agent/agentclient/client.go

@@ -87,7 +87,10 @@ func (a *AgentClient) Serve(stopCh <-chan struct{}) {
 		pkt, err := a.stream.Recv()
 		if err != nil {
 			if err2, ok := err.(*ReconnectError); ok {
-				err = err2.Wait()
+				err3 := err2.Wait()
+				if err3 != nil {
+					klog.Warningf("reconnect error: %v", err3)
+				}
 				continue
 			} else if err == io.EOF {
 				klog.Info("received EOF, exit")
@@ -102,6 +105,11 @@ func (a *AgentClient) Serve(stopCh <-chan struct{}) {
 
 		klog.Infof("[tracing] recv packet %+v", pkt)
 
+		if pkt == nil {
+			klog.Warningf("empty packet received")
+			continue
+		}
+
 		switch pkt.Type {
 		case agent.PacketType_DIAL_REQ:
 			klog.Info("received DIAL_REQ")

pkg/agent/agentclient/client_test.go

@@ -15,6 +15,7 @@ import (
 )
 
 func TestServeData_HTTP(t *testing.T) {
+	var err error
 	var stream agent.AgentService_ConnectClient
 	client := &AgentClient{
 		connContext: make(map[int64]*connContext),
@@ -35,12 +36,18 @@ func TestServeData_HTTP(t *testing.T) {
 
 	// Stimulate sending KAS DIAL_REQ to AgentClient
 	dialPacket := newDialPacket("tcp", ts.URL[len("http://"):], 111)
-	stream.Send(dialPacket)
+	err = stream.Send(dialPacket)
+	if err != nil {
+		t.Fatal(err.Error())
+	}
 
 	// Expect receiving DIAL_RSP packet from AgentClient
-	pkg, _ := stream.Recv()
+	pkg, err := stream.Recv()
+	if err != nil {
+		t.Fatal(err.Error())
+	}
 	if pkg == nil {
-		t.Error("unexpected nil packet")
+		t.Fatal("unexpected nil packet")
 	}
 	if pkg.Type != agent.PacketType_DIAL_RSP {
 		t.Errorf("expect PacketType_DIAL_RSP; got %v", pkg.Type)
@@ -53,7 +60,10 @@ func TestServeData_HTTP(t *testing.T) {
 
 	// Send Data (HTTP Request) via AgentClient to the test http server
 	dataPacket := newDataPacket(connID, []byte("GET / HTTP/1.1\r\nHost: localhost\r\n\r\n"))
-	stream.Send(dataPacket)
+	err = stream.Send(dataPacket)
+	if err != nil {
+		t.Error(err.Error())
+	}
 
 	// Expect receiving http response via AgentClient
 	pkg, _ = stream.Recv()
@@ -128,7 +138,7 @@ func TestClose_Client(t *testing.T) {
 	// Expect receiving DIAL_RSP packet from AgentClient
 	pkg, _ := stream.Recv()
 	if pkg == nil {
-		t.Error("unexpected nil packet")
+		t.Fatal("unexpected nil packet")
 	}
 	if pkg.Type != agent.PacketType_DIAL_RSP {
 		t.Errorf("expect PacketType_DIAL_RSP; got %v", pkg.Type)

pkg/agent/agentclient/stream.go

@@ -152,17 +152,20 @@ func (c *RedialableAgentClient) Recv() (*agent.Packet, error) {
 	c.recvLock.Lock()
 	defer c.recvLock.Unlock()
 
-	if pkt, err := c.stream.Recv(); err != nil {
+	var pkt *agent.Packet
+	var err error
+
+	if pkt, err = c.stream.Recv(); err != nil {
 		if err == io.EOF {
 			return pkt, err
 		}
 		return pkt, &ReconnectError{
 			internalErr: err,
 			errChan:     c.triggerReconnect(),
 		}
-	} else {
-		return pkt, nil
 	}
+
+	return pkt, nil
 }
 
 func (c *RedialableAgentClient) Connect() error {

pkg/agent/agentserver/server.go

@@ -54,7 +54,7 @@ func (c *ProxyClientConnection) send(pkt *agent.Packet) error {
 	}
 }
 
-// ProxyServer 
+// ProxyServer
 type ProxyServer struct {
 	Backend agent.AgentService_ConnectServer
 

pkg/agent/agentserver/tunnel.go

@@ -121,7 +121,11 @@ func (t *Tunnel) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 				},
 			},
 		}
-		t.Server.Backend.Send(packet)
+		err = t.Server.Backend.Send(packet)
+		if err != nil {
+			klog.Errorf("error sending packet %v", err)
+			continue
+		}
 		klog.Infof("Forwarding on tunnel, packet %v", string(pkt[:n]))
 	}
 

pkg/util/flags.go

@@ -22,4 +22,4 @@ import "strings"
 // we should always use hyphens instead of underscores when registering component flags
 func Normalize(s string) string {
 	return strings.Replace(s, "_", "-", -1)
-}
+}

tests/proxy_test.go

@@ -35,6 +35,9 @@ func TestBasicProxy_GRPC(t *testing.T) {
 	defer close(stopCh)
 
 	proxy, cleanup, err := runGRPCProxyServer()
+	if err != nil {
+		t.Fatal(err)
+	}
 	defer cleanup()
 
 	if err := runAgent(proxy.agent, stopCh); err != nil {
@@ -79,6 +82,9 @@ func TestBasicProxy_HTTPCONN(t *testing.T) {
 	defer close(stopCh)
 
 	proxy, cleanup, err := runHTTPConnProxyServer()
+	if err != nil {
+		t.Fatal(err)
+	}
 	defer cleanup()
 
 	if err := runAgent(proxy.agent, stopCh); err != nil {