@aws/nx-plugin 1.0.0-rc.83 → 1.0.0-rc.85

package/src/py/fast-api/__snapshots__/generator.terraform.spec.ts.snap

@@ -256,10 +256,18 @@ output "api_log_group_arn" {
   required_version = ">= 1.0"
 
   required_providers {
+    archive = {
+      source  = "hashicorp/archive"
+      version = "2.8.0"
+    }
     aws = {
       source  = "hashicorp/aws"
       version = "6.61.0"
     }
+    random = {
+      source  = "hashicorp/random"
+      version = "3.9.0"
+    }
   }
 }
 
@@ -379,6 +387,49 @@ resource "random_string" "suffix" {
   upper   = false
 }
 
+locals {
+  # Generated at build time from the API definition
+  operations_file = "\${path.module}/../../../generated/test-api/operations.json"
+  operations      = fileexists(local.operations_file) ? jsondecode(file(local.operations_file)) : {}
+
+  operation_slug = { for op in keys(local.operations) : op => replace(op, "/[^a-zA-Z0-9-_]/", "-") }
+  operation_hash = { for op in keys(local.operations) : op => substr(sha256(op), 0, 8) }
+
+  function_name = { for op in keys(local.operations) : op =>
+    "\${substr("TestApi-\${local.operation_slug[op]}", 0, 64 - length(local.operation_hash[op]) - length(random_string.suffix.result) - 2)}-\${local.operation_hash[op]}-\${random_string.suffix.result}"
+  }
+  role_name = { for op in keys(local.operations) : op =>
+    "\${substr("TestApi-\${local.operation_slug[op]}-role", 0, 64 - length(local.operation_hash[op]) - length(random_string.suffix.result) - 2)}-\${local.operation_hash[op]}-\${random_string.suffix.result}"
+  }
+
+  operation_path = { for op, details in local.operations : op =>
+    startswith(details.path, "/") ? details.path : "/\${details.path}"
+  }
+  route_key = { for op, details in local.operations : op =>
+    "\${upper(details.method)} \${local.operation_path[op]}"
+  }
+
+  permission_source_suffix = { for op, details in local.operations : op =>
+    "\${upper(details.method)}\${replace(local.operation_path[op], "/{[^}]*}/", "*")}"
+  }
+}
+
+resource "terraform_data" "operations_metadata" {
+  # Fails the plan when the operations metadata has not been generated
+  input = local.operations_file
+
+  lifecycle {
+    precondition {
+      condition     = fileexists(local.operations_file)
+      error_message = "Operations metadata not found at \${local.operations_file}. Build the TestApi project to generate it."
+    }
+    precondition {
+      condition     = length(local.operations) > 0
+      error_message = "No operations found in \${local.operations_file}. The TestApi API must define at least one operation."
+    }
+  }
+}
+
 # Resources
 
 # Create Lambda ZIP file from the bundle directory
@@ -439,9 +490,10 @@ resource "aws_vpc_security_group_egress_rule" "api_lambda_https" {
   description       = "Allow outbound HTTPS to AWS service endpoints"
 }
 
