From 5403f215bcf3b07371b58f072a8cffbaa246fb72 Mon Sep 17 00:00:00 2001 From: Juan Font Date: Sat, 30 Apr 2022 21:19:54 +0000 Subject: [PATCH 1/2] Reduce the number of containers in integration tests --- integration_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/integration_test.go b/integration_test.go index 52f1765..da3bc8a 100644 --- a/integration_test.go +++ b/integration_test.go @@ -47,11 +47,11 @@ func TestIntegrationTestSuite(t *testing.T) { s.namespaces = map[string]TestNamespace{ "thisspace": { - count: 15, + count: 10, tailscales: make(map[string]dockertest.Resource), }, "otherspace": { - count: 5, + count: 2, tailscales: make(map[string]dockertest.Resource), }, } From 01d9a2f589a03b51c100d9995663bc608d91d3ac Mon Sep 17 00:00:00 2001 From: Juan Font Alonso Date: Sat, 30 Apr 2022 23:48:28 +0200 Subject: [PATCH 2/2] Fixed linting issues --- app.go | 3 ++- derp_server.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app.go b/app.go index 8a43436..f2f481f 100644 --- a/app.go +++ b/app.go @@ -322,7 +322,8 @@ func (h *Headscale) expireEphemeralNodesWorker() { func (h *Headscale) grpcAuthenticationInterceptor(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, - handler grpc.UnaryHandler) (interface{}, error) { + handler grpc.UnaryHandler, +) (interface{}, error) { // Check if the request is coming from the on-server client. // This is not secure, but it is to maintain maintainability // with the "legacy" database-based client diff --git a/derp_server.go b/derp_server.go index 6580419..daec79a 100644 --- a/derp_server.go +++ b/derp_server.go @@ -122,7 +122,7 @@ func (h *Headscale) DERPHandler(ctx *gin.Context) { if !fastStart { pubKey := h.privateKey.Public() - pubKeyStr := pubKey.UntypedHexString() // nolint + pubKeyStr := pubKey.UntypedHexString() fmt.Fprintf(conn, "HTTP/1.1 101 Switching Protocols\r\n"+ "Upgrade: DERP\r\n"+ "Connection: Upgrade\r\n"+