[feature]: lambda vpc_config and memory_size #301
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,7 +12,7 @@ locals { | |
| } | ||
|
|
||
|
|
||
| resource "aws_lambda_function" "lambda" { | ||
| s3_bucket = var.source_s3_bucket | ||
| s3_key = var.source_s3_key | ||
|
|
||
|
|
@@ -31,18 +31,29 @@ resource aws_lambda_function lambda { | |
|
|
||
| reserved_concurrent_executions = var.reserved_concurrent_executions | ||
|
|
||
| dynamic "environment" { | ||
| for_each = length(var.environment) > 0 ? [0] : [] | ||
|
|
||
| content { | ||
| variables = var.environment | ||
| } | ||
| } | ||
|
|
||
| dynamic "vpc_config" { | ||
| for_each = var.vpc_config == null ? [] : [0] | ||
|
|
||
| content { | ||
| subnet_ids = var.vpc_config.subnet_ids | ||
| security_group_ids = var.vpc_config.security_group_ids | ||
| } | ||
| } | ||
|
|
||
| memory_size = var.memory_size | ||
|
|
||
| tags = local.tags | ||
| } | ||
|
|
||
| data "aws_iam_policy_document" "lambda_role_policy" { | ||
| statement { | ||
| principals { | ||
| type = "Service" | ||
|
|
@@ -55,7 +66,7 @@ data aws_iam_policy_document lambda_role_policy { | |
| } | ||
| } | ||
|
|
||
| resource "aws_iam_role" "role" { | ||
| name = local.name | ||
| path = var.lambda_role_path | ||
|
|
||
|
|
@@ -64,13 +75,13 @@ resource aws_iam_role role { | |
| tags = local.tags | ||
| } | ||
|
|
||
| resource "aws_cloudwatch_log_group" "log" { | ||
| name = "/aws/lambda/${local.name}" | ||
| retention_in_days = var.log_retention_in_days | ||
| } | ||
|
|
||
| data "aws_region" "current" {} | ||
| data "aws_caller_identity" "current" {} | ||
|
|
||
| # TODO scope this policy down | ||
| # | ||
|
|
@@ -81,7 +92,7 @@ data aws_caller_identity current {} | |
| # arn:aws:logs:us-west-2:123456789:log-group:/foo/bar | ||
| # to match operations on the log group(like creating a new stream.) So instead we construct one | ||
| # without the colon before the *, so that we can match both log groups and log streams. | ||
| data "aws_iam_policy_document" "lambda_logging_policy" { | ||
| statement { | ||
| effect = "Allow" | ||
| actions = compact([ | ||
|
|
@@ -98,15 +109,35 @@ data aws_iam_policy_document lambda_logging_policy { | |
| } | ||
| } | ||
|
|
||
| resource "aws_iam_policy" "lambda_logging" { | ||
| name_prefix = "${local.name}-lambda-logging" | ||
| path = "/" | ||
| description = "IAM policy for logging from the ${local.name} lambda." | ||
|
|
||
| policy = data.aws_iam_policy_document.lambda_logging_policy.json | ||
| } | ||
|
|
||
| resource "aws_iam_role_policy_attachment" "lambda_logs" { | ||
| role = aws_iam_role.role.name | ||
| policy_arn = aws_iam_policy.lambda_logging.arn | ||
| } | ||
|
|
||
| // Execution role basic permissions | ||
| data "aws_iam_policy_document" "role" { | ||
|
There was a problem hiding this comment.
|
||
| statement { | ||
| sid = "ec2" | ||
| effect = "Allow" | ||
| actions = [ | ||
| "ec2:CreateNetworkInterface", | ||
| ] | ||
|
|
||
| resources = [ | ||
| "*", | ||
| ] | ||
| } | ||
| } | ||
|
|
||
| resource "aws_iam_role_policy" "role" { | ||
| role = aws_iam_role.role.name | ||
| policy = aws_iam_policy_document.role.json | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,28 +1,28 @@ | ||
| output "arn" { | ||
|
There was a problem hiding this comment. 📝 [tflint] reported by reviewdog 🐶 |
||
| value = aws_lambda_function.lambda.arn | ||
| } | ||
|
|
||
| output "qualified_arn" { | ||
| description = "If the lambda function is published, the qualified_arn points at the latest version number." | ||
| value = aws_lambda_function.lambda.qualified_arn | ||
| } | ||
|
|
||
| output "invoke_arn" { | ||
|
There was a problem hiding this comment. 📝 [tflint] reported by reviewdog 🐶 |
||
| value = aws_lambda_function.lambda.invoke_arn | ||
| } | ||
|
|
||
| output "function_name" { | ||
|
There was a problem hiding this comment. 📝 [tflint] reported by reviewdog 🐶 |
||
| value = aws_lambda_function.lambda.function_name | ||
| } | ||
|
|
||
| output "log_group_name" { | ||
|
There was a problem hiding this comment. 📝 [tflint] reported by reviewdog 🐶 |
||
| value = aws_cloudwatch_log_group.log.name | ||
| } | ||
|
|
||
| output "role_name" { | ||
|
There was a problem hiding this comment. 📝 [tflint] reported by reviewdog 🐶 |
||
| value = aws_iam_role.role.name | ||
| } | ||
|
|
||
| output "role_id" { | ||
|
There was a problem hiding this comment. 📝 [tflint] reported by reviewdog 🐶 |
||
| value = aws_iam_role.role.id | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,110 +1,126 @@ | ||
| variable "project" { | ||
| type = string | ||
| description = "Project for tagging and naming. See [doc](../README.md#consistent-tagging)" | ||
| } | ||
|
|
||
| variable "env" { | ||
| type = string | ||
| description = "Env for tagging and naming. See [doc](../README.md#consistent-tagging)" | ||
| } | ||
|
|
||
| variable "service" { | ||
| type = string | ||
| description = "Service for tagging and naming. See [doc](../README.md#consistent-tagging)" | ||
| } | ||
|
|
||
| variable "owner" { | ||
| type = string | ||
| description = "Owner for tagging and naming. See [doc](../README.md#consistent-tagging)" | ||
| } | ||
|
|
||
| variable "source_s3_bucket" { | ||
| type = string | ||
| description = "Bucket holding lambda source code." | ||
| default = null | ||
| } | ||
|
|
||
| variable "source_s3_key" { | ||
| type = string | ||
| description = "Key identifying location of code." | ||
| default = null | ||
| } | ||
|
|
||
| variable "handler" { | ||
| type = string | ||
| description = "Name of the lambda handler." | ||
| } | ||
|
|
||
| variable "runtime" { | ||
| type = string | ||
| description = "Lambda language runtime." | ||
| } | ||
|
|
||
| variable "timeout" { | ||
| type = number | ||
| description = "Execution timeout for the lambda." | ||
| default = null | ||
| } | ||
|
|
||
| variable "environment" { | ||
| type = map(string) | ||
| description = "Map of environment variables." | ||
| default = {} | ||
| } | ||
|
|
||
| variable "kms_key_arn" { | ||
| type = string | ||
| description = "KMS key used to encrypt environment variables." | ||
| default = null | ||
| } | ||
|
|
||
| variable "source_code_hash" { | ||
|
There was a problem hiding this comment. 📝 [tflint] reported by reviewdog 🐶 |
||
| type = string | ||
| default = null | ||
| } | ||
|
|
||
| variable "filename" { | ||
|
There was a problem hiding this comment. 📝 [tflint] reported by reviewdog 🐶 |
||
| type = string | ||
| default = null | ||
| } | ||
|
|
||
| variable "log_retention_in_days" { | ||
|
There was a problem hiding this comment. 📝 [tflint] reported by reviewdog 🐶 |
||
| type = number | ||
| default = null | ||
| } | ||
|
|
||
| variable "function_name" { | ||
| type = string | ||
| description = "If not set, function use default naming convention of $project-$env-$service. See local.name in main.tf" | ||
| default = null | ||
| } | ||
|
|
||
| variable "function_description" { | ||
| type = string | ||
| description = "Description for lambda function." | ||
| default = "" | ||
| } | ||
|
|
||
| variable "publish_lambda" { | ||
| type = bool | ||
| description = "Whether to publish creation/change as new lambda function version." | ||
| default = false | ||
| } | ||
|
|
||
| variable "lambda_role_path" { | ||
| type = string | ||
| description = "The path to the IAM role for lambda." | ||
| default = null | ||
| } | ||
|
|
||
| variable "at_edge" { | ||
| type = bool | ||
| description = "Is this lambda going to be used with a Cloufront distribution? If you set this, you will not have control over log retention, and you cannot include environment variables." | ||
| default = false | ||
| } | ||
|
|
||
| variable "reserved_concurrent_executions" { | ||
| type = number | ||
| description = "Set reserved_concurrent_executions for this function. See [docs](https://docs.aws.amazon.com/lambda/latest/dg/configuration-concurrency.html)." | ||
| default = -1 // aws default | ||
|
There was a problem hiding this comment.
|
||
| } | ||
|
|
||
| variable "vpc_config" { | ||
| type = object({ | ||
| subnet_ids = list(string), | ||
| security_group_ids = list(string) | ||
| }) | ||
|
|
||
| description = "The lambda's vpc configuration" | ||
| default = null | ||
| } | ||
|
|
||
| variable "memory_size" { | ||
| type = number | ||
| description = "Amount of memory to allocate to the lambda" | ||
| default = 128 | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Single line comments should begin with #