Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Enable route_settings in default stage #80

Merged
merged 5 commits into from
Sep 12, 2022
Merged

feat: Enable route_settings in default stage #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6b64822
Enable route_settings in default stage
honglus Sep 9, 2022
91cfd0b
add example
honglus Sep 9, 2022
db679ef
Updated modules version in examples a bit
antonbabenko Sep 9, 2022
0926548
Fixed example
antonbabenko Sep 12, 2022
3f5b5bb
Simplified condition a bit
antonbabenko Sep 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/complete-http/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Note that this example may create resources which cost money. Run `terraform des
|------|--------|---------|
| <a name="module_acm"></a> [acm](#module\_acm) | terraform-aws-modules/acm/aws | ~> 3.0 |
| <a name="module_api_gateway"></a> [api\_gateway](#module\_api\_gateway) | ../../ | n/a |
| <a name="module_lambda_function"></a> [lambda\_function](#module\_lambda\_function) | terraform-aws-modules/lambda/aws | ~> 2.0 |
| <a name="module_lambda_function"></a> [lambda\_function](#module\_lambda\_function) | terraform-aws-modules/lambda/aws | ~> 3.0 |
| <a name="module_step_function"></a> [step\_function](#module\_step\_function) | terraform-aws-modules/step-functions/aws | ~> 2.0 |

## Resources
Expand All @@ -53,7 +53,7 @@ Note that this example may create resources which cost money. Run `terraform des
| [aws_cognito_user_pool.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cognito_user_pool) | resource |
| [aws_route53_record.api](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/route53_record) | resource |
| [aws_s3_bucket.truststore](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket) | resource |
| [aws_s3_bucket_object.truststore](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_bucket_object) | resource |
| [aws_s3_object.truststore](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/s3_object) | resource |
| [null_resource.download_package](https://registry.terraform.io/providers/hashicorp/null/latest/docs/resources/resource) | resource |
| [random_pet.this](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/pet) | resource |
| [tls_private_key.private_key](https://registry.terraform.io/providers/hashicorp/tls/latest/docs/resources/private_key) | resource |
Expand Down
21 changes: 13 additions & 8 deletions examples/complete-http/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ module "api_gateway" {
}

mutual_tls_authentication = {
truststore_uri = "s3://${aws_s3_bucket.truststore.bucket}/${aws_s3_bucket_object.truststore.id}"
truststore_version = aws_s3_bucket_object.truststore.version_id
truststore_uri = "s3://${aws_s3_bucket.truststore.bucket}/${aws_s3_object.truststore.id}"
truststore_version = aws_s3_object.truststore.version_id
}

domain_name = local.domain_name
Expand Down Expand Up @@ -69,10 +69,13 @@ module "api_gateway" {
}

"GET /some-route" = {
lambda_arn = module.lambda_function.lambda_function_arn
payload_format_version = "2.0"
authorization_type = "JWT"
authorizer_id = aws_apigatewayv2_authorizer.some_authorizer.id
lambda_arn = module.lambda_function.lambda_function_arn
payload_format_version = "2.0"
authorization_type = "JWT"
authorizer_id = aws_apigatewayv2_authorizer.some_authorizer.id
throttling_rate_limit = 80
throttling_burst_limit = 40
detailed_metrics_enabled = true
}

"GET /some-route-with-authorizer" = {
Expand All @@ -84,13 +87,15 @@ module "api_gateway" {
"GET /some-route-with-authorizer-and-scope" = {
lambda_arn = module.lambda_function.lambda_function_arn
payload_format_version = "2.0"
authorization_type = "JWT"
authorizer_key = "cognito"
authorization_scopes = "tf/something.relevant.read,tf/something.relevant.write" # Should comply with the resource server configuration part of the cognito user pool
}

"GET /some-route-with-authorizer-and-different-scope" = {
lambda_arn = module.lambda_function.lambda_function_arn
payload_format_version = "2.0"
authorization_type = "JWT"
authorizer_key = "cognito"
authorization_scopes = "tf/something.relevant.write" # Should comply with the resource server configuration part of the cognito user pool
}
Expand Down Expand Up @@ -263,7 +268,7 @@ resource "null_resource" "download_package" {

module "lambda_function" {
source = "terraform-aws-modules/lambda/aws"
version = "~> 2.0"
version = "~> 3.0"

function_name = "${random_pet.this.id}-lambda"
description = "My awesome lambda function"
Expand Down Expand Up @@ -292,7 +297,7 @@ resource "aws_s3_bucket" "truststore" {
# acl = "private"
}

resource "aws_s3_bucket_object" "truststore" {
resource "aws_s3_object" "truststore" {
bucket = aws_s3_bucket.truststore.bucket
key = "truststore.pem"
server_side_encryption = "AES256"
Expand Down
30 changes: 16 additions & 14 deletions main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,26 +80,28 @@ resource "aws_apigatewayv2_stage" "default" {
for_each = length(keys(var.default_route_settings)) == 0 ? [] : [var.default_route_settings]

content {
data_trace_enabled = try(default_route_settings.value.data_trace_enabled, false)
data_trace_enabled = try(default_route_settings.value.data_trace_enabled, false) # supported in Websocket APIGateway only
logging_level = try(default_route_settings.value.logging_level, null) # supported in Websocket APIGateway only

detailed_metrics_enabled = try(default_route_settings.value.detailed_metrics_enabled, false)
logging_level = try(default_route_settings.value.logging_level, null)
throttling_burst_limit = try(default_route_settings.value.throttling_burst_limit, null)
throttling_rate_limit = try(default_route_settings.value.throttling_rate_limit, null)
}
}

# # bug - /~https://github.com/terraform-providers/terraform-provider-aws/issues/12893
# dynamic "route_settings" {
# for_each = var.create_routes_and_integrations ? var.integrations : {}
# content {
# route_key = route_settings.key
# data_trace_enabled = try(route_settings.value.data_trace_enabled, null)
# detailed_metrics_enabled = try(route_settings.value.detailed_metrics_enabled, null)
# logging_level = try(route_settings.value.logging_level, null) # Error: error updating API Gateway v2 stage ($default): BadRequestException: Execution logs are not supported on protocolType HTTP
# throttling_burst_limit = try(route_settings.value.throttling_burst_limit, null)
# throttling_rate_limit = try(route_settings.value.throttling_rate_limit, null)
# }
# }
dynamic "route_settings" {
for_each = { for k, v in var.integrations : k => v if var.create_routes_and_integrations && length(setintersection(["data_trace_enabled", "detailed_metrics_enabled", "logging_level", "throttling_burst_limit", "throttling_rate_limit"], keys(v))) > 0 }

content {
route_key = route_settings.key
data_trace_enabled = try(route_settings.value.data_trace_enabled, var.default_route_settings["data_trace_enabled"], false) # supported in Websocket APIGateway only
logging_level = try(route_settings.value.logging_level, var.default_route_settings["logging_level"], null) # supported in Websocket APIGateway only

detailed_metrics_enabled = try(route_settings.value.detailed_metrics_enabled, var.default_route_settings["detailed_metrics_enabled"], false)
throttling_burst_limit = try(route_settings.value.throttling_burst_limit, var.default_route_settings["throttling_burst_limit"], null)
throttling_rate_limit = try(route_settings.value.throttling_rate_limit, var.default_route_settings["throttling_rate_limit"], null)
}
}

tags = merge(var.default_stage_tags, var.tags)

Expand Down