fix: Step function execution of example works

Author: bryantbiggs

.gitignore

@@ -31,3 +31,5 @@ terraform.rc
 # Zip archive
 *.zip
 builds
+
+.DS_Store

examples/complete-http/README.md

@@ -70,8 +70,6 @@ Note that this example may create resources which cost money. Run `terraform des
 | <a name="output_domain_name_hosted_zone_id"></a> [domain\_name\_hosted\_zone\_id](#output\_domain\_name\_hosted\_zone\_id) | The Amazon Route 53 Hosted Zone ID of the endpoint |
 | <a name="output_domain_name_id"></a> [domain\_name\_id](#output\_domain\_name\_id) | The domain name identifier |
 | <a name="output_domain_name_target_domain_name"></a> [domain\_name\_target\_domain\_name](#output\_domain\_name\_target\_domain\_name) | The target domain name |
-| <a name="output_integrations"></a> [integrations](#output\_integrations) | Map of the integrations created and their attributes |
-| <a name="output_routes"></a> [routes](#output\_routes) | Map of the routes created and their attributes |
 | <a name="output_stage_access_logs_cloudwatch_log_group_arn"></a> [stage\_access\_logs\_cloudwatch\_log\_group\_arn](#output\_stage\_access\_logs\_cloudwatch\_log\_group\_arn) | Arn of cloudwatch log group created |
 | <a name="output_stage_access_logs_cloudwatch_log_group_name"></a> [stage\_access\_logs\_cloudwatch\_log\_group\_name](#output\_stage\_access\_logs\_cloudwatch\_log\_group\_name) | Name of cloudwatch log group created |
 | <a name="output_stage_arn"></a> [stage\_arn](#output\_stage\_arn) | The stage ARN |

examples/complete-http/main.tf

@@ -109,6 +109,10 @@ module "api_gateway" {
       # Note: jsonencode is used to pass argument as a string
       request_parameters = jsonencode({
         StateMachineArn = module.step_function.state_machine_arn
+        Input = jsonencode({
+          "key1" : "value1",
+          "key2" : "value2"
+        })
       })
 
       payload_format_version = "1.0"
@@ -143,7 +147,23 @@ module "api_gateway" {
   stage_access_log_settings = {
     create_log_group            = true
     log_group_retention_in_days = 7
-    format                      = "$context.identity.sourceIp - - [$context.requestTime] \"$context.httpMethod $context.routeKey $context.protocol\" $context.status $context.responseLength $context.requestId $context.integrationErrorMessage"
+    format = jsonencode({
+      "requestId" : "$context.requestId",
+      "extendedRequestId" : "$context.extendedRequestId",
+      "ip" : "$context.identity.sourceIp",
+      "caller" : "$context.identity.caller",
+      "user" : "$context.identity.user",
+      "requestTime" : "$context.requestTime",
+      "httpMethod" : "$context.httpMethod",
+      "resourcePath" : "$context.resourcePath",
+      "status" : "$context.status",
+      "protocol" : "$context.protocol",
+      "responseLength" : "$context.responseLength",
+      "domainName" : "$context.domainName",
+      "errorMessage" : "$context.error.message",
+      "errorResponseType" : "$context.error.responseType",
+      "integrationErrorMessage" : "$context.integrationErrorMessage",
+    })
   }
 
   stage_default_route_settings = {
@@ -171,24 +191,35 @@ module "step_function" {
 
   name      = local.name
   role_name = "${local.name}-step-function"
+  trusted_entities = [
+    "apigateway.amazonaws.com",
+    "lambda.amazonaws.com",
+  ]
+
+  attach_policies_for_integrations = true
+  service_integrations = {
+    stepfunction = {
+      stepfunction = ["*"]
+    }
+  }
 
   definition = <<-EOT
-  {
-    "Comment": "A Hello World example of the Amazon States Language using Pass states",
-    "StartAt": "Hello",
-    "States": {
-      "Hello": {
-        "Type": "Pass",
-        "Result": "Hello",
-        "Next": "World"
-      },
-      "World": {
-        "Type": "Pass",
-        "Result": "World",
-        "End": true
+    {
+      "Comment": "A Hello World example of the Amazon States Language using Pass states",
+      "StartAt": "Hello",
+      "States": {
+        "Hello": {
+          "Type": "Pass",
+          "Result": "Hello",
+          "Next": "World"
+        },
+        "World": {
+          "Type": "Pass",
+          "Result": "World",
+          "End": true
+        }
       }
     }
-  }
   EOT
 
   tags = local.tags
@@ -206,6 +237,8 @@ module "lambda_function" {
   publish     = true
   source_path = "lambda.py"
 
+  cloudwatch_logs_retention_in_days = 7
+
   allowed_triggers = {
     AllowExecutionFromAPIGateway = {
       service    = "apigateway"

examples/complete-http/outputs.tf

@@ -78,19 +78,19 @@ output "acm_certificate_arn" {
 # Integration(s)
 ################################################################################
 
-output "integrations" {
-  description = "Map of the integrations created and their attributes"
-  value       = module.api_gateway.integrations
-}
+# output "integrations" {
+#   description = "Map of the integrations created and their attributes"
+#   value       = module.api_gateway.integrations
+# }
 
 ################################################################################
 # Route(s)
 ################################################################################
 
-output "routes" {
-  description = "Map of the routes created and their attributes"
-  value       = module.api_gateway.routes
-}
+# output "routes" {
+#   description = "Map of the routes created and their attributes"
+#   value       = module.api_gateway.routes
+# }
 
 ################################################################################
 # Stage

main.tf

@@ -286,8 +286,8 @@ resource "aws_apigatewayv2_stage" "this" {
       data_trace_enabled       = local.is_websocket ? try(default_route_settings.value.data_trace_enabled, false) : null
       detailed_metrics_enabled = try(default_route_settings.value.detailed_metrics_enabled, false)
       logging_level            = local.is_websocket ? try(default_route_settings.value.logging_level, null) : null
-      throttling_burst_limit   = try(default_route_settings.value.throttling_burst_limit, null)
-      throttling_rate_limit    = try(default_route_settings.value.throttling_rate_limit, null)
+      throttling_burst_limit   = try(default_route_settings.value.throttling_burst_limit, 500)
+      throttling_rate_limit    = try(default_route_settings.value.throttling_rate_limit, 1000)
     }
   }
 
@@ -302,8 +302,8 @@ resource "aws_apigatewayv2_stage" "this" {
       detailed_metrics_enabled = try(route_settings.value.detailed_metrics_enabled, false)
       logging_level            = local.is_websocket ? try(route_settings.value.logging_level, null) : null
       route_key                = route_settings.key
-      throttling_burst_limit   = try(route_settings.value.throttling_burst_limit, null)
-      throttling_rate_limit    = try(route_settings.value.throttling_rate_limit, null)
+      throttling_burst_limit   = try(route_settings.value.throttling_burst_limit, 500)
+      throttling_rate_limit    = try(route_settings.value.throttling_rate_limit, 1000)
     }
   }
 

wrappers/main.tf

@@ -38,6 +38,6 @@ module "wrapper" {
   subdomain                                          = try(each.value.subdomain, var.defaults.subdomain, null)
   tags                                               = try(each.value.tags, var.defaults.tags, {})
   target                                             = try(each.value.target, var.defaults.target, null)
-  vpc_links                                          = try(each.value.vpc_links, var.defaults.vpc_links, {})
   vpc_link_tags                                      = try(each.value.vpc_link_tags, var.defaults.vpc_link_tags, {})
+  vpc_links                                          = try(each.value.vpc_links, var.defaults.vpc_links, {})
 }