Skip to content

Commit f828a5a

Browse files
committed
Revert "VED-Add-Lambda-s3 Policy (#894)"
This reverts commit f15a1c3.
1 parent 51f1b7a commit f828a5a

File tree

5 files changed

+1
-73
lines changed

5 files changed

+1
-73
lines changed

infrastructure/instance/ecs_batch_processor_config.tf

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -158,14 +158,7 @@ resource "aws_iam_policy" "ecs_task_exec_policy" {
158158
"firehose:PutRecordBatch"
159159
],
160160
"Resource" : "arn:aws:firehose:*:*:deliverystream/${module.splunk.firehose_stream_name}"
161-
},
162-
{
163-
Effect = "Allow",
164-
Action = [
165-
"s3:PutObject",
166-
],
167-
Resource = "${aws_s3_bucket.data_quality_reports_bucket.arn}/*"
168-
},
161+
}
169162
]
170163
})
171164
}

infrastructure/instance/endpoints.tf

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ locals {
44
policy_path = "${path.root}/policies"
55
}
66

7-
# Select the Policy folder
87
data "aws_iam_policy_document" "logs_policy_document" {
98
source_policy_documents = [templatefile("${local.policy_path}/log.json", {})]
109
}
@@ -57,20 +56,6 @@ data "aws_iam_policy_document" "imms_policy_document" {
5756
]
5857
}
5958

60-
data "aws_iam_policy_document" "imms_data_quality_s3_doc" {
61-
source_policy_documents = [
62-
templatefile("${local.policy_path}/s3_data_quality_access.json", {
63-
s3_bucket_arn = aws_s3_bucket.data_quality_reports_bucket.arn
64-
kms_key_arn = data.aws_kms_key.existing_s3_encryption_key.arn
65-
})
66-
]
67-
}
68-
69-
resource "aws_iam_policy" "imms_s3_kms_policy" {
70-
name = "${local.short_prefix}-s3-kms-policy"
71-
policy = data.aws_iam_policy_document.imms_data_quality_s3_doc.json
72-
}
73-
7459
module "imms_event_endpoint_lambdas" {
7560
source = "./modules/lambda"
7661
count = length(local.imms_endpoints)
@@ -85,19 +70,6 @@ module "imms_event_endpoint_lambdas" {
8570
vpc_security_group_ids = [data.aws_security_group.existing_securitygroup.id]
8671
}
8772

88-
89-
# Attach data quality report S3 bucket and KMS policy only to "create_imms" and "update_imms" endpoints
90-
resource "aws_iam_role_policy_attachment" "attach_data_quality_s3_to_specific_lambdas" {
91-
for_each = {
92-
for i, mod in module.imms_event_endpoint_lambdas :
93-
local.imms_endpoints[i] => mod
94-
if local.imms_endpoints[i] == "create_imms" || local.imms_endpoints[i] == "update_imms"
95-
}
96-
97-
role = each.value.lambda_role_name
98-
policy_arn = aws_iam_policy.imms_s3_kms_policy.arn
99-
}
100-
10173
locals {
10274
# Mapping outputs with each called lambda
10375
imms_lambdas = {

infrastructure/instance/modules/lambda/outputs.tf

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,3 @@ output "lambda_arn" {
77
output "invoke_arn" {
88
value = module.lambda_function_container_image.lambda_function_invoke_arn
99
}
10-
output "lambda_role_name" {
11-
value = aws_iam_role.lambda_role.name
12-
}

infrastructure/instance/policies/s3_data_quality_access.json

Lines changed: 0 additions & 23 deletions
This file was deleted.

infrastructure/instance/s3_dq_reports.tf

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,4 @@ resource "aws_s3_bucket_policy" "data_quality_bucket_policy" {
8585
},
8686
]
8787
})
88-
}
89-
90-
resource "aws_s3_bucket_server_side_encryption_configuration" "s3_data_quality_encryption" {
91-
bucket = aws_s3_bucket.data_quality_reports_bucket.id
92-
93-
rule {
94-
apply_server_side_encryption_by_default {
95-
kms_master_key_id = data.aws_kms_key.existing_s3_encryption_key.arn
96-
sse_algorithm = "aws:kms"
97-
}
98-
}
9988
}

0 commit comments

Comments
 (0)