Merge pull request #91 from caesarxuchao/refactor

k8s-ci-robot · web-flow · commit c9359490a03d · 2020-03-13T11:27:47.000-07:00
Restructure the directories
diff --git a/Makefile b/Makefile
@@ -62,8 +62,8 @@ bin/proxy-agent: proto/agent/agent.pb.go konnectivity-client/proto/client/client
 bin/proxy-test-client: konnectivity-client/proto/client/client.pb.go bin cmd/client/main.go
 	GO111MODULE=on go build -o bin/proxy-test-client cmd/client/main.go
 
-bin/proxy-server: proto/agent/agent.pb.go konnectivity-client/proto/client/client.pb.go bin cmd/proxy/main.go
-	GO111MODULE=on go build -o bin/proxy-server cmd/proxy/main.go
+bin/proxy-server: proto/agent/agent.pb.go konnectivity-client/proto/client/client.pb.go bin cmd/server/main.go
+	GO111MODULE=on go build -o bin/proxy-server cmd/server/main.go
 
 ## --------------------------------------
 ## Linting
@@ -157,7 +157,7 @@ docker-push/proxy-agent: docker-build/proxy-agent
 	${DOCKER_CMD} push ${AGENT_FULL_IMAGE}-$(ARCH):${TAG}
 
 .PHONY: docker-build/proxy-server
-docker-build/proxy-server: cmd/proxy/main.go proto/agent/agent.pb.go
+docker-build/proxy-server: cmd/server/main.go proto/agent/agent.pb.go
 	@[ "${TAG}" ] || ( echo "TAG is not set"; exit 1 )
 	echo "Building proxy-server for ${ARCH}"
 	${DOCKER_CMD} build . --build-arg ARCH=$(ARCH) -f artifacts/images/server-build.Dockerfile -t ${SERVER_FULL_IMAGE}-$(ARCH):${TAG}
diff --git a/artifacts/images/server-build.Dockerfile b/artifacts/images/server-build.Dockerfile
@@ -23,7 +23,7 @@ COPY proto/  proto/
 
 # Build
 ARG ARCH
-RUN CGO_ENABLED=0 GOOS=linux GOARCH=${ARCH} go build -a -ldflags '-extldflags "-static"' -o proxy-server sigs.k8s.io/apiserver-network-proxy/cmd/proxy
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=${ARCH} go build -a -ldflags '-extldflags "-static"' -o proxy-server sigs.k8s.io/apiserver-network-proxy/cmd/server
 
 # Copy the loader into a thin image
 FROM scratch
diff --git a/cmd/agent/main.go b/cmd/agent/main.go
@@ -31,7 +31,7 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 	"k8s.io/klog"
-	"sigs.k8s.io/apiserver-network-proxy/pkg/agent/agentclient"
+	"sigs.k8s.io/apiserver-network-proxy/pkg/agent"
 	"sigs.k8s.io/apiserver-network-proxy/pkg/util"
 )
 
@@ -77,8 +77,8 @@ type GrpcProxyAgentOptions struct {
 	serviceAccountTokenPath string
 }
 
