Merge branch 'master' into update#186

aws · Oct 10, 2019 · f76ce0d · f76ce0d
2 parents 466dad2 + 319e4b3
commit f76ce0d
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -27,10 +27,10 @@ before_script:
   - LINT_PKGS=$(go list ./... | grep -Ev 'aws-lambda-go/lambda')
 
 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
-  - go vet -v ./...                                                # static analyisis
-  - golint $LINT_PKGS                                              # lint - ignore failures for now
+  - 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
 
 after_success:
   - bash <(curl -s https://codecov.io/bash)
diff --git a/events/README_Cognito_UserPools_PreTokenGen.md b/events/README_Cognito_UserPools_PreTokenGen.md
@@ -16,7 +16,7 @@ import (
 
 func handler(event events.CognitoEventUserPoolsPreTokenGen) (events.CognitoEventUserPoolsPreTokenGen, error) {
     fmt.Printf("PreTokenGen of user: %s\n", event.UserName)
-    event.Response.ClaimOverrideDetails.ClaimsToSupress = []string{"family_name"}
+    event.Response.ClaimsOverrideDetails.ClaimsToSuppress = []string{"family_name"}
     return event, nil
 }
 

diff --git a/events/apigw.go b/events/apigw.go
@@ -49,6 +49,7 @@ type APIGatewayRequestIdentity struct {
 	CognitoIdentityID             string `json:"cognitoIdentityId"`
 	Caller                        string `json:"caller"`
 	APIKey                        string `json:"apiKey"`
+	APIKeyID                      string `json:"apiKeyId"`
 	AccessKey                     string `json:"accessKey"`
 	SourceIP                      string `json:"sourceIp"`
 	CognitoAuthenticationType     string `json:"cognitoAuthenticationType"`

diff --git a/events/testdata/apigw-request.json b/events/testdata/apigw-request.json
@@ -1,4 +1,4 @@
-{ 
+{
 	"resource": "/{proxy+}",
 	  "path": "/hello/world",
 	  "httpMethod": "POST",
@@ -67,6 +67,7 @@
 			"cognitoIdentityId": "theCognitoIdentityId",
 			"caller": "theCaller",
             "apiKey": "theApiKey",
+            "apiKeyId": "theApiKeyId",
             "accessKey": "ANEXAMPLEOFACCESSKEY",
 			"sourceIp": "192.168.196.186",
 			"cognitoAuthenticationType": "theCognitoAuthenticationType",
@@ -79,7 +80,7 @@
 			"principalId": "admin",
 			"clientId": 1,
 			"clientName": "Exata"
-		},	
+		},
 		"resourcePath": "/{proxy+}",
 		"httpMethod": "POST",
 		"apiId": "gy415nuibc"

diff --git a/events/testdata/apigw-restapi-openapi-request.json b/events/testdata/apigw-restapi-openapi-request.json
@@ -68,6 +68,7 @@
       "cognitoIdentityId": "theCognitoIdentityId",
       "caller": "theCaller",
       "apiKey": "theApiKey",
+      "apiKeyId": "theApiKeyId",
       "accessKey": "ANEXAMPLEOFACCESSKEY",
       "sourceIp": "192.168.196.186",
       "cognitoAuthenticationType": "theCognitoAuthenticationType",

diff --git a/events/testdata/apigw-websocket-request.json b/events/testdata/apigw-websocket-request.json
@@ -72,6 +72,7 @@
       "cognitoIdentityId": "theCognitoIdentityId",
       "caller": "theCaller",
       "apiKey": "theApiKey",
+      "apiKeyId": "theApiKeyId",
       "accessKey": "ANEXAMPLEOFACCESSKEY",
       "sourceIp": "192.168.196.186",
       "cognitoAuthenticationType": "theCognitoAuthenticationType",