Skip to content

Commit 871eca8

Browse files
committed
add aws_region to locals & switch from deprecated aws_s3_bucket_object to aws_s3_object
1 parent 24e2369 commit 871eca8

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

terraform/locals.tf

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
locals {
2+
aws_region = "us-east-1"
23
json_data = file("./data.json")
34
tf_data = jsondecode(local.json_data)
4-
sns_topic_arn_prod = "arn:aws:sns:${var.aws_region}:${var.account_id}:${var.sns_topic_name}"
5-
sns_topic_arn_dev = "arn:aws:sns:${var.aws_region}:000000000000:${var.sns_topic_name}"
5+
sns_topic_arn_prod = "arn:aws:sns:${local.aws_region}:${var.account_id}:${var.sns_topic_name}"
6+
sns_topic_arn_dev = "arn:aws:sns:${local.aws_region}:000000000000:${var.sns_topic_name}"
67
}

terraform/main.tf

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ terraform {
1313
}
1414

1515
provider "aws" {
16-
region = "us-east-1"
16+
region = local.aws_region
1717
}
1818

1919
provider "random" {
@@ -24,11 +24,6 @@ resource "random_pet" "random_name" {
2424
separator = "-"
2525
}
2626

27-
variable "aws_region" {
28-
description = "AWS region"
29-
default = "us-east-1"
30-
}
31-
3227
variable "account_id" {
3328
description = "AWS Account ID"
3429
default = "YOUR_AWS_ACCOUNT_NUMBER"
@@ -85,10 +80,10 @@ resource "aws_s3_bucket" "lambda_code_bucket" {
8580
}
8681

8782
# Lambda source code
88-
resource "aws_s3_bucket_object" "lambda_code" {
89-
source = "../shipment-picture-lambda-validator/target/shipment-picture-lambda-validator.jar"
83+
resource "aws_s3_object" "lambda_code" {
9084
bucket = aws_s3_bucket.lambda_code_bucket.id
9185
key = "shipment-picture-lambda-validator.jar"
86+
source = "../shipment-picture-lambda-validator/target/shipment-picture-lambda-validator.jar"
9287
}
9388

9489
# Lambda definition
@@ -98,7 +93,7 @@ resource "aws_lambda_function" "shipment_picture_lambda_validator" {
9893
runtime = "java17"
9994
role = aws_iam_role.lambda_exec.arn
10095
s3_bucket = aws_s3_bucket.lambda_code_bucket.id
101-
s3_key = aws_s3_bucket_object.lambda_code.key
96+
s3_key = aws_s3_object.lambda_code.key
10297
memory_size = 512
10398
timeout = 60
10499
environment {

0 commit comments

Comments
 (0)