-func (o *GrpcProxyAgentOptions) ClientSetConfig(dialOption grpc.DialOption) *agentclient.ClientSetConfig {
-	return &agentclient.ClientSetConfig{
+func (o *GrpcProxyAgentOptions) ClientSetConfig(dialOption grpc.DialOption) *agent.ClientSetConfig {
+	return &agent.ClientSetConfig{
 		Address:                 fmt.Sprintf("%s:%d", o.proxyServerHost, o.proxyServerPort),
 		AgentID:                 o.agentID,
 		SyncInterval:            o.syncInterval,
diff --git a/cmd/server/main.go b/cmd/server/main.go
@@ -35,12 +35,12 @@ import (
 	"github.com/spf13/pflag"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
-	"k8s.io/klog"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/clientcmd"
-	"sigs.k8s.io/apiserver-network-proxy/pkg/agent/agentserver"
-	"sigs.k8s.io/apiserver-network-proxy/pkg/util"
+	"k8s.io/klog"
 	"sigs.k8s.io/apiserver-network-proxy/konnectivity-client/proto/client"
+	"sigs.k8s.io/apiserver-network-proxy/pkg/server"
+	"sigs.k8s.io/apiserver-network-proxy/pkg/util"
 	"sigs.k8s.io/apiserver-network-proxy/proto/agent"
 )
 
@@ -304,14 +304,14 @@ func (p *Proxy) run(o *ProxyRunOptions) error {
 		}
 	}
 
-	authOpt := &agentserver.AgentTokenAuthenticationOptions{
+	authOpt := &server.AgentTokenAuthenticationOptions{
 		Enabled:                o.agentNamespace != "",
 		AgentNamespace:         o.agentNamespace,
 		AgentServiceAccount:    o.agentServiceAccount,
 		KubernetesClient:       k8sClient,
 		AuthenticationAudience: o.authenticationAudience,
 	}
-	server := agentserver.NewProxyServer(o.serverID, int(o.serverCount), authOpt)
+	server := server.NewProxyServer(o.serverID, int(o.serverCount), authOpt)
 
 	klog.Info("Starting master server for client connections.")
 	masterStop, err := p.runMasterServer(ctx, o, server)
@@ -358,18 +358,18 @@ func SetupSignalHandler() (stopCh <-chan struct{}) {
 	return stop
 }
 
-func (p *Proxy) runMasterServer(ctx context.Context, o *ProxyRunOptions, server *agentserver.ProxyServer) (StopFunc, error) {
+func (p *Proxy) runMasterServer(ctx context.Context, o *ProxyRunOptions, server *server.ProxyServer) (StopFunc, error) {
 	if o.udsName != "" {
 		return p.runUDSMasterServer(ctx, o, server)
 	}
 	return p.runMTLSMasterServer(ctx, o, server)
 }
 
-func (p *Proxy) runUDSMasterServer(ctx context.Context, o *ProxyRunOptions, server *agentserver.ProxyServer) (StopFunc, error) {
+func (p *Proxy) runUDSMasterServer(ctx context.Context, o *ProxyRunOptions, s *server.ProxyServer) (StopFunc, error) {
 	var stop StopFunc
 	if o.mode == "grpc" {
 		grpcServer := grpc.NewServer()
-		client.RegisterProxyServiceServer(grpcServer, server)
+		client.RegisterProxyServiceServer(grpcServer, s)
 		var lc net.ListenConfig
 		lis, err := lc.Listen(ctx, "unix", o.udsName)
 		if err != nil {
@@ -380,8 +380,8 @@ func (p *Proxy) runUDSMasterServer(ctx context.Context, o *ProxyRunOptions, serv
 	} else {
 		// http-connect
 		server := &http.Server{
-			Handler: &agentserver.Tunnel{
-				Server: server,
+			Handler: &server.Tunnel{
+				Server: s,
 			},
 		}
 		stop = func() { server.Shutdown(ctx) }
@@ -432,7 +432,7 @@ func (p *Proxy) getTLSConfig(caFile, certFile, keyFile string) (*tls.Config, err
 	return tlsConfig, nil
 }
 
-func (p *Proxy) runMTLSMasterServer(ctx context.Context, o *ProxyRunOptions, server *agentserver.ProxyServer) (StopFunc, error) {
+func (p *Proxy) runMTLSMasterServer(ctx context.Context, o *ProxyRunOptions, s *server.ProxyServer) (StopFunc, error) {
 	var stop StopFunc
 
 	var tlsConfig *tls.Config
@@ -446,7 +446,7 @@ func (p *Proxy) runMTLSMasterServer(ctx context.Context, o *ProxyRunOptions, ser
 	if o.mode == "grpc" {
 		serverOption := grpc.Creds(credentials.NewTLS(tlsConfig))
 		grpcServer := grpc.NewServer(serverOption)
-		client.RegisterProxyServiceServer(grpcServer, server)
+		client.RegisterProxyServiceServer(grpcServer, s)
 		lis, err := net.Listen("tcp", addr)
 		if err != nil {
 			return nil, fmt.Errorf("failed to listen on %s: %v", addr, err)
@@ -458,8 +458,8 @@ func (p *Proxy) runMTLSMasterServer(ctx context.Context, o *ProxyRunOptions, ser
 		server := &http.Server{
 			Addr:      addr,
 			TLSConfig: tlsConfig,
-			Handler: &agentserver.Tunnel{
-				Server: server,
+			Handler: &server.Tunnel{
+				Server: s,
 			},
 			TLSNextProto: make(map[string]func(*http.Server, *tls.Conn, http.Handler)),
 		}
@@ -475,7 +475,7 @@ func (p *Proxy) runMTLSMasterServer(ctx context.Context, o *ProxyRunOptions, ser
 	return stop, nil
 }
 
-func (p *Proxy) runAgentServer(o *ProxyRunOptions, server *agentserver.ProxyServer) error {
+func (p *Proxy) runAgentServer(o *ProxyRunOptions, server *server.ProxyServer) error {
 	var tlsConfig *tls.Config
 	var err error
 	if tlsConfig, err = p.getTLSConfig(o.clusterCaCert, o.clusterCert, o.clusterKey); err != nil {
@@ -495,7 +495,7 @@ func (p *Proxy) runAgentServer(o *ProxyRunOptions, server *agentserver.ProxyServ
 	return nil
 }
 
-func (p *Proxy) runAdminServer(o *ProxyRunOptions, server *agentserver.ProxyServer) error {
+func (p *Proxy) runAdminServer(o *ProxyRunOptions, server *server.ProxyServer) error {
 	livenessHandler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		fmt.Fprintf(w, "ok")
 	})
diff --git a/pkg/agent/client.go b/pkg/agent/client.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package agentclient
+package agent
 
 import (
 	"io"
diff --git a/pkg/agent/client_test.go b/pkg/agent/client_test.go
@@ -1,4 +1,4 @@
-package agentclient
+package agent
 
 import (
 	"errors"
diff --git a/pkg/agent/clientset.go b/pkg/agent/clientset.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package agentclient
+package agent
 
 import (
 	"fmt"
diff --git a/pkg/agent/stream.go b/pkg/agent/stream.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package agentclient
+package agent
 
 import (
 	"context"
diff --git a/pkg/agent/stream_test.go b/pkg/agent/stream_test.go
@@ -1,4 +1,4 @@
-package agentclient
+package agent
 
 import (
 	"fmt"
diff --git a/pkg/server/backend_manager.go b/pkg/server/backend_manager.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package agentserver
+package server
 
 import (
 	"context"
diff --git a/pkg/server/backend_manager_test.go b/pkg/server/backend_manager_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package agentserver
+package server
 
 import (
 	"reflect"
diff --git a/pkg/server/server.go b/pkg/server/server.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package agentserver
+package server
 
 import (
 	"context"
diff --git a/pkg/server/server_test.go b/pkg/server/server_test.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package agentserver
+package server
 
 import (
 	"context"
diff --git a/pkg/server/tunnel.go b/pkg/server/tunnel.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package agentserver
+package server
 
 import (
 	"fmt"
diff --git a/tests/concurrent_client_request_test.go b/tests/concurrent_client_request_test.go
@@ -12,7 +12,7 @@ import (
 
 	"google.golang.org/grpc"
 	"sigs.k8s.io/apiserver-network-proxy/konnectivity-client/pkg/client"
-	"sigs.k8s.io/apiserver-network-proxy/pkg/agent/agentserver"
+	"sigs.k8s.io/apiserver-network-proxy/pkg/server"
 	"sigs.k8s.io/apiserver-network-proxy/proto/agent"
 )
 
@@ -78,7 +78,7 @@ func (s *singleTimeManager) RemoveBackend(agentID string, conn agent.AgentServic
 	delete(s.backends, agentID)
 }
 
-func (s *singleTimeManager) Backend() (agentserver.Backend, error) {
+func (s *singleTimeManager) Backend() (server.Backend, error) {
 	s.mu.Lock()
 	defer s.mu.Unlock()
 	for k, v := range s.backends {
@@ -90,21 +90,21 @@ func (s *singleTimeManager) Backend() (agentserver.Backend, error) {
 	return nil, fmt.Errorf("cannot find backend to a new agent")
 }
 
-func newSingleTimeGetter(m *agentserver.DefaultBackendManager) *singleTimeManager {
+func newSingleTimeGetter(m *server.DefaultBackendManager) *singleTimeManager {
 	return &singleTimeManager{
 		used:     make(map[string]struct{}),
 		backends: make(map[string]agent.AgentService_ConnectServer),
 	}
 }
 
-var _ agentserver.BackendManager = &singleTimeManager{}
+var _ server.BackendManager = &singleTimeManager{}
 
 func TestConcurrentClientRequest(t *testing.T) {
-	server := httptest.NewServer(&simpleServer{receivedSecondReq: make(chan struct{})})
-	defer server.Close()
+	s := httptest.NewServer(&simpleServer{receivedSecondReq: make(chan struct{})})
+	defer s.Close()
 
 	proxy, ps, cleanup, err := runGRPCProxyServerWithServerCount(1)
-	ps.BackendManager = newSingleTimeGetter(agentserver.NewDefaultBackendManager())
+	ps.BackendManager = newSingleTimeGetter(server.NewDefaultBackendManager())
 
 	if err != nil {
 		t.Fatal(err)
@@ -123,7 +123,7 @@ func TestConcurrentClientRequest(t *testing.T) {
 	wg.Add(2)
 	go func() {
 		defer wg.Done()
-		r, err := client1.Post(server.URL, "text/plain", bytes.NewBufferString("1"))
+		r, err := client1.Post(s.URL, "text/plain", bytes.NewBufferString("1"))
 		if err != nil {
 			t.Error(err)
 			return
@@ -141,7 +141,7 @@ func TestConcurrentClientRequest(t *testing.T) {
 	time.Sleep(1 * time.Second)
 	go func() {
 		defer wg.Done()
-		r, err := client2.Post(server.URL, "text/plain", bytes.NewBufferString("2"))
+		r, err := client2.Post(s.URL, "text/plain", bytes.NewBufferString("2"))
 		if err != nil {
 			t.Error(err)
 			return
diff --git a/tests/proxy_test.go b/tests/proxy_test.go
@@ -14,11 +14,11 @@ import (
 
 	"github.com/google/uuid"
 	"google.golang.org/grpc"
-	"sigs.k8s.io/apiserver-network-proxy/pkg/agent/agentclient"
-	"sigs.k8s.io/apiserver-network-proxy/pkg/agent/agentserver"
 	"sigs.k8s.io/apiserver-network-proxy/konnectivity-client/pkg/client"
 	clientproto "sigs.k8s.io/apiserver-network-proxy/konnectivity-client/proto/client"
-	"sigs.k8s.io/apiserver-network-proxy/proto/agent"
+	"sigs.k8s.io/apiserver-network-proxy/pkg/agent"
+	"sigs.k8s.io/apiserver-network-proxy/pkg/server"
+	agentproto "sigs.k8s.io/apiserver-network-proxy/proto/agent"
 )
 
 // test remote server
@@ -223,12 +223,12 @@ func runGRPCProxyServer() (proxy, func(), error) {
 	return p, cleanup, err
 }
 
-func runGRPCProxyServerWithServerCount(serverCount int) (proxy, *agentserver.ProxyServer, func(), error) {
+func runGRPCProxyServerWithServerCount(serverCount int) (proxy, *server.ProxyServer, func(), error) {
 	var proxy proxy
 	var err error
 	var lis, lis2 net.Listener
 
-	server := agentserver.NewProxyServer(uuid.New().String(), serverCount, &agentserver.AgentTokenAuthenticationOptions{})
+	server := server.NewProxyServer(uuid.New().String(), serverCount, &server.AgentTokenAuthenticationOptions{})
 	grpcServer := grpc.NewServer()
 	agentServer := grpc.NewServer()
 	cleanup := func() {
@@ -250,7 +250,7 @@ func runGRPCProxyServerWithServerCount(serverCount int) (proxy, *agentserver.Pro
 	go grpcServer.Serve(lis)
 	proxy.front = localAddr(lis.Addr())
 
-	agent.RegisterAgentServiceServer(agentServer, server)
+	agentproto.RegisterAgentServiceServer(agentServer, server)
 	lis2, err = net.Listen("tcp", "")
 	if err != nil {
 		return proxy, server, cleanup, err
@@ -265,10 +265,10 @@ func runGRPCProxyServerWithServerCount(serverCount int) (proxy, *agentserver.Pro
 
 func runHTTPConnProxyServer() (proxy, func(), error) {
 	var proxy proxy
-	server := agentserver.NewProxyServer(uuid.New().String(), 0, &agentserver.AgentTokenAuthenticationOptions{})
+	s := server.NewProxyServer(uuid.New().String(), 0, &server.AgentTokenAuthenticationOptions{})
 	agentServer := grpc.NewServer()
 
-	agent.RegisterAgentServiceServer(agentServer, server)
+	agentproto.RegisterAgentServiceServer(agentServer, s)
 	lis, err := net.Listen("tcp", "")
 	if err != nil {
 		return proxy, func() {}, err
@@ -280,8 +280,8 @@ func runHTTPConnProxyServer() (proxy, func(), error) {
 
 	// http-connect
 	httpServer := &http.Server{
-		Handler: &agentserver.Tunnel{
-			Server: server,
+		Handler: &server.Tunnel{
+			Server: s,
 		},
 	}
 	lis2, err := net.Listen("tcp", "")
@@ -306,8 +306,8 @@ func runHTTPConnProxyServer() (proxy, func(), error) {
 	return proxy, cleanup, nil
 }
 
-func runAgent(addr string, stopCh <-chan struct{}) *agentclient.ClientSet {
-	cc := agentclient.ClientSetConfig{
+func runAgent(addr string, stopCh <-chan struct{}) *agent.ClientSet {
+	cc := agent.ClientSetConfig{
 		Address:           addr,
 		AgentID:           uuid.New().String(),
 		SyncInterval:      1 * time.Millisecond,

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package agentclient`
	`1`	`+package agent`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"errors"`