Merge pull request #116 from nekochans/feature/issue115

lgtm-cat-processerのLambdaに環境変数を追加
nekochans · Sep 1, 2024 · 1abc127 · 1abc127
2 parents 882eb18 + 42ef1d5
commit 1abc127
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 2 deletions.
diff --git a/modules/aws/lgtm-image-processor/lambda.tf b/modules/aws/lgtm-image-processor/lambda.tf
@@ -8,6 +8,18 @@ resource "aws_lambda_function" "lgtm_image_processor" {
   memory_size   = 128
   timeout       = 30
 
+  environment {
+    variables = {
+      JUDGE_IMAGE_UPLOAD_BUCKET         = var.judge_image_upload_bucket
+      GENERATE_LGTM_IMAGE_UPLOAD_BUCKET = var.generate_lgtm_image_upload_bucket
+      CONVERT_TO_WEBP_UPLOAD_BUCKET     = var.convert_to_webp_upload_bucket
+      DB_HOSTNAME                       = jsondecode(data.aws_secretsmanager_secret_version.secret.secret_string)["db_host"]
+      DB_USERNAME                       = jsondecode(data.aws_secretsmanager_secret_version.secret.secret_string)["db_app_user"]
+      DB_PASSWORD                       = jsondecode(data.aws_secretsmanager_secret_version.secret.secret_string)["db_app_password"]
+      DB_NAME                           = jsondecode(data.aws_secretsmanager_secret_version.secret.secret_string)["db_name"]
+    }
+  }
+
   lifecycle {
     ignore_changes = [
       last_modified,

diff --git a/modules/aws/lgtm-image-processor/variables.tf b/modules/aws/lgtm-image-processor/variables.tf
@@ -1,3 +1,7 @@
+variable "env" {
+  type = string
+}
+
 variable "ecr_name" {
   type = string
 }
@@ -46,5 +50,25 @@ variable "eventbridge_iam_policy_name" {
   type = string
 }
 
+variable "judge_image_upload_bucket" {
+  type = string
+}
+
+variable "generate_lgtm_image_upload_bucket" {
+  type = string
+}
+
+variable "convert_to_webp_upload_bucket" {
+  type = string
+}
+
 data "aws_region" "current" {}
 data "aws_caller_identity" "current" {}
+
+data "aws_secretsmanager_secret" "secret" {
+  name = "/${var.env}/lgtm-cat"
+}
+
+data "aws_secretsmanager_secret_version" "secret" {
+  secret_id = data.aws_secretsmanager_secret.secret.id
+}
diff --git a/providers/aws/environments/stg/22-lgtm-image-processor/main.tf b/providers/aws/environments/stg/22-lgtm-image-processor/main.tf
@@ -1,6 +1,7 @@
 module "lgtm_image_processor" {
   source = "../../../../../modules/aws/lgtm-image-processor"
 
+  env                           = local.env
   ecr_name                      = local.ecr_name
   lambda_function_name          = local.lambda_function_name
   lambda_iam_role_name          = local.lambda_iam_role_name
@@ -13,4 +14,8 @@ module "lgtm_image_processor" {
   eventbridge_iam_role_name     = local.eventbridge_iam_role_name
   eventbridge_iam_policy_name   = local.eventbridge_iam_policy_name
   upload_images_bucket          = local.upload_images_bucket
+
+  judge_image_upload_bucket         = local.judge_image_upload_bucket
+  generate_lgtm_image_upload_bucket = local.generate_lgtm_image_upload_bucket
+  convert_to_webp_upload_bucket     = local.convert_to_webp_upload_bucket
 }
diff --git a/providers/aws/environments/stg/22-lgtm-image-processor/variables.tf b/providers/aws/environments/stg/22-lgtm-image-processor/variables.tf
@@ -13,7 +13,11 @@ locals {
 
   eventbridge_rule_name       = "${local.env}-${local.service_name}-rule"
   eventbridge_rule_target_id  = "${local.env}-${local.service_name}-stepfunctions-invoke"
-  eventbridge_iam_role_name   = "${local.env}-eventbridge-${local.service_name}-invoke-stepfunctions--role"
-  eventbridge_iam_policy_name = "${local.env}-eventbridge-${local.service_name}-invoke-stepfunctions--policy"
+  eventbridge_iam_role_name   = "${local.env}-eventbridge-${local.service_name}-invoke-stepfunctions-role"
+  eventbridge_iam_policy_name = "${local.env}-eventbridge-${local.service_name}-invoke-stepfunctions-policy"
   upload_images_bucket        = "${local.env}-lgtmeow-cat-images"
+
+  judge_image_upload_bucket         = "${local.env}-lgtmeow-cat-images"
+  generate_lgtm_image_upload_bucket = "${local.env}-lgtmeow-created-lgtm-images"
+  convert_to_webp_upload_bucket     = "${local.env}-lgtmeow-images"
 }