Merge branch 'master' into ci-golint

Author: bmoffatt

.travis.yml

@@ -1,33 +1,23 @@
 language: go
 
 go:
-  - 1.12
-  - 1.11
-  - tip 
+  - 1.12.x
+  - 1.11.x
+  - tip
+
+env: GO111MODULE=on
 
 before_install:
-    - curl -L -s https://github.com/golang/dep/releases/download/v0.4.1/dep-linux-amd64 -o $GOPATH/bin/dep
-    - chmod +x $GOPATH/bin/dep
+  - go mod download
 
-install: 
-  - dep ensure
+install:
   - go get golang.org/x/lint/golint
   - go get github.com/haya14busa/goverage
   - go get github.com/alecthomas/gometalinter
 
 matrix:
-  include:
-    - go: 1.12
-      env: GO111MODULE=on
-      before_install:
-        - go mod download
-      install:
-        - go get golang.org/x/lint/golint
-        - go get github.com/haya14busa/goverage
   allow_failures:
     - go: tip
-    - go: 1.12
-      env: GO111MODULE=on
   fast_finish: true
 
 notifications:
@@ -37,9 +27,11 @@ before_script:
   - PKGS=$(go list ./...)
 
 script:
-  - diff -u <(echo -n) <(gofmt -d ./)                              # Fail if a .go file hasn't been formatted with gofmt
-  - goverage -v -covermode=atomic -coverprofile=coverage.txt $PKGS # Run all tests with coverage 
+  - diff -u <(echo -n) <(gofmt -d ./)                                    # Fail if a .go file hasn't been formatted with gofmt
+  - goverage -v -race -covermode=atomic -coverprofile=coverage.txt $PKGS # Run all tests with coverage
+  - go vet -v ./...                                                      # static analyisis
+  - golint $LINT_PKGS                                                    # lint - ignore failures for now
   - gometalinter --vendor --disable-all --enable=vet --enable=golint ./...
-  
+
 after_success:
