diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6dda8931..daf979f4 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -21,6 +21,6 @@ repos: - '--args=--only=terraform_standard_module_structure' - '--args=--only=terraform_workspace_remote' - repo: git://github.com/pre-commit/pre-commit-hooks - rev: v3.4.0 + rev: v4.0.1 hooks: - id: check-merge-conflict diff --git a/README.md b/README.md index 4812cbff..8b737a14 100644 --- a/README.md +++ b/README.md @@ -549,7 +549,7 @@ Q4: What does this error mean - `"We currently do not support adding policies fo | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 0.12.26 | -| [aws](#requirement\_aws) | >= 3.19 | +| [aws](#requirement\_aws) | >= 3.35 | | [external](#requirement\_external) | >= 1 | | [local](#requirement\_local) | >= 1 | | [null](#requirement\_null) | >= 2 | @@ -559,7 +559,7 @@ Q4: What does this error mean - `"We currently do not support adding policies fo | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 3.19 | +| [aws](#provider\_aws) | >= 3.35 | | [external](#provider\_external) | >= 1 | | [local](#provider\_local) | >= 1 | | [null](#provider\_null) | >= 2 | diff --git a/iam.tf b/iam.tf index 6ab10ee7..41492ab1 100644 --- a/iam.tf +++ b/iam.tf @@ -98,6 +98,7 @@ resource "aws_iam_policy" "logs" { name = "${local.role_name}-logs" policy = data.aws_iam_policy_document.logs[0].json + tags = var.tags } resource "aws_iam_policy_attachment" "logs" { @@ -134,6 +135,7 @@ resource "aws_iam_policy" "dead_letter" { name = "${local.role_name}-dl" policy = data.aws_iam_policy_document.dead_letter[0].json + tags = var.tags } resource "aws_iam_policy_attachment" "dead_letter" { @@ -160,6 +162,7 @@ resource "aws_iam_policy" "vpc" { name = "${local.role_name}-vpc" policy = data.aws_iam_policy.vpc[0].policy + tags = var.tags } resource "aws_iam_policy_attachment" "vpc" { @@ -186,6 +189,7 @@ resource "aws_iam_policy" "tracing" { name = "${local.role_name}-tracing" policy = data.aws_iam_policy.tracing[0].policy + tags = var.tags } resource "aws_iam_policy_attachment" "tracing" { @@ -222,6 +226,7 @@ resource "aws_iam_policy" "async" { name = "${local.role_name}-async" policy = data.aws_iam_policy_document.async[0].json + tags = var.tags } resource "aws_iam_policy_attachment" "async" { @@ -241,6 +246,7 @@ resource "aws_iam_policy" "additional_json" { name = local.role_name policy = var.policy_json + tags = var.tags } resource "aws_iam_policy_attachment" "additional_json" { @@ -260,6 +266,7 @@ resource "aws_iam_policy" "additional_jsons" { name = "${local.role_name}-${count.index}" policy = var.policy_jsons[count.index] + tags = var.tags } resource "aws_iam_policy_attachment" "additional_jsons" { @@ -343,6 +350,7 @@ resource "aws_iam_policy" "additional_inline" { name = "${local.role_name}-inline" policy = data.aws_iam_policy_document.additional_inline[0].json + tags = var.tags } resource "aws_iam_policy_attachment" "additional_inline" { diff --git a/modules/alias/README.md b/modules/alias/README.md index 35ed350b..4677fb48 100644 --- a/modules/alias/README.md +++ b/modules/alias/README.md @@ -116,13 +116,13 @@ module "lambda" { | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 0.12.26 | -| [aws](#requirement\_aws) | >= 3.19 | +| [aws](#requirement\_aws) | >= 3.35 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 3.19 | +| [aws](#provider\_aws) | >= 3.35 | ## Modules diff --git a/modules/alias/versions.tf b/modules/alias/versions.tf index 2c2f74fa..e8c4e706 100644 --- a/modules/alias/versions.tf +++ b/modules/alias/versions.tf @@ -2,6 +2,6 @@ terraform { required_version = ">= 0.12.26" required_providers { - aws = ">= 3.19" + aws = ">= 3.35" } } diff --git a/modules/deploy/README.md b/modules/deploy/README.md index 93d226aa..499b169b 100644 --- a/modules/deploy/README.md +++ b/modules/deploy/README.md @@ -100,7 +100,7 @@ module "lambda" { | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 0.12.26 | -| [aws](#requirement\_aws) | >= 3.19 | +| [aws](#requirement\_aws) | >= 3.35 | | [local](#requirement\_local) | >= 1 | | [null](#requirement\_null) | >= 2 | @@ -108,7 +108,7 @@ module "lambda" { | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 3.19 | +| [aws](#provider\_aws) | >= 3.35 | | [local](#provider\_local) | >= 1 | | [null](#provider\_null) | >= 2 | @@ -164,6 +164,7 @@ No modules. | [function\_name](#input\_function\_name) | The name of the Lambda function to deploy | `string` | `""` | no | | [interpreter](#input\_interpreter) | List of interpreter arguments used to execute deploy script, first arg is path | `list(string)` |
[| no | | [save\_deploy\_script](#input\_save\_deploy\_script) | Save deploy script locally | `bool` | `false` | no | +| [tags](#input\_tags) | A map of tags to assign to resources. | `map(string)` | `{}` | no | | [target\_version](#input\_target\_version) | Target version of Lambda function version to deploy | `string` | `""` | no | | [triggers](#input\_triggers) | Map of triggers which will be notified when event happens. Valid options for event types are DeploymentStart, DeploymentSuccess, DeploymentFailure, DeploymentStop, DeploymentRollback, DeploymentReady (Applies only to replacement instances in a blue/green deployment), InstanceStart, InstanceSuccess, InstanceFailure, InstanceReady. Note that not all are applicable for Lambda deployments. | `map(any)` | `{}` | no | | [use\_existing\_app](#input\_use\_existing\_app) | Whether to use existing AWS CodeDeploy app | `bool` | `false` | no | diff --git a/modules/deploy/main.tf b/modules/deploy/main.tf index b33d1c70..f1d18d5d 100644 --- a/modules/deploy/main.tf +++ b/modules/deploy/main.tf @@ -123,6 +123,7 @@ resource "aws_codedeploy_app" "this" { name = var.app_name compute_platform = "Lambda" + tags = var.tags } resource "aws_codedeploy_deployment_group" "this" { @@ -162,6 +163,8 @@ resource "aws_codedeploy_deployment_group" "this" { trigger_target_arn = trigger_configuration.value.target_arn } } + + tags = var.tags } data "aws_iam_role" "codedeploy" { @@ -175,6 +178,7 @@ resource "aws_iam_role" "codedeploy" { name = coalesce(var.codedeploy_role_name, "${local.app_name}-codedeploy") assume_role_policy = data.aws_iam_policy_document.assume_role[0].json + tags = var.tags } @@ -217,6 +221,7 @@ resource "aws_iam_policy" "triggers" { count = var.create && var.create_codedeploy_role && var.attach_triggers_policy ? 1 : 0 policy = data.aws_iam_policy_document.triggers[0].json + tags = var.tags } resource "aws_iam_role_policy_attachment" "triggers" { diff --git a/modules/deploy/variables.tf b/modules/deploy/variables.tf index 867a9fda..4d22144a 100644 --- a/modules/deploy/variables.tf +++ b/modules/deploy/variables.tf @@ -4,6 +4,12 @@ variable "create" { default = true } +variable "tags" { + description = "A map of tags to assign to resources." + type = map(string) + default = {} +} + variable "alias_name" { description = "Name for the alias" type = string diff --git a/modules/deploy/versions.tf b/modules/deploy/versions.tf index dcc12288..6b4055ba 100644 --- a/modules/deploy/versions.tf +++ b/modules/deploy/versions.tf @@ -2,7 +2,7 @@ terraform { required_version = ">= 0.12.26" required_providers { - aws = ">= 3.19" + aws = ">= 3.35" local = ">= 1" null = ">= 2" } diff --git a/versions.tf b/versions.tf index 7a3c7e2b..67683702 100644 --- a/versions.tf +++ b/versions.tf @@ -2,7 +2,7 @@ terraform { required_version = ">= 0.12.26" required_providers { - aws = ">= 3.19" + aws = ">= 3.35" external = ">= 1" local = ">= 1" random = ">= 2"
"/bin/bash",
"-c"
]