From 66e973e715b438150922b8bb1ce15bee19d8cf35 Mon Sep 17 00:00:00 2001 From: Lukasz Raczylo Date: Wed, 26 Feb 2025 01:27:23 +0000 Subject: [PATCH] Fixup govet --- graphql_test.go | 28 ++++++++++++---------------- proxy_test.go | 30 ++++++++++++++---------------- 2 files changed, 26 insertions(+), 32 deletions(-) diff --git a/graphql_test.go b/graphql_test.go index 8c50693..b7645f8 100644 --- a/graphql_test.go +++ b/graphql_test.go @@ -282,23 +282,19 @@ func (suite *Tests) Test_parseGraphQLQuery() { suite.Run(tt.name, func() { cfg = &config{} parseConfig() - ctx_headers := func() *fasthttp.RequestHeader { - h := fasthttp.RequestHeader{} - for k, v := range tt.suppliedQuery.headers { - h.Add(k, v) - } - return &h - }() - - ctx_request := fasthttp.Request{ - Header: *ctx_headers, + // Create a context first, then modify its request directly + reqCtx := &fasthttp.RequestCtx{} + + // Set headers directly on the request + for k, v := range tt.suppliedQuery.headers { + reqCtx.Request.Header.Add(k, v) } - - ctx_request.AppendBody([]byte(tt.suppliedQuery.body)) - - ctx := suite.app.AcquireCtx(&fasthttp.RequestCtx{ - Request: ctx_request, - }) + + // Set the body + reqCtx.Request.AppendBody([]byte(tt.suppliedQuery.body)) + + // Now create the fiber context with the request context + ctx := suite.app.AcquireCtx(reqCtx) // defer func() { // cfg = &config{} diff --git a/proxy_test.go b/proxy_test.go index 53b5aed..aaf68d6 100644 --- a/proxy_test.go +++ b/proxy_test.go @@ -87,23 +87,21 @@ func (suite *Tests) Test_proxyTheRequest() { cfg.Server.HostGraphQLReadOnly = tt.hostRO } - ctx_headers := func() *fasthttp.RequestHeader { - h := fasthttp.RequestHeader{} - for k, v := range tt.headers { - h.Add(k, v) - } - return &h - }() - - ctx_request := fasthttp.Request{ - Header: *ctx_headers, + // Create a request context first + reqCtx := &fasthttp.RequestCtx{} + + // Set headers directly on the request + for k, v := range tt.headers { + reqCtx.Request.Header.Add(k, v) } - ctx_request.SetBody([]byte(tt.body)) - ctx_request.SetRequestURI(tt.path) - ctx_request.Header.SetMethod("POST") - ctx := suite.app.AcquireCtx(&fasthttp.RequestCtx{ - Request: ctx_request, - }) + + // Set the body and other request properties + reqCtx.Request.SetBody([]byte(tt.body)) + reqCtx.Request.SetRequestURI(tt.path) + reqCtx.Request.Header.SetMethod("POST") + + // Create fiber context with the request context + ctx := suite.app.AcquireCtx(reqCtx) res := parseGraphQLQuery(ctx) assert.NotNil(ctx, "Fiber context is nil", tt.name) err := proxyTheRequest(ctx, res.activeEndpoint)