Rebasing and updating iot events since the contract has chagned

Author: ynori7

events/apigw.go

@@ -253,10 +253,3 @@ type APIGatewayCustomAuthorizerPolicy struct {
 	Version   string
 	Statement []IAMPolicyStatement
 }
-
-// IAMPolicyStatement represents one statement from IAM policy with action, effect and resource
-type IAMPolicyStatement struct {
-	Action   []string
-	Effect   string
-	Resource []string
-}

events/iam.go

@@ -1,5 +1,6 @@
 package events
 
+// IAMPolicyStatement represents one statement from IAM policy with action, effect and resource
 type IAMPolicyStatement struct {
 	Action   []string
 	Effect   string

events/iot.go

@@ -2,7 +2,26 @@ package events
 
 // IoTCustomAuthorizerRequest contains data coming in to a custom IoT device gateway authorizer function.
 type IoTCustomAuthorizerRequest struct {
-	AuthorizationToken string `json:"token"`
+	HttpContext        *IoTHttpContext `json:"httpContext,omitempty"`
+	MqttContext        *IoTMqttContext `json:"mqttContext,omitempty"`
+	TlsContext         *IotTlsContext  `json:"tlsContext,omitempty"`
+	AuthorizationToken string          `json:"token"`
+	TokenSignature     string          `json:"tokenSignature"`
+}
+
+type IoTHttpContext struct {
+	Headers     map[string]string `json:"headers,omitempty"`
+	QueryString string            `json:"queryString"`
+}
+
+type IoTMqttContext struct {
+	ClientId string `json:"clientId"`
+	Password []byte `json:"password"`
+	Username string `json:"username"`
+}
+
+type IotTlsContext struct {
+	ServerName string `json:"serverName"`
 }
 
 // IoTCustomAuthorizerResponse represents the expected format of an IoT device gateway authorization response.
@@ -12,7 +31,6 @@ type IoTCustomAuthorizerResponse struct {
 	DisconnectAfterInSeconds int32                  `json:"disconnectAfterInSeconds"`
 	RefreshAfterInSeconds    int32                  `json:"refreshAfterInSeconds"`
 	PolicyDocuments          []string               `json:"policyDocuments"`
-	Context                  map[string]interface{} `json:"context,omitempty"`
 }
 
 // IoTCustomAuthorizerPolicy represents an IAM policy. PolicyDocuments is an array of IoTCustomAuthorizerPolicy JSON strings

events/testdata/iot-custom-auth-request.json

@@ -1,3 +1,18 @@
 {
-  "token":"allow"
+  "httpContext": {
+    "headers": {
+      "Accept-Language" : "en"
+    },
+    "queryString": "abc"
+  },
+  "mqttContext": {
+    "clientId": "someclient",
+    "password": "aslkfjwoeiuwekrujwlrueowieurowieurowiuerwleuroiwueroiwueroiuweoriuweoriuwoeiruwoeiur",
+    "username": "thebestuser"
+  },
+  "tlsContext": {
+    "serverName": "server.stuff.com"
+  },
+  "token": "someToken",
+  "tokenSignature": "somelongtokensignature"
 }

events/testdata/iot-custom-auth-response.json

@@ -5,10 +5,5 @@
   "refreshAfterInSeconds": 300,
   "policyDocuments": [
     "{ \"Version\": \"2012-10-17\", \"Statement\": [ { \"Action\": [\"iot:Subscribe\"], \"Effect\": \"Allow\", \"Resource\": [\"*\"] } ] }"
-  ],
-  "context": {
-    "username" : "johnDoe123",
-    "city" : "Seattle",
-    "country" : "USA"
-  }
+  ]
 }