From 2ba0b76bb9073bc43a566c8f8bd36ba89373870b Mon Sep 17 00:00:00 2001 From: Salim Afiune Maya Date: Fri, 17 Nov 2023 10:50:44 -0800 Subject: [PATCH 1/2] chore: downgrade Python version to 3.9 Signed-off-by: Salim Afiune Maya --- README.md | 4 ++-- main.tf | 26 ++++++++++++++++++++++++-- versions.tf | 2 +- 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 621ae76..6441639 100644 --- a/README.md +++ b/README.md @@ -12,14 +12,14 @@ Terraform module for configuring an integration with Lacework and AWS for cloud | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 0.14 | -| [aws](#requirement\_aws) | >= 3.35.0 | +| [aws](#requirement\_aws) | >= 3.55.0 | ## Providers | Name | Version | |------|---------| | [archive](#provider\_archive) | n/a | -| [aws](#provider\_aws) | >= 3.35.0 | +| [aws](#provider\_aws) | >= 3.55.0 | ## Modules diff --git a/main.tf b/main.tf index 47bbf25..553a5de 100644 --- a/main.tf +++ b/main.tf @@ -44,10 +44,21 @@ resource "aws_lambda_function" "lacework_copy_zip_files" { function_name = "lacework_copy_zip_files" handler = "index.handler" role = aws_iam_role.lacework_copy_zip_files_role.arn - runtime = "python3.11" source_code_hash = data.archive_file.lambda_zip_file.output_base64sha256 timeout = 240 + # Python3.9 support introduced in version 3.55.0 + # https://github.com/hashicorp/terraform-provider-aws/blob/release/3.x/CHANGELOG.md#3550-august-19-2021 + runtime = "python3.9" + + # Python3.10 support introduced in version 4.64.0 + # https://github.com/hashicorp/terraform-provider-aws/blob/release/4.x/CHANGELOG.md#4640-april-20-2023 + # runtime = "python3.10" + + # Python3.11 support introduced in version 5.11.0 + # https://github.com/hashicorp/terraform-provider-aws/blob/main/CHANGELOG.md#5110-august--3-2023 + # runtime = "python3.11" + tracing_config { mode = "Active" } @@ -143,11 +154,22 @@ resource "aws_lambda_function" "lacework_setup_function" { function_name = "lacework_setup_function" handler = "lw_integration_lambda_function.handler" role = aws_iam_role.lacework_setup_function_role.arn - runtime = "python3.11" s3_bucket = aws_s3_bucket.lacework_org_lambda.bucket s3_key = local.s3_lambda_key timeout = 900 + # Python3.9 support introduced in version 3.55.0 + # https://github.com/hashicorp/terraform-provider-aws/blob/release/3.x/CHANGELOG.md#3550-august-19-2021 + runtime = "python3.9" + + # Python3.10 support introduced in version 4.64.0 + # https://github.com/hashicorp/terraform-provider-aws/blob/release/4.x/CHANGELOG.md#4640-april-20-2023 + # runtime = "python3.10" + + # Python3.11 support introduced in version 5.11.0 + # https://github.com/hashicorp/terraform-provider-aws/blob/main/CHANGELOG.md#5110-august--3-2023 + # runtime = "python3.11" + tracing_config { mode = "Active" } diff --git a/versions.tf b/versions.tf index 33402f0..0738c65 100644 --- a/versions.tf +++ b/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 3.35.0" + version = ">= 3.55.0" } } } From 106d6d560dfa2bc6e1acbeb36133abc1a63e3f6e Mon Sep 17 00:00:00 2001 From: Salim Afiune Maya Date: Fri, 17 Nov 2023 11:02:31 -0800 Subject: [PATCH 2/2] style: create a local variable Signed-off-by: Salim Afiune Maya --- main.tf | 38 ++++++++++++++------------------------ 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/main.tf b/main.tf index 553a5de..ac6d1df 100644 --- a/main.tf +++ b/main.tf @@ -1,4 +1,16 @@ locals { + # Python3.9 support introduced in version 3.55.0 + # https://github.com/hashicorp/terraform-provider-aws/blob/release/3.x/CHANGELOG.md#3550-august-19-2021 + python_version = "python3.9" + + # Python3.10 support introduced in version 4.64.0 + # https://github.com/hashicorp/terraform-provider-aws/blob/release/4.x/CHANGELOG.md#4640-april-20-2023 + # python_version = "python3.10" + + # Python3.11 support introduced in version 5.11.0 + # https://github.com/hashicorp/terraform-provider-aws/blob/main/CHANGELOG.md#5110-august--3-2023 + # python_version = "python3.11" + kms_key_arn = length(var.kms_key_arn) > 0 ? var.kms_key_arn : aws_kms_key.lacework_kms_key[0].arn lambda_zip = "LaceworkIntegrationSetup1.1.2.zip" s3_lambda_key = "${var.cf_s3_prefix}/lambda/${local.lambda_zip}" @@ -46,18 +58,7 @@ resource "aws_lambda_function" "lacework_copy_zip_files" { role = aws_iam_role.lacework_copy_zip_files_role.arn source_code_hash = data.archive_file.lambda_zip_file.output_base64sha256 timeout = 240 - - # Python3.9 support introduced in version 3.55.0 - # https://github.com/hashicorp/terraform-provider-aws/blob/release/3.x/CHANGELOG.md#3550-august-19-2021 - runtime = "python3.9" - - # Python3.10 support introduced in version 4.64.0 - # https://github.com/hashicorp/terraform-provider-aws/blob/release/4.x/CHANGELOG.md#4640-april-20-2023 - # runtime = "python3.10" - - # Python3.11 support introduced in version 5.11.0 - # https://github.com/hashicorp/terraform-provider-aws/blob/main/CHANGELOG.md#5110-august--3-2023 - # runtime = "python3.11" + runtime = local.python_version tracing_config { mode = "Active" @@ -157,18 +158,7 @@ resource "aws_lambda_function" "lacework_setup_function" { s3_bucket = aws_s3_bucket.lacework_org_lambda.bucket s3_key = local.s3_lambda_key timeout = 900 - - # Python3.9 support introduced in version 3.55.0 - # https://github.com/hashicorp/terraform-provider-aws/blob/release/3.x/CHANGELOG.md#3550-august-19-2021 - runtime = "python3.9" - - # Python3.10 support introduced in version 4.64.0 - # https://github.com/hashicorp/terraform-provider-aws/blob/release/4.x/CHANGELOG.md#4640-april-20-2023 - # runtime = "python3.10" - - # Python3.11 support introduced in version 5.11.0 - # https://github.com/hashicorp/terraform-provider-aws/blob/main/CHANGELOG.md#5110-august--3-2023 - # runtime = "python3.11" + runtime = local.python_version tracing_config { mode = "Active"