add aws_caller_identity to lambda_layers

Author: jameslinnell

infrastructure/lambda-layers.tf

@@ -1,23 +1,19 @@
 module "lambda-layer-core" {
   source     = "./modules/lambda_layers"
-  account_id = data.aws_caller_identity.current.account_id
   layer_name = "core"
 }
 
 module "lambda-layer-data" {
   source     = "./modules/lambda_layers"
-  account_id = data.aws_caller_identity.current.account_id
   layer_name = "data"
 }
 
 module "lambda-layer-alerting" {
   source     = "./modules/lambda_layers"
-  account_id = data.aws_caller_identity.current.account_id
   layer_name = "alerting"
 }
 
 module "lambda-layer-reports" {
   source     = "./modules/lambda_layers"
-  account_id = data.aws_caller_identity.current.account_id
   layer_name = "reports"
 }

infrastructure/modules/lambda_layers/iam.tf

@@ -11,9 +11,10 @@ resource "aws_iam_policy" "lambda_layer_policy" {
           "lambda:ListLayers"
         ],
         Resource = [
-          "arn:aws:lambda:eu-west-2:${var.account_id}:layer:${local.lambda_layer_aws_name}:*"
+          "arn:aws:lambda:eu-west-2:${data.aws_caller_identity.current.account_id}:layer:${local.lambda_layer_aws_name}:*"
         ]
       }
     ]
   })
-}
+}
+

infrastructure/modules/lambda_layers/main.tf

@@ -2,6 +2,8 @@ locals {
   lambda_layer_aws_name = "${terraform.workspace}_${var.layer_name}_lambda_layer"
 }
 
+data "aws_caller_identity" "current" {}
+
 data "archive_file" "lambda_layer_placeholder" {
   type        = "zip"
   source_file = "placeholder_lambda.py"

infrastructure/modules/lambda_layers/variable.tf

@@ -1,8 +1,3 @@
-variable "account_id" {
-  description = "The AWS account ID used to generate IAM policy for layer access."
-  type        = string
-}
-
 variable "layer_name" {
   description = "Logical name assigned to the Lambda layer."
   type        = string