Merge branch 'master' of https://github.com/dum0nt73/aws-lambda-go

BWPSmith73 · BWPSmith73 · commit 92a9843e063d · 2021-04-11T17:17:39.000-07:00
diff --git a/.github/workflows/reviewdog.yml b/.github/workflows/reviewdog.yml
@@ -0,0 +1,17 @@
+name: reviewdog
+on:
+  pull_request:
+
+jobs:
+  test:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v2
+
+      - name: golangci-lint
+        uses: reviewdog/action-golangci-lint@v1
+        with:
+          level: warning
+          reporter: github-pr-review
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -1,27 +1,35 @@
 name: tests
-on: 
+on:
   push:
   pull_request:
 
 jobs:
-
   test:
-    name: run tests with code coverage 
+    name: run tests with code coverage
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        go:
+          - "1.16"
+          - "1.15"
+          - "1.14"
+          - "1.13"
+
     steps:
-      - name: Set up Go 1.13
+      - name: Set up Go ${{ matrix.go }}
         uses: actions/setup-go@v1
         with:
-          go-version: 1.13
+          go-version: ${{ matrix.go }}
         id: go
 
       - name: Check out code into the Go module directory
         uses: actions/checkout@v1
 
       - name: go test
         run: go test -race -coverprofile=coverage.txt -covermode=atomic ./...
-      
-      - name: Upload coverage to Codecov  
+
+      - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v1
+        if: matrix.go == '1.16'
         with:
-         file: ./coverage.txt
+          file: ./coverage.txt
diff --git a/README.md b/README.md
@@ -2,16 +2,16 @@
 
 [![tests][1]][2]
 [![build-lambda-zip][3]][4]
-[![GoDoc][5]][6]
+[![Go Reference][5]][6]
 [![GoCard][7]][8]
 [![codecov][9]][10]
 
 [1]: https://github.com/aws/aws-lambda-go/workflows/tests/badge.svg
 [2]: https://github.com/aws/aws-lambda-go/actions?query=workflow%3Atests
 [3]: https://github.com/aws/aws-lambda-go/workflows/go%20get%20build-lambda-zip/badge.svg
 [4]: https://github.com/aws/aws-lambda-go/actions?query=workflow%3A%22go+get+build-lambda-zip%22
-[5]: https://godoc.org/github.com/aws/aws-lambda-go?status.svg
-[6]: https://godoc.org/github.com/aws/aws-lambda-go
+[5]: https://pkg.go.dev/badge/github.com/aws/aws-lambda-go.svg
+[6]: https://pkg.go.dev/github.com/aws/aws-lambda-go
 [7]: https://goreportcard.com/badge/github.com/aws/aws-lambda-go
 [8]: https://goreportcard.com/report/github.com/aws/aws-lambda-go
 [9]: https://codecov.io/gh/aws/aws-lambda-go/branch/master/graph/badge.svg
diff --git a/events/README.md b/events/README.md
@@ -1,6 +1,6 @@
 # Overview
 
