From f96cc373ef59ccdba85cae3a2288c5ce4041ab2c Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Tue, 28 Feb 2023 10:45:33 -0500 Subject: [PATCH 1/9] Added S3 variables and parameters --- main.tf | 4 ++++ variables.tf | 19 +++++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/main.tf b/main.tf index 1fc68385..8ccbf810 100644 --- a/main.tf +++ b/main.tf @@ -49,6 +49,10 @@ module "lambda" { local_existing_package = try(var.lambda.local_existing_package, null) recreate_missing_package = try(var.lambda.recreate_missing_package, false) ephemeral_storage_size = try(var.lambda.ephemeral_storage_size, null) + s3_bucket = var.lambda.s3_bucket + s3_existing_package = var.lambda.s3_existing_package + s3_prefix = var.lambda.s3_prefix + store_on_s3 = var.lambda.store_on_s3 environment_variables = { ASSUME_ROLE_NAME = var.assume_role_name diff --git a/variables.tf b/variables.tf index be07ff75..9739b81c 100644 --- a/variables.tf +++ b/variables.tf @@ -29,8 +29,23 @@ variable "event_types" { variable "lambda" { description = "Map of any additional arguments for the upstream lambda module. See " - type = any - default = {} + type = object({ + artifacts_dir = optional(string, "builds") + build_in_docker = optional(bool, false) + create_package = optional(bool, true) + ephemeral_storage_size = optional(number) + ignore_source_code_hash = optional(bool, true) + local_existing_package = optional(string) + memory_size = optional(number, 128) + recreate_missing_package = optional(bool, false) + runtime = optional(string, "python3.8") + s3_bucket = optional(string) + s3_existing_package = optional(map(string)) + s3_prefix = optional(string) + store_on_s3 = optional(bool, false) + timeout = optional(number, 300) + }) + default = {} } variable "log_level" { From 8b1741bd50ea4bb6033c9ae97f63acc7b252ed97 Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Tue, 28 Feb 2023 10:46:00 -0500 Subject: [PATCH 2/9] Bumps version to 1.0.1 --- .bumpversion.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index fab32b7e..09fd8af1 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.0.0 +current_version = 1.0.1 commit = True message = Bumps version to {new_version} tag = False From ec5213c8ba091a26250ad2d6d98f69cd31b340dc Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Tue, 28 Feb 2023 10:57:15 -0500 Subject: [PATCH 3/9] README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index eeb084d3..39f1e088 100644 --- a/README.md +++ b/README.md @@ -83,7 +83,7 @@ make mockstack/clean | [trust\_policy](#input\_trust\_policy) | JSON string representing the trust policy to apply to the role being updated | `string` | n/a | yes | | [update\_role\_name](#input\_update\_role\_name) | Name of the IAM role to update in the target account (case sensitive) | `string` | n/a | yes | | [event\_types](#input\_event\_types) | Event types that will trigger this lambda | `set(string)` | 
[
  "CreateAccountResult",
  "InviteAccountToOrganization"
]
| no | -| [lambda](#input\_lambda) | Map of any additional arguments for the upstream lambda module. See | `any` | `{}` | no | +| [lambda](#input\_lambda) | Map of any additional arguments for the upstream lambda module. See | 
object({
    artifacts_dir            = optional(string, "builds")
    build_in_docker          = optional(bool, false)
    create_package           = optional(bool, true)
    ephemeral_storage_size   = optional(number)
    ignore_source_code_hash  = optional(bool, true)
    local_existing_package   = optional(string)
    memory_size              = optional(number, 128)
    recreate_missing_package = optional(bool, false)
    runtime                  = optional(string, "python3.8")
    s3_bucket                = optional(string)
    s3_existing_package      = optional(map(string))
    s3_prefix                = optional(string)
    store_on_s3              = optional(bool, false)
    timeout                  = optional(number, 300)
  })
| `{}` | no | | [log\_level](#input\_log\_level) | Log level of the lambda output, one of: debug, info, warning, error, critical | `string` | `"info"` | no | | [tags](#input\_tags) | Tags that are passed to resources | `map(string)` | `{}` | no | From a7a2cd1417c19c88df281c247672fdb9832284db Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Mon, 6 Mar 2023 10:33:03 -0500 Subject: [PATCH 4/9] Removing try() in main, updating terraform required version --- main.tf | 12 ++++++------ versions.tf | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/main.tf b/main.tf index 8ccbf810..1e5596ba 100644 --- a/main.tf +++ b/main.tf @@ -43,12 +43,12 @@ module "lambda" { } ] - artifacts_dir = try(var.lambda.artifacts_dir, "builds") - create_package = try(var.lambda.create_package, true) - ignore_source_code_hash = try(var.lambda.ignore_source_code_hash, true) - local_existing_package = try(var.lambda.local_existing_package, null) - recreate_missing_package = try(var.lambda.recreate_missing_package, false) - ephemeral_storage_size = try(var.lambda.ephemeral_storage_size, null) + artifacts_dir = var.lambda.artifacts_dir + create_package = var.lambda.create_package + ignore_source_code_hash = var.lambda.ignore_source_code_hash + local_existing_package = var.lambda.local_existing_package + recreate_missing_package = var.lambda.recreate_missing_package + ephemeral_storage_size = var.lambda.ephemeral_storage_size s3_bucket = var.lambda.s3_bucket s3_existing_package = var.lambda.s3_existing_package s3_prefix = var.lambda.s3_prefix diff --git a/versions.tf b/versions.tf index 094732c8..e84dfca7 100644 --- a/versions.tf +++ b/versions.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 0.13.1" + required_version = ">= 1.3" required_providers { aws = { From 1f19663f75c3c25604651c5797f5a2f2b63058b6 Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Mon, 6 Mar 2023 10:33:10 -0500 Subject: [PATCH 5/9] Bumps version to 2.0.0 --- .bumpversion.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 09fd8af1..b49e5139 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.0.1 +current_version = 2.0.0 commit = True message = Bumps version to {new_version} tag = False From 1695cd3acb1b60db791afa825ac5bc0a07d46489 Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Tue, 7 Mar 2023 10:21:04 -0500 Subject: [PATCH 6/9] make doc --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 39f1e088..a82c7d9d 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ make mockstack/clean | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 0.13.1 | +| [terraform](#requirement\_terraform) | >= 1.3 | | [aws](#requirement\_aws) | >= 4.9 | | [external](#requirement\_external) | >= 1.0 | | [local](#requirement\_local) | >= 1.0 | From 089d43ed15cca165b1c2fdc8abf8f95966fbb75e Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Wed, 8 Mar 2023 11:50:54 -0500 Subject: [PATCH 7/9] removed unused variables --- variables.tf | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/variables.tf b/variables.tf index 9739b81c..aa624815 100644 --- a/variables.tf +++ b/variables.tf @@ -29,21 +29,19 @@ variable "event_types" { variable "lambda" { description = "Map of any additional arguments for the upstream lambda module. See " + type = object({ type = object({ artifacts_dir = optional(string, "builds") - build_in_docker = optional(bool, false) create_package = optional(bool, true) ephemeral_storage_size = optional(number) ignore_source_code_hash = optional(bool, true) local_existing_package = optional(string) - memory_size = optional(number, 128) recreate_missing_package = optional(bool, false) - runtime = optional(string, "python3.8") s3_bucket = optional(string) s3_existing_package = optional(map(string)) s3_prefix = optional(string) store_on_s3 = optional(bool, false) - timeout = optional(number, 300) + }) }) default = {} } From b5e164056f40dc4df4a645439e92ec31aabdd305 Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Wed, 8 Mar 2023 11:52:42 -0500 Subject: [PATCH 8/9] fixing typo --- variables.tf | 2 -- 1 file changed, 2 deletions(-) diff --git a/variables.tf b/variables.tf index aa624815..ce5184d5 100644 --- a/variables.tf +++ b/variables.tf @@ -29,7 +29,6 @@ variable "event_types" { variable "lambda" { description = "Map of any additional arguments for the upstream lambda module. See " - type = object({ type = object({ artifacts_dir = optional(string, "builds") create_package = optional(bool, true) @@ -42,7 +41,6 @@ variable "lambda" { s3_prefix = optional(string) store_on_s3 = optional(bool, false) }) - }) default = {} } From b4ef0768891617e488f618d25a4305d765dfc5fd Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Wed, 8 Mar 2023 11:54:54 -0500 Subject: [PATCH 9/9] make doc --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a82c7d9d..5da6dc20 100644 --- a/README.md +++ b/README.md @@ -83,7 +83,7 @@ make mockstack/clean | [trust\_policy](#input\_trust\_policy) | JSON string representing the trust policy to apply to the role being updated | `string` | n/a | yes | | [update\_role\_name](#input\_update\_role\_name) | Name of the IAM role to update in the target account (case sensitive) | `string` | n/a | yes | | [event\_types](#input\_event\_types) | Event types that will trigger this lambda | `set(string)` | 
[
  "CreateAccountResult",
  "InviteAccountToOrganization"
]
| no | -| [lambda](#input\_lambda) | Map of any additional arguments for the upstream lambda module. See | 
object({
    artifacts_dir            = optional(string, "builds")
    build_in_docker          = optional(bool, false)
    create_package           = optional(bool, true)
    ephemeral_storage_size   = optional(number)
    ignore_source_code_hash  = optional(bool, true)
    local_existing_package   = optional(string)
    memory_size              = optional(number, 128)
    recreate_missing_package = optional(bool, false)
    runtime                  = optional(string, "python3.8")
    s3_bucket                = optional(string)
    s3_existing_package      = optional(map(string))
    s3_prefix                = optional(string)
    store_on_s3              = optional(bool, false)
    timeout                  = optional(number, 300)
  })
| `{}` | no | +| [lambda](#input\_lambda) | Map of any additional arguments for the upstream lambda module. See | 
object({
    artifacts_dir            = optional(string, "builds")
    create_package           = optional(bool, true)
    ephemeral_storage_size   = optional(number)
    ignore_source_code_hash  = optional(bool, true)
    local_existing_package   = optional(string)
    recreate_missing_package = optional(bool, false)
    s3_bucket                = optional(string)
    s3_existing_package      = optional(map(string))
    s3_prefix                = optional(string)
    store_on_s3              = optional(bool, false)
  })
| `{}` | no | | [log\_level](#input\_log\_level) | Log level of the lambda output, one of: debug, info, warning, error, critical | `string` | `"info"` | no | | [tags](#input\_tags) | Tags that are passed to resources | `map(string)` | `{}` | no |