-# Lambda function
-# This configures a single "router" lambda to serve all requests
 resource "aws_lambda_function" "api_lambda" {
+  # One lambda function per operation, each serving just that operation
+  for_each = local.operations
+
   #checkov:skip=CKV_AWS_117:Lambda function is optionally deployed into a VPC via vpc_id/subnet_ids; not required for this use case
   #checkov:skip=CKV_AWS_116:Dead Letter Queue not required for this simple API use case
   #checkov:skip=CKV_AWS_272:Code signing not required for this use case
@@ -450,8 +502,8 @@ resource "aws_lambda_function" "api_lambda" {
   s3_bucket         = aws_s3_object.lambda_zip.bucket
   s3_key            = aws_s3_object.lambda_zip.key
   s3_object_version = aws_s3_object.lambda_zip.version_id
-  function_name    = "TestApiHandler-\${random_string.suffix.result}"
-  role            = aws_iam_role.lambda_execution_role.arn
+  function_name    = local.function_name[each.key]
+  role            = aws_iam_role.lambda_execution_role[each.key].arn
   handler         = "run.sh"
   runtime         = "python3.14"
   layers          = ["arn:aws:lambda:\${data.aws_region.current.region}:753240598075:layer:LambdaAdapterLayerX86:24"]
@@ -496,7 +548,9 @@ resource "aws_lambda_function" "api_lambda" {
 
 # IAM role for Lambda execution
 resource "aws_iam_role" "lambda_execution_role" {
-  name = "TestApiHandler-execution-role-\${random_string.suffix.result}"
+  for_each = local.operations
+
+  name = local.role_name[each.key]
 
   assume_role_policy = jsonencode({
     Version = "2012-10-17"
@@ -516,32 +570,38 @@ resource "aws_iam_role" "lambda_execution_role" {
 
 # Attach basic execution policy to Lambda role
 resource "aws_iam_role_policy_attachment" "lambda_basic_execution" {
+  for_each = local.operations
+
   policy_arn = "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-  role       = aws_iam_role.lambda_execution_role.name
+  role       = aws_iam_role.lambda_execution_role[each.key].name
 }
 
 # Attach X-Ray tracing policy to Lambda role
 resource "aws_iam_role_policy_attachment" "lambda_xray_execution" {
+  for_each = local.operations
+
   policy_arn = "arn:aws:iam::aws:policy/AWSXRayDaemonWriteAccess"
-  role       = aws_iam_role.lambda_execution_role.name
+  role       = aws_iam_role.lambda_execution_role[each.key].name
 }
 
 # Attach VPC access policy to Lambda role when deployed into a VPC
 resource "aws_iam_role_policy_attachment" "lambda_vpc_access" {
-  count      = var.enable_vpc ? 1 : 0
+  for_each = var.enable_vpc ? local.operations : {}
+
   policy_arn = "arn:aws:iam::aws:policy/service-role/AWSLambdaVPCAccessExecutionRole"
-  role       = aws_iam_role.lambda_execution_role.name
+  role       = aws_iam_role.lambda_execution_role[each.key].name
 }
 
 # Additional IAM policies for Lambda (if provided)
 resource "aws_iam_role_policy" "lambda_additional_policies" {
-  count = length(local.lambda_policy_statements) > 0 ? 1 : 0
-  name  = "TestApiHandler-additional-policies-\${random_string.suffix.result}"
-  role  = aws_iam_role.lambda_execution_role.id
+  for_each = local.operations
+
+  name = "\${substr(local.function_name[each.key], 0, 55)}-policies"
+  role = aws_iam_role.lambda_execution_role[each.key].id
 
   policy = jsonencode({
     Version = "2012-10-17"
-    Statement = local.lambda_policy_statements
+    Statement = local.lambda_policy_document_statements
   })
 }
 
@@ -557,6 +617,15 @@ locals {
       Resource = ["\${var.appconfig_application_arn}/*"]
     }
   ] : [], var.additional_iam_policy_statements)
+
+  # IAM rejects an empty statement list, so fall back to a no-op deny
+  lambda_policy_document_statements = length(local.lambda_policy_statements) > 0 ? local.lambda_policy_statements : [
+    {
+      Effect   = "Deny"
+      Action   = ["appconfig:GetLatestConfiguration"]
+      Resource = ["arn:aws:appconfig:\${data.aws_region.current.region}:\${data.aws_caller_identity.current.account_id}:application/none"]
+    }
+  ]
 }
 
 # CloudWatch Log Group for Lambda
@@ -564,15 +633,19 @@ resource "aws_cloudwatch_log_group" "lambda_logs" {
   #checkov:skip=CKV_AWS_158:Using default CloudWatch log encryption
   #checkov:skip=CKV_AWS_338:Log retention set to forever
   #checkov:skip=CKV_AWS_66:Log retention set to forever
-  name              = "/aws/lambda/TestApiHandler-\${random_string.suffix.result}"
-  tags              = var.tags
+  for_each = local.operations
+
+  name = "/aws/lambda/\${local.function_name[each.key]}"
+  tags = var.tags
 }
 
 # Lambda alias pointing to the latest published version for SnapStart
 resource "aws_lambda_alias" "live" {
+  for_each = local.operations
+
   name             = "live"
-  function_name    = aws_lambda_function.api_lambda.function_name
-  function_version = aws_lambda_function.api_lambda.version
+  function_name    = aws_lambda_function.api_lambda[each.key].function_name
+  function_version = aws_lambda_function.api_lambda[each.key].version
 
   depends_on = [aws_lambda_function.api_lambda]
 }
@@ -592,9 +665,11 @@ resource "aws_apigatewayv2_authorizer" "cognito_authorizer" {
 
 # Lambda integration for HTTP API
 resource "aws_apigatewayv2_integration" "lambda_integration" {
+  for_each = local.operations
+
   api_id           = module.http_api.api_id
   integration_type = "AWS_PROXY"
-  integration_uri  = aws_lambda_alias.live.invoke_arn
+  integration_uri  = aws_lambda_alias.live[each.key].invoke_arn
 
   payload_format_version = "2.0"
   timeout_milliseconds   = 30000
@@ -602,15 +677,13 @@ resource "aws_apigatewayv2_integration" "lambda_integration" {
   depends_on = [aws_lambda_alias.live]
 }
 
-# Route for proxy integration (catches all requests)
-resource "aws_apigatewayv2_route" "proxy_routes" {
-  # NB: OPTIONS is omitted here since API Gateway manages responding to preflight requests
-  # when cors settings are configured
-  for_each = toset(["GET", "POST", "PUT", "PATCH", "DELETE", "HEAD"])
+# One route per operation, each targeting that operation's integration
+resource "aws_apigatewayv2_route" "operation_routes" {
+  for_each = local.operations
 
   api_id    = module.http_api.api_id
-  route_key = "\${each.key} /{proxy+}"
-  target    = "integrations/\${aws_apigatewayv2_integration.lambda_integration.id}"
+  route_key = local.route_key[each.key]
+  target    = "integrations/\${aws_apigatewayv2_integration.lambda_integration[each.key].id}"
 
   authorization_type = "JWT"
   authorizer_id      = aws_apigatewayv2_authorizer.cognito_authorizer.id
@@ -631,12 +704,14 @@ module "add_url_to_runtime_config" {
 
 # Lambda permission for API Gateway to invoke the function via alias
 resource "aws_lambda_permission" "api_gateway_invoke" {
+  for_each = local.operations
+
   statement_id  = "AllowExecutionFromAPIGateway"
   action        = "lambda:InvokeFunction"
-  function_name = aws_lambda_function.api_lambda.function_name
-  qualifier     = aws_lambda_alias.live.name
+  function_name = aws_lambda_function.api_lambda[each.key].function_name
+  qualifier     = aws_lambda_alias.live[each.key].name
   principal     = "apigateway.amazonaws.com"
-  source_arn    = "\${module.http_api.api_execution_arn}/*/*"
+  source_arn    = "\${module.http_api.api_execution_arn}/*/\${local.permission_source_suffix[each.key]}"
 
   depends_on = [module.http_api, aws_lambda_alias.live]
 }
@@ -679,73 +754,73 @@ output "stage_execution_arn" {
   value       = module.http_api.stage_execution_arn
 }
 
-# Lambda Function Outputs
-output "lambda_function_name" {
-  description = "Name of the Lambda function"
-  value       = aws_lambda_function.api_lambda.function_name
+# Lambda Function Outputs, keyed by operation name
+output "operations" {
+  description = "Names of the API operations, each with its own Lambda function"
+  value       = keys(local.operations)
 }
 
-output "lambda_function_arn" {
-  description = "ARN of the Lambda function"
-  value       = aws_lambda_function.api_lambda.arn
+output "lambda_function_names" {
+  description = "Name of each operation's Lambda function, keyed by operation name"
+  value       = { for op, fn in aws_lambda_function.api_lambda : op => fn.function_name }
 }
 
-output "lambda_invoke_arn" {
-  description = "Invoke ARN of the Lambda function"
-  value       = aws_lambda_function.api_lambda.invoke_arn
+output "lambda_function_arns" {
+  description = "ARN of each operation's Lambda function, keyed by operation name"
+  value       = { for op, fn in aws_lambda_function.api_lambda : op => fn.arn }
 }
 
-output "lambda_qualified_arn" {
-  description = "Qualified ARN of the Lambda function"
-  value       = aws_lambda_function.api_lambda.qualified_arn
+output "lambda_invoke_arns" {
+  description = "Invoke ARN of each operation's Lambda function, keyed by operation name"
+  value       = { for op, fn in aws_lambda_function.api_lambda : op => fn.invoke_arn }
 }
 
-output "lambda_version" {
-  description = "Version of the Lambda function"
-  value       = aws_lambda_function.api_lambda.version
+output "lambda_qualified_arns" {
+  description = "Qualified ARN of each operation's Lambda function, keyed by operation name"
+  value       = { for op, fn in aws_lambda_function.api_lambda : op => fn.qualified_arn }
 }
 
-output "lambda_source_code_hash" {
-  description = "Base64-encoded SHA256 hash of the Lambda deployment package"
-  value       = aws_lambda_function.api_lambda.source_code_hash
+output "lambda_versions" {
+  description = "Version of each operation's Lambda function, keyed by operation name"
+  value       = { for op, fn in aws_lambda_function.api_lambda : op => fn.version }
 }
 
-output "lambda_source_code_size" {
-  description = "Size of the Lambda deployment package in bytes"
-  value       = aws_lambda_function.api_lambda.source_code_size
+output "lambda_source_code_hash" {
+  description = "Base64-encoded SHA256 hash of the Lambda deployment package, shared by every operation"
+  value       = data.archive_file.lambda_zip.output_base64sha256
 }
 
-# IAM Role Outputs
-output "lambda_execution_role_arn" {
-  description = "ARN of the Lambda execution role"
-  value       = aws_iam_role.lambda_execution_role.arn
+# IAM Role Outputs, keyed by operation name
+output "lambda_execution_role_arns" {
+  description = "ARN of each operation's Lambda execution role, keyed by operation name"
+  value       = { for op, role in aws_iam_role.lambda_execution_role : op => role.arn }
 }
 
-output "lambda_execution_role_name" {
-  description = "Name of the Lambda execution role"
-  value       = aws_iam_role.lambda_execution_role.name
+output "lambda_execution_role_names" {
+  description = "Name of each operation's Lambda execution role, keyed by operation name. Attach additional policies to a specific operation's role by name."
+  value       = { for op, role in aws_iam_role.lambda_execution_role : op => role.name }
 }
 
 output "security_group_id" {
-  description = "Security group ID of the API Lambda function, for use in ingress rules on resources it must reach (e.g. a database). Null unless enable_vpc is true."
+  description = "Security group ID shared by the API Lambda functions, for use in ingress rules on resources they must reach (e.g. a database). Null unless enable_vpc is true."
   value       = var.enable_vpc ? aws_security_group.api_lambda[0].id : null
 }
 
-# Integration Outputs
-output "integration_id" {
-  description = "ID of the Lambda integration"
-  value       = aws_apigatewayv2_integration.lambda_integration.id
+# Integration Outputs, keyed by operation name
+output "integration_ids" {
+  description = "ID of each operation's Lambda integration, keyed by operation name"
+  value       = { for op, i in aws_apigatewayv2_integration.lambda_integration : op => i.id }
 }
 
-# CloudWatch Log Groups
-output "lambda_log_group_name" {
-  description = "Name of the Lambda CloudWatch log group"
-  value       = aws_cloudwatch_log_group.lambda_logs.name
+# CloudWatch Log Groups, keyed by operation name
+output "lambda_log_group_names" {
+  description = "Name of each operation's Lambda CloudWatch log group, keyed by operation name"
+  value       = { for op, lg in aws_cloudwatch_log_group.lambda_logs : op => lg.name }
 }
 
-output "lambda_log_group_arn" {
-  description = "ARN of the Lambda CloudWatch log group"
-  value       = aws_cloudwatch_log_group.lambda_logs.arn
+output "lambda_log_group_arns" {
+  description = "ARN of each operation's Lambda CloudWatch log group, keyed by operation name"
+  value       = { for op, lg in aws_cloudwatch_log_group.lambda_logs : op => lg.arn }
 }
 
 output "api_log_group_name" {
@@ -1016,10 +1091,18 @@ output "api_log_group_arn" {
   required_version = ">= 1.0"
 
   required_providers {
+    archive = {
+      source  = "hashicorp/archive"
+      version = "2.8.0"
+    }
     aws = {
       source  = "hashicorp/aws"
       version = "6.61.0"
     }
+    random = {
+      source  = "hashicorp/random"
+      version = "3.9.0"
+    }
   }
 }
 
@@ -1129,6 +1212,49 @@ resource "random_string" "suffix" {
   upper   = false
 }
 
+locals {
+  # Generated at build time from the API definition
+  operations_file = "\${path.module}/../../../generated/test-api/operations.json"
+  operations      = fileexists(local.operations_file) ? jsondecode(file(local.operations_file)) : {}
+
+  operation_slug = { for op in keys(local.operations) : op => replace(op, "/[^a-zA-Z0-9-_]/", "-") }
+  operation_hash = { for op in keys(local.operations) : op => substr(sha256(op), 0, 8) }
+
+  function_name = { for op in keys(local.operations) : op =>
+    "\${substr("TestApi-\${local.operation_slug[op]}", 0, 64 - length(local.operation_hash[op]) - length(random_string.suffix.result) - 2)}-\${local.operation_hash[op]}-\${random_string.suffix.result}"
+  }
+  role_name = { for op in keys(local.operations) : op =>
+    "\${substr("TestApi-\${local.operation_slug[op]}-role", 0, 64 - length(local.operation_hash[op]) - length(random_string.suffix.result) - 2)}-\${local.operation_hash[op]}-\${random_string.suffix.result}"
+  }
+
+  operation_path = { for op, details in local.operations : op =>
+    startswith(details.path, "/") ? details.path : "/\${details.path}"
+  }
+  route_key = { for op, details in local.operations : op =>
+    "\${upper(details.method)} \${local.operation_path[op]}"
+  }
+
+  permission_source_suffix = { for op, details in local.operations : op =>
+    "\${upper(details.method)}\${replace(local.operation_path[op], "/{[^}]*}/", "*")}"
+  }
+}
+
+resource "terraform_data" "operations_metadata" {
+  # Fails the plan when the operations metadata has not been generated
+  input = local.operations_file
+
+  lifecycle {
+    precondition {
+      condition     = fileexists(local.operations_file)
+      error_message = "Operations metadata not found at \${local.operations_file}. Build the TestApi project to generate it."
+    }
+    precondition {
+      condition     = length(local.operations) > 0
+      error_message = "No operations found in \${local.operations_file}. The TestApi API must define at least one operation."
+    }
+  }
+}
+
 # Resources
 
 # Create Lambda ZIP file from the bundle directory
@@ -1189,9 +1315,10 @@ resource "aws_vpc_security_group_egress_rule" "api_lambda_https" {
   description       = "Allow outbound HTTPS to AWS service endpoints"
 }
 
-# Lambda function
-# This configures a single "router" lambda to serve all requests
 resource "aws_lambda_function" "api_lambda" {
+  # One lambda function per operation, each serving just that operation
+  for_each = local.operations
+
   #checkov:skip=CKV_AWS_117:Lambda function is optionally deployed into a VPC via vpc_id/subnet_ids; not required for this use case
   #checkov:skip=CKV_AWS_116:Dead Letter Queue not required for this simple API use case
   #checkov:skip=CKV_AWS_272:Code signing not required for this use case
@@ -1200,8 +1327,8 @@ resource "aws_lambda_function" "api_lambda" {
   s3_bucket         = aws_s3_object.lambda_zip.bucket
   s3_key            = aws_s3_object.lambda_zip.key
   s3_object_version = aws_s3_object.lambda_zip.version_id
-  function_name    = "TestApiHandler-\${random_string.suffix.result}"
-  role            = aws_iam_role.lambda_execution_role.arn
+  function_name    = local.function_name[each.key]
+  role            = aws_iam_role.lambda_execution_role[each.key].arn
   handler         = "run.sh"
   runtime         = "python3.14"
   layers          = ["arn:aws:lambda:\${data.aws_region.current.region}:753240598075:layer:LambdaAdapterLayerX86:24"]
@@ -1246,7 +1373,9 @@ resource "aws_lambda_function" "api_lambda" {
 
 # IAM role for Lambda execution
 resource "aws_iam_role" "lambda_execution_role" {
-  name = "TestApiHandler-execution-role-\${random_string.suffix.result}"
+  for_each = local.operations
+
+  name = local.role_name[each.key]
 
   assume_role_policy = jsonencode({
     Version = "2012-10-17"
@@ -1266,32 +1395,38 @@ resource "aws_iam_role" "lambda_execution_role" {
 
 # Attach basic execution policy to Lambda role
 resource "aws_iam_role_policy_attachment" "lambda_basic_execution" {
+  for_each = local.operations
+
   policy_arn = "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-  role       = aws_iam_role.lambda_execution_role.name
+  role       = aws_iam_role.lambda_execution_role[each.key].name
 }
 
 # Attach X-Ray tracing policy to Lambda role
 resource "aws_iam_role_policy_attachment" "lambda_xray_execution" {
+  for_each = local.operations
+
   policy_arn = "arn:aws:iam::aws:policy/AWSXRayDaemonWriteAccess"
-  role       = aws_iam_role.lambda_execution_role.name
+  role       = aws_iam_role.lambda_execution_role[each.key].name
 }
 
 # Attach VPC access policy to Lambda role when deployed into a VPC
 resource "aws_iam_role_policy_attachment" "lambda_vpc_access" {
-  count      = var.enable_vpc ? 1 : 0
+  for_each = var.enable_vpc ? local.operations : {}
+
   policy_arn = "arn:aws:iam::aws:policy/service-role/AWSLambdaVPCAccessExecutionRole"
-  role       = aws_iam_role.lambda_execution_role.name
+  role       = aws_iam_role.lambda_execution_role[each.key].name
 }
 
 # Additional IAM policies for Lambda (if provided)
 resource "aws_iam_role_policy" "lambda_additional_policies" {
-  count = length(local.lambda_policy_statements) > 0 ? 1 : 0
-  name  = "TestApiHandler-additional-policies-\${random_string.suffix.result}"
-  role  = aws_iam_role.lambda_execution_role.id
+  for_each = local.operations
+
+  name = "\${substr(local.function_name[each.key], 0, 55)}-policies"
+  role = aws_iam_role.lambda_execution_role[each.key].id
 
   policy = jsonencode({
     Version = "2012-10-17"
-    Statement = local.lambda_policy_statements
+    Statement = local.lambda_policy_document_statements
   })
 }
 
@@ -1307,6 +1442,15 @@ locals {
       Resource = ["\${var.appconfig_application_arn}/*"]
     }
   ] : [], var.additional_iam_policy_statements)
+
+  # IAM rejects an empty statement list, so fall back to a no-op deny
+  lambda_policy_document_statements = length(local.lambda_policy_statements) > 0 ? local.lambda_policy_statements : [
+    {
+      Effect   = "Deny"
+      Action   = ["appconfig:GetLatestConfiguration"]
+      Resource = ["arn:aws:appconfig:\${data.aws_region.current.region}:\${data.aws_caller_identity.current.account_id}:application/none"]
+    }
+  ]
 }
 
 # CloudWatch Log Group for Lambda
@@ -1314,15 +1458,19 @@ resource "aws_cloudwatch_log_group" "lambda_logs" {
   #checkov:skip=CKV_AWS_158:Using default CloudWatch log encryption
   #checkov:skip=CKV_AWS_338:Log retention set to forever
   #checkov:skip=CKV_AWS_66:Log retention set to forever
-  name              = "/aws/lambda/TestApiHandler-\${random_string.suffix.result}"
-  tags              = var.tags
+  for_each = local.operations
+
+  name = "/aws/lambda/\${local.function_name[each.key]}"
+  tags = var.tags
 }
 
 # Lambda alias pointing to the latest published version for SnapStart
 resource "aws_lambda_alias" "live" {
+  for_each = local.operations
+
   name             = "live"
-  function_name    = aws_lambda_function.api_lambda.function_name
-  function_version = aws_lambda_function.api_lambda.version
+  function_name    = aws_lambda_function.api_lambda[each.key].function_name
+  function_version = aws_lambda_function.api_lambda[each.key].version
 
   depends_on = [aws_lambda_function.api_lambda]
 }
@@ -1409,7 +1557,8 @@ resource "aws_apigatewayv2_authorizer" "custom_authorizer" {
   authorizer_type                   = "REQUEST"
   authorizer_uri                    = aws_lambda_function.authorizer_lambda.invoke_arn
   authorizer_payload_format_version = "2.0"
-  authorizer_result_ttl_in_seconds  = 0
+  authorizer_result_ttl_in_seconds  = 300
+  identity_sources                  = ["$request.header.Authorization"]
   enable_simple_responses           = true
   name                              = "TestApiAuthorizer-\${random_string.suffix.result}"
 }
@@ -1424,9 +1573,11 @@ resource "aws_lambda_permission" "authorizer_invoke" {
 
 # Lambda integration for HTTP API
 resource "aws_apigatewayv2_integration" "lambda_integration" {
+  for_each = local.operations
+
   api_id           = module.http_api.api_id
   integration_type = "AWS_PROXY"
-  integration_uri  = aws_lambda_alias.live.invoke_arn
+  integration_uri  = aws_lambda_alias.live[each.key].invoke_arn
 
   payload_format_version = "2.0"
   timeout_milliseconds   = 30000
@@ -1434,15 +1585,13 @@ resource "aws_apigatewayv2_integration" "lambda_integration" {
   depends_on = [aws_lambda_alias.live]
 }
 
-# Route for proxy integration (catches all requests)
-resource "aws_apigatewayv2_route" "proxy_routes" {
-  # NB: OPTIONS is omitted here since API Gateway manages responding to preflight requests
-  # when cors settings are configured
-  for_each = toset(["GET", "POST", "PUT", "PATCH", "DELETE", "HEAD"])
+# One route per operation, each targeting that operation's integration
+resource "aws_apigatewayv2_route" "operation_routes" {
+  for_each = local.operations
 
   api_id    = module.http_api.api_id
-  route_key = "\${each.key} /{proxy+}"
-  target    = "integrations/\${aws_apigatewayv2_integration.lambda_integration.id}"
+  route_key = local.route_key[each.key]
+  target    = "integrations/\${aws_apigatewayv2_integration.lambda_integration[each.key].id}"
 
   authorization_type = "CUSTOM"
   authorizer_id      = aws_apigatewayv2_authorizer.custom_authorizer.id
@@ -1463,12 +1612,14 @@ module "add_url_to_runtime_config" {
 
 # Lambda permission for API Gateway to invoke the function via alias
 resource "aws_lambda_permission" "api_gateway_invoke" {
+  for_each = local.operations
+
   statement_id  = "AllowExecutionFromAPIGateway"
   action        = "lambda:InvokeFunction"
-  function_name = aws_lambda_function.api_lambda.function_name
-  qualifier     = aws_lambda_alias.live.name
+  function_name = aws_lambda_function.api_lambda[each.key].function_name
+  qualifier     = aws_lambda_alias.live[each.key].name
   principal     = "apigateway.amazonaws.com"
-  source_arn    = "\${module.http_api.api_execution_arn}/*/*"
+  source_arn    = "\${module.http_api.api_execution_arn}/*/\${local.permission_source_suffix[each.key]}"
 
   depends_on = [module.http_api, aws_lambda_alias.live]
 }
@@ -1511,73 +1662,73 @@ output "stage_execution_arn" {
   value       = module.http_api.stage_execution_arn
 }
 
-# Lambda Function Outputs
-output "lambda_function_name" {
-  description = "Name of the Lambda function"
-  value       = aws_lambda_function.api_lambda.function_name
+# Lambda Function Outputs, keyed by operation name
+output "operations" {
+  description = "Names of the API operations, each with its own Lambda function"
+  value       = keys(local.operations)
 }
 
-output "lambda_function_arn" {
-  description = "ARN of the Lambda function"
-  value       = aws_lambda_function.api_lambda.arn
+output "lambda_function_names" {
+  description = "Name of each operation's Lambda function, keyed by operation name"
+  value       = { for op, fn in aws_lambda_function.api_lambda : op => fn.function_name }
 }
 
-output "lambda_invoke_arn" {
-  description = "Invoke ARN of the Lambda function"
-  value       = aws_lambda_function.api_lambda.invoke_arn
+output "lambda_function_arns" {
+  description = "ARN of each operation's Lambda function, keyed by operation name"
+  value       = { for op, fn in aws_lambda_function.api_lambda : op => fn.arn }
 }
 
-output "lambda_qualified_arn" {
-  description = "Qualified ARN of the Lambda function"
-  value       = aws_lambda_function.api_lambda.qualified_arn
+output "lambda_invoke_arns" {
+  description = "Invoke ARN of each operation's Lambda function, keyed by operation name"
+  value       = { for op, fn in aws_lambda_function.api_lambda : op => fn.invoke_arn }
 }
 
-output "lambda_version" {
-  description = "Version of the Lambda function"
-  value       = aws_lambda_function.api_lambda.version
+output "lambda_qualified_arns" {
+  description = "Qualified ARN of each operation's Lambda function, keyed by operation name"
+  value       = { for op, fn in aws_lambda_function.api_lambda : op => fn.qualified_arn }
 }
 
-output "lambda_source_code_hash" {
-  description = "Base64-encoded SHA256 hash of the Lambda deployment package"
-  value       = aws_lambda_function.api_lambda.source_code_hash
+output "lambda_versions" {
+  description = "Version of each operation's Lambda function, keyed by operation name"
+  value       = { for op, fn in aws_lambda_function.api_lambda : op => fn.version }
 }
 
-output "lambda_source_code_size" {
-  description = "Size of the Lambda deployment package in bytes"
-  value       = aws_lambda_function.api_lambda.source_code_size
+output "lambda_source_code_hash" {
+  description = "Base64-encoded SHA256 hash of the Lambda deployment package, shared by every operation"
+  value       = data.archive_file.lambda_zip.output_base64sha256
 }
 
-# IAM Role Outputs
-output "lambda_execution_role_arn" {
-  description = "ARN of the Lambda execution role"
-  value       = aws_iam_role.lambda_execution_role.arn
+# IAM Role Outputs, keyed by operation name
+output "lambda_execution_role_arns" {
+  description = "ARN of each operation's Lambda execution role, keyed by operation name"
+  value       = { for op, role in aws_iam_role.lambda_execution_role : op => role.arn }
 }
 
-output "lambda_execution_role_name" {
-  description = "Name of the Lambda execution role"
-  value       = aws_iam_role.lambda_execution_role.name
+output "lambda_execution_role_names" {
+  description = "Name of each operation's Lambda execution role, keyed by operation name. Attach additional policies to a specific operation's role by name."
+  value       = { for op, role in aws_iam_role.lambda_execution_role : op => role.name }
 }
 
 output "security_group_id" {
-  description = "Security group ID of the API Lambda function, for use in ingress rules on resources it must reach (e.g. a database). Null unless enable_vpc is true."
+  description = "Security group ID shared by the API Lambda functions, for use in ingress rules on resources they must reach (e.g. a database). Null unless enable_vpc is true."
   value       = var.enable_vpc ? aws_security_group.api_lambda[0].id : null
 }
 
-# Integration Outputs
-output "integration_id" {
-  description = "ID of the Lambda integration"
-  value       = aws_apigatewayv2_integration.lambda_integration.id
+# Integration Outputs, keyed by operation name
+output "integration_ids" {
+  description = "ID of each operation's Lambda integration, keyed by operation name"
+  value       = { for op, i in aws_apigatewayv2_integration.lambda_integration : op => i.id }
 }
 
-# CloudWatch Log Groups
-output "lambda_log_group_name" {
-  description = "Name of the Lambda CloudWatch log group"
-  value       = aws_cloudwatch_log_group.lambda_logs.name
+# CloudWatch Log Groups, keyed by operation name
+output "lambda_log_group_names" {
+  description = "Name of each operation's Lambda CloudWatch log group, keyed by operation name"
+  value       = { for op, lg in aws_cloudwatch_log_group.lambda_logs : op => lg.name }
 }
 
-output "lambda_log_group_arn" {
-  description = "ARN of the Lambda CloudWatch log group"
-  value       = aws_cloudwatch_log_group.lambda_logs.arn
+output "lambda_log_group_arns" {
+  description = "ARN of each operation's Lambda CloudWatch log group, keyed by operation name"
+  value       = { for op, lg in aws_cloudwatch_log_group.lambda_logs : op => lg.arn }
 }
 
 output "api_log_group_name" {
@@ -1848,10 +1999,18 @@ output "api_log_group_arn" {
   required_version = ">= 1.0"
 
   required_providers {
+    archive = {
+      source  = "hashicorp/archive"
+      version = "2.8.0"
+    }
     aws = {
       source  = "hashicorp/aws"
       version = "6.61.0"
     }
+    random = {
+      source  = "hashicorp/random"
+      version = "3.9.0"
+    }
   }
 }
 
@@ -1961,6 +2120,49 @@ resource "random_string" "suffix" {
   upper   = false
 }
 
+locals {
+  # Generated at build time from the API definition
+  operations_file = "\${path.module}/../../../generated/test-api/operations.json"
+  operations      = fileexists(local.operations_file) ? jsondecode(file(local.operations_file)) : {}
+
+  operation_slug = { for op in keys(local.operations) : op => replace(op, "/[^a-zA-Z0-9-_]/", "-") }
+  operation_hash = { for op in keys(local.operations) : op => substr(sha256(op), 0, 8) }
+
+  function_name = { for op in keys(local.operations) : op =>
+    "\${substr("TestApi-\${local.operation_slug[op]}", 0, 64 - length(local.operation_hash[op]) - length(random_string.suffix.result) - 2)}-\${local.operation_hash[op]}-\${random_string.suffix.result}"
+  }
+  role_name = { for op in keys(local.operations) : op =>
+    "\${substr("TestApi-\${local.operation_slug[op]}-role", 0, 64 - length(local.operation_hash[op]) - length(random_string.suffix.result) - 2)}-\${local.operation_hash[op]}-\${random_string.suffix.result}"
+  }
+
+  operation_path = { for op, details in local.operations : op =>
+    startswith(details.path, "/") ? details.path : "/\${details.path}"
+  }
+  route_key = { for op, details in local.operations : op =>
+    "\${upper(details.method)} \${local.operation_path[op]}"
+  }
+
+  permission_source_suffix = { for op, details in local.operations : op =>
+    "\${upper(details.method)}\${replace(local.operation_path[op], "/{[^}]*}/", "*")}"
+  }
+}
+
+resource "terraform_data" "operations_metadata" {
+  # Fails the plan when the operations metadata has not been generated
+  input = local.operations_file
+
+  lifecycle {
+    precondition {
+      condition     = fileexists(local.operations_file)
+      error_message = "Operations metadata not found at \${local.operations_file}. Build the TestApi project to generate it."
+    }
+    precondition {
+      condition     = length(local.operations) > 0
+      error_message = "No operations found in \${local.operations_file}. The TestApi API must define at least one operation."
+    }
+  }
+}
+
 # Resources
 
 # Create Lambda ZIP file from the bundle directory
@@ -2021,9 +2223,10 @@ resource "aws_vpc_security_group_egress_rule" "api_lambda_https" {
   description       = "Allow outbound HTTPS to AWS service endpoints"
 }
 
-# Lambda function
-# This configures a single "router" lambda to serve all requests
 resource "aws_lambda_function" "api_lambda" {
+  # One lambda function per operation, each serving just that operation
+  for_each = local.operations
+
   #checkov:skip=CKV_AWS_117:Lambda function is optionally deployed into a VPC via vpc_id/subnet_ids; not required for this use case
   #checkov:skip=CKV_AWS_116:Dead Letter Queue not required for this simple API use case
   #checkov:skip=CKV_AWS_272:Code signing not required for this use case
@@ -2032,8 +2235,8 @@ resource "aws_lambda_function" "api_lambda" {
   s3_bucket         = aws_s3_object.lambda_zip.bucket
   s3_key            = aws_s3_object.lambda_zip.key
   s3_object_version = aws_s3_object.lambda_zip.version_id
-  function_name    = "TestApiHandler-\${random_string.suffix.result}"
-  role            = aws_iam_role.lambda_execution_role.arn
+  function_name    = local.function_name[each.key]
+  role            = aws_iam_role.lambda_execution_role[each.key].arn
   handler         = "run.sh"
   runtime         = "python3.14"
   layers          = ["arn:aws:lambda:\${data.aws_region.current.region}:753240598075:layer:LambdaAdapterLayerX86:24"]
@@ -2078,7 +2281,9 @@ resource "aws_lambda_function" "api_lambda" {
 
 # IAM role for Lambda execution
 resource "aws_iam_role" "lambda_execution_role" {
-  name = "TestApiHandler-execution-role-\${random_string.suffix.result}"
+  for_each = local.operations
+
+  name = local.role_name[each.key]
 
   assume_role_policy = jsonencode({
     Version = "2012-10-17"
@@ -2098,32 +2303,38 @@ resource "aws_iam_role" "lambda_execution_role" {
 
 # Attach basic execution policy to Lambda role
 resource "aws_iam_role_policy_attachment" "lambda_basic_execution" {
+  for_each = local.operations
+
   policy_arn = "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-  role       = aws_iam_role.lambda_execution_role.name
+  role       = aws_iam_role.lambda_execution_role[each.key].name
 }
 
 # Attach X-Ray tracing policy to Lambda role
 resource "aws_iam_role_policy_attachment" "lambda_xray_execution" {
+  for_each = local.operations
+
   policy_arn = "arn:aws:iam::aws:policy/AWSXRayDaemonWriteAccess"
-  role       = aws_iam_role.lambda_execution_role.name
+  role       = aws_iam_role.lambda_execution_role[each.key].name
 }
 
 # Attach VPC access policy to Lambda role when deployed into a VPC
 resource "aws_iam_role_policy_attachment" "lambda_vpc_access" {
-  count      = var.enable_vpc ? 1 : 0
+  for_each = var.enable_vpc ? local.operations : {}
+
   policy_arn = "arn:aws:iam::aws:policy/service-role/AWSLambdaVPCAccessExecutionRole"
-  role       = aws_iam_role.lambda_execution_role.name
+  role       = aws_iam_role.lambda_execution_role[each.key].name
 }
 
 # Additional IAM policies for Lambda (if provided)
 resource "aws_iam_role_policy" "lambda_additional_policies" {
-  count = length(local.lambda_policy_statements) > 0 ? 1 : 0
-  name  = "TestApiHandler-additional-policies-\${random_string.suffix.result}"
-  role  = aws_iam_role.lambda_execution_role.id
+  for_each = local.operations
+
+  name = "\${substr(local.function_name[each.key], 0, 55)}-policies"
+  role = aws_iam_role.lambda_execution_role[each.key].id
 
   policy = jsonencode({
     Version = "2012-10-17"
-    Statement = local.lambda_policy_statements
+    Statement = local.lambda_policy_document_statements
   })
 }
 
@@ -2139,6 +2350,15 @@ locals {
       Resource = ["\${var.appconfig_application_arn}/*"]
     }
   ] : [], var.additional_iam_policy_statements)
+
+  # IAM rejects an empty statement list, so fall back to a no-op deny
+  lambda_policy_document_statements = length(local.lambda_policy_statements) > 0 ? local.lambda_policy_statements : [
+    {
+      Effect   = "Deny"
+      Action   = ["appconfig:GetLatestConfiguration"]
+      Resource = ["arn:aws:appconfig:\${data.aws_region.current.region}:\${data.aws_caller_identity.current.account_id}:application/none"]
+    }
+  ]
 }
 
 # CloudWatch Log Group for Lambda
@@ -2146,15 +2366,19 @@ resource "aws_cloudwatch_log_group" "lambda_logs" {
   #checkov:skip=CKV_AWS_158:Using default CloudWatch log encryption
   #checkov:skip=CKV_AWS_338:Log retention set to forever
   #checkov:skip=CKV_AWS_66:Log retention set to forever
-  name              = "/aws/lambda/TestApiHandler-\${random_string.suffix.result}"
-  tags              = var.tags
+  for_each = local.operations
+
+  name = "/aws/lambda/\${local.function_name[each.key]}"
+  tags = var.tags
 }
 
 # Lambda alias pointing to the latest published version for SnapStart
 resource "aws_lambda_alias" "live" {
+  for_each = local.operations
+
   name             = "live"
-  function_name    = aws_lambda_function.api_lambda.function_name
-  function_version = aws_lambda_function.api_lambda.version
+  function_name    = aws_lambda_function.api_lambda[each.key].function_name
+  function_version = aws_lambda_function.api_lambda[each.key].version
 
   depends_on = [aws_lambda_function.api_lambda]
 }
@@ -2162,9 +2386,11 @@ resource "aws_lambda_alias" "live" {
 
 # Lambda integration for HTTP API
 resource "aws_apigatewayv2_integration" "lambda_integration" {
+  for_each = local.operations
+
   api_id           = module.http_api.api_id
   integration_type = "AWS_PROXY"
-  integration_uri  = aws_lambda_alias.live.invoke_arn
+  integration_uri  = aws_lambda_alias.live[each.key].invoke_arn
 
   payload_format_version = "2.0"
   timeout_milliseconds   = 30000
@@ -2172,15 +2398,13 @@ resource "aws_apigatewayv2_integration" "lambda_integration" {
   depends_on = [aws_lambda_alias.live]
 }
 
-# Route for proxy integration (catches all requests)
-resource "aws_apigatewayv2_route" "proxy_routes" {
-  # NB: OPTIONS is omitted here since API Gateway manages responding to preflight requests
-  # when cors settings are configured
-  for_each = toset(["GET", "POST", "PUT", "PATCH", "DELETE", "HEAD"])
+# One route per operation, each targeting that operation's integration
+resource "aws_apigatewayv2_route" "operation_routes" {
+  for_each = local.operations
 
   api_id    = module.http_api.api_id
-  route_key = "\${each.key} /{proxy+}"
-  target    = "integrations/\${aws_apigatewayv2_integration.lambda_integration.id}"
+  route_key = local.route_key[each.key]
+  target    = "integrations/\${aws_apigatewayv2_integration.lambda_integration[each.key].id}"
 
   authorization_type = "AWS_IAM"
 
@@ -2200,12 +2424,14 @@ module "add_url_to_runtime_config" {
 
 # Lambda permission for API Gateway to invoke the function via alias
 resource "aws_lambda_permission" "api_gateway_invoke" {
+  for_each = local.operations
+
   statement_id  = "AllowExecutionFromAPIGateway"
   action        = "lambda:InvokeFunction"
-  function_name = aws_lambda_function.api_lambda.function_name
-  qualifier     = aws_lambda_alias.live.name
+  function_name = aws_lambda_function.api_lambda[each.key].function_name
+  qualifier     = aws_lambda_alias.live[each.key].name
   principal     = "apigateway.amazonaws.com"
-  source_arn    = "\${module.http_api.api_execution_arn}/*/*"
+  source_arn    = "\${module.http_api.api_execution_arn}/*/\${local.permission_source_suffix[each.key]}"
 
   depends_on = [module.http_api, aws_lambda_alias.live]
 }
@@ -2248,73 +2474,73 @@ output "stage_execution_arn" {
   value       = module.http_api.stage_execution_arn
 }
 
-# Lambda Function Outputs
-output "lambda_function_name" {
-  description = "Name of the Lambda function"
-  value       = aws_lambda_function.api_lambda.function_name
+# Lambda Function Outputs, keyed by operation name
+output "operations" {
+  description = "Names of the API operations, each with its own Lambda function"
+  value       = keys(local.operations)
 }
 
-output "lambda_function_arn" {
-  description = "ARN of the Lambda function"
-  value       = aws_lambda_function.api_lambda.arn
+output "lambda_function_names" {
+  description = "Name of each operation's Lambda function, keyed by operation name"
+  value       = { for op, fn in aws_lambda_function.api_lambda : op => fn.function_name }
 }
 
-output "lambda_invoke_arn" {
-  description = "Invoke ARN of the Lambda function"
-  value       = aws_lambda_function.api_lambda.invoke_arn
+output "lambda_function_arns" {
+  description = "ARN of each operation's Lambda function, keyed by operation name"
+  value       = { for op, fn in aws_lambda_function.api_lambda : op => fn.arn }
 }
 
-output "lambda_qualified_arn" {
-  description = "Qualified ARN of the Lambda function"
-  value       = aws_lambda_function.api_lambda.qualified_arn
+output "lambda_invoke_arns" {
+  description = "Invoke ARN of each operation's Lambda function, keyed by operation name"
+  value       = { for op, fn in aws_lambda_function.api_lambda : op => fn.invoke_arn }
 }
 
-output "lambda_version" {
-  description = "Version of the Lambda function"
-  value       = aws_lambda_function.api_lambda.version
+output "lambda_qualified_arns" {
+  description = "Qualified ARN of each operation's Lambda function, keyed by operation name"
+  value       = { for op, fn in aws_lambda_function.api_lambda : op => fn.qualified_arn }
 }
 
-output "lambda_source_code_hash" {
-  description = "Base64-encoded SHA256 hash of the Lambda deployment package"
-  value       = aws_lambda_function.api_lambda.source_code_hash
+output "lambda_versions" {
+  description = "Version of each operation's Lambda function, keyed by operation name"
+  value       = { for op, fn in aws_lambda_function.api_lambda : op => fn.version }
 }
 
-output "lambda_source_code_size" {
-  description = "Size of the Lambda deployment package in bytes"
-  value       = aws_lambda_function.api_lambda.source_code_size
+output "lambda_source_code_hash" {
+  description = "Base64-encoded SHA256 hash of the Lambda deployment package, shared by every operation"
+  value       = data.archive_file.lambda_zip.output_base64sha256
 }
 
-# IAM Role Outputs
-output "lambda_execution_role_arn" {
-  description = "ARN of the Lambda execution role"
-  value       = aws_iam_role.lambda_execution_role.arn
+# IAM Role Outputs, keyed by operation name
+output "lambda_execution_role_arns" {
+  description = "ARN of each operation's Lambda execution role, keyed by operation name"
+  value       = { for op, role in aws_iam_role.lambda_execution_role : op => role.arn }
 }
 
-output "lambda_execution_role_name" {
-  description = "Name of the Lambda execution role"
-  value       = aws_iam_role.lambda_execution_role.name
+output "lambda_execution_role_names" {
+  description = "Name of each operation's Lambda execution role, keyed by operation name. Attach additional policies to a specific operation's role by name."
+  value       = { for op, role in aws_iam_role.lambda_execution_role : op => role.name }
 }
 
 output "security_group_id" {
-  description = "Security group ID of the API Lambda function, for use in ingress rules on resources it must reach (e.g. a database). Null unless enable_vpc is true."
+  description = "Security group ID shared by the API Lambda functions, for use in ingress rules on resources they must reach (e.g. a database). Null unless enable_vpc is true."
   value       = var.enable_vpc ? aws_security_group.api_lambda[0].id : null
 }
 
-# Integration Outputs
-output "integration_id" {
-  description = "ID of the Lambda integration"
-  value       = aws_apigatewayv2_integration.lambda_integration.id
+# Integration Outputs, keyed by operation name
+output "integration_ids" {
+  description = "ID of each operation's Lambda integration, keyed by operation name"
+  value       = { for op, i in aws_apigatewayv2_integration.lambda_integration : op => i.id }
 }
 
-# CloudWatch Log Groups
-output "lambda_log_group_name" {
-  description = "Name of the Lambda CloudWatch log group"
-  value       = aws_cloudwatch_log_group.lambda_logs.name
+# CloudWatch Log Groups, keyed by operation name
+output "lambda_log_group_names" {
+  description = "Name of each operation's Lambda CloudWatch log group, keyed by operation name"
+  value       = { for op, lg in aws_cloudwatch_log_group.lambda_logs : op => lg.name }
 }
 
-output "lambda_log_group_arn" {
-  description = "ARN of the Lambda CloudWatch log group"
-  value       = aws_cloudwatch_log_group.lambda_logs.arn
+output "lambda_log_group_arns" {
+  description = "ARN of each operation's Lambda CloudWatch log group, keyed by operation name"
+  value       = { for op, lg in aws_cloudwatch_log_group.lambda_logs : op => lg.arn }
 }
 
 output "api_log_group_name" {
@@ -2533,22 +2759,75 @@ resource "aws_wafv2_web_acl" "api_waf" {
   }
 }
 
+resource "random_id" "waf_log_suffix" {
+  count       = var.enable_waf ? 1 : 0
+  byte_length = 4
+}
+
+locals {
+  waf_log_group_name = var.enable_waf ? "aws-waf-logs-\${var.api_name}-\${random_id.waf_log_suffix[0].hex}" : null
+}
+
+# KMS key for encrypting WAF request logs at rest
+resource "aws_kms_key" "waf_logs" {
+  count = var.enable_waf ? 1 : 0
+
+  description             = "\${var.api_name} API WAF log encryption"
+  deletion_window_in_days = 7
+  enable_key_rotation     = true
+
+  policy = jsonencode({
+    Version = "2012-10-17"
+    Statement = [
+      {
+        Sid       = "Enable IAM User Permissions"
+        Effect    = "Allow"
+        Principal = { AWS = "arn:aws:iam::\${data.aws_caller_identity.current.account_id}:root" }
+        Action    = "kms:*"
+        Resource  = "*"
+      },
+      {
+        Sid       = "Allow CloudWatch Logs"
+        Effect    = "Allow"
+        Principal = { Service = "logs.\${data.aws_region.current.region}.amazonaws.com" }
+        Action = [
+          "kms:Encrypt",
+          "kms:Decrypt",
+          "kms:ReEncrypt*",
+          "kms:GenerateDataKey*",
+          "kms:DescribeKey"
+        ]
+        Resource = "*"
+        Condition = {
+          ArnEquals = {
+            "kms:EncryptionContext:aws:logs:arn" = "arn:aws:logs:\${data.aws_region.current.region}:\${data.aws_caller_identity.current.account_id}:log-group:\${local.waf_log_group_name}"
+          }
+        }
+      }
+    ]
+  })
+
+  tags = var.tags
+}
+
+resource "aws_kms_alias" "waf_logs" {
+  count = var.enable_waf ? 1 : 0
+
+  name          = "alias/\${var.api_name}-\${random_id.waf_log_suffix[0].hex}-waf-logs"
+  target_key_id = aws_kms_key.waf_logs[0].key_id
+}
+
 # CloudWatch Log Group for WAF request logs. Name must start with \`aws-waf-logs-\`.
 resource "aws_cloudwatch_log_group" "api_waf_logs" {
-  #checkov:skip=CKV_AWS_158:Using default CloudWatch log encryption
   #checkov:skip=CKV_AWS_338:Log retention set to one month which is sufficient for WAF logs
   count = var.enable_waf ? 1 : 0
 
-  name              = "aws-waf-logs-\${var.api_name}-\${random_id.waf_log_suffix[0].hex}"
+  name              = local.waf_log_group_name
   retention_in_days = 30
+  kms_key_id        = aws_kms_key.waf_logs[0].arn
   tags              = var.tags
 }
 
-resource "random_id" "waf_log_suffix" {
-  count       = var.enable_waf ? 1 : 0
-  byte_length = 4
-}
-
 resource "aws_wafv2_web_acl_logging_configuration" "api_waf_logging" {
   count = var.enable_waf ? 1 : 0
 
@@ -2594,10 +2873,18 @@ output "waf_web_acl_arn" {
   required_version = ">= 1.0"
 
   required_providers {
+    archive = {
+      source  = "hashicorp/archive"
+      version = "2.8.0"
+    }
     aws = {
       source  = "hashicorp/aws"
       version = "6.61.0"
     }
+    random = {
+      source  = "hashicorp/random"
+      version = "3.9.0"
+    }
   }
 }
 
@@ -2713,63 +3000,292 @@ resource "random_string" "suffix" {
   upper   = false
 }
 
-# Resources
+locals {
+  # Generated at build time from the API definition
+  operations_file = "\${path.module}/../../../generated/test-api/operations.json"
+  operations      = fileexists(local.operations_file) ? jsondecode(file(local.operations_file)) : {}
 
-# Create Lambda ZIP file from the bundle directory
-data "archive_file" "lambda_zip" {
-  type        = "zip"
-  source_dir  = "\${path.module}/../../../../../../../dist/apps/test_api/bundle-x86"
-  output_path = "\${path.module}/../../../../../../../dist/packages/common/terraform/apis/test-api/lambda.zip"
+  operation_slug = { for op in keys(local.operations) : op => replace(op, "/[^a-zA-Z0-9-_]/", "-") }
+  operation_hash = { for op in keys(local.operations) : op => substr(sha256(op), 0, 8) }
+
+  function_name = { for op in keys(local.operations) : op =>
+    "\${substr("TestApi-\${local.operation_slug[op]}", 0, 64 - length(local.operation_hash[op]) - length(random_string.suffix.result) - 2)}-\${local.operation_hash[op]}-\${random_string.suffix.result}"
+  }
+  role_name = { for op in keys(local.operations) : op =>
+    "\${substr("TestApi-\${local.operation_slug[op]}-role", 0, 64 - length(local.operation_hash[op]) - length(random_string.suffix.result) - 2)}-\${local.operation_hash[op]}-\${random_string.suffix.result}"
+  }
+
+  # A REST API needs a resource per path segment, so each operation's path is
+  # split into the distinct path prefixes the resource tree is built from below
+  operation_segments = { for op, details in local.operations : op => compact(split("/", details.path)) }
+
+  path_nodes = merge([
+    for op, segments in local.operation_segments : {
+      for i, segment in segments : join("/", slice(segments, 0, i + 1)) => {
+        depth  = i
+        parent = i == 0 ? "" : join("/", slice(segments, 0, i))
+        part   = segment
+      }
+    }
+  ]...)
+
+  # Instances of a resource cannot reference one another, so each depth is a
+  # separate resource. Deeper paths are reported by the precondition below.
+  max_path_depth = 16
+  path_nodes_by_depth = { for depth in range(local.max_path_depth) : depth => {
+    for path, node in local.path_nodes : path => node if node.depth == depth
+  } }
+  paths_too_deep = [for path, node in local.path_nodes : path if node.depth >= local.max_path_depth]
+
+  resource_ids = merge(
+    { for path, resource in aws_api_gateway_resource.path_depth_0 : path => resource.id },
+    { for path, resource in aws_api_gateway_resource.path_depth_1 : path => resource.id },
+    { for path, resource in aws_api_gateway_resource.path_depth_2 : path => resource.id },
+    { for path, resource in aws_api_gateway_resource.path_depth_3 : path => resource.id },
+    { for path, resource in aws_api_gateway_resource.path_depth_4 : path => resource.id },
+    { for path, resource in aws_api_gateway_resource.path_depth_5 : path => resource.id },
+    { for path, resource in aws_api_gateway_resource.path_depth_6 : path => resource.id },
+    { for path, resource in aws_api_gateway_resource.path_depth_7 : path => resource.id },
+    { for path, resource in aws_api_gateway_resource.path_depth_8 : path => resource.id },
+    { for path, resource in aws_api_gateway_resource.path_depth_9 : path => resource.id },
+    { for path, resource in aws_api_gateway_resource.path_depth_10 : path => resource.id },
+    { for path, resource in aws_api_gateway_resource.path_depth_11 : path => resource.id },
+    { for path, resource in aws_api_gateway_resource.path_depth_12 : path => resource.id },
+    { for path, resource in aws_api_gateway_resource.path_depth_13 : path => resource.id },
+    { for path, resource in aws_api_gateway_resource.path_depth_14 : path => resource.id },
+    { for path, resource in aws_api_gateway_resource.path_depth_15 : path => resource.id },
+  )
+
+  operation_resource_id = { for op, segments in local.operation_segments : op =>
+    local.resource_ids[join("/", segments)]
+  }
+
+  permission_source_suffix = { for op, details in local.operations : op =>
+    "\${upper(details.method)}/\${replace(join("/", local.operation_segments[op]), "/{[^}]*}/", "*")}"
+  }
 }
 
-resource "aws_s3_object" "lambda_zip" {
-  bucket      = var.asset_bucket_name
-  key         = "apis/test-api/\${data.archive_file.lambda_zip.output_sha256}.zip"
-  source      = data.archive_file.lambda_zip.output_path
-  source_hash = data.archive_file.lambda_zip.output_base64sha256
-  etag        = data.archive_file.lambda_zip.output_md5
+resource "terraform_data" "operations_metadata" {
+  # Fails the plan when the operations metadata has not been generated
+  input = local.operations_file
+
+  lifecycle {
+    precondition {
+      condition     = fileexists(local.operations_file)
+      error_message = "Operations metadata not found at \${local.operations_file}. Build the TestApi project to generate it."
+    }
+    precondition {
+      condition     = length(local.operations) > 0
+      error_message = "No operations found in \${local.operations_file}. The TestApi API must define at least one operation."
+    }
+    precondition {
+      condition     = length(local.paths_too_deep) == 0
+      error_message = "Operation paths exceed the supported depth of \${local.max_path_depth} segments: \${join(", ", local.paths_too_deep)}. Add further aws_api_gateway_resource levels to this module to support them."
+    }
+  }
 }
 
-# Use the core REST API module
-# Account-level CloudWatch role required for REST API access logging
-module "account" {
-  source = "../../../core/api/api-gateway-account"
+# API Gateway resources at path depth 0
+resource "aws_api_gateway_resource" "path_depth_0" {
+  for_each = local.path_nodes_by_depth[0]
+
+  rest_api_id = module.rest_api.api_id
+  parent_id   = module.rest_api.api_root_resource_id
+  path_part   = each.value.part
 }
 
-module "rest_api" {
-  source = "../../../core/api/rest-api"
+# API Gateway resources at path depth 1
+resource "aws_api_gateway_resource" "path_depth_1" {
+  for_each = local.path_nodes_by_depth[1]
 
-  api_name        = "TestApi-\${random_string.suffix.result}"
-  api_description = "TestApi REST API"
-  stage_name      = "prod"
-  stage_auto_deploy = true
+  rest_api_id = module.rest_api.api_id
+  parent_id   = aws_api_gateway_resource.path_depth_0[each.value.parent].id
+  path_part   = each.value.part
+}
 
-  # WAF Configuration
-  enable_waf = var.enable_waf
+# API Gateway resources at path depth 2
+resource "aws_api_gateway_resource" "path_depth_2" {
+  for_each = local.path_nodes_by_depth[2]
 
-  # CORS Configuration
-  cors_allow_headers     = var.cors_allow_headers
-  cors_allow_methods     = var.cors_allow_methods
-  cors_allow_origins     = var.cors_allow_origins
+  rest_api_id = module.rest_api.api_id
+  parent_id   = aws_api_gateway_resource.path_depth_1[each.value.parent].id
+  path_part   = each.value.part
+}
 
-  # Tags
-  tags = var.tags
+# API Gateway resources at path depth 3
+resource "aws_api_gateway_resource" "path_depth_3" {
+  for_each = local.path_nodes_by_depth[3]
+
+  rest_api_id = module.rest_api.api_id
+  parent_id   = aws_api_gateway_resource.path_depth_2[each.value.parent].id
+  path_part   = each.value.part
 }
 
-resource "aws_wafv2_web_acl_association" "api_waf_association" {
-  count = var.enable_waf ? 1 : 0
+# API Gateway resources at path depth 4
+resource "aws_api_gateway_resource" "path_depth_4" {
+  for_each = local.path_nodes_by_depth[4]
 
-  resource_arn = aws_api_gateway_stage.api_stage.arn
-  web_acl_arn  = module.rest_api.waf_web_acl_arn
+  rest_api_id = module.rest_api.api_id
+  parent_id   = aws_api_gateway_resource.path_depth_3[each.value.parent].id
+  path_part   = each.value.part
+}
 
-  depends_on = [aws_api_gateway_stage.api_stage]
+# API Gateway resources at path depth 5
+resource "aws_api_gateway_resource" "path_depth_5" {
+  for_each = local.path_nodes_by_depth[5]
+
+  rest_api_id = module.rest_api.api_id
+  parent_id   = aws_api_gateway_resource.path_depth_4[each.value.parent].id
+  path_part   = each.value.part
 }
 
-# Security group for the API Lambda function, used when deployed into a VPC
-resource "aws_security_group" "api_lambda" {
-  count = var.enable_vpc ? 1 : 0
+# API Gateway resources at path depth 6
+resource "aws_api_gateway_resource" "path_depth_6" {
+  for_each = local.path_nodes_by_depth[6]
 
-  #checkov:skip=CKV2_AWS_5:Attached to api_lambda via vpc_config block; Checkov cannot resolve this reference
+  rest_api_id = module.rest_api.api_id
+  parent_id   = aws_api_gateway_resource.path_depth_5[each.value.parent].id
+  path_part   = each.value.part
+}
+
+# API Gateway resources at path depth 7
+resource "aws_api_gateway_resource" "path_depth_7" {
+  for_each = local.path_nodes_by_depth[7]
+
+  rest_api_id = module.rest_api.api_id
+  parent_id   = aws_api_gateway_resource.path_depth_6[each.value.parent].id
+  path_part   = each.value.part
+}
+
+# API Gateway resources at path depth 8
+resource "aws_api_gateway_resource" "path_depth_8" {
+  for_each = local.path_nodes_by_depth[8]
+
+  rest_api_id = module.rest_api.api_id
+  parent_id   = aws_api_gateway_resource.path_depth_7[each.value.parent].id
+  path_part   = each.value.part
+}
+
+# API Gateway resources at path depth 9
+resource "aws_api_gateway_resource" "path_depth_9" {
+  for_each = local.path_nodes_by_depth[9]
+
+  rest_api_id = module.rest_api.api_id
+  parent_id   = aws_api_gateway_resource.path_depth_8[each.value.parent].id
+  path_part   = each.value.part
+}
+
+# API Gateway resources at path depth 10
+resource "aws_api_gateway_resource" "path_depth_10" {
+  for_each = local.path_nodes_by_depth[10]
+
+  rest_api_id = module.rest_api.api_id
+  parent_id   = aws_api_gateway_resource.path_depth_9[each.value.parent].id
+  path_part   = each.value.part
+}
+
+# API Gateway resources at path depth 11
+resource "aws_api_gateway_resource" "path_depth_11" {
+  for_each = local.path_nodes_by_depth[11]
+
+  rest_api_id = module.rest_api.api_id
+  parent_id   = aws_api_gateway_resource.path_depth_10[each.value.parent].id
+  path_part   = each.value.part
+}
+
+# API Gateway resources at path depth 12
+resource "aws_api_gateway_resource" "path_depth_12" {
+  for_each = local.path_nodes_by_depth[12]
+
+  rest_api_id = module.rest_api.api_id
+  parent_id   = aws_api_gateway_resource.path_depth_11[each.value.parent].id
+  path_part   = each.value.part
+}
+
+# API Gateway resources at path depth 13
+resource "aws_api_gateway_resource" "path_depth_13" {
+  for_each = local.path_nodes_by_depth[13]
+
+  rest_api_id = module.rest_api.api_id
+  parent_id   = aws_api_gateway_resource.path_depth_12[each.value.parent].id
+  path_part   = each.value.part
+}
+
+# API Gateway resources at path depth 14
+resource "aws_api_gateway_resource" "path_depth_14" {
+  for_each = local.path_nodes_by_depth[14]
+
+  rest_api_id = module.rest_api.api_id
+  parent_id   = aws_api_gateway_resource.path_depth_13[each.value.parent].id
+  path_part   = each.value.part
+}
+
+# API Gateway resources at path depth 15
+resource "aws_api_gateway_resource" "path_depth_15" {
+  for_each = local.path_nodes_by_depth[15]
+
+  rest_api_id = module.rest_api.api_id
+  parent_id   = aws_api_gateway_resource.path_depth_14[each.value.parent].id
+  path_part   = each.value.part
+}
+
+# Resources
+
+# Create Lambda ZIP file from the bundle directory
+data "archive_file" "lambda_zip" {
+  type        = "zip"
+  source_dir  = "\${path.module}/../../../../../../../dist/apps/test_api/bundle-x86"
+  output_path = "\${path.module}/../../../../../../../dist/packages/common/terraform/apis/test-api/lambda.zip"
+}
+
+resource "aws_s3_object" "lambda_zip" {
+  bucket      = var.asset_bucket_name
+  key         = "apis/test-api/\${data.archive_file.lambda_zip.output_sha256}.zip"
+  source      = data.archive_file.lambda_zip.output_path
+  source_hash = data.archive_file.lambda_zip.output_base64sha256
+  etag        = data.archive_file.lambda_zip.output_md5
+}
+
+# Use the core REST API module
+# Account-level CloudWatch role required for REST API access logging
+module "account" {
+  source = "../../../core/api/api-gateway-account"
+}
+
+module "rest_api" {
+  source = "../../../core/api/rest-api"
+
+  api_name        = "TestApi-\${random_string.suffix.result}"
+  api_description = "TestApi REST API"
+  stage_name      = "prod"
+  stage_auto_deploy = true
+
+  # WAF Configuration
+  enable_waf = var.enable_waf
+
+  # CORS Configuration
+  cors_allow_headers     = var.cors_allow_headers
+  cors_allow_methods     = var.cors_allow_methods
+  cors_allow_origins     = var.cors_allow_origins
+
+  # Tags
+  tags = var.tags
+}
+
+resource "aws_wafv2_web_acl_association" "api_waf_association" {
+  count = var.enable_waf ? 1 : 0
+
+  resource_arn = aws_api_gateway_stage.api_stage.arn
+  web_acl_arn  = module.rest_api.waf_web_acl_arn
+
+  depends_on = [aws_api_gateway_stage.api_stage]
+}
+
+# Security group for the API Lambda function, used when deployed into a VPC
+resource "aws_security_group" "api_lambda" {
+  count = var.enable_vpc ? 1 : 0
+
+  #checkov:skip=CKV2_AWS_5:Attached to api_lambda via vpc_config block; Checkov cannot resolve this reference
   name_prefix = "test-api-lambda-"
   description = "Security group for the TestApi API Lambda function"
   vpc_id      = var.vpc_id
@@ -2787,8 +3303,10 @@ resource "aws_vpc_security_group_egress_rule" "api_lambda_https" {
   description       = "Allow outbound HTTPS to AWS service endpoints"
 }
 
-# Lambda function
 resource "aws_lambda_function" "api_lambda" {
+  # One lambda function per operation, each serving just that operation
+  for_each = local.operations
+
   #checkov:skip=CKV_AWS_117:Lambda function is optionally deployed into a VPC via vpc_id/subnet_ids; not required for this use case
   #checkov:skip=CKV_AWS_116:Dead Letter Queue not required for this simple API use case
   #checkov:skip=CKV_AWS_272:Code signing not required for this use case
@@ -2797,8 +3315,8 @@ resource "aws_lambda_function" "api_lambda" {
   s3_bucket         = aws_s3_object.lambda_zip.bucket
   s3_key            = aws_s3_object.lambda_zip.key
   s3_object_version = aws_s3_object.lambda_zip.version_id
-  function_name    = "TestApiHandler-\${random_string.suffix.result}"
-  role            = aws_iam_role.lambda_execution_role.arn
+  function_name    = local.function_name[each.key]
+  role            = aws_iam_role.lambda_execution_role[each.key].arn
   handler         = "run.sh"
   runtime         = "python3.14"
   layers          = ["arn:aws:lambda:\${data.aws_region.current.region}:753240598075:layer:LambdaAdapterLayerX86:24"]
@@ -2843,7 +3361,9 @@ resource "aws_lambda_function" "api_lambda" {
 
 # IAM role for Lambda execution
 resource "aws_iam_role" "lambda_execution_role" {
-  name = "TestApiHandler-execution-role-\${random_string.suffix.result}"
+  for_each = local.operations
+
+  name = local.role_name[each.key]
 
   assume_role_policy = jsonencode({
     Version = "2012-10-17"
@@ -2863,32 +3383,38 @@ resource "aws_iam_role" "lambda_execution_role" {
 
 # Attach basic execution policy to Lambda role
 resource "aws_iam_role_policy_attachment" "lambda_basic_execution" {
+  for_each = local.operations
+
   policy_arn = "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-  role       = aws_iam_role.lambda_execution_role.name
+  role       = aws_iam_role.lambda_execution_role[each.key].name
 }
 
 # Attach X-Ray tracing policy to Lambda role
 resource "aws_iam_role_policy_attachment" "lambda_xray_execution" {
+  for_each = local.operations
+
   policy_arn = "arn:aws:iam::aws:policy/AWSXRayDaemonWriteAccess"
-  role       = aws_iam_role.lambda_execution_role.name
+  role       = aws_iam_role.lambda_execution_role[each.key].name
 }
 
 # Attach VPC access policy to Lambda role when deployed into a VPC
 resource "aws_iam_role_policy_attachment" "lambda_vpc_access" {
-  count      = var.enable_vpc ? 1 : 0
+  for_each = var.enable_vpc ? local.operations : {}
+
   policy_arn = "arn:aws:iam::aws:policy/service-role/AWSLambdaVPCAccessExecutionRole"
-  role       = aws_iam_role.lambda_execution_role.name
+  role       = aws_iam_role.lambda_execution_role[each.key].name
 }
 
 # Additional IAM policies for Lambda (if provided)
 resource "aws_iam_role_policy" "lambda_additional_policies" {
-  count = length(local.lambda_policy_statements) > 0 ? 1 : 0
-  name  = "TestApiHandler-additional-policies-\${random_string.suffix.result}"
-  role  = aws_iam_role.lambda_execution_role.id
+  for_each = local.operations
+
+  name = "\${substr(local.function_name[each.key], 0, 55)}-policies"
+  role = aws_iam_role.lambda_execution_role[each.key].id
 
   policy = jsonencode({
     Version = "2012-10-17"
-    Statement = local.lambda_policy_statements
+    Statement = local.lambda_policy_document_statements
   })
 }
 
@@ -2904,6 +3430,15 @@ locals {
       Resource = ["\${var.appconfig_application_arn}/*"]
     }
   ] : [], var.additional_iam_policy_statements)
+
+  # IAM rejects an empty statement list, so fall back to a no-op deny
+  lambda_policy_document_statements = length(local.lambda_policy_statements) > 0 ? local.lambda_policy_statements : [
+    {
+      Effect   = "Deny"
+      Action   = ["appconfig:GetLatestConfiguration"]
+      Resource = ["arn:aws:appconfig:\${data.aws_region.current.region}:\${data.aws_caller_identity.current.account_id}:application/none"]
+    }
+  ]
 }
 
 # CloudWatch Log Group for Lambda
@@ -2911,15 +3446,19 @@ resource "aws_cloudwatch_log_group" "lambda_logs" {
   #checkov:skip=CKV_AWS_158:Using default CloudWatch log encryption
   #checkov:skip=CKV_AWS_338:Log retention set to forever
   #checkov:skip=CKV_AWS_66:Log retention set to forever
-  name              = "/aws/lambda/TestApiHandler-\${random_string.suffix.result}"
-  tags              = var.tags
+  for_each = local.operations
+
+  name = "/aws/lambda/\${local.function_name[each.key]}"
+  tags = var.tags
 }
 
 # Lambda alias pointing to the latest published version for SnapStart
 resource "aws_lambda_alias" "live" {
+  for_each = local.operations
+
   name             = "live"
-  function_name    = aws_lambda_function.api_lambda.function_name
-  function_version = aws_lambda_function.api_lambda.version
+  function_name    = aws_lambda_function.api_lambda[each.key].function_name
+  function_version = aws_lambda_function.api_lambda[each.key].version
 
   depends_on = [aws_lambda_function.api_lambda]
 }
@@ -2933,34 +3472,14 @@ resource "aws_api_gateway_authorizer" "cognito_authorizer" {
   identity_source       = "method.request.header.Authorization"
 }
 
-# Create proxy resource (captures all paths)
-resource "aws_api_gateway_resource" "proxy_resource" {
-  rest_api_id = module.rest_api.api_id
-  parent_id   = module.rest_api.api_root_resource_id
-  path_part   = "{proxy+}"
-}
-
-# Lambda integration for REST API
-resource "aws_api_gateway_integration" "lambda_integration" {
-  rest_api_id = module.rest_api.api_id
-  resource_id = aws_api_gateway_resource.proxy_resource.id
-  http_method = aws_api_gateway_method.proxy_method.http_method
-
-  integration_http_method = "POST"
-  type                    = "AWS_PROXY"
-  # Use the response streaming invocation path with the alias ARN for SnapStart
-  uri                     = "arn:aws:apigateway:\${data.aws_region.current.region}:lambda:path/2021-11-15/functions/\${aws_lambda_alias.live.arn}/response-streaming-invocations"
-  response_transfer_mode  = "STREAM"
-
-  depends_on = [aws_lambda_alias.live]
-}
-
-# Method for proxy integration
-resource "aws_api_gateway_method" "proxy_method" {
+# Method per operation
+resource "aws_api_gateway_method" "operation_methods" {
   #checkov:skip=CKV2_AWS_53:Request validation not required for proxy integration as Lambda handles validation
+  for_each = local.operations
+
   rest_api_id   = module.rest_api.api_id
-  resource_id   = aws_api_gateway_resource.proxy_resource.id
-  http_method   = "ANY"
+  resource_id   = local.operation_resource_id[each.key]
+  http_method   = upper(each.value.method)
 
   authorization = "COGNITO_USER_POOLS"
   authorizer_id = aws_api_gateway_authorizer.cognito_authorizer.id
@@ -2968,28 +3487,52 @@ resource "aws_api_gateway_method" "proxy_method" {
   # and 'aws.cognito.signin.user.admin' (Cognito admin/SRP auth APIs).
   authorization_scopes = ["openid", "aws.cognito.signin.user.admin"]
 
+  # Path parameters must be declared on the method
   request_parameters = {
-    "method.request.path.proxy" = true
+    for segment in local.operation_segments[each.key] :
+    "method.request.path.\${trimsuffix(trimprefix(segment, "{"), "}")}" => true
+    if startswith(segment, "{")
   }
 
   depends_on = [aws_api_gateway_authorizer.cognito_authorizer]
 }
 
-# OPTIONS method for CORS preflight
+# Lambda integration per operation
+resource "aws_api_gateway_integration" "lambda_integration" {
+  for_each = local.operations
+
+  rest_api_id = module.rest_api.api_id
+  resource_id = local.operation_resource_id[each.key]
+  http_method = aws_api_gateway_method.operation_methods[each.key].http_method
+
+  integration_http_method = "POST"
+  type                    = "AWS_PROXY"
+  # Use the response streaming invocation path with the alias ARN for SnapStart
+  uri                     = "arn:aws:apigateway:\${data.aws_region.current.region}:lambda:path/2021-11-15/functions/\${aws_lambda_alias.live[each.key].arn}/response-streaming-invocations"
+  response_transfer_mode  = "STREAM"
+
+  depends_on = [aws_lambda_alias.live]
+}
+
+# OPTIONS method for CORS preflight, on every resource an operation is served from
 resource "aws_api_gateway_method" "options_method" {
   #checkov:skip=CKV2_AWS_70:OPTIONS method must be unauthenticated for CORS preflight requests
   #checkov:skip=CKV2_AWS_53:Request validation not required for OPTIONS CORS preflight method
+  for_each = local.resource_ids
+
   rest_api_id   = module.rest_api.api_id
-  resource_id   = aws_api_gateway_resource.proxy_resource.id
+  resource_id   = each.value
   http_method   = "OPTIONS"
   authorization = "NONE"
 }
 
-# CORS integration for OPTIONS method
+# CORS integration for OPTIONS methods
 resource "aws_api_gateway_integration" "options_integration" {
+  for_each = local.resource_ids
+
   rest_api_id = module.rest_api.api_id
-  resource_id = aws_api_gateway_resource.proxy_resource.id
-  http_method = aws_api_gateway_method.options_method.http_method
+  resource_id = each.value
+  http_method = aws_api_gateway_method.options_method[each.key].http_method
 
   type = "MOCK"
   request_templates = {
@@ -2997,11 +3540,13 @@ resource "aws_api_gateway_integration" "options_integration" {
   }
 }
 
-# OPTIONS method response
+# OPTIONS method responses
 resource "aws_api_gateway_method_response" "options_response" {
+  for_each = local.resource_ids
+
   rest_api_id = module.rest_api.api_id
-  resource_id = aws_api_gateway_resource.proxy_resource.id
-  http_method = aws_api_gateway_method.options_method.http_method
+  resource_id = each.value
+  http_method = aws_api_gateway_method.options_method[each.key].http_method
   status_code = "204"
 
   response_parameters = {
@@ -3011,18 +3556,22 @@ resource "aws_api_gateway_method_response" "options_response" {
   }
 }
 
-# OPTIONS integration response
+# OPTIONS integration responses
 resource "aws_api_gateway_integration_response" "options_integration_response" {
+  for_each = local.resource_ids
+
   rest_api_id = module.rest_api.api_id
-  resource_id = aws_api_gateway_resource.proxy_resource.id
-  http_method = aws_api_gateway_method.options_method.http_method
-  status_code = aws_api_gateway_method_response.options_response.status_code
+  resource_id = each.value
+  http_method = aws_api_gateway_method.options_method[each.key].http_method
+  status_code = aws_api_gateway_method_response.options_response[each.key].status_code
 
   response_parameters = {
     "method.response.header.Access-Control-Allow-Headers" = "'\${join(",", var.cors_allow_headers)}'"
     "method.response.header.Access-Control-Allow-Methods" = "'\${join(",", var.cors_allow_methods)}'"
     "method.response.header.Access-Control-Allow-Origin"  = "'\${join(",", var.cors_allow_origins)}'"
   }
+
+  depends_on = [aws_api_gateway_integration.options_integration]
 }
 
 # API Gateway deployment
@@ -3030,13 +3579,28 @@ resource "aws_api_gateway_deployment" "api_deployment" {
   rest_api_id = module.rest_api.api_id
 
   triggers = {
-    redeployment = sha1(jsonencode([
-      aws_api_gateway_resource.proxy_resource.id,
-      aws_api_gateway_method.proxy_method.id,
-      aws_api_gateway_integration.lambda_integration.id,
-      aws_api_gateway_method.options_method.id,
-      aws_api_gateway_integration.options_integration.id,
-    ]))
+    redeployment = sha1(jsonencode(concat(
+      [for r in aws_api_gateway_resource.path_depth_0 : r.id],
+      [for r in aws_api_gateway_resource.path_depth_1 : r.id],
+      [for r in aws_api_gateway_resource.path_depth_2 : r.id],
+      [for r in aws_api_gateway_resource.path_depth_3 : r.id],
+      [for r in aws_api_gateway_resource.path_depth_4 : r.id],
+      [for r in aws_api_gateway_resource.path_depth_5 : r.id],
+      [for r in aws_api_gateway_resource.path_depth_6 : r.id],
+      [for r in aws_api_gateway_resource.path_depth_7 : r.id],
+      [for r in aws_api_gateway_resource.path_depth_8 : r.id],
+      [for r in aws_api_gateway_resource.path_depth_9 : r.id],
+      [for r in aws_api_gateway_resource.path_depth_10 : r.id],
+      [for r in aws_api_gateway_resource.path_depth_11 : r.id],
+      [for r in aws_api_gateway_resource.path_depth_12 : r.id],
+      [for r in aws_api_gateway_resource.path_depth_13 : r.id],
+      [for r in aws_api_gateway_resource.path_depth_14 : r.id],
+      [for r in aws_api_gateway_resource.path_depth_15 : r.id],
+      [for m in aws_api_gateway_method.operation_methods : m.id],
+      [for i in aws_api_gateway_integration.lambda_integration : i.id],
+      [for m in aws_api_gateway_method.options_method : m.id],
+      [for i in aws_api_gateway_integration.options_integration : i.id],
+    )))
   }
 
   lifecycle {
@@ -3044,7 +3608,7 @@ resource "aws_api_gateway_deployment" "api_deployment" {
   }
 
   depends_on = [
-    aws_api_gateway_method.proxy_method,
+    aws_api_gateway_method.operation_methods,
     aws_api_gateway_integration.lambda_integration,
     aws_api_gateway_method.options_method,
     aws_api_gateway_integration.options_integration,
@@ -3172,24 +3736,28 @@ resource "aws_api_gateway_rest_api_policy" "api_policy" {
 
 # Lambda permission for API Gateway to invoke the function via alias
 resource "aws_lambda_permission" "api_gateway_invoke" {
+  for_each = local.operations
+
   statement_id  = "AllowExecutionFromAPIGateway"
   action        = "lambda:InvokeFunction"
-  function_name = aws_lambda_function.api_lambda.function_name
-  qualifier     = aws_lambda_alias.live.name
+  function_name = aws_lambda_function.api_lambda[each.key].function_name
+  qualifier     = aws_lambda_alias.live[each.key].name
   principal     = "apigateway.amazonaws.com"
-  source_arn    = "\${module.rest_api.api_execution_arn}/*/*"
+  source_arn    = "\${module.rest_api.api_execution_arn}/*/\${local.permission_source_suffix[each.key]}"
 
   depends_on = [module.rest_api, aws_lambda_alias.live]
 }
 
 # Lambda permission for API Gateway to invoke with response streaming via alias
 resource "aws_lambda_permission" "api_gateway_invoke_streaming" {
+  for_each = local.operations
+
   statement_id  = "AllowStreamingFromAPIGateway"
   action        = "lambda:InvokeFunctionWithResponseStream"
-  function_name = aws_lambda_function.api_lambda.function_name
-  qualifier     = aws_lambda_alias.live.name
+  function_name = aws_lambda_function.api_lambda[each.key].function_name
+  qualifier     = aws_lambda_alias.live[each.key].name
   principal     = "apigateway.amazonaws.com"
-  source_arn    = "\${module.rest_api.api_execution_arn}/*/*"
+  source_arn    = "\${module.rest_api.api_execution_arn}/*/\${local.permission_source_suffix[each.key]}"
 
   depends_on = [module.rest_api, aws_lambda_alias.live]
 }
@@ -3200,7 +3768,7 @@ module "add_url_to_runtime_config" {
 
   namespace = "connection"
   key       = "apis"
-  value     = { "TestApi" = aws_api_gateway_stage.api_stage.invoke_url }
+  value     = { "TestApi" = "\${aws_api_gateway_stage.api_stage.invoke_url}/" }
 
   depends_on = [aws_api_gateway_stage.api_stage]
 }
@@ -3253,83 +3821,83 @@ output "stage_id" {
   value       = aws_api_gateway_stage.api_stage.id
 }
 
-# Lambda Function Outputs
-output "lambda_function_name" {
-  description = "Name of the Lambda function"
-  value       = aws_lambda_function.api_lambda.function_name
+# Lambda Function Outputs, keyed by operation name
+output "operations" {
+  description = "Names of the API operations, each with its own Lambda function"
+  value       = keys(local.operations)
 }
 
-output "lambda_function_arn" {
-  description = "ARN of the Lambda function"
-  value       = aws_lambda_function.api_lambda.arn
+output "lambda_function_names" {
+  description = "Name of each operation's Lambda function, keyed by operation name"
+  value       = { for op, fn in aws_lambda_function.api_lambda : op => fn.function_name }
 }
 
-output "lambda_invoke_arn" {
-  description = "Invoke ARN of the Lambda function"
-  value       = aws_lambda_function.api_lambda.invoke_arn
+output "lambda_function_arns" {
+  description = "ARN of each operation's Lambda function, keyed by operation name"
+  value       = { for op, fn in aws_lambda_function.api_lambda : op => fn.arn }
 }
 
-output "lambda_qualified_arn" {
-  description = "Qualified ARN of the Lambda function"
-  value       = aws_lambda_function.api_lambda.qualified_arn
+output "lambda_invoke_arns" {
+  description = "Invoke ARN of each operation's Lambda function, keyed by operation name"
+  value       = { for op, fn in aws_lambda_function.api_lambda : op => fn.invoke_arn }
 }
 
-output "lambda_version" {
-  description = "Version of the Lambda function"
-  value       = aws_lambda_function.api_lambda.version
+output "lambda_qualified_arns" {
+  description = "Qualified ARN of each operation's Lambda function, keyed by operation name"
+  value       = { for op, fn in aws_lambda_function.api_lambda : op => fn.qualified_arn }
 }
 
-output "lambda_source_code_hash" {
-  description = "Base64-encoded SHA256 hash of the Lambda deployment package"
-  value       = aws_lambda_function.api_lambda.source_code_hash
+output "lambda_versions" {
+  description = "Version of each operation's Lambda function, keyed by operation name"
+  value       = { for op, fn in aws_lambda_function.api_lambda : op => fn.version }
 }
 
-output "lambda_source_code_size" {
-  description = "Size of the Lambda deployment package in bytes"
-  value       = aws_lambda_function.api_lambda.source_code_size
+output "lambda_source_code_hash" {
+  description = "Base64-encoded SHA256 hash of the Lambda deployment package, shared by every operation"
+  value       = data.archive_file.lambda_zip.output_base64sha256
 }
 
-# IAM Role Outputs
-output "lambda_execution_role_arn" {
-  description = "ARN of the Lambda execution role"
-  value       = aws_iam_role.lambda_execution_role.arn
+# IAM Role Outputs, keyed by operation name
+output "lambda_execution_role_arns" {
+  description = "ARN of each operation's Lambda execution role, keyed by operation name"
+  value       = { for op, role in aws_iam_role.lambda_execution_role : op => role.arn }
 }
 
-output "lambda_execution_role_name" {
-  description = "Name of the Lambda execution role"
-  value       = aws_iam_role.lambda_execution_role.name
+output "lambda_execution_role_names" {
+  description = "Name of each operation's Lambda execution role, keyed by operation name. Attach additional policies to a specific operation's role by name."
+  value       = { for op, role in aws_iam_role.lambda_execution_role : op => role.name }
 }
 
 output "security_group_id" {
-  description = "Security group ID of the API Lambda function, for use in ingress rules on resources it must reach (e.g. a database). Null unless enable_vpc is true."
+  description = "Security group ID shared by the API Lambda functions, for use in ingress rules on resources they must reach (e.g. a database). Null unless enable_vpc is true."
   value       = var.enable_vpc ? aws_security_group.api_lambda[0].id : null
 }
 
-# Integration Outputs
-output "integration_id" {
-  description = "ID of the Lambda integration"
-  value       = aws_api_gateway_integration.lambda_integration.id
+# Integration Outputs, keyed by operation name
+output "integration_ids" {
+  description = "ID of each operation's Lambda integration, keyed by operation name"
+  value       = { for op, i in aws_api_gateway_integration.lambda_integration : op => i.id }
 }
 
-output "proxy_resource_id" {
-  description = "ID of the proxy resource"
-  value       = aws_api_gateway_resource.proxy_resource.id
+output "method_ids" {
+  description = "ID of each operation's API Gateway method, keyed by operation name"
+  value       = { for op, m in aws_api_gateway_method.operation_methods : op => m.id }
 }
 
-output "proxy_method_id" {
-  description = "ID of the proxy method"
-  value       = aws_api_gateway_method.proxy_method.id
+output "resource_ids" {
+  description = "ID of each API Gateway resource, keyed by its path"
+  value       = local.resource_ids
 }
 
-# CloudWatch Log Groups
-output "lambda_log_group_name" {
-  description = "Name of the Lambda CloudWatch log group"
-  value       = aws_cloudwatch_log_group.lambda_logs.name
+# CloudWatch Log Groups, keyed by operation name
+output "lambda_log_group_names" {
+  description = "Name of each operation's Lambda CloudWatch log group, keyed by operation name"
+  value       = { for op, lg in aws_cloudwatch_log_group.lambda_logs : op => lg.name }
 }
 
-output "lambda_log_group_arn" {
-  description = "ARN of the Lambda CloudWatch log group"
-  value       = aws_cloudwatch_log_group.lambda_logs.arn
+output "lambda_log_group_arns" {
+  description = "ARN of each operation's Lambda CloudWatch log group, keyed by operation name"
+  value       = { for op, lg in aws_cloudwatch_log_group.lambda_logs : op => lg.arn }
 }
 ",
 }
@@ -3539,22 +4107,75 @@ resource "aws_wafv2_web_acl" "api_waf" {
   }
 }
 
+resource "random_id" "waf_log_suffix" {
+  count       = var.enable_waf ? 1 : 0
+  byte_length = 4
+}
+
+locals {
+  waf_log_group_name = var.enable_waf ? "aws-waf-logs-\${var.api_name}-\${random_id.waf_log_suffix[0].hex}" : null
+}
+
+# KMS key for encrypting WAF request logs at rest
+resource "aws_kms_key" "waf_logs" {
+  count = var.enable_waf ? 1 : 0
+
+  description             = "\${var.api_name} API WAF log encryption"
+  deletion_window_in_days = 7
+  enable_key_rotation     = true
+
+  policy = jsonencode({
+    Version = "2012-10-17"
+    Statement = [
+      {
+        Sid       = "Enable IAM User Permissions"
+        Effect    = "Allow"
+        Principal = { AWS = "arn:aws:iam::\${data.aws_caller_identity.current.account_id}:root" }
+        Action    = "kms:*"
+        Resource  = "*"
+      },
+      {
+        Sid       = "Allow CloudWatch Logs"
+        Effect    = "Allow"
+        Principal = { Service = "logs.\${data.aws_region.current.region}.amazonaws.com" }
+        Action = [
+          "kms:Encrypt",
+          "kms:Decrypt",
+          "kms:ReEncrypt*",
+          "kms:GenerateDataKey*",
+          "kms:DescribeKey"
+        ]
+        Resource = "*"
+        Condition = {
+          ArnEquals = {
+            "kms:EncryptionContext:aws:logs:arn" = "arn:aws:logs:\${data.aws_region.current.region}:\${data.aws_caller_identity.current.account_id}:log-group:\${local.waf_log_group_name}"
+          }
+        }
+      }
+    ]
+  })
+
+  tags = var.tags
+}
+
+resource "aws_kms_alias" "waf_logs" {
+  count = var.enable_waf ? 1 : 0
+
+  name          = "alias/\${var.api_name}-\${random_id.waf_log_suffix[0].hex}-waf-logs"
+  target_key_id = aws_kms_key.waf_logs[0].key_id
+}
+
 # CloudWatch Log Group for WAF request logs. Name must start with \`aws-waf-logs-\`.
 resource "aws_cloudwatch_log_group" "api_waf_logs" {
-  #checkov:skip=CKV_AWS_158:Using default CloudWatch log encryption
   #checkov:skip=CKV_AWS_338:Log retention set to one month which is sufficient for WAF logs
   count = var.enable_waf ? 1 : 0
 
-  name              = "aws-waf-logs-\${var.api_name}-\${random_id.waf_log_suffix[0].hex}"
+  name              = local.waf_log_group_name
   retention_in_days = 30
+  kms_key_id        = aws_kms_key.waf_logs[0].arn
   tags              = var.tags
 }
 
-resource "random_id" "waf_log_suffix" {
-  count       = var.enable_waf ? 1 : 0
-  byte_length = 4
-}
-
 resource "aws_wafv2_web_acl_logging_configuration" "api_waf_logging" {
   count = var.enable_waf ? 1 : 0
 
@@ -3600,10 +4221,18 @@ output "waf_web_acl_arn" {
   required_version = ">= 1.0"
 
   required_providers {
+    archive = {
+      source  = "hashicorp/archive"
+      version = "2.8.0"
+    }
     aws = {
       source  = "hashicorp/aws"
       version = "6.61.0"
     }
+    random = {
+      source  = "hashicorp/random"
+      version = "3.9.0"
+    }
   }
 }
 
@@ -3699,14 +4328,243 @@ variable "tags" {
   default     = {}
 }
 
-# Get current AWS region and account ID
-data "aws_region" "current" {}
-data "aws_caller_identity" "current" {}
+# Get current AWS region and account ID
+data "aws_region" "current" {}
+data "aws_caller_identity" "current" {}
+
+resource "random_string" "suffix" {
+  length  = 8
+  special = false
+  upper   = false
+}
+
+locals {
+  # Generated at build time from the API definition
+  operations_file = "\${path.module}/../../../generated/test-api/operations.json"
+  operations      = fileexists(local.operations_file) ? jsondecode(file(local.operations_file)) : {}
+
+  operation_slug = { for op in keys(local.operations) : op => replace(op, "/[^a-zA-Z0-9-_]/", "-") }
+  operation_hash = { for op in keys(local.operations) : op => substr(sha256(op), 0, 8) }
+
+  function_name = { for op in keys(local.operations) : op =>
+    "\${substr("TestApi-\${local.operation_slug[op]}", 0, 64 - length(local.operation_hash[op]) - length(random_string.suffix.result) - 2)}-\${local.operation_hash[op]}-\${random_string.suffix.result}"
+  }
+  role_name = { for op in keys(local.operations) : op =>
+    "\${substr("TestApi-\${local.operation_slug[op]}-role", 0, 64 - length(local.operation_hash[op]) - length(random_string.suffix.result) - 2)}-\${local.operation_hash[op]}-\${random_string.suffix.result}"
+  }
+
+  # A REST API needs a resource per path segment, so each operation's path is
+  # split into the distinct path prefixes the resource tree is built from below
+  operation_segments = { for op, details in local.operations : op => compact(split("/", details.path)) }
+
+  path_nodes = merge([
+    for op, segments in local.operation_segments : {
+      for i, segment in segments : join("/", slice(segments, 0, i + 1)) => {
+        depth  = i
+        parent = i == 0 ? "" : join("/", slice(segments, 0, i))
+        part   = segment
+      }
+    }
+  ]...)
+
+  # Instances of a resource cannot reference one another, so each depth is a
+  # separate resource. Deeper paths are reported by the precondition below.
+  max_path_depth = 16
+  path_nodes_by_depth = { for depth in range(local.max_path_depth) : depth => {
+    for path, node in local.path_nodes : path => node if node.depth == depth
+  } }
+  paths_too_deep = [for path, node in local.path_nodes : path if node.depth >= local.max_path_depth]
+
+  resource_ids = merge(
+    { for path, resource in aws_api_gateway_resource.path_depth_0 : path => resource.id },
+    { for path, resource in aws_api_gateway_resource.path_depth_1 : path => resource.id },
+    { for path, resource in aws_api_gateway_resource.path_depth_2 : path => resource.id },
+    { for path, resource in aws_api_gateway_resource.path_depth_3 : path => resource.id },
+    { for path, resource in aws_api_gateway_resource.path_depth_4 : path => resource.id },
+    { for path, resource in aws_api_gateway_resource.path_depth_5 : path => resource.id },
+    { for path, resource in aws_api_gateway_resource.path_depth_6 : path => resource.id },
+    { for path, resource in aws_api_gateway_resource.path_depth_7 : path => resource.id },
+    { for path, resource in aws_api_gateway_resource.path_depth_8 : path => resource.id },
+    { for path, resource in aws_api_gateway_resource.path_depth_9 : path => resource.id },
+    { for path, resource in aws_api_gateway_resource.path_depth_10 : path => resource.id },
+    { for path, resource in aws_api_gateway_resource.path_depth_11 : path => resource.id },
+    { for path, resource in aws_api_gateway_resource.path_depth_12 : path => resource.id },
+    { for path, resource in aws_api_gateway_resource.path_depth_13 : path => resource.id },
+    { for path, resource in aws_api_gateway_resource.path_depth_14 : path => resource.id },
+    { for path, resource in aws_api_gateway_resource.path_depth_15 : path => resource.id },
+  )
+
+  operation_resource_id = { for op, segments in local.operation_segments : op =>
+    local.resource_ids[join("/", segments)]
+  }
+
+  permission_source_suffix = { for op, details in local.operations : op =>
+    "\${upper(details.method)}/\${replace(join("/", local.operation_segments[op]), "/{[^}]*}/", "*")}"
+  }
+}
+
+resource "terraform_data" "operations_metadata" {
+  # Fails the plan when the operations metadata has not been generated
+  input = local.operations_file
+
+  lifecycle {
+    precondition {
+      condition     = fileexists(local.operations_file)
+      error_message = "Operations metadata not found at \${local.operations_file}. Build the TestApi project to generate it."
+    }
+    precondition {
+      condition     = length(local.operations) > 0
+      error_message = "No operations found in \${local.operations_file}. The TestApi API must define at least one operation."
+    }
+    precondition {
+      condition     = length(local.paths_too_deep) == 0
+      error_message = "Operation paths exceed the supported depth of \${local.max_path_depth} segments: \${join(", ", local.paths_too_deep)}. Add further aws_api_gateway_resource levels to this module to support them."
+    }
+  }
+}
+
+# API Gateway resources at path depth 0
+resource "aws_api_gateway_resource" "path_depth_0" {
+  for_each = local.path_nodes_by_depth[0]
+
+  rest_api_id = module.rest_api.api_id
+  parent_id   = module.rest_api.api_root_resource_id
+  path_part   = each.value.part
+}
+
+# API Gateway resources at path depth 1
+resource "aws_api_gateway_resource" "path_depth_1" {
+  for_each = local.path_nodes_by_depth[1]
+
+  rest_api_id = module.rest_api.api_id
+  parent_id   = aws_api_gateway_resource.path_depth_0[each.value.parent].id
+  path_part   = each.value.part
+}
+
+# API Gateway resources at path depth 2
+resource "aws_api_gateway_resource" "path_depth_2" {
+  for_each = local.path_nodes_by_depth[2]
+
+  rest_api_id = module.rest_api.api_id
+  parent_id   = aws_api_gateway_resource.path_depth_1[each.value.parent].id
+  path_part   = each.value.part
+}
+
+# API Gateway resources at path depth 3
+resource "aws_api_gateway_resource" "path_depth_3" {
+  for_each = local.path_nodes_by_depth[3]
+
+  rest_api_id = module.rest_api.api_id
+  parent_id   = aws_api_gateway_resource.path_depth_2[each.value.parent].id
+  path_part   = each.value.part
+}
+
+# API Gateway resources at path depth 4
+resource "aws_api_gateway_resource" "path_depth_4" {
+  for_each = local.path_nodes_by_depth[4]
+
+  rest_api_id = module.rest_api.api_id
+  parent_id   = aws_api_gateway_resource.path_depth_3[each.value.parent].id
+  path_part   = each.value.part
+}
+
+# API Gateway resources at path depth 5
+resource "aws_api_gateway_resource" "path_depth_5" {
+  for_each = local.path_nodes_by_depth[5]
+
+  rest_api_id = module.rest_api.api_id
+  parent_id   = aws_api_gateway_resource.path_depth_4[each.value.parent].id
+  path_part   = each.value.part
+}
+
+# API Gateway resources at path depth 6
+resource "aws_api_gateway_resource" "path_depth_6" {
+  for_each = local.path_nodes_by_depth[6]
+
+  rest_api_id = module.rest_api.api_id
+  parent_id   = aws_api_gateway_resource.path_depth_5[each.value.parent].id
+  path_part   = each.value.part
+}
+
+# API Gateway resources at path depth 7
+resource "aws_api_gateway_resource" "path_depth_7" {
+  for_each = local.path_nodes_by_depth[7]
+
+  rest_api_id = module.rest_api.api_id
+  parent_id   = aws_api_gateway_resource.path_depth_6[each.value.parent].id
+  path_part   = each.value.part
+}
+
+# API Gateway resources at path depth 8
+resource "aws_api_gateway_resource" "path_depth_8" {
+  for_each = local.path_nodes_by_depth[8]
+
+  rest_api_id = module.rest_api.api_id
+  parent_id   = aws_api_gateway_resource.path_depth_7[each.value.parent].id
+  path_part   = each.value.part
+}
+
+# API Gateway resources at path depth 9
+resource "aws_api_gateway_resource" "path_depth_9" {
+  for_each = local.path_nodes_by_depth[9]
+
+  rest_api_id = module.rest_api.api_id
+  parent_id   = aws_api_gateway_resource.path_depth_8[each.value.parent].id
+  path_part   = each.value.part
+}
+
+# API Gateway resources at path depth 10
+resource "aws_api_gateway_resource" "path_depth_10" {
+  for_each = local.path_nodes_by_depth[10]
+
+  rest_api_id = module.rest_api.api_id
+  parent_id   = aws_api_gateway_resource.path_depth_9[each.value.parent].id
+  path_part   = each.value.part
+}
+
+# API Gateway resources at path depth 11
+resource "aws_api_gateway_resource" "path_depth_11" {
+  for_each = local.path_nodes_by_depth[11]
+
+  rest_api_id = module.rest_api.api_id
+  parent_id   = aws_api_gateway_resource.path_depth_10[each.value.parent].id
+  path_part   = each.value.part
+}
+
+# API Gateway resources at path depth 12
+resource "aws_api_gateway_resource" "path_depth_12" {
+  for_each = local.path_nodes_by_depth[12]
+
+  rest_api_id = module.rest_api.api_id
+  parent_id   = aws_api_gateway_resource.path_depth_11[each.value.parent].id
+  path_part   = each.value.part
+}
+
+# API Gateway resources at path depth 13
+resource "aws_api_gateway_resource" "path_depth_13" {
+  for_each = local.path_nodes_by_depth[13]
+
+  rest_api_id = module.rest_api.api_id
+  parent_id   = aws_api_gateway_resource.path_depth_12[each.value.parent].id
+  path_part   = each.value.part
+}
+
+# API Gateway resources at path depth 14
+resource "aws_api_gateway_resource" "path_depth_14" {
+  for_each = local.path_nodes_by_depth[14]
 
-resource "random_string" "suffix" {
-  length  = 8
-  special = false
-  upper   = false
+  rest_api_id = module.rest_api.api_id
+  parent_id   = aws_api_gateway_resource.path_depth_13[each.value.parent].id
+  path_part   = each.value.part
+}
+
+# API Gateway resources at path depth 15
+resource "aws_api_gateway_resource" "path_depth_15" {
+  for_each = local.path_nodes_by_depth[15]
+
+  rest_api_id = module.rest_api.api_id
+  parent_id   = aws_api_gateway_resource.path_depth_14[each.value.parent].id
+  path_part   = each.value.part
 }
 
 # Resources
@@ -3783,8 +4641,10 @@ resource "aws_vpc_security_group_egress_rule" "api_lambda_https" {
   description       = "Allow outbound HTTPS to AWS service endpoints"
 }
 
-# Lambda function
 resource "aws_lambda_function" "api_lambda" {
+  # One lambda function per operation, each serving just that operation
+  for_each = local.operations
+
   #checkov:skip=CKV_AWS_117:Lambda function is optionally deployed into a VPC via vpc_id/subnet_ids; not required for this use case
   #checkov:skip=CKV_AWS_116:Dead Letter Queue not required for this simple API use case
   #checkov:skip=CKV_AWS_272:Code signing not required for this use case
@@ -3793,8 +4653,8 @@ resource "aws_lambda_function" "api_lambda" {
   s3_bucket         = aws_s3_object.lambda_zip.bucket
   s3_key            = aws_s3_object.lambda_zip.key
   s3_object_version = aws_s3_object.lambda_zip.version_id
-  function_name    = "TestApiHandler-\${random_string.suffix.result}"
-  role            = aws_iam_role.lambda_execution_role.arn
+  function_name    = local.function_name[each.key]
+  role            = aws_iam_role.lambda_execution_role[each.key].arn
   handler         = "run.sh"
   runtime         = "python3.14"
   layers          = ["arn:aws:lambda:\${data.aws_region.current.region}:753240598075:layer:LambdaAdapterLayerX86:24"]
@@ -3839,7 +4699,9 @@ resource "aws_lambda_function" "api_lambda" {
 
 # IAM role for Lambda execution
 resource "aws_iam_role" "lambda_execution_role" {
-  name = "TestApiHandler-execution-role-\${random_string.suffix.result}"
+  for_each = local.operations
+
+  name = local.role_name[each.key]
 
   assume_role_policy = jsonencode({
     Version = "2012-10-17"
@@ -3859,32 +4721,38 @@ resource "aws_iam_role" "lambda_execution_role" {
 
 # Attach basic execution policy to Lambda role
 resource "aws_iam_role_policy_attachment" "lambda_basic_execution" {
+  for_each = local.operations
+
   policy_arn = "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-  role       = aws_iam_role.lambda_execution_role.name
+  role       = aws_iam_role.lambda_execution_role[each.key].name
 }
 
 # Attach X-Ray tracing policy to Lambda role
 resource "aws_iam_role_policy_attachment" "lambda_xray_execution" {
+  for_each = local.operations
+
   policy_arn = "arn:aws:iam::aws:policy/AWSXRayDaemonWriteAccess"
-  role       = aws_iam_role.lambda_execution_role.name
+  role       = aws_iam_role.lambda_execution_role[each.key].name
 }
 
 # Attach VPC access policy to Lambda role when deployed into a VPC
 resource "aws_iam_role_policy_attachment" "lambda_vpc_access" {
-  count      = var.enable_vpc ? 1 : 0
+  for_each = var.enable_vpc ? local.operations : {}
+
   policy_arn = "arn:aws:iam::aws:policy/service-role/AWSLambdaVPCAccessExecutionRole"
-  role       = aws_iam_role.lambda_execution_role.name
+  role       = aws_iam_role.lambda_execution_role[each.key].name
 }
 
 # Additional IAM policies for Lambda (if provided)
 resource "aws_iam_role_policy" "lambda_additional_policies" {
-  count = length(local.lambda_policy_statements) > 0 ? 1 : 0
-  name  = "TestApiHandler-additional-policies-\${random_string.suffix.result}"
-  role  = aws_iam_role.lambda_execution_role.id
+  for_each = local.operations
+
+  name = "\${substr(local.function_name[each.key], 0, 55)}-policies"
+  role = aws_iam_role.lambda_execution_role[each.key].id
 
   policy = jsonencode({
     Version = "2012-10-17"
-    Statement = local.lambda_policy_statements
+    Statement = local.lambda_policy_document_statements
   })
 }
 
@@ -3900,6 +4768,15 @@ locals {
       Resource = ["\${var.appconfig_application_arn}/*"]
     }
   ] : [], var.additional_iam_policy_statements)
+
+  # IAM rejects an empty statement list, so fall back to a no-op deny
+  lambda_policy_document_statements = length(local.lambda_policy_statements) > 0 ? local.lambda_policy_statements : [
+    {
+      Effect   = "Deny"
+      Action   = ["appconfig:GetLatestConfiguration"]
+      Resource = ["arn:aws:appconfig:\${data.aws_region.current.region}:\${data.aws_caller_identity.current.account_id}:application/none"]
+    }
+  ]
 }
 
 # CloudWatch Log Group for Lambda
@@ -3907,73 +4784,81 @@ resource "aws_cloudwatch_log_group" "lambda_logs" {
   #checkov:skip=CKV_AWS_158:Using default CloudWatch log encryption
   #checkov:skip=CKV_AWS_338:Log retention set to forever
   #checkov:skip=CKV_AWS_66:Log retention set to forever
-  name              = "/aws/lambda/TestApiHandler-\${random_string.suffix.result}"
-  tags              = var.tags
+  for_each = local.operations
+
+  name = "/aws/lambda/\${local.function_name[each.key]}"
+  tags = var.tags
 }
 
 # Lambda alias pointing to the latest published version for SnapStart
 resource "aws_lambda_alias" "live" {
+  for_each = local.operations
+
   name             = "live"
-  function_name    = aws_lambda_function.api_lambda.function_name
-  function_version = aws_lambda_function.api_lambda.version
+  function_name    = aws_lambda_function.api_lambda[each.key].function_name
+  function_version = aws_lambda_function.api_lambda[each.key].version
 
   depends_on = [aws_lambda_function.api_lambda]
 }
 
 
-# Create proxy resource (captures all paths)
-resource "aws_api_gateway_resource" "proxy_resource" {
-  rest_api_id = module.rest_api.api_id
-  parent_id   = module.rest_api.api_root_resource_id
-  path_part   = "{proxy+}"
+# Method per operation
+resource "aws_api_gateway_method" "operation_methods" {
+  #checkov:skip=CKV2_AWS_53:Request validation not required for proxy integration as Lambda handles validation
+  for_each = local.operations
+
+  rest_api_id   = module.rest_api.api_id
+  resource_id   = local.operation_resource_id[each.key]
+  http_method   = upper(each.value.method)
+
+  authorization = "AWS_IAM"
+
+  # Path parameters must be declared on the method
+  request_parameters = {
+    for segment in local.operation_segments[each.key] :
+    "method.request.path.\${trimsuffix(trimprefix(segment, "{"), "}")}" => true
+    if startswith(segment, "{")
+  }
+
+  depends_on = []
 }
 
-# Lambda integration for REST API
+# Lambda integration per operation
 resource "aws_api_gateway_integration" "lambda_integration" {
+  for_each = local.operations
+
   rest_api_id = module.rest_api.api_id
-  resource_id = aws_api_gateway_resource.proxy_resource.id
-  http_method = aws_api_gateway_method.proxy_method.http_method
+  resource_id = local.operation_resource_id[each.key]
+  http_method = aws_api_gateway_method.operation_methods[each.key].http_method
 
   integration_http_method = "POST"
   type                    = "AWS_PROXY"
   # Use the response streaming invocation path with the alias ARN for SnapStart
-  uri                     = "arn:aws:apigateway:\${data.aws_region.current.region}:lambda:path/2021-11-15/functions/\${aws_lambda_alias.live.arn}/response-streaming-invocations"
+  uri                     = "arn:aws:apigateway:\${data.aws_region.current.region}:lambda:path/2021-11-15/functions/\${aws_lambda_alias.live[each.key].arn}/response-streaming-invocations"
   response_transfer_mode  = "STREAM"
 
   depends_on = [aws_lambda_alias.live]
 }
 
-# Method for proxy integration
-resource "aws_api_gateway_method" "proxy_method" {
-  #checkov:skip=CKV2_AWS_53:Request validation not required for proxy integration as Lambda handles validation
-  rest_api_id   = module.rest_api.api_id
-  resource_id   = aws_api_gateway_resource.proxy_resource.id
-  http_method   = "ANY"
-
-  authorization = "AWS_IAM"
-
-  request_parameters = {
-    "method.request.path.proxy" = true
-  }
-
-  depends_on = []
-}
-
-# OPTIONS method for CORS preflight
+# OPTIONS method for CORS preflight, on every resource an operation is served from
 resource "aws_api_gateway_method" "options_method" {
   #checkov:skip=CKV2_AWS_70:OPTIONS method must be unauthenticated for CORS preflight requests
   #checkov:skip=CKV2_AWS_53:Request validation not required for OPTIONS CORS preflight method
+  for_each = local.resource_ids
+
   rest_api_id   = module.rest_api.api_id
-  resource_id   = aws_api_gateway_resource.proxy_resource.id
+  resource_id   = each.value
   http_method   = "OPTIONS"
   authorization = "NONE"
 }
 
-# CORS integration for OPTIONS method
+# CORS integration for OPTIONS methods
 resource "aws_api_gateway_integration" "options_integration" {
+  for_each = local.resource_ids
+
   rest_api_id = module.rest_api.api_id
-  resource_id = aws_api_gateway_resource.proxy_resource.id
-  http_method = aws_api_gateway_method.options_method.http_method
+  resource_id = each.value
+  http_method = aws_api_gateway_method.options_method[each.key].http_method
 
   type = "MOCK"
   request_templates = {
@@ -3981,11 +4866,13 @@ resource "aws_api_gateway_integration" "options_integration" {
   }
 }
 
-# OPTIONS method response
+# OPTIONS method responses
 resource "aws_api_gateway_method_response" "options_response" {
+  for_each = local.resource_ids
+
   rest_api_id = module.rest_api.api_id
-  resource_id = aws_api_gateway_resource.proxy_resource.id
-  http_method = aws_api_gateway_method.options_method.http_method
+  resource_id = each.value
+  http_method = aws_api_gateway_method.options_method[each.key].http_method
   status_code = "204"
 
   response_parameters = {
@@ -3995,18 +4882,22 @@ resource "aws_api_gateway_method_response" "options_response" {
   }
 }
 
-# OPTIONS integration response
+# OPTIONS integration responses
 resource "aws_api_gateway_integration_response" "options_integration_response" {
+  for_each = local.resource_ids
+
   rest_api_id = module.rest_api.api_id
-  resource_id = aws_api_gateway_resource.proxy_resource.id
-  http_method = aws_api_gateway_method.options_method.http_method
-  status_code = aws_api_gateway_method_response.options_response.status_code
+  resource_id = each.value
+  http_method = aws_api_gateway_method.options_method[each.key].http_method
+  status_code = aws_api_gateway_method_response.options_response[each.key].status_code
 
   response_parameters = {
     "method.response.header.Access-Control-Allow-Headers" = "'\${join(",", var.cors_allow_headers)}'"
     "method.response.header.Access-Control-Allow-Methods" = "'\${join(",", var.cors_allow_methods)}'"
     "method.response.header.Access-Control-Allow-Origin"  = "'\${join(",", var.cors_allow_origins)}'"
   }
+
+  depends_on = [aws_api_gateway_integration.options_integration]
 }
 
 # API Gateway deployment
@@ -4014,13 +4905,28 @@ resource "aws_api_gateway_deployment" "api_deployment" {
   rest_api_id = module.rest_api.api_id
 
   triggers = {
-    redeployment = sha1(jsonencode([
-      aws_api_gateway_resource.proxy_resource.id,
-      aws_api_gateway_method.proxy_method.id,
-      aws_api_gateway_integration.lambda_integration.id,
-      aws_api_gateway_method.options_method.id,
-      aws_api_gateway_integration.options_integration.id,
-    ]))
+    redeployment = sha1(jsonencode(concat(
+      [for r in aws_api_gateway_resource.path_depth_0 : r.id],
+      [for r in aws_api_gateway_resource.path_depth_1 : r.id],
+      [for r in aws_api_gateway_resource.path_depth_2 : r.id],
+      [for r in aws_api_gateway_resource.path_depth_3 : r.id],
+      [for r in aws_api_gateway_resource.path_depth_4 : r.id],
+      [for r in aws_api_gateway_resource.path_depth_5 : r.id],
+      [for r in aws_api_gateway_resource.path_depth_6 : r.id],
+      [for r in aws_api_gateway_resource.path_depth_7 : r.id],
+      [for r in aws_api_gateway_resource.path_depth_8 : r.id],
+      [for r in aws_api_gateway_resource.path_depth_9 : r.id],
+      [for r in aws_api_gateway_resource.path_depth_10 : r.id],
+      [for r in aws_api_gateway_resource.path_depth_11 : r.id],
+      [for r in aws_api_gateway_resource.path_depth_12 : r.id],
+      [for r in aws_api_gateway_resource.path_depth_13 : r.id],
+      [for r in aws_api_gateway_resource.path_depth_14 : r.id],
+      [for r in aws_api_gateway_resource.path_depth_15 : r.id],
+      [for m in aws_api_gateway_method.operation_methods : m.id],
+      [for i in aws_api_gateway_integration.lambda_integration : i.id],
+      [for m in aws_api_gateway_method.options_method : m.id],
+      [for i in aws_api_gateway_integration.options_integration : i.id],
+    )))
   }
 
   lifecycle {
@@ -4028,7 +4934,7 @@ resource "aws_api_gateway_deployment" "api_deployment" {
   }
 
   depends_on = [
-    aws_api_gateway_method.proxy_method,
+    aws_api_gateway_method.operation_methods,
     aws_api_gateway_integration.lambda_integration,
     aws_api_gateway_method.options_method,
     aws_api_gateway_integration.options_integration,
@@ -4167,24 +5073,28 @@ resource "aws_api_gateway_rest_api_policy" "api_policy" {
 
 # Lambda permission for API Gateway to invoke the function via alias
 resource "aws_lambda_permission" "api_gateway_invoke" {
+  for_each = local.operations
+
   statement_id  = "AllowExecutionFromAPIGateway"
   action        = "lambda:InvokeFunction"
-  function_name = aws_lambda_function.api_lambda.function_name
-  qualifier     = aws_lambda_alias.live.name
+  function_name = aws_lambda_function.api_lambda[each.key].function_name
+  qualifier     = aws_lambda_alias.live[each.key].name
   principal     = "apigateway.amazonaws.com"
-  source_arn    = "\${module.rest_api.api_execution_arn}/*/*"
+  source_arn    = "\${module.rest_api.api_execution_arn}/*/\${local.permission_source_suffix[each.key]}"
 
   depends_on = [module.rest_api, aws_lambda_alias.live]
 }
 
 # Lambda permission for API Gateway to invoke with response streaming via alias
 resource "aws_lambda_permission" "api_gateway_invoke_streaming" {
+  for_each = local.operations
+
   statement_id  = "AllowStreamingFromAPIGateway"
   action        = "lambda:InvokeFunctionWithResponseStream"
-  function_name = aws_lambda_function.api_lambda.function_name
-  qualifier     = aws_lambda_alias.live.name
+  function_name = aws_lambda_function.api_lambda[each.key].function_name
+  qualifier     = aws_lambda_alias.live[each.key].name
   principal     = "apigateway.amazonaws.com"
-  source_arn    = "\${module.rest_api.api_execution_arn}/*/*"
+  source_arn    = "\${module.rest_api.api_execution_arn}/*/\${local.permission_source_suffix[each.key]}"
 
   depends_on = [module.rest_api, aws_lambda_alias.live]
 }
@@ -4195,7 +5105,7 @@ module "add_url_to_runtime_config" {
 
   namespace = "connection"
   key       = "apis"
-  value     = { "TestApi" = aws_api_gateway_stage.api_stage.invoke_url }
+  value     = { "TestApi" = "\${aws_api_gateway_stage.api_stage.invoke_url}/" }
 
   depends_on = [aws_api_gateway_stage.api_stage]
 }
@@ -4248,83 +5158,83 @@ output "stage_id" {
   value       = aws_api_gateway_stage.api_stage.id
 }
 
-# Lambda Function Outputs
-output "lambda_function_name" {
-  description = "Name of the Lambda function"
-  value       = aws_lambda_function.api_lambda.function_name
+# Lambda Function Outputs, keyed by operation name
+output "operations" {
+  description = "Names of the API operations, each with its own Lambda function"
+  value       = keys(local.operations)
 }
 
-output "lambda_function_arn" {
-  description = "ARN of the Lambda function"
-  value       = aws_lambda_function.api_lambda.arn
+output "lambda_function_names" {
+  description = "Name of each operation's Lambda function, keyed by operation name"
+  value       = { for op, fn in aws_lambda_function.api_lambda : op => fn.function_name }
 }
 
-output "lambda_invoke_arn" {
-  description = "Invoke ARN of the Lambda function"
-  value       = aws_lambda_function.api_lambda.invoke_arn
+output "lambda_function_arns" {
+  description = "ARN of each operation's Lambda function, keyed by operation name"
+  value       = { for op, fn in aws_lambda_function.api_lambda : op => fn.arn }
 }
 
-output "lambda_qualified_arn" {
-  description = "Qualified ARN of the Lambda function"
-  value       = aws_lambda_function.api_lambda.qualified_arn
+output "lambda_invoke_arns" {
+  description = "Invoke ARN of each operation's Lambda function, keyed by operation name"
+  value       = { for op, fn in aws_lambda_function.api_lambda : op => fn.invoke_arn }
 }
 
-output "lambda_version" {
-  description = "Version of the Lambda function"
-  value       = aws_lambda_function.api_lambda.version
+output "lambda_qualified_arns" {
+  description = "Qualified ARN of each operation's Lambda function, keyed by operation name"
+  value       = { for op, fn in aws_lambda_function.api_lambda : op => fn.qualified_arn }
 }
 
-output "lambda_source_code_hash" {
-  description = "Base64-encoded SHA256 hash of the Lambda deployment package"
-  value       = aws_lambda_function.api_lambda.source_code_hash
+output "lambda_versions" {
+  description = "Version of each operation's Lambda function, keyed by operation name"
+  value       = { for op, fn in aws_lambda_function.api_lambda : op => fn.version }
 }
 
-output "lambda_source_code_size" {
-  description = "Size of the Lambda deployment package in bytes"
-  value       = aws_lambda_function.api_lambda.source_code_size
+output "lambda_source_code_hash" {
+  description = "Base64-encoded SHA256 hash of the Lambda deployment package, shared by every operation"
+  value       = data.archive_file.lambda_zip.output_base64sha256
 }
 
-# IAM Role Outputs
-output "lambda_execution_role_arn" {
-  description = "ARN of the Lambda execution role"
-  value       = aws_iam_role.lambda_execution_role.arn
+# IAM Role Outputs, keyed by operation name
+output "lambda_execution_role_arns" {
+  description = "ARN of each operation's Lambda execution role, keyed by operation name"
+  value       = { for op, role in aws_iam_role.lambda_execution_role : op => role.arn }
 }
 
-output "lambda_execution_role_name" {
-  description = "Name of the Lambda execution role"
-  value       = aws_iam_role.lambda_execution_role.name
+output "lambda_execution_role_names" {
+  description = "Name of each operation's Lambda execution role, keyed by operation name. Attach additional policies to a specific operation's role by name."
+  value       = { for op, role in aws_iam_role.lambda_execution_role : op => role.name }
 }
 
 output "security_group_id" {
-  description = "Security group ID of the API Lambda function, for use in ingress rules on resources it must reach (e.g. a database). Null unless enable_vpc is true."
+  description = "Security group ID shared by the API Lambda functions, for use in ingress rules on resources they must reach (e.g. a database). Null unless enable_vpc is true."
   value       = var.enable_vpc ? aws_security_group.api_lambda[0].id : null
 }
 
-# Integration Outputs
-output "integration_id" {
-  description = "ID of the Lambda integration"
-  value       = aws_api_gateway_integration.lambda_integration.id
+# Integration Outputs, keyed by operation name
+output "integration_ids" {
+  description = "ID of each operation's Lambda integration, keyed by operation name"
+  value       = { for op, i in aws_api_gateway_integration.lambda_integration : op => i.id }
 }
 
-output "proxy_resource_id" {
-  description = "ID of the proxy resource"
-  value       = aws_api_gateway_resource.proxy_resource.id
+output "method_ids" {
+  description = "ID of each operation's API Gateway method, keyed by operation name"
+  value       = { for op, m in aws_api_gateway_method.operation_methods : op => m.id }
 }
 
-output "proxy_method_id" {
-  description = "ID of the proxy method"
-  value       = aws_api_gateway_method.proxy_method.id
+output "resource_ids" {
+  description = "ID of each API Gateway resource, keyed by its path"
+  value       = local.resource_ids
 }
 
-# CloudWatch Log Groups
-output "lambda_log_group_name" {
-  description = "Name of the Lambda CloudWatch log group"
-  value       = aws_cloudwatch_log_group.lambda_logs.name
+# CloudWatch Log Groups, keyed by operation name
+output "lambda_log_group_names" {
+  description = "Name of each operation's Lambda CloudWatch log group, keyed by operation name"
+  value       = { for op, lg in aws_cloudwatch_log_group.lambda_logs : op => lg.name }
 }
 
-output "lambda_log_group_arn" {
-  description = "ARN of the Lambda CloudWatch log group"
-  value       = aws_cloudwatch_log_group.lambda_logs.arn
+output "lambda_log_group_arns" {
+  description = "ARN of each operation's Lambda CloudWatch log group, keyed by operation name"
+  value       = { for op, lg in aws_cloudwatch_log_group.lambda_logs : op => lg.arn }
 }
 ",
 }
@@ -4534,22 +5444,75 @@ resource "aws_wafv2_web_acl" "api_waf" {
   }
 }
 
+resource "random_id" "waf_log_suffix" {
+  count       = var.enable_waf ? 1 : 0
+  byte_length = 4
+}
+
+locals {
+  waf_log_group_name = var.enable_waf ? "aws-waf-logs-\${var.api_name}-\${random_id.waf_log_suffix[0].hex}" : null
+}
+
+# KMS key for encrypting WAF request logs at rest
+resource "aws_kms_key" "waf_logs" {
+  count = var.enable_waf ? 1 : 0
+
+  description             = "\${var.api_name} API WAF log encryption"
+  deletion_window_in_days = 7
+  enable_key_rotation     = true
+
+  policy = jsonencode({
+    Version = "2012-10-17"
+    Statement = [
+      {
+        Sid       = "Enable IAM User Permissions"
+        Effect    = "Allow"
+        Principal = { AWS = "arn:aws:iam::\${data.aws_caller_identity.current.account_id}:root" }
+        Action    = "kms:*"
+        Resource  = "*"
+      },
+      {
+        Sid       = "Allow CloudWatch Logs"
+        Effect    = "Allow"
+        Principal = { Service = "logs.\${data.aws_region.current.region}.amazonaws.com" }
+        Action = [
+          "kms:Encrypt",
+          "kms:Decrypt",
+          "kms:ReEncrypt*",
+          "kms:GenerateDataKey*",
+          "kms:DescribeKey"
+        ]
+        Resource = "*"
+        Condition = {
+          ArnEquals = {
+            "kms:EncryptionContext:aws:logs:arn" = "arn:aws:logs:\${data.aws_region.current.region}:\${data.aws_caller_identity.current.account_id}:log-group:\${local.waf_log_group_name}"
+          }
+        }
+      }
+    ]
+  })
+
+  tags = var.tags
+}
+
+resource "aws_kms_alias" "waf_logs" {
+  count = var.enable_waf ? 1 : 0
+
+  name          = "alias/\${var.api_name}-\${random_id.waf_log_suffix[0].hex}-waf-logs"
+  target_key_id = aws_kms_key.waf_logs[0].key_id
+}
+
 # CloudWatch Log Group for WAF request logs. Name must start with \`aws-waf-logs-\`.
 resource "aws_cloudwatch_log_group" "api_waf_logs" {
-  #checkov:skip=CKV_AWS_158:Using default CloudWatch log encryption
   #checkov:skip=CKV_AWS_338:Log retention set to one month which is sufficient for WAF logs
   count = var.enable_waf ? 1 : 0
 
-  name              = "aws-waf-logs-\${var.api_name}-\${random_id.waf_log_suffix[0].hex}"
+  name              = local.waf_log_group_name
   retention_in_days = 30
+  kms_key_id        = aws_kms_key.waf_logs[0].arn
   tags              = var.tags
 }
 
-resource "random_id" "waf_log_suffix" {
-  count       = var.enable_waf ? 1 : 0
-  byte_length = 4
-}
-
 resource "aws_wafv2_web_acl_logging_configuration" "api_waf_logging" {
   count = var.enable_waf ? 1 : 0
 
@@ -4595,10 +5558,18 @@ output "waf_web_acl_arn" {
   required_version = ">= 1.0"
 
   required_providers {
+    archive = {
+      source  = "hashicorp/archive"
+      version = "2.8.0"
+    }
     aws = {
       source  = "hashicorp/aws"
       version = "6.61.0"
     }
+    random = {
+      source  = "hashicorp/random"
+      version = "3.9.0"
+    }
   }
 }
 
@@ -4704,6 +5675,235 @@ resource "random_string" "suffix" {
   upper   = false
 }
 
+locals {
+  # Generated at build time from the API definition
+  operations_file = "\${path.module}/../../../generated/test-api/operations.json"
+  operations      = fileexists(local.operations_file) ? jsondecode(file(local.operations_file)) : {}
+
+  operation_slug = { for op in keys(local.operations) : op => replace(op, "/[^a-zA-Z0-9-_]/", "-") }
+  operation_hash = { for op in keys(local.operations) : op => substr(sha256(op), 0, 8) }
+
+  function_name = { for op in keys(local.operations) : op =>
+    "\${substr("TestApi-\${local.operation_slug[op]}", 0, 64 - length(local.operation_hash[op]) - length(random_string.suffix.result) - 2)}-\${local.operation_hash[op]}-\${random_string.suffix.result}"
+  }
+  role_name = { for op in keys(local.operations) : op =>
+    "\${substr("TestApi-\${local.operation_slug[op]}-role", 0, 64 - length(local.operation_hash[op]) - length(random_string.suffix.result) - 2)}-\${local.operation_hash[op]}-\${random_string.suffix.result}"
+  }
+
+  # A REST API needs a resource per path segment, so each operation's path is
+  # split into the distinct path prefixes the resource tree is built from below
+  operation_segments = { for op, details in local.operations : op => compact(split("/", details.path)) }
+
+  path_nodes = merge([
+    for op, segments in local.operation_segments : {
+      for i, segment in segments : join("/", slice(segments, 0, i + 1)) => {
+        depth  = i
+        parent = i == 0 ? "" : join("/", slice(segments, 0, i))
+        part   = segment
+      }
+    }
+  ]...)
+
+  # Instances of a resource cannot reference one another, so each depth is a
+  # separate resource. Deeper paths are reported by the precondition below.
+  max_path_depth = 16
+  path_nodes_by_depth = { for depth in range(local.max_path_depth) : depth => {
+    for path, node in local.path_nodes : path => node if node.depth == depth
+  } }
+  paths_too_deep = [for path, node in local.path_nodes : path if node.depth >= local.max_path_depth]
+
+  resource_ids = merge(
+    { for path, resource in aws_api_gateway_resource.path_depth_0 : path => resource.id },
+    { for path, resource in aws_api_gateway_resource.path_depth_1 : path => resource.id },
+    { for path, resource in aws_api_gateway_resource.path_depth_2 : path => resource.id },
+    { for path, resource in aws_api_gateway_resource.path_depth_3 : path => resource.id },
+    { for path, resource in aws_api_gateway_resource.path_depth_4 : path => resource.id },
+    { for path, resource in aws_api_gateway_resource.path_depth_5 : path => resource.id },
+    { for path, resource in aws_api_gateway_resource.path_depth_6 : path => resource.id },
+    { for path, resource in aws_api_gateway_resource.path_depth_7 : path => resource.id },
+    { for path, resource in aws_api_gateway_resource.path_depth_8 : path => resource.id },
+    { for path, resource in aws_api_gateway_resource.path_depth_9 : path => resource.id },
+    { for path, resource in aws_api_gateway_resource.path_depth_10 : path => resource.id },
+    { for path, resource in aws_api_gateway_resource.path_depth_11 : path => resource.id },
+    { for path, resource in aws_api_gateway_resource.path_depth_12 : path => resource.id },
+    { for path, resource in aws_api_gateway_resource.path_depth_13 : path => resource.id },
+    { for path, resource in aws_api_gateway_resource.path_depth_14 : path => resource.id },
+    { for path, resource in aws_api_gateway_resource.path_depth_15 : path => resource.id },
+  )
+
+  operation_resource_id = { for op, segments in local.operation_segments : op =>
+    local.resource_ids[join("/", segments)]
+  }
+
+  permission_source_suffix = { for op, details in local.operations : op =>
+    "\${upper(details.method)}/\${replace(join("/", local.operation_segments[op]), "/{[^}]*}/", "*")}"
+  }
+}
+
+resource "terraform_data" "operations_metadata" {
+  # Fails the plan when the operations metadata has not been generated
+  input = local.operations_file
+
+  lifecycle {
+    precondition {
+      condition     = fileexists(local.operations_file)
+      error_message = "Operations metadata not found at \${local.operations_file}. Build the TestApi project to generate it."
+    }
+    precondition {
+      condition     = length(local.operations) > 0
+      error_message = "No operations found in \${local.operations_file}. The TestApi API must define at least one operation."
+    }
+    precondition {
+      condition     = length(local.paths_too_deep) == 0
+      error_message = "Operation paths exceed the supported depth of \${local.max_path_depth} segments: \${join(", ", local.paths_too_deep)}. Add further aws_api_gateway_resource levels to this module to support them."
+    }
+  }
+}
+
+# API Gateway resources at path depth 0
+resource "aws_api_gateway_resource" "path_depth_0" {
+  for_each = local.path_nodes_by_depth[0]
+
+  rest_api_id = module.rest_api.api_id
+  parent_id   = module.rest_api.api_root_resource_id
+  path_part   = each.value.part
+}
+
+# API Gateway resources at path depth 1
+resource "aws_api_gateway_resource" "path_depth_1" {
+  for_each = local.path_nodes_by_depth[1]
+
+  rest_api_id = module.rest_api.api_id
+  parent_id   = aws_api_gateway_resource.path_depth_0[each.value.parent].id
+  path_part   = each.value.part
+}
+
+# API Gateway resources at path depth 2
+resource "aws_api_gateway_resource" "path_depth_2" {
+  for_each = local.path_nodes_by_depth[2]
+
+  rest_api_id = module.rest_api.api_id
+  parent_id   = aws_api_gateway_resource.path_depth_1[each.value.parent].id
+  path_part   = each.value.part
+}
+
+# API Gateway resources at path depth 3
+resource "aws_api_gateway_resource" "path_depth_3" {
+  for_each = local.path_nodes_by_depth[3]
+
+  rest_api_id = module.rest_api.api_id
+  parent_id   = aws_api_gateway_resource.path_depth_2[each.value.parent].id
+  path_part   = each.value.part
+}
+
+# API Gateway resources at path depth 4
+resource "aws_api_gateway_resource" "path_depth_4" {
+  for_each = local.path_nodes_by_depth[4]
+
+  rest_api_id = module.rest_api.api_id
+  parent_id   = aws_api_gateway_resource.path_depth_3[each.value.parent].id
+  path_part   = each.value.part
+}
+
+# API Gateway resources at path depth 5
+resource "aws_api_gateway_resource" "path_depth_5" {
+  for_each = local.path_nodes_by_depth[5]
+
+  rest_api_id = module.rest_api.api_id
+  parent_id   = aws_api_gateway_resource.path_depth_4[each.value.parent].id
+  path_part   = each.value.part
+}
+
+# API Gateway resources at path depth 6
+resource "aws_api_gateway_resource" "path_depth_6" {
+  for_each = local.path_nodes_by_depth[6]
+
+  rest_api_id = module.rest_api.api_id
+  parent_id   = aws_api_gateway_resource.path_depth_5[each.value.parent].id
+  path_part   = each.value.part
+}
+
+# API Gateway resources at path depth 7
+resource "aws_api_gateway_resource" "path_depth_7" {
+  for_each = local.path_nodes_by_depth[7]
+
+  rest_api_id = module.rest_api.api_id
+  parent_id   = aws_api_gateway_resource.path_depth_6[each.value.parent].id
+  path_part   = each.value.part
+}
+
+# API Gateway resources at path depth 8
+resource "aws_api_gateway_resource" "path_depth_8" {
+  for_each = local.path_nodes_by_depth[8]
+
+  rest_api_id = module.rest_api.api_id
+  parent_id   = aws_api_gateway_resource.path_depth_7[each.value.parent].id
+  path_part   = each.value.part
+}
+
+# API Gateway resources at path depth 9
+resource "aws_api_gateway_resource" "path_depth_9" {
+  for_each = local.path_nodes_by_depth[9]
+
+  rest_api_id = module.rest_api.api_id
+  parent_id   = aws_api_gateway_resource.path_depth_8[each.value.parent].id
+  path_part   = each.value.part
+}
+
+# API Gateway resources at path depth 10
+resource "aws_api_gateway_resource" "path_depth_10" {
+  for_each = local.path_nodes_by_depth[10]
+
+  rest_api_id = module.rest_api.api_id
+  parent_id   = aws_api_gateway_resource.path_depth_9[each.value.parent].id
+  path_part   = each.value.part
+}
+
+# API Gateway resources at path depth 11
+resource "aws_api_gateway_resource" "path_depth_11" {
+  for_each = local.path_nodes_by_depth[11]
+
+  rest_api_id = module.rest_api.api_id
+  parent_id   = aws_api_gateway_resource.path_depth_10[each.value.parent].id
+  path_part   = each.value.part
+}
+
+# API Gateway resources at path depth 12
+resource "aws_api_gateway_resource" "path_depth_12" {
+  for_each = local.path_nodes_by_depth[12]
+
+  rest_api_id = module.rest_api.api_id
+  parent_id   = aws_api_gateway_resource.path_depth_11[each.value.parent].id
+  path_part   = each.value.part
+}
+
+# API Gateway resources at path depth 13
+resource "aws_api_gateway_resource" "path_depth_13" {
+  for_each = local.path_nodes_by_depth[13]
+
+  rest_api_id = module.rest_api.api_id
+  parent_id   = aws_api_gateway_resource.path_depth_12[each.value.parent].id
+  path_part   = each.value.part
+}
+
+# API Gateway resources at path depth 14
+resource "aws_api_gateway_resource" "path_depth_14" {
+  for_each = local.path_nodes_by_depth[14]
+
+  rest_api_id = module.rest_api.api_id
+  parent_id   = aws_api_gateway_resource.path_depth_13[each.value.parent].id
+  path_part   = each.value.part
+}
+
+# API Gateway resources at path depth 15
+resource "aws_api_gateway_resource" "path_depth_15" {
+  for_each = local.path_nodes_by_depth[15]
+
+  rest_api_id = module.rest_api.api_id
+  parent_id   = aws_api_gateway_resource.path_depth_14[each.value.parent].id
+  path_part   = each.value.part
+}
+
 # Resources
 
 # Create Lambda ZIP file from the bundle directory
@@ -4778,8 +5978,10 @@ resource "aws_vpc_security_group_egress_rule" "api_lambda_https" {
   description       = "Allow outbound HTTPS to AWS service endpoints"
 }
 
-# Lambda function
 resource "aws_lambda_function" "api_lambda" {
+  # One lambda function per operation, each serving just that operation
+  for_each = local.operations
+
   #checkov:skip=CKV_AWS_117:Lambda function is optionally deployed into a VPC via vpc_id/subnet_ids; not required for this use case
   #checkov:skip=CKV_AWS_116:Dead Letter Queue not required for this simple API use case
   #checkov:skip=CKV_AWS_272:Code signing not required for this use case
@@ -4788,8 +5990,8 @@ resource "aws_lambda_function" "api_lambda" {
   s3_bucket         = aws_s3_object.lambda_zip.bucket
   s3_key            = aws_s3_object.lambda_zip.key
   s3_object_version = aws_s3_object.lambda_zip.version_id
-  function_name    = "TestApiHandler-\${random_string.suffix.result}"
-  role            = aws_iam_role.lambda_execution_role.arn
+  function_name    = local.function_name[each.key]
+  role            = aws_iam_role.lambda_execution_role[each.key].arn
   handler         = "run.sh"
   runtime         = "python3.14"
   layers          = ["arn:aws:lambda:\${data.aws_region.current.region}:753240598075:layer:LambdaAdapterLayerX86:24"]
@@ -4834,7 +6036,9 @@ resource "aws_lambda_function" "api_lambda" {
 
 # IAM role for Lambda execution
 resource "aws_iam_role" "lambda_execution_role" {
-  name = "TestApiHandler-execution-role-\${random_string.suffix.result}"
+  for_each = local.operations
+
+  name = local.role_name[each.key]
 
   assume_role_policy = jsonencode({
     Version = "2012-10-17"
@@ -4854,32 +6058,38 @@ resource "aws_iam_role" "lambda_execution_role" {
 
 # Attach basic execution policy to Lambda role
 resource "aws_iam_role_policy_attachment" "lambda_basic_execution" {
+  for_each = local.operations
+
   policy_arn = "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
-  role       = aws_iam_role.lambda_execution_role.name
+  role       = aws_iam_role.lambda_execution_role[each.key].name
 }
 
 # Attach X-Ray tracing policy to Lambda role
 resource "aws_iam_role_policy_attachment" "lambda_xray_execution" {
+  for_each = local.operations
+
   policy_arn = "arn:aws:iam::aws:policy/AWSXRayDaemonWriteAccess"
-  role       = aws_iam_role.lambda_execution_role.name
+  role       = aws_iam_role.lambda_execution_role[each.key].name
 }
 
 # Attach VPC access policy to Lambda role when deployed into a VPC
 resource "aws_iam_role_policy_attachment" "lambda_vpc_access" {
-  count      = var.enable_vpc ? 1 : 0
+  for_each = var.enable_vpc ? local.operations : {}
+
   policy_arn = "arn:aws:iam::aws:policy/service-role/AWSLambdaVPCAccessExecutionRole"
-  role       = aws_iam_role.lambda_execution_role.name
+  role       = aws_iam_role.lambda_execution_role[each.key].name
 }
 
 # Additional IAM policies for Lambda (if provided)
 resource "aws_iam_role_policy" "lambda_additional_policies" {
-  count = length(local.lambda_policy_statements) > 0 ? 1 : 0
-  name  = "TestApiHandler-additional-policies-\${random_string.suffix.result}"
-  role  = aws_iam_role.lambda_execution_role.id
+  for_each = local.operations
+
+  name = "\${substr(local.function_name[each.key], 0, 55)}-policies"
+  role = aws_iam_role.lambda_execution_role[each.key].id
 
   policy = jsonencode({
     Version = "2012-10-17"
-    Statement = local.lambda_policy_statements
+    Statement = local.lambda_policy_document_statements
   })
 }
 
@@ -4895,6 +6105,15 @@ locals {
       Resource = ["\${var.appconfig_application_arn}/*"]
     }
   ] : [], var.additional_iam_policy_statements)
+
+  # IAM rejects an empty statement list, so fall back to a no-op deny
+  lambda_policy_document_statements = length(local.lambda_policy_statements) > 0 ? local.lambda_policy_statements : [
+    {
+      Effect   = "Deny"
+      Action   = ["appconfig:GetLatestConfiguration"]
+      Resource = ["arn:aws:appconfig:\${data.aws_region.current.region}:\${data.aws_caller_identity.current.account_id}:application/none"]
+    }
+  ]
 }
 
 # CloudWatch Log Group for Lambda
@@ -4902,15 +6121,19 @@ resource "aws_cloudwatch_log_group" "lambda_logs" {
   #checkov:skip=CKV_AWS_158:Using default CloudWatch log encryption
   #checkov:skip=CKV_AWS_338:Log retention set to forever
   #checkov:skip=CKV_AWS_66:Log retention set to forever
-  name              = "/aws/lambda/TestApiHandler-\${random_string.suffix.result}"
-  tags              = var.tags
+  for_each = local.operations
+
+  name = "/aws/lambda/\${local.function_name[each.key]}"
+  tags = var.tags
 }
 
 # Lambda alias pointing to the latest published version for SnapStart
 resource "aws_lambda_alias" "live" {
+  for_each = local.operations
+
   name             = "live"
-  function_name    = aws_lambda_function.api_lambda.function_name
-  function_version = aws_lambda_function.api_lambda.version
+  function_name    = aws_lambda_function.api_lambda[each.key].function_name
+  function_version = aws_lambda_function.api_lambda[each.key].version
 
   depends_on = [aws_lambda_function.api_lambda]
 }
@@ -5008,60 +6231,64 @@ resource "aws_lambda_permission" "authorizer_invoke" {
   source_arn    = "\${module.rest_api.api_execution_arn}/authorizers/\${aws_api_gateway_authorizer.custom_authorizer.id}"
 }
 
-# Create proxy resource (captures all paths)
-resource "aws_api_gateway_resource" "proxy_resource" {
-  rest_api_id = module.rest_api.api_id
-  parent_id   = module.rest_api.api_root_resource_id
-  path_part   = "{proxy+}"
+# Method per operation
+resource "aws_api_gateway_method" "operation_methods" {
+  #checkov:skip=CKV2_AWS_53:Request validation not required for proxy integration as Lambda handles validation
+  for_each = local.operations
+
+  rest_api_id   = module.rest_api.api_id
+  resource_id   = local.operation_resource_id[each.key]
+  http_method   = upper(each.value.method)
+
+  authorization = "CUSTOM"
+  authorizer_id = aws_api_gateway_authorizer.custom_authorizer.id
+
+  # Path parameters must be declared on the method
+  request_parameters = {
+    for segment in local.operation_segments[each.key] :
+    "method.request.path.\${trimsuffix(trimprefix(segment, "{"), "}")}" => true
+    if startswith(segment, "{")
+  }
+
+  depends_on = [aws_api_gateway_authorizer.custom_authorizer]
 }
 
-# Lambda integration for REST API
+# Lambda integration per operation
 resource "aws_api_gateway_integration" "lambda_integration" {
+  for_each = local.operations
+
   rest_api_id = module.rest_api.api_id
-  resource_id = aws_api_gateway_resource.proxy_resource.id
-  http_method = aws_api_gateway_method.proxy_method.http_method
+  resource_id = local.operation_resource_id[each.key]
+  http_method = aws_api_gateway_method.operation_methods[each.key].http_method
 
   integration_http_method = "POST"
   type                    = "AWS_PROXY"
   # Use the response streaming invocation path with the alias ARN for SnapStart
-  uri                     = "arn:aws:apigateway:\${data.aws_region.current.region}:lambda:path/2021-11-15/functions/\${aws_lambda_alias.live.arn}/response-streaming-invocations"
+  uri                     = "arn:aws:apigateway:\${data.aws_region.current.region}:lambda:path/2021-11-15/functions/\${aws_lambda_alias.live[each.key].arn}/response-streaming-invocations"
   response_transfer_mode  = "STREAM"
 
   depends_on = [aws_lambda_alias.live]
 }
 
-# Method for proxy integration
-resource "aws_api_gateway_method" "proxy_method" {
-  #checkov:skip=CKV2_AWS_53:Request validation not required for proxy integration as Lambda handles validation
-  rest_api_id   = module.rest_api.api_id
-  resource_id   = aws_api_gateway_resource.proxy_resource.id
-  http_method   = "ANY"
-
-  authorization = "CUSTOM"
-  authorizer_id = aws_api_gateway_authorizer.custom_authorizer.id
-
-  request_parameters = {
-    "method.request.path.proxy" = true
-  }
-
-  depends_on = [aws_api_gateway_authorizer.custom_authorizer]
-}
-
-# OPTIONS method for CORS preflight
+# OPTIONS method for CORS preflight, on every resource an operation is served from
 resource "aws_api_gateway_method" "options_method" {
   #checkov:skip=CKV2_AWS_70:OPTIONS method must be unauthenticated for CORS preflight requests
   #checkov:skip=CKV2_AWS_53:Request validation not required for OPTIONS CORS preflight method
+  for_each = local.resource_ids
+
   rest_api_id   = module.rest_api.api_id
-  resource_id   = aws_api_gateway_resource.proxy_resource.id
+  resource_id   = each.value
   http_method   = "OPTIONS"
   authorization = "NONE"
 }
 
-# CORS integration for OPTIONS method
+# CORS integration for OPTIONS methods
 resource "aws_api_gateway_integration" "options_integration" {
+  for_each = local.resource_ids
+
   rest_api_id = module.rest_api.api_id
-  resource_id = aws_api_gateway_resource.proxy_resource.id
-  http_method = aws_api_gateway_method.options_method.http_method
+  resource_id = each.value
+  http_method = aws_api_gateway_method.options_method[each.key].http_method
 
   type = "MOCK"
   request_templates = {
@@ -5069,11 +6296,13 @@ resource "aws_api_gateway_integration" "options_integration" {
   }
 }
 
-# OPTIONS method response
+# OPTIONS method responses
 resource "aws_api_gateway_method_response" "options_response" {
+  for_each = local.resource_ids
+
   rest_api_id = module.rest_api.api_id
-  resource_id = aws_api_gateway_resource.proxy_resource.id
-  http_method = aws_api_gateway_method.options_method.http_method
+  resource_id = each.value
+  http_method = aws_api_gateway_method.options_method[each.key].http_method
   status_code = "204"
 
   response_parameters = {
@@ -5083,18 +6312,22 @@ resource "aws_api_gateway_method_response" "options_response" {
   }
 }
 
-# OPTIONS integration response
+# OPTIONS integration responses
 resource "aws_api_gateway_integration_response" "options_integration_response" {
+  for_each = local.resource_ids
+
   rest_api_id = module.rest_api.api_id
-  resource_id = aws_api_gateway_resource.proxy_resource.id
-  http_method = aws_api_gateway_method.options_method.http_method
-  status_code = aws_api_gateway_method_response.options_response.status_code
+  resource_id = each.value
+  http_method = aws_api_gateway_method.options_method[each.key].http_method
+  status_code = aws_api_gateway_method_response.options_response[each.key].status_code
 
   response_parameters = {
     "method.response.header.Access-Control-Allow-Headers" = "'\${join(",", var.cors_allow_headers)}'"
     "method.response.header.Access-Control-Allow-Methods" = "'\${join(",", var.cors_allow_methods)}'"
     "method.response.header.Access-Control-Allow-Origin"  = "'\${join(",", var.cors_allow_origins)}'"
   }
+
+  depends_on = [aws_api_gateway_integration.options_integration]
 }
 
 # API Gateway deployment
@@ -5102,13 +6335,28 @@ resource "aws_api_gateway_deployment" "api_deployment" {
   rest_api_id = module.rest_api.api_id
 
   triggers = {
-    redeployment = sha1(jsonencode([
-      aws_api_gateway_resource.proxy_resource.id,
-      aws_api_gateway_method.proxy_method.id,
-      aws_api_gateway_integration.lambda_integration.id,
-      aws_api_gateway_method.options_method.id,
-      aws_api_gateway_integration.options_integration.id,
-    ]))
+    redeployment = sha1(jsonencode(concat(
+      [for r in aws_api_gateway_resource.path_depth_0 : r.id],
+      [for r in aws_api_gateway_resource.path_depth_1 : r.id],
+      [for r in aws_api_gateway_resource.path_depth_2 : r.id],
+      [for r in aws_api_gateway_resource.path_depth_3 : r.id],
+      [for r in aws_api_gateway_resource.path_depth_4 : r.id],
+      [for r in aws_api_gateway_resource.path_depth_5 : r.id],
+      [for r in aws_api_gateway_resource.path_depth_6 : r.id],
+      [for r in aws_api_gateway_resource.path_depth_7 : r.id],
+      [for r in aws_api_gateway_resource.path_depth_8 : r.id],
+      [for r in aws_api_gateway_resource.path_depth_9 : r.id],
+      [for r in aws_api_gateway_resource.path_depth_10 : r.id],
+      [for r in aws_api_gateway_resource.path_depth_11 : r.id],
+      [for r in aws_api_gateway_resource.path_depth_12 : r.id],
+      [for r in aws_api_gateway_resource.path_depth_13 : r.id],
+      [for r in aws_api_gateway_resource.path_depth_14 : r.id],
+      [for r in aws_api_gateway_resource.path_depth_15 : r.id],
+      [for m in aws_api_gateway_method.operation_methods : m.id],
+      [for i in aws_api_gateway_integration.lambda_integration : i.id],
+      [for m in aws_api_gateway_method.options_method : m.id],
+      [for i in aws_api_gateway_integration.options_integration : i.id],
+    )))
   }
 
   lifecycle {
@@ -5116,7 +6364,7 @@ resource "aws_api_gateway_deployment" "api_deployment" {
   }
 
   depends_on = [
-    aws_api_gateway_method.proxy_method,
+    aws_api_gateway_method.operation_methods,
     aws_api_gateway_integration.lambda_integration,
     aws_api_gateway_method.options_method,
     aws_api_gateway_integration.options_integration,
@@ -5245,24 +6493,28 @@ resource "aws_api_gateway_rest_api_policy" "api_policy" {
 
 # Lambda permission for API Gateway to invoke the function via alias
 resource "aws_lambda_permission" "api_gateway_invoke" {
+  for_each = local.operations
+
   statement_id  = "AllowExecutionFromAPIGateway"
   action        = "lambda:InvokeFunction"
-  function_name = aws_lambda_function.api_lambda.function_name
-  qualifier     = aws_lambda_alias.live.name
+  function_name = aws_lambda_function.api_lambda[each.key].function_name
+  qualifier     = aws_lambda_alias.live[each.key].name
   principal     = "apigateway.amazonaws.com"
-  source_arn    = "\${module.rest_api.api_execution_arn}/*/*"
+  source_arn    = "\${module.rest_api.api_execution_arn}/*/\${local.permission_source_suffix[each.key]}"
 
   depends_on = [module.rest_api, aws_lambda_alias.live]
 }
 
 # Lambda permission for API Gateway to invoke with response streaming via alias
 resource "aws_lambda_permission" "api_gateway_invoke_streaming" {
+  for_each = local.operations
+
   statement_id  = "AllowStreamingFromAPIGateway"
   action        = "lambda:InvokeFunctionWithResponseStream"
-  function_name = aws_lambda_function.api_lambda.function_name
-  qualifier     = aws_lambda_alias.live.name
+  function_name = aws_lambda_function.api_lambda[each.key].function_name
+  qualifier     = aws_lambda_alias.live[each.key].name
   principal     = "apigateway.amazonaws.com"
-  source_arn    = "\${module.rest_api.api_execution_arn}/*/*"
+  source_arn    = "\${module.rest_api.api_execution_arn}/*/\${local.permission_source_suffix[each.key]}"
 
   depends_on = [module.rest_api, aws_lambda_alias.live]
 }
@@ -5273,7 +6525,7 @@ module "add_url_to_runtime_config" {
 
   namespace = "connection"
   key       = "apis"
-  value     = { "TestApi" = aws_api_gateway_stage.api_stage.invoke_url }
+  value     = { "TestApi" = "\${aws_api_gateway_stage.api_stage.invoke_url}/" }
 
   depends_on = [aws_api_gateway_stage.api_stage]
 }
@@ -5326,83 +6578,83 @@ output "stage_id" {
   value       = aws_api_gateway_stage.api_stage.id
 }
 
-# Lambda Function Outputs
-output "lambda_function_name" {
-  description = "Name of the Lambda function"
-  value       = aws_lambda_function.api_lambda.function_name
+# Lambda Function Outputs, keyed by operation name
+output "operations" {
+  description = "Names of the API operations, each with its own Lambda function"
+  value       = keys(local.operations)
 }
 
-output "lambda_function_arn" {
-  description = "ARN of the Lambda function"
-  value       = aws_lambda_function.api_lambda.arn
+output "lambda_function_names" {
+  description = "Name of each operation's Lambda function, keyed by operation name"
+  value       = { for op, fn in aws_lambda_function.api_lambda : op => fn.function_name }
 }
 
-output "lambda_invoke_arn" {
-  description = "Invoke ARN of the Lambda function"
-  value       = aws_lambda_function.api_lambda.invoke_arn
+output "lambda_function_arns" {
+  description = "ARN of each operation's Lambda function, keyed by operation name"
+  value       = { for op, fn in aws_lambda_function.api_lambda : op => fn.arn }
 }
 
-output "lambda_qualified_arn" {
-  description = "Qualified ARN of the Lambda function"
-  value       = aws_lambda_function.api_lambda.qualified_arn
+output "lambda_invoke_arns" {
+  description = "Invoke ARN of each operation's Lambda function, keyed by operation name"
+  value       = { for op, fn in aws_lambda_function.api_lambda : op => fn.invoke_arn }
 }
 
-output "lambda_version" {
-  description = "Version of the Lambda function"
-  value       = aws_lambda_function.api_lambda.version
+output "lambda_qualified_arns" {
+  description = "Qualified ARN of each operation's Lambda function, keyed by operation name"
+  value       = { for op, fn in aws_lambda_function.api_lambda : op => fn.qualified_arn }
 }
 
-output "lambda_source_code_hash" {
-  description = "Base64-encoded SHA256 hash of the Lambda deployment package"
-  value       = aws_lambda_function.api_lambda.source_code_hash
+output "lambda_versions" {
+  description = "Version of each operation's Lambda function, keyed by operation name"
+  value       = { for op, fn in aws_lambda_function.api_lambda : op => fn.version }
 }
 
-output "lambda_source_code_size" {
-  description = "Size of the Lambda deployment package in bytes"
-  value       = aws_lambda_function.api_lambda.source_code_size
+output "lambda_source_code_hash" {
+  description = "Base64-encoded SHA256 hash of the Lambda deployment package, shared by every operation"
+  value       = data.archive_file.lambda_zip.output_base64sha256
 }
 
-# IAM Role Outputs
-output "lambda_execution_role_arn" {
-  description = "ARN of the Lambda execution role"
-  value       = aws_iam_role.lambda_execution_role.arn
+# IAM Role Outputs, keyed by operation name
+output "lambda_execution_role_arns" {
+  description = "ARN of each operation's Lambda execution role, keyed by operation name"
+  value       = { for op, role in aws_iam_role.lambda_execution_role : op => role.arn }
 }
 
-output "lambda_execution_role_name" {
-  description = "Name of the Lambda execution role"
-  value       = aws_iam_role.lambda_execution_role.name
+output "lambda_execution_role_names" {
+  description = "Name of each operation's Lambda execution role, keyed by operation name. Attach additional policies to a specific operation's role by name."
+  value       = { for op, role in aws_iam_role.lambda_execution_role : op => role.name }
 }
 
 output "security_group_id" {
-  description = "Security group ID of the API Lambda function, for use in ingress rules on resources it must reach (e.g. a database). Null unless enable_vpc is true."
+  description = "Security group ID shared by the API Lambda functions, for use in ingress rules on resources they must reach (e.g. a database). Null unless enable_vpc is true."
   value       = var.enable_vpc ? aws_security_group.api_lambda[0].id : null
 }
 
-# Integration Outputs
-output "integration_id" {
-  description = "ID of the Lambda integration"
-  value       = aws_api_gateway_integration.lambda_integration.id
+# Integration Outputs, keyed by operation name
+output "integration_ids" {
+  description = "ID of each operation's Lambda integration, keyed by operation name"
+  value       = { for op, i in aws_api_gateway_integration.lambda_integration : op => i.id }
 }
 
-output "proxy_resource_id" {
-  description = "ID of the proxy resource"
-  value       = aws_api_gateway_resource.proxy_resource.id
+output "method_ids" {
+  description = "ID of each operation's API Gateway method, keyed by operation name"
+  value       = { for op, m in aws_api_gateway_method.operation_methods : op => m.id }
 }
 
-output "proxy_method_id" {
-  description = "ID of the proxy method"
-  value       = aws_api_gateway_method.proxy_method.id
+output "resource_ids" {
+  description = "ID of each API Gateway resource, keyed by its path"
+  value       = local.resource_ids
 }
 
-# CloudWatch Log Groups
-output "lambda_log_group_name" {
-  description = "Name of the Lambda CloudWatch log group"
-  value       = aws_cloudwatch_log_group.lambda_logs.name
+# CloudWatch Log Groups, keyed by operation name
+output "lambda_log_group_names" {
+  description = "Name of each operation's Lambda CloudWatch log group, keyed by operation name"
+  value       = { for op, lg in aws_cloudwatch_log_group.lambda_logs : op => lg.name }
 }
 
-output "lambda_log_group_arn" {
-  description = "ARN of the Lambda CloudWatch log group"
-  value       = aws_cloudwatch_log_group.lambda_logs.arn
+output "lambda_log_group_arns" {
+  description = "ARN of each operation's Lambda CloudWatch log group, keyed by operation name"
+  value       = { for op, lg in aws_cloudwatch_log_group.lambda_logs : op => lg.arn }
 }
 ",
 }