Skip to content

Commit 61b67f7

Browse files
authored
Merge pull request #7 from ecukalla/master
Bump TF provider versions and update deprecated resources
2 parents b146266 + 871eca8 commit 61b67f7

File tree

2 files changed

+14
-13
lines changed

2 files changed

+14
-13
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: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,28 @@ terraform {
22
required_providers {
33
aws = {
44
source = "hashicorp/aws"
5-
version = "= 5.31.0"
5+
version = "~> 5.59.0"
6+
}
7+
8+
random = {
9+
source = "hashicorp/random"
10+
version = "~> 3.6.2"
611
}
712
}
813
}
14+
915
provider "aws" {
10-
region = "us-east-1"
16+
region = local.aws_region
1117
}
1218

1319
provider "random" {
14-
version = "3.1.0"
1520
}
1621

1722
resource "random_pet" "random_name" {
1823
length = 2
1924
separator = "-"
2025
}
2126

22-
variable "aws_region" {
23-
description = "AWS region"
24-
default = "us-east-1"
25-
}
26-
2727
variable "account_id" {
2828
description = "AWS Account ID"
2929
default = "YOUR_AWS_ACCOUNT_NUMBER"
@@ -80,10 +80,10 @@ resource "aws_s3_bucket" "lambda_code_bucket" {
8080
}
8181

8282
# Lambda source code
83-
resource "aws_s3_bucket_object" "lambda_code" {
84-
source = "../shipment-picture-lambda-validator/target/shipment-picture-lambda-validator.jar"
83+
resource "aws_s3_object" "lambda_code" {
8584
bucket = aws_s3_bucket.lambda_code_bucket.id
8685
key = "shipment-picture-lambda-validator.jar"
86+
source = "../shipment-picture-lambda-validator/target/shipment-picture-lambda-validator.jar"
8787
}
8888

8989
# Lambda definition
@@ -93,7 +93,7 @@ resource "aws_lambda_function" "shipment_picture_lambda_validator" {
9393
runtime = "java17"
9494
role = aws_iam_role.lambda_exec.arn
9595
s3_bucket = aws_s3_bucket.lambda_code_bucket.id
96-
s3_key = aws_s3_bucket_object.lambda_code.key
96+
s3_key = aws_s3_object.lambda_code.key
9797
memory_size = 512
9898
timeout = 60
9999
environment {

0 commit comments

Comments
 (0)