Merge branch 'main' into master

Author: bmoffatt

.github/workflows/tests.yml

@@ -29,7 +29,9 @@ jobs:
         run: go test -race -coverprofile=coverage.txt -covermode=atomic ./...
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v1
-        if: matrix.go == '1.16'
+        uses: codecov/codecov-action@v2
         with:
           file: ./coverage.txt
+          env_vars: GO
+        env:
+          GO: ${{ matrix.go }}

events/apigw.go

@@ -285,6 +285,12 @@ type APIGatewayCustomAuthorizerResponse struct {
 	UsageIdentifierKey string                           `json:"usageIdentifierKey,omitempty"`
 }
 
+// APIGatewayV2CustomAuthorizerSimpleResponse represents the simple format of an API Gateway V2 authorization response.
+type APIGatewayV2CustomAuthorizerSimpleResponse struct {
+	IsAuthorized bool                   `json:"isAuthorized"`
+	Context      map[string]interface{} `json:"context,omitempty"`
+}
+
 // APIGatewayCustomAuthorizerPolicy represents an IAM policy
 type APIGatewayCustomAuthorizerPolicy struct {
 	Version   string

events/apigw_test.go

@@ -177,6 +177,67 @@ func TestApiGatewayCustomAuthorizerResponseMarshaling(t *testing.T) {
 	assert.JSONEq(t, string(inputJSON), string(outputJSON))
 }
 
+func TestAPIGatewayV2CustomAuthorizerSimpleResponseMarshalling(t *testing.T) {
+	var tests = []struct {
+		desc string
+		in   APIGatewayV2CustomAuthorizerSimpleResponse
+		out  string
+	}{
+		{
+			"defaults",
+			APIGatewayV2CustomAuthorizerSimpleResponse{},
+			`{"isAuthorized":false}`,
+		},
+		{
+			"without context",
+			APIGatewayV2CustomAuthorizerSimpleResponse{IsAuthorized: true},
+			`{"isAuthorized":true}`,
+		},
+		{
+			"context is nil",
+			APIGatewayV2CustomAuthorizerSimpleResponse{Context: nil},
+			`{"isAuthorized":false}`,
+		},
+		{
+			"context is empty",
+			APIGatewayV2CustomAuthorizerSimpleResponse{Context: map[string]interface{}{}},
+			`{"isAuthorized":false}`,
+		},
+		{
+			"context with basic types",
+			APIGatewayV2CustomAuthorizerSimpleResponse{Context: map[string]interface{}{"string": "value", "bool": true, "number": 1234}},
+			`{"isAuthorized":false,"context":{"string":"value","bool":true,"number":1234}}`,
+		},
+		{
+			"context with array",
+			APIGatewayV2CustomAuthorizerSimpleResponse{Context: map[string]interface{}{"array": []string{"value1", "value2"}}},
+			`{"isAuthorized":false,"context":{"array":["value1","value2"]}}`,
+		},
+		{
+			"context with map",
+			APIGatewayV2CustomAuthorizerSimpleResponse{Context: map[string]interface{}{"map": map[string]string{"key": "value"}}},
+			`{"isAuthorized":false,"context":{"map":{"key":"value"}}}`,
+		},
+		{
+			"context with nil value",
+			APIGatewayV2CustomAuthorizerSimpleResponse{Context: map[string]interface{}{"nil": nil}},
+			`{"isAuthorized":false,"context":{"nil":null}}`,
+		},
+	}
+
+	for _, tt := range tests {
+		tt := tt
+		t.Run(tt.desc, func(t *testing.T) {
+			outputJSON, err := json.Marshal(tt.in)
+			if err != nil {
+				t.Errorf("could not marshal event. details: %v", err)
+			}
+
+			assert.JSONEq(t, tt.out, string(outputJSON))
+		})
+	}
+}
+
 func TestApiGatewayCustomAuthorizerResponseMalformedJson(t *testing.T) {
 	test.TestMalformedJson(t, APIGatewayCustomAuthorizerResponse{})
 }

events/kafka_test.go

@@ -39,6 +39,15 @@ func TestKafkaEventMarshaling(t *testing.T) {
 			}
 		}
 	}
+
+	// 3. serialize to JSON
+	outputJson, err := json.Marshal(inputEvent)
+	if err != nil {
+		t.Errorf("could not marshal event. details: %v", err)
+	}
+
+	// 4. check result
+	assert.JSONEq(t, string(inputJson), string(outputJson))
 }
 
 func TestKafkaMarshalingMalformedJson(t *testing.T) {

events/testdata/kafka-event.json

@@ -14,19 +14,7 @@
           "value": "OGQ1NTk2YjQtMTgxMy00MjM4LWIyNGItNmRhZDhlM2QxYzBj",
           "headers": [
             {
-              "headerKey": [
-                104,
-                101,
-                97,
-                100,
-                101,
-                114,
-                86,
-                97,
-                108,
-                117,
-                101
-              ]
+              "headerKey": "aGVhZGVyVmFsdWU="
             }
           ]
         }