Skip to content

Commit 80de2e5

Browse files
authored
Merge pull request #697 from pagopa/feat/update-sg-lambda-assertion
feat: Update sg lambda assertion
2 parents 74cb3f4 + fe131ba commit 80de2e5

File tree

8 files changed

+20
-2
lines changed

8 files changed

+20
-2
lines changed

src/infra/dev/eu-south-1/main.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,7 @@ module "backend" {
284284
vpc_id = module.network.vpc_id
285285
vpc_subnet_ids = module.network.intra_subnets_ids
286286
vpc_s3_prefix_id = module.network.vpc_endpoints["s3"]["prefix_list_id"]
287+
vpc_tls_security_group_id = module.network.security_group_vpc_tls_id
287288
cloudwatch_logs_retention_in_days = var.lambda_cloudwatch_logs_retention_in_days
288289
}
289290

src/infra/modules/backend/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@
193193
| [aws_sqs_queue.pipe_dlq](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/sqs_queue) | resource |
194194
| [aws_ssm_parameter.key_pem](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/ssm_parameter) | resource |
195195
| [aws_vpc_security_group_egress_rule.client_registration_sec_group_egress_rule](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/vpc_security_group_egress_rule) | resource |
196+
| [aws_vpc_security_group_egress_rule.https_rule](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/vpc_security_group_egress_rule) | resource |
196197
| [random_integer.bucket_lambda_code_suffix](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/integer) | resource |
197198
| [aws_iam_policy_document.assertion_lambda](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source |
198199
| [aws_iam_policy_document.client_registration_lambda](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) | data source |
@@ -210,7 +211,7 @@
210211
| Name | Description | Type | Default | Required |
211212
|------|-------------|------|---------|:--------:|
212213
| <a name="input_account_id"></a> [account\_id](#input\_account\_id) | AWS Account id. | `string` | n/a | yes |
213-
| <a name="input_assertion_lambda"></a> [assertion\_lambda](#input\_assertion\_lambda) | n/a | <pre>object({<br> name = string<br> filename = string<br> s3_assertion_bucket_arn = string<br> kms_assertion_key_arn = string<br> environment_variables = map(string)<br> cloudwatch_logs_retention_in_days = number<br> vpc_s3_prefix_id = string<br> vpc_subnet_ids = list(string)<br> vpc_id = string<br> })</pre> | n/a | yes |
214+
| <a name="input_assertion_lambda"></a> [assertion\_lambda](#input\_assertion\_lambda) | n/a | <pre>object({<br> name = string<br> filename = string<br> s3_assertion_bucket_arn = string<br> kms_assertion_key_arn = string<br> environment_variables = map(string)<br> cloudwatch_logs_retention_in_days = number<br> vpc_s3_prefix_id = string<br> vpc_tls_security_group_id = string<br> vpc_subnet_ids = list(string)<br> vpc_id = string<br> })</pre> | n/a | yes |
214215
| <a name="input_aws_caller_identity"></a> [aws\_caller\_identity](#input\_aws\_caller\_identity) | n/a | `string` | `""` | no |
215216
| <a name="input_aws_region"></a> [aws\_region](#input\_aws\_region) | AWS Region. | `string` | n/a | yes |
216217
| <a name="input_client_alarm"></a> [client\_alarm](#input\_client\_alarm) | n/a | <pre>object({<br> namespace = string<br> clients = list(object({<br> client_id = string<br> friendly_name = string<br> }))<br> })</pre> | `null` | no |

src/infra/modules/backend/lambda.tf

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -499,6 +499,7 @@ data "aws_iam_policy_document" "assertion_lambda" {
499499
}
500500
}
501501

502+
502503
module "security_group_lambda_assertion" {
503504
source = "terraform-aws-modules/security-group/aws"
504505
version = "4.17.2"
@@ -518,10 +519,21 @@ module "security_group_lambda_assertion" {
518519
egress_rules = ["https-443-tcp"]
519520
}
520521

522+
523+
resource "aws_vpc_security_group_egress_rule" "https_rule" {
524+
security_group_id = module.security_group_lambda_assertion.security_group_id
525+
from_port = 443
526+
ip_protocol = "tcp"
527+
to_port = 443
528+
referenced_security_group_id = var.assertion_lambda.vpc_tls_security_group_id
529+
}
530+
521531
resource "aws_sqs_queue" "dlq_lambda_assertion" {
522532
name = format("%s-dlq", var.assertion_lambda.name)
523533
}
524534

535+
536+
525537
module "assertion_lambda" {
526538
source = "terraform-aws-modules/lambda/aws"
527539
version = "7.4.0"

src/infra/modules/backend/variables.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ variable "assertion_lambda" {
236236
environment_variables = map(string)
237237
cloudwatch_logs_retention_in_days = number
238238
vpc_s3_prefix_id = string
239+
vpc_tls_security_group_id = string
239240
vpc_subnet_ids = list(string)
240241
vpc_id = string
241242
})

src/infra/prod/eu-central-1/main.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,7 @@ module "backend" {
250250
vpc_id = module.network.vpc_id
251251
vpc_subnet_ids = module.network.intra_subnets_ids
252252
vpc_s3_prefix_id = module.network.vpc_endpoints["s3"]["prefix_list_id"]
253+
vpc_tls_security_group_id = module.network.security_group_vpc_tls_id
253254
cloudwatch_logs_retention_in_days = var.lambda_cloudwatch_logs_retention_in_days
254255
}
255256

src/infra/prod/eu-south-1/main.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -294,6 +294,7 @@ module "backend" {
294294
vpc_id = module.network.vpc_id
295295
vpc_subnet_ids = module.network.intra_subnets_ids
296296
vpc_s3_prefix_id = module.network.vpc_endpoints["s3"]["prefix_list_id"]
297+
vpc_tls_security_group_id = module.network.security_group_vpc_tls_id
297298
cloudwatch_logs_retention_in_days = var.lambda_cloudwatch_logs_retention_in_days
298299
}
299300

src/infra/uat/eu-south-1/main.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,7 @@ module "backend" {
278278
vpc_id = module.network.vpc_id
279279
vpc_subnet_ids = module.network.intra_subnets_ids
280280
vpc_s3_prefix_id = module.network.vpc_endpoints["s3"]["prefix_list_id"]
281+
vpc_tls_security_group_id = module.network.security_group_vpc_tls_id
281282
cloudwatch_logs_retention_in_days = var.lambda_cloudwatch_logs_retention_in_days
282283
}
283284
idp_metadata_lambda = {

src/oneid/oneid-lambda-assertion/index.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def publish_metric(value: float, metric_name: str) -> None:
4646
'MetricName': metric_name,
4747
'Value': float(value),
4848
'Unit': 'Count',
49-
'StorageResolution': 60,
49+
'StorageResolution': 60
5050
}]
5151
)
5252

0 commit comments

Comments
 (0)