Making the api gateway custom authorizer policy more generic

Author: ynori7

events/apigw.go

@@ -242,14 +242,8 @@ type APIGatewayCustomAuthorizerRequestTypeRequest struct {
 
 // APIGatewayCustomAuthorizerResponse represents the expected format of an API Gateway authorization response.
 type APIGatewayCustomAuthorizerResponse struct {
-	PrincipalID        string                           `json:"principalId"`
-	PolicyDocument     APIGatewayCustomAuthorizerPolicy `json:"policyDocument"`
-	Context            map[string]interface{}           `json:"context,omitempty"`
-	UsageIdentifierKey string                           `json:"usageIdentifierKey,omitempty"`
-}
-
-// APIGatewayCustomAuthorizerPolicy represents an IAM policy
-type APIGatewayCustomAuthorizerPolicy struct {
-	Version   string
-	Statement []IAMPolicyStatement
+	PrincipalID        string                 `json:"principalId"`
+	PolicyDocument     CustomAuthorizerPolicy `json:"policyDocument"`
+	Context            map[string]interface{} `json:"context,omitempty"`
+	UsageIdentifierKey string                 `json:"usageIdentifierKey,omitempty"`
 }

events/iot.go

@@ -32,9 +32,3 @@ type IoTCustomAuthorizerResponse struct {
 	RefreshAfterInSeconds    int32                  `json:"refreshAfterInSeconds"`
 	PolicyDocuments          []string               `json:"policyDocuments"`
 }
-
-// IoTCustomAuthorizerPolicy represents an IAM policy. PolicyDocuments is an array of IoTCustomAuthorizerPolicy JSON strings
-type IoTCustomAuthorizerPolicy struct {
-	Version   string
-	Statement []IAMPolicyStatement
-}

events/policy.go

@@ -0,0 +1,7 @@
+package events
+
+// CustomAuthorizerPolicy represents an IAM policy
+type CustomAuthorizerPolicy struct {
+	Version   string
+	Statement []IAMPolicyStatement
+}