AWS Lambda: Address GHA Validation Issues

Signed-off-by: Trevor Bramwell <[email protected]>

pkg/middlewares/awslambda/aws_lambda.go

@@ -32,7 +32,6 @@ import (
 	"context"
 	"encoding/base64"
 	"encoding/json"
-	_ "errors"
 	"fmt"
 	"io"
 	"net/http"
@@ -58,15 +57,15 @@ const (
 )
 
 // awsLambda is a middleware that provides routing to aws lambda
-// functions
+// functions.
 type awsLambda struct {
 	next        http.Handler
 	functionArn string
 	name        string
 	client      *lambda.Client
 }
 
-// New builds a new AwsLambda middleware
+// New builds a new AwsLambda middleware.
 func New(ctx context.Context, next http.Handler, config dynamic.AWSLambda, name string) (http.Handler, error) {
 	logger := log.FromContext(middlewares.GetLoggerCtx(ctx, name, typeName))
 	logger.Debug("Creating middleware")
@@ -125,7 +124,7 @@ func New(ctx context.Context, next http.Handler, config dynamic.AWSLambda, name
 	}, nil
 }
 
-// GetTracingInformation
+// GetTracingInformation.
 func (a *awsLambda) GetTracingInformation() (string, ext.SpanKindEnum) {
 	return a.name, tracing.SpanKindNoneEnum
 }
@@ -224,7 +223,7 @@ func (a *awsLambda) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
 	}
 }
 
-// bodyToBase64 ensures the request body is base64 encoded
+// bodyToBase64 ensures the request body is base64 encoded.
 func bodyToBase64(req *http.Request) (bool, string, error) {
 	base64Encoded := false
 	body := ""
@@ -254,7 +253,7 @@ func (a *awsLambda) invokeFunction(ctx context.Context, request events.APIGatewa
 
 	payload, err := json.Marshal(request)
 	if err != nil {
-		return resp, fmt.Errorf("failed to marshal request: %v", err)
+		return resp, fmt.Errorf("failed to marshal request: %w", err)
 	}
 
 	result, err := a.client.Invoke(ctx, &lambda.InvokeInput{
@@ -271,7 +270,7 @@ func (a *awsLambda) invokeFunction(ctx context.Context, request events.APIGatewa
 
 	err = json.Unmarshal(result.Payload, &resp)
 	if err != nil {
-		return resp, fmt.Errorf("failed to unmarshal response: %s, %v", result.Payload, err)
+		return resp, fmt.Errorf("failed to unmarshal response: %s, %w", result.Payload, err)
 	}
 
 	return resp, nil

pkg/middlewares/awslambda/aws_lambda_test.go

@@ -69,7 +69,8 @@ func Test_AWSLambdaMiddleware_Invoke(t *testing.T) {
 	recorder := httptest.NewRecorder()
 
 	var buf bytes.Buffer
-	buf.Write([]byte("This is the body"))
+	b := []byte("This is the body")
+	buf.Write(b)
 
 	req, err := http.NewRequestWithContext(ctx, http.MethodGet, fmt.Sprintf("%s/%s", mockserver.URL, "test/example/path?a=1&b=2&c=3&c=4&d[]=5&d[]=6"), &buf)
 	if err != nil {
@@ -83,7 +84,7 @@ func Test_AWSLambdaMiddleware_Invoke(t *testing.T) {
 	resp := recorder.Result()
 	rBody, _ := io.ReadAll(resp.Body)
 
-	assert.Equal(t, rBody, []byte("response_body"))
+	assert.Equal(t, []byte("response_body"), rbody)
 	assert.Equal(t, resp.StatusCode, http.StatusTeapot)
 }
 
@@ -106,7 +107,7 @@ func Test_AWSLambdaMiddleware_GetTracingInformation(t *testing.T) {
 // Test_AWSLambdaMiddleware_bodyToBase64_empty
 func Test_AWSLambdaMiddleware_bodyToBase64_empty(t *testing.T) {
 	req, err := http.NewRequest(http.MethodGet, "/", nil)
-	assert.Nil(t, err)
+	assert.NoError(t, err)
 	isEncoded, body, err := bodyToBase64(req)
 
 	assert.Equal(t, isEncoded, false)