Skip to content

Commit 5c5c17f

Browse files
authored
Merge pull request #47 from SPHTech-Platform/chore/add-support-aws-v6-region-attribute
chore: add aws provider v6 support for region attribute
2 parents 6278de4 + 92a4837 commit 5c5c17f

File tree

3 files changed

+13
-8
lines changed

3 files changed

+13
-8
lines changed

data.tf

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ data "aws_iam_openid_connect_provider" "github" {
44

55
data "aws_caller_identity" "current" {}
66

7-
data "aws_region" "current" {}
8-
97
data "aws_iam_policy_document" "update_lambda" {
108
#checkov:skip=CKV_AWS_356: Read only
119
statement {
@@ -32,7 +30,7 @@ data "aws_iam_policy_document" "update_lambda" {
3230
"lambda:PutProvisionedConcurrencyConfig",
3331
"lambda:DeleteProvisionedConcurrencyConfig",
3432
]
35-
resources = ["arn:aws:lambda:${data.aws_region.current.region}:${data.aws_caller_identity.current.account_id}:function:${var.function_prefix}*"]
33+
resources = ["arn:aws:lambda:${var.region}:${data.aws_caller_identity.current.account_id}:function:${var.function_prefix}*"]
3634
}
3735

3836
dynamic "statement" {
@@ -43,7 +41,7 @@ data "aws_iam_policy_document" "update_lambda" {
4341
"apigateway:POST",
4442
"apigateway:PUT",
4543
]
46-
resources = ["arn:aws:apigateway:${data.aws_region.current.region}::/restapis/${var.apigw_id}/*"]
44+
resources = ["arn:aws:apigateway:${var.region}::/restapis/${var.apigw_id}/*"]
4745
}
4846
}
4947

@@ -54,7 +52,7 @@ data "aws_iam_policy_document" "update_lambda" {
5452
actions = [
5553
"lambda:AddPermission",
5654
]
57-
resources = ["arn:aws:lambda:${data.aws_region.current.region}:${data.aws_caller_identity.current.account_id}:function:${var.function_prefix}*"]
55+
resources = ["arn:aws:lambda:${var.region}:${data.aws_caller_identity.current.account_id}:function:${var.function_prefix}*"]
5856
}
5957
}
6058

@@ -65,7 +63,7 @@ data "aws_iam_policy_document" "update_lambda" {
6563
actions = [
6664
"lambda:UpdateEventSourceMapping",
6765
]
68-
resources = ["arn:aws:lambda:${data.aws_region.current.region}:${data.aws_caller_identity.current.account_id}:event-source-mapping:*"]
66+
resources = ["arn:aws:lambda:${var.region}:${data.aws_caller_identity.current.account_id}:event-source-mapping:*"]
6967
}
7068
}
7169
}
@@ -175,7 +173,7 @@ data "aws_iam_policy_document" "sign_code" {
175173
]
176174

177175
resources = [
178-
"arn:aws:signer:${data.aws_region.current.region}:${data.aws_caller_identity.current.account_id}:/signing-jobs/*",
176+
"arn:aws:signer:${var.region}:${data.aws_caller_identity.current.account_id}:/signing-jobs/*",
179177
]
180178
}
181179

@@ -188,7 +186,7 @@ data "aws_iam_policy_document" "sign_code" {
188186
]
189187

190188
resources = [
191-
"arn:aws:signer:${data.aws_region.current.region}:${data.aws_caller_identity.current.account_id}:/signing-profiles/${var.signing_profile_name}",
189+
"arn:aws:signer:${var.region}:${data.aws_caller_identity.current.account_id}:/signing-profiles/${var.signing_profile_name}",
192190
]
193191
}
194192
}

main.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ module "lambda" {
1414
function_name = var.function_name
1515
description = var.description
1616
lambda_role = var.lambda_role
17+
region = var.region
1718

1819
create_package = false
1920

variables.tf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
variable "region" {
2+
description = "The AWS region to create resources in."
3+
type = string
4+
default = "ap-southeast-1"
5+
}
6+
17
variable "create_github_actions_oidc_provider" {
28
description = "Controls Whether to create openid connect provider."
39
type = bool

0 commit comments

Comments
 (0)