refactor and remove unused code

agent/cmd/args.go

@@ -9,8 +9,7 @@ type agentCommandValidator struct{}
 
 func (v agentCommandValidator) IsCommandValid(cmd string) bool {
 	switch cmd {
-	case CommandStart,
-		CommandNewClient:
+	case CommandStart, CommandNewClient:
 		return true
 	}
 	return false

agent/cmd/main.go

@@ -72,8 +72,7 @@ func main() {
 		E.LogFatal("init CA error", err)
 	}
 
-	switch args.Command {
-	case CommandNewClient:
+	if args.Command == CommandNewClient {
 		printNewClientHelp(ca)
 		return
 	}

agent/pkg/agent/config.go

@@ -37,7 +37,6 @@ type (
 const (
 	EndpointVersion   = "/version"
 	EndpointName      = "/name"
-	EndpointCACert    = "/ca-cert"
 	EndpointProxyHTTP = "/proxy/http"
 	EndpointHealth    = "/health"
 	EndpointLogs      = "/logs"

agent/pkg/agent/requests.go

@@ -24,7 +24,7 @@ func (cfg *AgentConfig) Fetch(ctx context.Context, endpoint string) ([]byte, int
 		return nil, 0, err
 	}
 	defer resp.Body.Close()
-	data, err := io.ReadAll(resp.Body)
+	data, _ := io.ReadAll(resp.Body)
 	return data, resp.StatusCode, nil
 }
 

agent/pkg/handler/docker_socket.go

@@ -86,7 +86,7 @@ func DockerSocketHandler() http.HandlerFunc {
 			}
 		} else {
 			// For non-event streams, just copy the body
-			godoxyIO.NewPipe(r.Context(), resp.Body, NopWriteCloser{w}).Start()
+			_ = godoxyIO.NewPipe(r.Context(), resp.Body, NopWriteCloser{w}).Start()
 		}
 	}
 }

agent/pkg/handler/handler.go

@@ -32,7 +32,7 @@ func (NopWriteCloser) Close() error {
 	return nil
 }
 
-func NewHandler(caCertPEM []byte) http.Handler {
+func NewHandler() http.Handler {
 	mux := ServeMux{http.NewServeMux()}
 
 	mux.HandleFunc(agent.EndpointProxyHTTP+"/{path...}", ProxyHTTP)
@@ -40,9 +40,6 @@ func NewHandler(caCertPEM []byte) http.Handler {
 	mux.HandleMethods("GET", agent.EndpointName, func(w http.ResponseWriter, r *http.Request) {
 		fmt.Fprint(w, env.AgentName)
 	})
-	mux.HandleMethods("GET", agent.EndpointCACert, func(w http.ResponseWriter, r *http.Request) {
-		w.Write(caCertPEM)
-	})
 	mux.HandleMethods("GET", agent.EndpointHealth, CheckHealth)
 	mux.HandleMethods("GET", agent.EndpointLogs, memlogger.LogsWS(nil))
 	mux.ServeMux.HandleFunc("/", DockerSocketHandler())

agent/pkg/handler/proxy_http.go

@@ -17,14 +17,14 @@ import (
 
 func ProxyHTTP(w http.ResponseWriter, r *http.Request) {
 	host := r.Header.Get(agentproxy.HeaderXProxyHost)
-	isHTTPs := strutils.ParseBool(r.Header.Get(agentproxy.HeaderXProxyHTTPS))
+	isHTTPS := strutils.ParseBool(r.Header.Get(agentproxy.HeaderXProxyHTTPS))
 	skipTLSVerify := strutils.ParseBool(r.Header.Get(agentproxy.HeaderXProxySkipTLSVerify))
 	responseHeaderTimeout, err := strconv.Atoi(r.Header.Get(agentproxy.HeaderXProxyResponseHeaderTimeout))
 	if err != nil {
 		responseHeaderTimeout = 0
 	}
 
-	logging.Debug().Msgf("proxy http request: host=%s, isHTTPs=%t, skipTLSVerify=%t, responseHeaderTimeout=%d", host, isHTTPs, skipTLSVerify, responseHeaderTimeout)
+	logging.Debug().Msgf("proxy http request: host=%s, isHTTPs=%t, skipTLSVerify=%t, responseHeaderTimeout=%d", host, isHTTPS, skipTLSVerify, responseHeaderTimeout)
 
 	if host == "" {
 		http.Error(w, "missing required headers", http.StatusBadRequest)
@@ -32,7 +32,7 @@ func ProxyHTTP(w http.ResponseWriter, r *http.Request) {
 	}
 
 	scheme := "http"
-	if isHTTPs {
+	if isHTTPS {
 		scheme = "https"
 	}
 

agent/pkg/server/server.go

@@ -43,9 +43,11 @@ func StartAgentServer(parent task.Parent, opt Options) {
 	defer l.Close()
 
 	server := &http.Server{
-		Handler:   handler.NewHandler(caCertPEM),
+		Handler:   handler.NewHandler(),
 		TLSConfig: tlsConfig,
 		ErrorLog:  log.New(logging.GetLogger(), "", 0),
 	}
-	server.Serve(tls.NewListener(l, tlsConfig))
+	if err := server.Serve(tls.NewListener(l, tlsConfig)); err != nil {
+		logging.Fatal().Err(err).Int("port", opt.Port).Msg("failed to serve")
+	}
 }