-  - bash <(curl -s https://codecov.io/bash)
+  - bash <(curl -s https://codecov.io/bash)

Gopkg.lock

@@ -54,6 +54,7 @@ Windows developers may have trouble producing a zip file that marks the binary a
 
 Get the tool
 ``` shell
+set GO111MODULE=on
 go.exe get -u github.com/aws/aws-lambda-go/cmd/build-lambda-zip
 ```
 

Gopkg.toml

@@ -4,15 +4,22 @@ package cfn
 
 import (
 	"context"
+	"encoding/json"
+	"errors"
 	"log"
 	"net/http"
 
+	"github.com/aws/aws-lambda-go/events"
 	"github.com/aws/aws-lambda-go/lambdacontext"
 )
 
 // CustomResourceLambdaFunction is a standard form Lambda for a Custom Resource.
 type CustomResourceLambdaFunction func(context.Context, Event) (reason string, err error)
 
+// SNSCustomResourceLambdaFunction is a standard form Lambda for a Custom Resource
+// that is triggered via a SNS topic.
+type SNSCustomResourceLambdaFunction func(context.Context, events.SNSEvent) (reason string, err error)
+
 // CustomResourceFunction is a representation of the customer's Custom Resource function.
 // LambdaWrap will take the returned values and turn them into a response to be sent
 // to CloudFormation.
@@ -73,3 +80,24 @@ func lambdaWrapWithClient(lambdaFunction CustomResourceFunction, client httpClie
 func LambdaWrap(lambdaFunction CustomResourceFunction) (fn CustomResourceLambdaFunction) {
 	return lambdaWrapWithClient(lambdaFunction, http.DefaultClient)
 }
+
+// LambdaWrapSNS wraps a Lambda handler with support for SNS-based custom
+// resources. Usage and purpose otherwise same as LambdaWrap().
+func LambdaWrapSNS(lambdaFunction CustomResourceFunction) SNSCustomResourceLambdaFunction {
+	inner := LambdaWrap(lambdaFunction)
+	return func(ctx context.Context, event events.SNSEvent) (reason string, err error) {
+		if len(event.Records) != 1 {
+			err = errors.New("expected exactly 1 incoming record")
+			return
+		}
+
+		message := event.Records[0].SNS.Message
+
+		var innerEvent Event
+		if err = json.Unmarshal([]byte(message), &innerEvent); err != nil {
+			return
+		}
+
+		return inner(ctx, innerEvent)
+	}
+}

README.md

@@ -8,15 +8,15 @@ import (
 	"os"
 	"path/filepath"
 
-	"gopkg.in/urfave/cli.v1"
+	"github.com/urfave/cli"
 )
 
 func main() {
 	app := cli.NewApp()
 	app.Name = "build-lambda-zip"
 	app.Usage = "Put an executable and supplemental files into a zip file that works with AWS Lambda."
 	app.Flags = []cli.Flag{
-		cli.StringFlag{
+		&cli.StringFlag{
 			Name:  "output, o",
 			Value: "",
 			Usage: "output file path for the zip. Defaults to the first input file name.",
@@ -25,7 +25,7 @@ func main() {
 
 	app.Action = func(c *cli.Context) error {
 		if !c.Args().Present() {
-			return errors.New("No input provided")
+			return errors.New("no input provided")
 		}
 
 		inputExe := c.Args().First()
@@ -35,7 +35,7 @@ func main() {
 		}
 
 		if err := compressExeAndArgs(outputZip, inputExe, c.Args().Tail()); err != nil {
-			return fmt.Errorf("Failed to compress file: %v", err)
+			return fmt.Errorf("failed to compress file: %v", err)
 		}
 		return nil
 	}
@@ -71,7 +71,6 @@ func compressExeAndArgs(outZipPath string, exePath string, args []string) error
 		if closeErr != nil {
 			fmt.Fprintf(os.Stderr, "Failed to close zip file: %v\n", closeErr)
 		}
-		return
 	}()
 
 	zipWriter := zip.NewWriter(zipFile)

cfn/wrap.go

@@ -14,6 +14,12 @@ This package provides input types for Lambda functions that process AWS events.
 
 [CloudFormation Events](../cfn/README.md)
 
+[CloudWatch Events](README_CloudWatch_Events.md)
+
+[CloudWatch Logs](README_CloudWatch_Logs.md)
+
+[Chime Bot Events](README_Chime_Bots.md)
+
 [Code Commit Events](README_CodeCommit.md)
 
 [Cognito Events](README_Cognito.md)
@@ -32,6 +38,8 @@ This package provides input types for Lambda functions that process AWS events.
 
 [Kinesis Firehose Events](README_KinesisFirehose.md)
 
+[Lex Events](README_Lex.md)
+
 [S3 Events](README_S3.md)
 
 [SES Events](README_SES.md)

cmd/build-lambda-zip/main.go

@@ -29,7 +29,7 @@ func handleRequest(ctx context.Context, request events.ALBTargetGroupRequest) (e
 		fmt.Printf("    %s: %s\n", key, value)
 	}
 
-	return events.ALBTargetGroupResponse{Body: request.Body, StatusCode: 200, StatusDescription: "200 OK", IsBase64Encoded: false}, nil
+	return events.ALBTargetGroupResponse{Body: request.Body, StatusCode: 200, StatusDescription: "200 OK", IsBase64Encoded: false, Headers: map[string]string{}}}, nil
 }
 
 func main() {

events/README.md

@@ -0,0 +1,67 @@
+# Sample Function
+
+The following is a sample class and Lambda function that receives a Amazon Chime Bot event and handles the various event types accordingly.
+
+```go
+
+package main
+
+import (
+    "fmt"
+    "context"
+    "net/http"
+    "bytes"
+    "encoding/json"
+    "errors"
+    "strconv"
+    
+    "github.com/aws/aws-lambda-go/events"
+)
+
+func handler(_ context.Context, chimeBotEvent events.ChimeBotEvent) error {
+    switch chimeBotEvent.EventType {
+    case "Invite":
+        if err := message(chimeBotEvent.InboundHTTPSEndpoint.URL, "Thanks for inviting me to this room " + chimeBotEvent.Sender.SenderID); err != nil {
+            return fmt.Errorf("failed to send webhook message: %v", err)
+        }
+        return nil
+    case "Mention":
+        if err := message(chimeBotEvent.InboundHTTPSEndpoint.URL, "Thanks for mentioning me " + chimeBotEvent.Sender.SenderID); err != nil {
+            return fmt.Errorf("failed to send webhook message: %v", err)
+        }
+        return nil
+    case "Remove":
+        fmt.Printf("I have been removed from %q by %q", chimeBotEvent.Discussion.DiscussionType,  chimeBotEvent.Sender.SenderID)
+        return nil
+    default:
+        return fmt.Errorf("event type %q is unsupported", chimeBotEvent.EventType)
+    }
+}
+
+func message(url, content string) (error) {
+    input := &bytes.Buffer{}
+    if err := json.NewEncoder(input).Encode(webhookInput{Content:content}); err != nil {
+        return errors.New("failed to marshal request: " + err.Error())
+    }
+
+    resp, err := http.Post("POST", url, input)
+    if err != nil {
+        return errors.New("failed to execute post http request: " + err.Error())
+    }
+    
+    if resp != nil && resp.Body != nil {
+        defer resp.Body.Close()
+    }
+
+    if resp.StatusCode != http.StatusOK {
+        return errors.New("bad response: status code not is " + strconv.Itoa(http.StatusOK) + " not " + strconv.Itoa(resp.StatusCode))
+    }
+    
+    return nil
+}
+
+type webhookInput struct {
+    Content    string `json:"Content"`
+}
+
+```

events/README_ALBTargetGroupEvents.md

@@ -0,0 +1,17 @@
+
+# Sample Function
+
+The following is a Lambda function that receives Amazon CloudWatch event record data as input and writes event detail to Lambda's CloudWatch Logs. Note that by default anything written to Console will be logged as CloudWatch Logs events.
+
+```go
+import (
+	"context"
+	"fmt"
+
+	"github.com/aws/aws-lambda-go/events"
+)
+
+func handler(ctx context.Context, event events.CloudWatchEvent) {
+	fmt.Printf("Detail = %s\n", event.Detail)
+}
+```

events/README_Chime_Bots.md

@@ -0,0 +1,20 @@
+
+# Sample Function
+
+The following is a Lambda function that receives Amazon CloudWatch Logs event record data as input and writes message part to Lambda's CloudWatch Logs. Note that by default anything written to Console will be logged as CloudWatch Logs events.
+
+```go
+import (
+	"context"
+	"fmt"
+
+	"github.com/aws/aws-lambda-go/events"
+)
+
+func handler(ctx context.Context, logsEvent events.CloudwatchLogsEvent) {
+	data, _ := logsEvent.AWSLogs.Parse()
+	for _, logEvent := range data.LogEvents {
+		fmt.Printf("Message = %s\n", logEvent.Message)
+  	}
+}
+```

events/README_CloudWatch_Events.md

@@ -0,0 +1,15 @@
+# Sample Function
+
+The following is a sample Lambda function that receives an Amazon CodeBuild event
+and writes it to standard output.
+
+```go
+import (
+    "fmt"
+    "github.com/aws/aws-lambda-go/events"
+)
+
+func handleRequest(evt events.CodeBuildEvent) {
+	fmt.Println(evt)
+}
+```

events/README_CloudWatch_Logs.md

@@ -0,0 +1,15 @@
+# Sample Function
+
+The following is a sample Lambda function that receives an Amazon CodeDeploy event
+and writes it to standard output.
+
+```go
+import (
+    "fmt"
+    "github.com/aws/aws-lambda-go/events"
+)
+
+func handleRequest(evt events.CodeDeployEvent) {
+	fmt.Println(evt)
+}
+```