Code cleanup

- Remove legacy/unused code
- Reorder imports

Author: anfernee

.gitignore

@@ -0,0 +1 @@
+/bin

cmd/agent/main.go

@@ -20,16 +20,17 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"fmt"
-	"sigs.k8s.io/apiserver-network-proxy/pkg/agent/agentclient"
+	"io/ioutil"
+	"net/http"
+	"os"
+
 	"github.com/golang/glog"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
-	"io/ioutil"
-	"net/http"
-	"os"
+	"sigs.k8s.io/apiserver-network-proxy/pkg/agent/agentclient"
 )
 
 func main() {

cmd/client/main.go

@@ -20,16 +20,16 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"fmt"
-	"github.com/spf13/pflag"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials"
 	"io"
 	"io/ioutil"
 	"os"
 
-	"sigs.k8s.io/apiserver-network-proxy/pkg/agent/client"
 	"github.com/golang/glog"
 	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials"
+	"sigs.k8s.io/apiserver-network-proxy/pkg/agent/client"
 )
 
 func main() {

cmd/proxy/main.go

@@ -17,23 +17,22 @@ limitations under the License.
 package main
 
 import (
+	"crypto/tls"
+	"crypto/x509"
 	"fmt"
-	"github.com/prometheus/client_golang/prometheus"
-	"google.golang.org/grpc/credentials"
+	"io/ioutil"
 	"net"
 	"net/http"
 	"os"
 
-	"google.golang.org/grpc"
-
-	"crypto/tls"
-	"crypto/x509"
-	"sigs.k8s.io/apiserver-network-proxy/pkg/agent/agentserver"
-	"sigs.k8s.io/apiserver-network-proxy/proto/agent"
 	"github.com/golang/glog"
+	"github.com/prometheus/client_golang/prometheus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-	"io/ioutil"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials"
+	"sigs.k8s.io/apiserver-network-proxy/pkg/agent/agentserver"
+	"sigs.k8s.io/apiserver-network-proxy/proto/agent"
 )
 
 func main() {

examples/legacy/client/main.go

@@ -23,9 +23,9 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"sigs.k8s.io/apiserver-network-proxy/proto/agent"
 	"github.com/golang/glog"
 	"google.golang.org/grpc"
+	"sigs.k8s.io/apiserver-network-proxy/proto/agent"
 )
 
 type AgentClient struct {

examples/legacy/server/main.go

@@ -17,19 +17,18 @@ limitations under the License.
 package agentserver
 
 import (
+	"fmt"
 	"io"
+	"net"
 
-	"fmt"
-	"sigs.k8s.io/apiserver-network-proxy/proto/agent"
 	"github.com/golang/glog"
-	"net"
+	"sigs.k8s.io/apiserver-network-proxy/proto/agent"
 )
 
 // ProxyClientConnection...
 type ProxyClientConnection struct {
-	Mode string
-	Grpc agent.ProxyService_ProxyServer
-	// Http http.ResponseWriter
+	Mode      string
+	Grpc      agent.ProxyService_ProxyServer
 	Http      net.Conn
 	connected chan struct{}
 	connectID int64
@@ -74,14 +73,14 @@ func NewProxyServer() *ProxyServer {
 	}
 }
 
-// Agent ...
+// Proxy handles incoming streams from gRPC frontend.
 func (s *ProxyServer) Proxy(stream agent.ProxyService_ProxyServer) error {
 	glog.Info("proxy request from client")
 
 	recvCh := make(chan *agent.Packet, 10)
 	stopCh := make(chan error)
 
-	go s.serveRecv(stream, recvCh)
+	go s.serveRecvFrontend(stream, recvCh)
 
 	defer func() {
 		close(recvCh)
@@ -106,7 +105,7 @@ func (s *ProxyServer) Proxy(stream agent.ProxyService_ProxyServer) error {
 	return <-stopCh
 }
 
-func (s *ProxyServer) serveRecv(stream agent.ProxyService_ProxyServer, recvCh <-chan *agent.Packet) {
+func (s *ProxyServer) serveRecvFrontend(stream agent.ProxyService_ProxyServer, recvCh <-chan *agent.Packet) {
 	glog.Info("start serve recv ...")
 	for pkt := range recvCh {
 		switch pkt.Type {

pkg/agent/agentclient/client.go

@@ -17,11 +17,12 @@ limitations under the License.
 package agentserver
 
 import (
-	"sigs.k8s.io/apiserver-network-proxy/proto/agent"
-	"github.com/golang/glog"
 	"io"
 	"math/rand"
 	"net/http"
+
+	"github.com/golang/glog"
+	"sigs.k8s.io/apiserver-network-proxy/proto/agent"
 )
 
 type Tunnel struct {

pkg/agent/agentserver/server.go

@@ -24,10 +24,9 @@ import (
 	"net"
 	"time"
 
-	"sigs.k8s.io/apiserver-network-proxy/proto/agent"
 	"github.com/golang/glog"
-
 	"google.golang.org/grpc"
+	"sigs.k8s.io/apiserver-network-proxy/proto/agent"
 )
 
 // Tunnel provides ability to dial a connection through itself