-[![GoDoc](https://godoc.org/github.com/aws/aws-lambda-go/events?status.svg)](https://godoc.org/github.com/aws/aws-lambda-go/events)
+[![Go Reference](https://pkg.go.dev/badge/github.com/aws/aws-lambda-go/events.svg)](https://pkg.go.dev/github.com/aws/aws-lambda-go/events)
 
 This package provides input types for Lambda functions that process AWS events.
 
@@ -12,6 +12,8 @@ This package provides input types for Lambda functions that process AWS events.
 
 [AppSync](README_AppSync.md)
 
+[ClientVPN Connection Handler](README_ClientVPN.md)
+
 [CloudFormation Events](../cfn/README.md)
 
 [CloudWatch Events](README_CloudWatch_Events.md)
diff --git a/events/README_ALBTargetGroupEvents.md b/events/README_ALBTargetGroupEvents.md
@@ -6,7 +6,7 @@ https://docs.aws.amazon.com/elasticloadbalancing/latest/application/lambda-funct
 
 # Sample Function
 
-The following is a sample class and Lambda function that receives an ALB Target Group event as an input, writes some of the incoming data to CloudWatch Logs, and responds with a 200 status and the same body as the request. (Note that by default anything written to Console will be logged as CloudWatch Logs events.)
+The following is a sample class and Lambda function that receives an ALB Target Group event as an input, writes some of the incoming data to CloudWatch Logs, and responds with a 200 status and the same body as the request. (Note that anything written to stdout or stderr will be logged as CloudWatch Logs events.)
 
 ```go
 
diff --git a/events/README_ApiGatewayEvent.md b/events/README_ApiGatewayEvent.md
@@ -4,7 +4,7 @@ API Gateway events consist of a request that was routed to a Lambda function by
 
 # Sample Function
 
-The following is a sample class and Lambda function that receives Amazon API Gateway event record data as an input, writes some of the record data to CloudWatch Logs, and responds with a 200 status and the same body as the request. (Note that by default anything written to Console will be logged as CloudWatch Logs events.)
+The following is a sample class and Lambda function that receives Amazon API Gateway event record data as an input, writes some of the record data to CloudWatch Logs, and responds with a 200 status and the same body as the request. (Note that anything written to stdout or stderr will be logged as CloudWatch Logs events.)
 
 ```go
 
diff --git a/events/README_AutoScaling.md b/events/README_AutoScaling.md
@@ -1,6 +1,6 @@
 # Sample Function
 
-The following is a sample Lambda function that receives an Auto Scaling event as an input and logs the EC2 instance ID to CloudWatch Logs. (Note that by default anything written to Console will be logged as CloudWatch Logs events.)
+The following is a sample Lambda function that receives an Auto Scaling event as an input and logs the EC2 instance ID to CloudWatch Logs. (Note that anything written to stdout or stderr will be logged as CloudWatch Logs events.)
 
 ```go
 import (
diff --git a/events/README_ClientVPN.md b/events/README_ClientVPN.md
@@ -0,0 +1,56 @@
+# Sample Function
+
+The following is a sample Lambda function that receives a Client VPN connection handler request as an input and then validates the IP address input and checks whether the connection source IP is on the allowed list defined as a map inside the function. If the source IP matches an allowed IP address it allows the access, otherwise an error message is presented to the user. Debug logs are generated to CloudWatch Logs. (Note that anything written to stdout or stderr will be logged as CloudWatch Logs events.)
+
+```go
+import (
+	"fmt"
+	"log"
+	"net"
+
+	"encoding/json"
+
+	"github.com/aws/aws-lambda-go/events"
+	"github.com/aws/aws-lambda-go/lambda"
+)
+
+var (
+	AllowedIPs = map[string]bool{
+		"10.11.12.13": true,
+	}
+)
+
+func handler(request events.ClientVPNConnectionHandlerRequest) (events.ClientVPNConnectionHandlerResponse, error) {
+	requestJson, _ := json.MarshalIndent(request, "", "  ")
+	log.Printf("REQUEST: %s", requestJson)
+
+	sourceIP := request.PublicIP
+	if net.ParseIP(sourceIP) == nil {
+		return events.ClientVPNConnectionHandlerResponse{}, fmt.Errorf("Invalid parameter PublicIP passed in request: %q", sourceIP)
+	}
+
+	log.Printf("SOURCE IP: %q", sourceIP)
+
+	if allowed, ok := AllowedIPs[sourceIP]; ok && allowed {
+		log.Printf("Allowing access from: %q", sourceIP)
+		return events.ClientVPNConnectionHandlerResponse{
+			Allow: true,
+			ErrorMsgOnFailedPostureCompliance: "",
+			PostureComplianceStatuses: []string{},
+			SchemaVersion: "v1",
+		}, nil
+	}
+
+	log.Printf("Blocking access from: %q", sourceIP)
+	return events.ClientVPNConnectionHandlerResponse{
+		Allow: false,
+		ErrorMsgOnFailedPostureCompliance: "You're trying to connect from an IP address that is not allowed.",
+		PostureComplianceStatuses: []string{"BlockedSourceIP"},
+		SchemaVersion: "v1",
+	}, nil
+}
+
+func main() {
+	lambda.Start(handler)
+}
+```
diff --git a/events/README_Cognito.md b/events/README_Cognito.md
@@ -1,6 +1,6 @@
 # Sample Function
 
-The following is a sample Lambda function that receives Amazon Cognito Sync event record data as an input and writes some of the record data to CloudWatch Logs. (Note that by default anything written to Console will be logged as CloudWatch Logs events.)
+The following is a sample Lambda function that receives Amazon Cognito Sync event record data as an input and writes some of the record data to CloudWatch Logs. (Note that anything written to stdout or stderr will be logged as CloudWatch Logs events.)
 
 ```go
 
diff --git a/events/README_Cognito_UserPools_PostConfirmation.md b/events/README_Cognito_UserPools_PostConfirmation.md
@@ -1,6 +1,6 @@
 # Sample Function
 
-The following is a sample Lambda function that receives Amazon Cognito User Pools post-confirmation event as an input and writes some of the record data to CloudWatch Logs. (Note that by default anything written to Console will be logged as CloudWatch Logs events.)
+The following is a sample Lambda function that receives Amazon Cognito User Pools post-confirmation event as an input and writes some of the record data to CloudWatch Logs. (Note that anything written to stdout or stderr will be logged as CloudWatch Logs events.)
 
 Please see instructions for setting up the Cognito triggers at https://docs.aws.amazon.com/cognito/latest/developerguide/cognito-user-identity-pools-working-with-aws-lambda-triggers.html .
 
diff --git a/events/README_Cognito_UserPools_PreAuthentication.md b/events/README_Cognito_UserPools_PreAuthentication.md
@@ -1,6 +1,6 @@
 # Sample Function
 
-The following is a sample Lambda function that receives Amazon Cognito User Pools pre-authentication event as an input and writes some of the record data to CloudWatch Logs. (Note that by default anything written to Console will be logged as CloudWatch Logs events.)
+The following is a sample Lambda function that receives Amazon Cognito User Pools pre-authentication event as an input and writes some of the record data to CloudWatch Logs. (Note that anything written to stdout or stderr will be logged as CloudWatch Logs events.)
 
 Please see instructions for setting up the Cognito triggers at https://docs.aws.amazon.com/cognito/latest/developerguide/cognito-user-identity-pools-working-with-aws-lambda-triggers.html .
 
diff --git a/events/README_Cognito_UserPools_PreSignup.md b/events/README_Cognito_UserPools_PreSignup.md
@@ -1,6 +1,6 @@
 # Sample Function
 
-The following is a sample Lambda function that receives Amazon Cognito User Pools pre-signup event as an input and writes some of the record data to CloudWatch Logs. (Note that by default anything written to Console will be logged as CloudWatch Logs events.)
+The following is a sample Lambda function that receives Amazon Cognito User Pools pre-signup event as an input and writes some of the record data to CloudWatch Logs. (Note that anything written to stdout or stderr will be logged as CloudWatch Logs events.)
 
 Please see instructions for setting up the Cognito triggers at https://docs.aws.amazon.com/cognito/latest/developerguide/cognito-user-identity-pools-working-with-aws-lambda-triggers.html .
 
diff --git a/events/README_Cognito_UserPools_PreTokenGen.md b/events/README_Cognito_UserPools_PreTokenGen.md
@@ -1,6 +1,6 @@
 # Sample Function
 
-The following is a sample Lambda function that receives Amazon Cognito User Pools pre-token-gen event as an input and writes some of the record data to CloudWatch Logs. (Note that by default anything written to Console will be logged as CloudWatch Logs events.)
+The following is a sample Lambda function that receives Amazon Cognito User Pools pre-token-gen event as an input and writes some of the record data to CloudWatch Logs. (Note that anything written to stdout or stderr will be logged as CloudWatch Logs events.)
 
 Please see instructions for setting up the Cognito triggers at https://docs.aws.amazon.com/cognito/latest/developerguide/cognito-user-identity-pools-working-with-aws-lambda-triggers.html .
 
diff --git a/events/README_Config.md b/events/README_Config.md
@@ -1,6 +1,6 @@
 # Sample Function
 
-The following is a sample Lambda function that receives Amazon Config event record data as an input and writes some of the record data to CloudWatch Logs. (Note that by default anything written to Console will be logged as CloudWatch Logs events.)
+The following is a sample Lambda function that receives Amazon Config event record data as an input and writes some of the record data to CloudWatch Logs. (Note that anything written to stdout or stderr will be logged as CloudWatch Logs events.)
 
 ```go
 
diff --git a/events/README_Connect.md b/events/README_Connect.md
@@ -1,6 +1,6 @@
 # Sample Function
 
-The following is a sample Lambda function that receives an Amazon Connect event as an input and writes some of the record data to CloudWatch Logs. (Note that by default anything written to Console will be logged as CloudWatch Logs events.)
+The following is a sample Lambda function that receives an Amazon Connect event as an input and writes some of the record data to CloudWatch Logs. (Note that anything written to stdout or stderr will be logged as CloudWatch Logs events.)
 
 ```go
 package main
diff --git a/events/README_Kinesis.md b/events/README_Kinesis.md
@@ -1,6 +1,6 @@
 # Sample Function
 
-The following is a sample class and Lambda function that receives Amazon Kinesis event record data as an input and writes some of the record data to CloudWatch Logs. (Note that by default anything written to Console will be logged as CloudWatch Logs events.)
+The following is a sample class and Lambda function that receives Amazon Kinesis event record data as an input and writes some of the record data to CloudWatch Logs. (Note that anything written to stdout or stderr will be logged as CloudWatch Logs events.)
 
 ```go
 
diff --git a/events/README_Lex.md b/events/README_Lex.md
@@ -1,7 +1,7 @@
 
 # Sample Function
 
-The following is a sample class and Lambda function that receives Amazon Lex event data as input, writes some of the record data to CloudWatch Logs, and responds back to Lex. (Note that by default anything written to Console will be logged as CloudWatch Logs events.)
+The following is a sample class and Lambda function that receives Amazon Lex event data as input, writes some of the record data to CloudWatch Logs, and responds back to Lex. (Note that anything written to stdout or stderr will be logged as CloudWatch Logs events.)
 
 ```go
 import (
diff --git a/events/README_S3.md b/events/README_S3.md
@@ -1,6 +1,6 @@
 # Sample Function
 
-The following is a sample class and Lambda function that receives Amazon S3 event record data as an input and writes some of the record data to CloudWatch Logs. (Note that by default anything written to Console will be logged as CloudWatch Logs events.)
+The following is a sample class and Lambda function that receives Amazon S3 event record data as an input and writes some of the record data to CloudWatch Logs. (Note that anything written to stdout or stderr will be logged as CloudWatch Logs events.)
 
 ```go
 
diff --git a/events/README_S3_Batch_Job.md b/events/README_S3_Batch_Job.md
@@ -1,6 +1,6 @@
 # Sample Function
 
-The following is a sample class and Lambda function that receives Amazon S3 event record data as an input and writes some of the record data to CloudWatch Logs. (Note that by default anything written to Console will be logged as CloudWatch Logs events.)
+The following is a sample class and Lambda function that receives Amazon S3 event record data as an input and writes some of the record data to CloudWatch Logs. (Note that anything written to stdout or stderr will be logged as CloudWatch Logs events.)
 
 ```go
 
diff --git a/events/README_SES.md b/events/README_SES.md
@@ -1,7 +1,7 @@
 
 # Sample Function
 
-The following is a sample class and Lambda function that receives Amazon SES event message data as input, writes some of the message data to CloudWatch Logs, and responds with a 200 status and the same body as the request. (Note that by default anything written to Console will be logged as CloudWatch Logs events.)
+The following is a sample class and Lambda function that receives Amazon SES event message data as input, writes some of the message data to CloudWatch Logs, and responds with a 200 status and the same body as the request. (Note that anything written to stdout or stderr will be logged as CloudWatch Logs events.)
 
 ```go
 package main
diff --git a/events/README_SNS.md b/events/README_SNS.md
@@ -1,7 +1,7 @@
 
 # Sample Function
 
-The following is a sample class and Lambda function that receives Amazon SNS event record data as input, writes some of the record data to CloudWatch Logs, and responds with a 200 status and the same body as the request. (Note that by default anything written to Console will be logged as CloudWatch Logs events.)
+The following is a sample class and Lambda function that receives Amazon SNS event record data as input, writes some of the record data to CloudWatch Logs, and responds with a 200 status and the same body as the request. (Note that anything written to stdout or stderr will be logged as CloudWatch Logs events.)
 
 ```go
 import (
diff --git a/events/README_SQS.md b/events/README_SQS.md
@@ -1,7 +1,7 @@
 
 # Sample Function
 
-The following is a sample class and Lambda function that receives Amazon SQS event message data as input, writes some of the message data to CloudWatch Logs, and responds with a 200 status and the same body as the request. (Note that by default anything written to Console will be logged as CloudWatch Logs events.)
+The following is a sample class and Lambda function that receives Amazon SQS event message data as input, writes some of the message data to CloudWatch Logs, and responds with a 200 status and the same body as the request. (Note that anything written to stdout or stderr will be logged as CloudWatch Logs events.)
 
 ```go
 package main
diff --git a/events/activemq.go b/events/activemq.go
@@ -0,0 +1,30 @@
+// Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+
+package events
+
+type ActiveMQEvent struct {
+	EventSource    string            `json:"eventSource"`
+	EventSourceARN string            `json:"eventSourceArn"`
+	Messages       []ActiveMQMessage `json:"messages"`
+}
+
+type ActiveMQMessage struct {
+	MessageID     string              `json:"messageID"`
+	MessageType   string              `json:"messageType"`
+	Timestamp     int64               `json:"timestamp"`
+	DeliveryMode  int                 `json:"deliveryMode"`
+	CorrelationID string              `json:"correlationID"`
+	ReplyTo       string              `json:"replyTo"`
+	Destination   ActiveMQDestination `json:"destination"`
+	Redelivered   bool                `json:"redelivered"`
+	Type          string              `json:"type"`
+	Expiration    int64               `json:"expiration"`
+	Priority      int                 `json:"priority"`
+	Data          string              `json:"data"`
+	BrokerInTime  int64               `json:"brokerInTime"`
+	BrokerOutTime int64               `json:"brokerOutTime"`
+}
+
+type ActiveMQDestination struct {
+	PhysicalName string `json:"physicalName"`
+}
diff --git a/events/activemq_test.go b/events/activemq_test.go
@@ -0,0 +1,46 @@
+// Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+package events
+
+import (
+	"encoding/json"
+	"testing"
+
+	"github.com/aws/aws-lambda-go/events/test"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestActiveMQEventMarshaling(t *testing.T) {
+	// 1. read JSON from file
+	inputJson := test.ReadJSONFromFile(t, "./testdata/activemq-event.json")
+
+	// 2. de-serialize into Go object
+	var inputEvent ActiveMQEvent
+	if err := json.Unmarshal(inputJson, &inputEvent); err != nil {
+		t.Errorf("could not unmarshal event. details: %v", err)
+	}
+
+	// 3. Verify values populated into Go Object, at least one validation per data type
+	assert.Equal(t, "aws:mq", inputEvent.EventSource)
+	assert.Equal(t, "arn:aws:mq:us-west-2:533019413397:broker:shask-test:b-0f5b7522-2b41-4f85-a615-735a4e6d96b5", inputEvent.EventSourceARN)
+	assert.Equal(t, 1, len(inputEvent.Messages))
+
+	var message = inputEvent.Messages[0]
+	assert.Equal(t, "jms/text-message", message.MessageType)
+	assert.Equal(t, int64(1599863938941), message.Timestamp)
+	assert.Equal(t, 1, message.DeliveryMode)
+	assert.Equal(t, "testQueue", message.Destination.PhysicalName)
+	assert.Equal(t, false, message.Redelivered)
+
+	// 4. serialize to JSON
+	outputJson, err := json.Marshal(inputEvent)
+	if err != nil {
+		t.Errorf("could not marshal event. details: %v", err)
+	}
+
+	// 5. check result
+	assert.JSONEq(t, string(inputJson), string(outputJson))
+}
+
+func TestActiveMQMarshalingMalformedJson(t *testing.T) {
+	test.TestMalformedJson(t, ActiveMQEvent{})
+}
diff --git a/events/apigw.go b/events/apigw.go
@@ -150,7 +150,7 @@ type APIGatewayRequestIdentity struct {
 type APIGatewayWebsocketProxyRequest struct {
 	Resource                        string                                 `json:"resource"` // The resource path defined in API Gateway
 	Path                            string                                 `json:"path"`     // The url path for the caller
-	HTTPMethod                      string                                 `json:"httpMethod"`
+	HTTPMethod                      string                                 `json:"httpMethod,omitempty"`
 	Headers                         map[string]string                      `json:"headers"`
 	MultiValueHeaders               map[string][]string                    `json:"multiValueHeaders"`
 	QueryStringParameters           map[string]string                      `json:"queryStringParameters"`
diff --git a/events/clientvpn.go b/events/clientvpn.go
diff --git a/events/clientvpn_test.go b/events/clientvpn_test.go
diff --git a/events/codepipeline_test.go b/events/codepipeline_test.go
diff --git a/events/cognito.go b/events/cognito.go
diff --git a/events/lex.go b/events/lex.go
diff --git a/events/testdata/activemq-event.json b/events/testdata/activemq-event.json
diff --git a/events/testdata/clientvpn-connectionhandler-request.json b/events/testdata/clientvpn-connectionhandler-request.json
diff --git a/events/testdata/cognito-event-userpools-migrateuser.json b/events/testdata/cognito-event-userpools-migrateuser.json
diff --git a/lambda/README.md b/lambda/README.md
diff --git a/lambda/messages/README.md b/lambda/messages/README.md
diff --git a/lambdacontext/README.md b/lambdacontext/README.md
