fix: lint issues

Author: franklinkim

.goreleaser.yml

@@ -1,6 +1,11 @@
+version: 2
+
 builds:
   - skip: true
 
+release:
+  prerelease: auto
+
 changelog:
   use: github-native
 

cmd/webgrapple/reverseproxy.go

@@ -9,7 +9,7 @@ import (
 
 const DefaultServiceAddress = "127.0.0.1:8888"
 
-var MiddlewareFactory server.WebGrappleMiddleWareCreator = nil // should be overriden
+var MiddlewareFactory server.WebGrappleMiddleWareCreator // should be overridden
 
 var (
 	flagAddresses      = []string{"https://localhost"}

pkg/clientconfig/clientconfig.go

@@ -13,19 +13,18 @@ func ReadConfig(file string) (multiServerConfig vo.ClientConfig, err error) {
 	if errRead != nil {
 		return nil, errRead
 	}
-	return readConfig(configBytes)
+	return readConfigBytes(configBytes)
 }
 
-func readConfig(configBytes []byte) (multiServerConfig vo.ClientConfig, err error) {
-
+func readConfigBytes(configBytes []byte) (vo.ClientConfig, error) {
 	// a list of services
 	clientConfig := vo.ClientConfig{}
 	if yaml.Unmarshal(configBytes, &clientConfig) == nil {
 		return clientConfig, nil
 	}
 
 	// just one service
-	service := &vo.Service{}
+	var service *vo.Service
 	if yaml.Unmarshal(configBytes, &service) == nil {
 		return vo.ClientConfig{
 			service,

pkg/clientconfig/clientconfig_test.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/foomo/webgrapple/pkg/vo"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 var (
@@ -22,11 +23,10 @@ id: my-service
 )
 
 func TestReadConfigService(t *testing.T) {
-	serviceConfigServices, errRead := readConfig(configBytesServices)
-	assert.NoError(t, errRead)
+	serviceConfigServices, errRead := readConfigBytes(configBytesServices)
+	require.NoError(t, errRead)
 	assert.Equal(t, vo.ServiceID("hello"), serviceConfigServices[1].ID)
-	serviceConfigService, errRead := readConfig(configBytesService)
-	assert.NoError(t, errRead)
+	serviceConfigService, errRead := readConfigBytes(configBytesService)
+	require.NoError(t, errRead)
 	assert.Equal(t, vo.ServiceID("my-service"), serviceConfigService[0].ID)
-	return
 }

pkg/clientnpm/clientnpm.go

@@ -78,7 +78,7 @@ func Run(
 		port = ports[0]
 	}
 
-	debugPort := 0
+	var debugPort int
 	if flagDebugServerPort == 0 && flagStartVSCode {
 		debugPorts, errTakeDebugPort := freeport.Take(1)
 		if errTakeDebugPort != nil {
@@ -89,7 +89,9 @@ func Run(
 		debugPort = flagDebugServerPort
 	}
 	if flagStartVSCode {
-		vscodedebug(l, workDir, name, debugPort)
+		if err := vscodedebug(l, workDir, name, debugPort); err != nil {
+			return err
+		}
 	}
 
 	// ports have to be set in env
@@ -145,12 +147,12 @@ func Run(
 	}()
 
 	go func() {
-		if _, err := io.Copy(os.Stdout, stdOutPipe); err != nil && err.(*os.PathError).Err != os.ErrClosed {
+		if _, err := io.Copy(os.Stdout, stdOutPipe); err != nil && !errors.Is(err, os.ErrClosed) {
 			l.Error(fmt.Sprintf("could not copy std out: %v", err))
 		}
 	}()
 	go func() {
-		if _, err := io.Copy(os.Stderr, stdErrPipe); err != nil && err.(*os.PathError).Err != os.ErrClosed {
+		if _, err := io.Copy(os.Stderr, stdErrPipe); err != nil && !errors.Is(err, os.ErrClosed) {
 			l.Error(fmt.Sprintf("could not copy std err: %v", err))
 		}
 	}()
@@ -176,8 +178,8 @@ func Run(
 }
 
 func removeServices(ctx context.Context, l log.Logger, address string, config vo.ClientConfig) {
-	client := server.NewServiceGoTSRPCClient(string(address), server.DefaultEndPoint)
-	serviceIDs := []vo.ServiceID{}
+	client := server.NewServiceGoTSRPCClient(address, server.DefaultEndPoint)
+	var serviceIDs []vo.ServiceID
 	for _, s := range config {
 		serviceIDs = append(serviceIDs, s.ID)
 	}
@@ -191,7 +193,7 @@ func removeServices(ctx context.Context, l log.Logger, address string, config vo
 }
 
 func addServices(ctx context.Context, address string, config vo.ClientConfig, port int) error {
-	client := server.NewServiceGoTSRPCClient(string(address), server.DefaultEndPoint)
+	client := server.NewServiceGoTSRPCClient(address, server.DefaultEndPoint)
 	errUpsert, errClient := client.Upsert(ctx, config)
 	if errClient != nil {
 		return errClient

pkg/clientnpm/vscodedebug.go

@@ -64,25 +64,22 @@ func vscodedebug(logger log.Logger, path, name string, debugPort int) error {
 
 	debugConfig, errDebugConfig := vscodeDebugConfig(name, debugPort)
 	if errDebugConfig != nil {
-		return nil
+		return errDebugConfig
 	}
 
-	const tries = 5
-
 	go func() {
 		logger.Info("starting vscode")
 		launchOutput, errLaunch := exec.Command("code", vscodeTarget).CombinedOutput()
 		if errLaunch == nil {
 			launchedVSCode := false
-			for i := 0; i < 5; i++ {
+			for range 5 {
 				_, errRunVSCodeStatus := exec.Command("code", "-s").CombinedOutput()
-				if errRunVSCodeStatus != nil {
-					logger.Info("waiting for vscode to start...")
-				} else {
+				if errRunVSCodeStatus == nil {
 					logger.Info("vscode is up")
 					launchedVSCode = true
 					break
 				}
+				logger.Info("waiting for vscode to start...")
 			}
 			if launchedVSCode {
 				logger.Info(fmt.Sprintf("launching vscode: %s", debugConfig))

pkg/httputils/server.go

@@ -30,7 +30,7 @@ func (s *serverErrorLogWriter) Write(p []byte) (int, error) {
 	return len(p), nil
 }
 
-func GracefulHttpServer(ctx context.Context, l log.Logger, name string, address string, handler http.Handler) *http.Server {
+func GracefulHTTPServer(ctx context.Context, l log.Logger, name string, address string, handler http.Handler) *http.Server {
 	httpServer := &http.Server{
 		Addr:    address,
 		Handler: handler,
@@ -39,6 +39,7 @@ func GracefulHttpServer(ctx context.Context, l log.Logger, name string, address
 			name: name,
 		}, "", 0),
 	}
+	cancelCtx := context.WithoutCancel(ctx)
 
 	idleConnectionsClosed := make(chan struct{})
 	go func() {
@@ -53,7 +54,8 @@ func GracefulHttpServer(ctx context.Context, l log.Logger, name string, address
 			l.Info(fmt.Sprintf("server %q shutdown initiated due to context", address))
 		}
 
-		shutdownCtx, _ := context.WithTimeout(context.Background(), DefaultShutdownTimeout)
+		shutdownCtx, cancel := context.WithTimeout(cancelCtx, DefaultShutdownTimeout)
+		defer cancel()
 		if err := httpServer.Shutdown(shutdownCtx); err != nil {
 			l.Info(fmt.Sprintf("HTTP Server Shutdown Error: %v", err))
 		}

pkg/server/middleware.go

@@ -1,7 +1,7 @@
 package server
 
 import (
-	http "net/http"
+	"net/http"
 	"net/url"
 
 	"github.com/foomo/webgrapple/pkg/vo"

pkg/server/registry.go

@@ -9,12 +9,12 @@ import (
 	"github.com/foomo/webgrapple/pkg/vo"
 )
 
-func (sm ServiceMap) cp() (copy ServiceMap) {
-	copy = ServiceMap{}
+func (sm ServiceMap) cp() ServiceMap {
+	c := ServiceMap{}
 	for id, s := range sm {
-		copy[id] = s
+		c[id] = s
 	}
-	return
+	return c
 }
 
 type registryState struct {
@@ -38,33 +38,33 @@ func newRegistry(l log.Logger, backendURL *url.URL, middlewareFactory WebGrapple
 }
 
 func (r *registry) getServicesCopy() ServiceMap {
-	copy := ServiceMap{}
+	c := ServiceMap{}
 	if r.state != nil && r.state.services != nil {
-		copy = r.state.services.cp()
+		c = r.state.services.cp()
 	}
-	return copy
+	return c
 }
 
 func (r *registry) upsert(services []*vo.Service) (err error) {
-	copy := r.getServicesCopy()
+	c := r.getServicesCopy()
 	for _, service := range services {
 		r.logger.Info(fmt.Sprintf("upserting service %q with backend %q", service.ID, service.Address))
-		copy[service.ID] = service
+		c[service.ID] = service
 	}
-	return r.update(copy)
+	return r.update(c)
 }
 
 func (r *registry) remove(ids []vo.ServiceID) (err error) {
-	copy := r.getServicesCopy()
+	c := r.getServicesCopy()
 	for _, id := range ids {
-		_, found := copy[id]
+		_, found := c[id]
 		if !found {
 			return errors.New("service not found")
 		}
 		r.logger.Info(fmt.Sprintf("removing service with ID %q", id))
-		delete(copy, id)
+		delete(c, id)
 	}
-	return r.update(copy)
+	return r.update(c)
 }
 
 func (r *registry) update(services ServiceMap) error {

pkg/server/run.go

@@ -142,8 +142,8 @@ func ensureCertAndKey(
 	return certFile, keyFile, nil
 }
 
-func checkHosts(l log.Logger, hostList []hostName) (hostAdresses map[hostName]string) {
-	hostAdresses = map[hostName]string{}
+func checkHosts(l log.Logger, hostList []hostName) map[hostName]string {
+	hostAdresses := map[hostName]string{}
 	for _, host := range hostList {
 		addresses, errLookup := net.LookupHost(string(host))
 		if errLookup != nil {
@@ -222,7 +222,7 @@ func Run(
 		if usedAddressPorts[addressPort] == 1 {
 			g.Go(func() error {
 				name := fmt.Sprintf("proxy (%s)", u)
-				httpServer := httputils.GracefulHttpServer(gctx, l, name, listenAddress, s)
+				httpServer := httputils.GracefulHTTPServer(gctx, l, name, listenAddress, s)
 				l.Info(fmt.Sprintf("starting server on %s", addressPort))
 				if useTLS {
 					return httpServer.ListenAndServeTLS(certFile, keyFile)
@@ -236,7 +236,7 @@ func Run(
 
 	g.Go(func() error {
 		l.Info(fmt.Sprintf("starting dev client service on %q", serviceAddress))
-		httpDevClient := httputils.GracefulHttpServer(gctx, l, "dev-client", serviceAddress, s.serviceHandler)
+		httpDevClient := httputils.GracefulHTTPServer(gctx, l, "dev-client", serviceAddress, s.serviceHandler)
 		return httpDevClient.ListenAndServe()
 	})