Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: DBTP-972 Ignored by Checkov baseline #190

Merged
merged 37 commits into from
Aug 19, 2024
Merged

fix: DBTP-972 Ignored by Checkov baseline #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
1d53313
fix: CKV_AWS_158 and CKV_AWS_7 remediation
mramplin Jun 25, 2024
42cced2
fix: CKV_AWS_338 - Log Retention Exclusions
mramplin Jun 25, 2024
b5256e7
fix: Added Log Policy to work with CMK Logs
mramplin Jun 28, 2024
8c8dbfa
fix: Lambda Checkov Findings
mramplin Jun 28, 2024
8bdf158
fix: CKV_AWS_23 adding descriptions to security rules
mramplin Jul 2, 2024
69f463f
fix: Checkov ALB Warnings
mramplin Jul 2, 2024
2435171
fix: Remove Items not Found by current checkov scan
mramplin Jul 3, 2024
7c2aefc
fix: various checkov warnings
mramplin Jul 3, 2024
325cd24
fix: Lamda Checkov Items
mramplin Jul 8, 2024
2f5697a
chore: Formatting
mramplin Jul 8, 2024
bdd8ca5
fix: Allow conduit to work with CMK keys
mramplin Jul 8, 2024
d3d886e
chore: Tidy up baseline file
mramplin Jul 8, 2024
28e5693
elasticache items
mramplin Jul 15, 2024
b20b61d
OpenSearch - Can't turn on encryption without recreating cluster
mramplin Jul 16, 2024
bdb0b54
Skipped Checks
mramplin Jul 16, 2024
a289881
Newly added CMK now have app/environment specific descriptions
mramplin Jul 17, 2024
565065b
Added unit tests
mramplin Jul 17, 2024
0248032
Fixed Unit Tests
mramplin Jul 17, 2024
fa6e442
Merge branch 'main' into DBTP-972-ignored-by-checkov-baseline
mramplin Jul 17, 2024
b5e497c
Fix merge issues
mramplin Jul 17, 2024
1d0bf19
Terraform Format Issues
mramplin Jul 17, 2024
3150f6e
Items picked up by Checkov Pipeline not picked up locally - 1
mramplin Jul 17, 2024
96e1048
Skipped checks due to Checkov false positive. Closing DBTP-1039
mramplin Jul 18, 2024
42c11d7
Typo in skip reference
mramplin Jul 18, 2024
c1006c3
Items picked up by Checkov Pipeline not picked up locally - 2
mramplin Jul 18, 2024
a21f213
Items picked up by Checkov Pipeline not picked up locally - 3
mramplin Jul 19, 2024
0deddfb
Items picked up by Checkov Pipeline not picked up locally - 4
mramplin Jul 19, 2024
e58fadb
Merge branch 'main' into DBTP-972-ignored-by-checkov-baseline
mramplin Jul 19, 2024
2e98a6f
Update application-load-balancer/main.tf
mramplin Jul 19, 2024
b977a0c
Update postgres/rds.tf - PR Feedback
mramplin Jul 22, 2024
a62e7dc
PR Feedback
mramplin Jul 22, 2024
0ced9d4
Merge branch 'DBTP-972-ignored-by-checkov-baseline' of https://github…
mramplin Jul 22, 2024
1f800f4
Added JIRA References to items requiring further work
mramplin Jul 24, 2024
69fdfaf
Merge branch 'main' into DBTP-972-ignored-by-checkov-baseline
mramplin Aug 15, 2024
68b7a62
failed validate since pulling in main
mramplin Aug 16, 2024
9e95c79
Reverting Description Change to Prevent Recreating Security Groups
mramplin Aug 16, 2024
1d932b1
Update statefile-backend/main.tf
mramplin Aug 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
337 changes: 0 additions & 337 deletions .checkov.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,341 +1,4 @@
{
"failed_checks": [
{
"file": "/application-load-balancer/main.tf",
"findings": [
{
"resource": "module.extensions-staging.module.alb.aws_lb.this",
"check_ids": [
"CKV2_AWS_28",
"CKV_AWS_131",
"CKV_AWS_150"
]
},
{
"resource": "module.extensions-staging.module.alb.aws_lb_listener.alb-listener",
"check_ids": [
"CKV_AWS_103",
"CKV_AWS_2"
]
},
{
"resource": "module.extensions-staging.module.alb.aws_lb_target_group.http-target-group",
"check_ids": [
"CKV_AWS_261"
]
},
{
"resource": "module.extensions-staging.module.alb.aws_security_group.alb-security-group",
"check_ids": [
"CKV_AWS_23",
"CKV2_AWS_5"
]
}
]
},
{
"file": "/domain/main.tf",
"findings": [
{
"resource": "aws_route53_zone.new-zone",
"check_ids": [
"CKV2_AWS_38",
"CKV2_AWS_39"
]
}
]
},
{
"file": "/elasticache-redis/e2e-tests/setup/main.tf",
"findings": [
{
"resource": "aws_security_group.vpc-core-sg",
"check_ids": [
"CKV2_AWS_5"
]
},
{
"resource": "aws_vpc.main",
"check_ids": [
"CKV2_AWS_11",
"CKV2_AWS_12"
]
}
]
},
{
"file": "/elasticache-redis/main.tf",
"findings": [
{
"resource": "module.extensions-staging.module.elasticache-redis.aws_cloudwatch_log_group.redis-engine-log-group",
"check_ids": [
"CKV_AWS_158",
"CKV_AWS_338"
]
},
{
"resource": "module.extensions-staging.module.elasticache-redis.aws_cloudwatch_log_group.redis-slow-log-group",
"check_ids": [
"CKV_AWS_158",
"CKV_AWS_338"
]
},
{
"resource": "module.extensions-staging.module.elasticache-redis.aws_elasticache_replication_group.redis",
"check_ids": [
"CKV_AWS_191",
"CKV_AWS_31"
]
},
{
"resource": "module.extensions-staging.module.elasticache-redis.aws_security_group.redis",
"check_ids": [
"CKV_AWS_23"
]
},
{
"resource": "module.extensions-staging.module.elasticache-redis.aws_ssm_parameter.endpoint",
"check_ids": [
"CKV_AWS_337"
]
}
]
},
{
"file": "/environment-pipelines/codebuild.tf",
"findings": [
{
"resource": "aws_cloudwatch_log_group.environment_pipeline_codebuild",
"check_ids": [
"CKV_AWS_158"
]
}
]
},
{
"file": "/environment-pipelines/iam.tf",
"findings": [
{
"resource": "aws_iam_policy_document.access_artifact_store",
"check_ids": [
"CKV_AWS_111",
"CKV_AWS_356"
]
}
]
},
{
"file": "/extensions/main.tf",
"findings": [
{
"resource": "module.extensions-staging.aws_ssm_parameter.addons",
"check_ids": [
"CKV2_AWS_34",
"CKV_AWS_337"
]
}
]
},
{
"file": "/opensearch/e2e-tests/setup/main.tf",
"findings": [
{
"resource": "aws_vpc.main",
"check_ids": [
"CKV2_AWS_11",
"CKV2_AWS_12"
]
}
]
},
{
"file": "/opensearch/main.tf",
"findings": [
{
"resource": "module.extensions-staging.module.opensearch.aws_cloudwatch_log_group.opensearch_log_group_audit_logs",
"check_ids": [
"CKV_AWS_158"
]
},
{
"resource": "module.extensions-staging.module.opensearch.aws_cloudwatch_log_group.opensearch_log_group_es_application_logs",
"check_ids": [
"CKV_AWS_158"
]
},
{
"resource": "module.extensions-staging.module.opensearch.aws_cloudwatch_log_group.opensearch_log_group_index_slow_logs",
"check_ids": [
"CKV_AWS_158"
]
},
{
"resource": "module.extensions-staging.module.opensearch.aws_cloudwatch_log_group.opensearch_log_group_search_slow_logs",
"check_ids": [
"CKV_AWS_158"
]
},
{
"resource": "module.extensions-staging.module.opensearch.aws_opensearch_domain.this",
"check_ids": [
"CKV2_AWS_59",
"CKV_AWS_247",
"CKV_AWS_317",
"CKV_AWS_318"
]
},
{
"resource": "module.extensions-staging.module.opensearch.aws_security_group.opensearch-security-group",
"check_ids": [
"CKV2_AWS_5"
]
},
{
"resource": "module.extensions-staging.module.opensearch.aws_ssm_parameter.opensearch_endpoint",
"check_ids": [
"CKV_AWS_337"
]
}
]
},
{
"file": "/postgres/lambda.tf",
"findings": [
{
"resource": "module.extensions-staging.module.postgres.aws_iam_policy_document.lambda-execution-policy",
"check_ids": [
"CKV_AWS_108",
"CKV_AWS_111",
"CKV_AWS_356"
]
},
{
"resource": "module.extensions-staging.module.postgres.aws_lambda_function.lambda",
"check_ids": [
"CKV_AWS_115",
"CKV_AWS_116",
"CKV_AWS_272",
"CKV_AWS_50"
]
}
]
},
{
"file": "/postgres/rds.tf",
"findings": [
{
"resource": "module.extensions-staging.module.postgres.aws_db_instance.default",
"check_ids": [
"CKV_AWS_161",
"CKV_AWS_293",
"CKV_AWS_354"
]
},
{
"resource": "module.extensions-staging.module.postgres.aws_kms_key.default",
"check_ids": [
"CKV2_AWS_64",
"CKV_AWS_7"
]
}
]
},
{
"file": "/postgres/secrets.tf",
"findings": [
{
"resource": "module.extensions-staging.module.postgres.aws_ssm_parameter.master-secret-arn",
"check_ids": [
"CKV_AWS_337"
]
}
]
},
{
"file": "/s3/main.tf",
"findings": [
{
"resource": "module.artifact_store.aws_kms_key.kms-key",
"check_ids": [
"CKV2_AWS_64",
"CKV_AWS_7"
]
},
{
"resource": "module.artifact_store.aws_s3_bucket.this",
"check_ids": [
"CKV2_AWS_6",
"CKV2_AWS_61",
"CKV2_AWS_62",
"CKV_AWS_144",
"CKV_AWS_18"
]
},
{
"resource": "module.extensions-staging.module.s3.aws_kms_key.kms-key",
"check_ids": [
"CKV2_AWS_64",
"CKV_AWS_7"
]
},
{
"resource": "module.extensions-staging.module.s3.aws_s3_bucket.this",
"check_ids": [
"CKV2_AWS_6",
"CKV2_AWS_61",
"CKV2_AWS_62",
"CKV_AWS_144",
"CKV_AWS_18"
]
}
]
},
{
"file": "/statefile-backend/main.tf",
"findings": [
{
"resource": "aws_dynamodb_table.terraform-state",
"check_ids": [
"CKV2_AWS_16",
"CKV_AWS_119",
"CKV_AWS_28"
]
},
{
"resource": "aws_kms_key.terraform-bucket-key",
"check_ids": [
"CKV2_AWS_64",
"CKV_AWS_7"
]
},
{
"resource": "aws_s3_bucket.terraform-state",
"check_ids": [
"CKV2_AWS_61",
"CKV2_AWS_62",
"CKV_AWS_144",
"CKV_AWS_18"
]
},
{
"resource": "aws_s3_bucket_ownership_controls.terraform-state-ownership",
"check_ids": [
"CKV2_AWS_65"
]
}
]
},
{
"file": "/vpc/main.tf",
"findings": [
{
"resource": "aws_vpc.vpc",
"check_ids": [
"CKV2_AWS_11",
"CKV2_AWS_12"
]
}
]
}
]
}
19 changes: 14 additions & 5 deletions application-load-balancer/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ data "aws_subnets" "public-subnets" {
}

resource "aws_lb" "this" {
# checkov:skip=CKV2_AWS_28: WAF is outside of terraform-platform-modules
name = "${var.application}-${var.environment}"
load_balancer_type = "application"
subnets = tolist(data.aws_subnets.public-subnets.ids)
Expand All @@ -25,10 +26,16 @@ resource "aws_lb" "this" {
prefix = "${var.application}/${var.environment}"
enabled = true
}

tags = local.tags

drop_invalid_header_fields = true
enable_deletion_protection = true
}

resource "aws_lb_listener" "alb-listener" {
# checkov:skip=CKV_AWS_2:Checkov Looking for Hard Coded HTTPS but we use a variable.
# checkov:skip=CKV_AWS_103:Checkov Looking for Hard Coded TLS1.2 but we use a variable.
depends_on = [aws_acm_certificate_validation.cert_validate]

for_each = local.protocols
Expand All @@ -45,11 +52,12 @@ resource "aws_lb_listener" "alb-listener" {
}

resource "aws_security_group" "alb-security-group" {
# checkov:skip=CKV2_AWS_5:Security group is used by VPC. Ticket to investigate: https://uktrade.atlassian.net/browse/DBTP-1039
for_each = local.protocols
name = "${var.application}-${var.environment}-alb-${each.key}"
vpc_id = data.aws_vpc.vpc.id
tags = local.tags
# checkov:skip=CKV2_AWS_5: False Positive in Checkov - https://github.com/bridgecrewio/checkov/issues/3010
for_each = local.protocols
name = "${var.application}-${var.environment}-alb-${each.key}"
description = "Managed by Terraform"
mramplin marked this conversation as resolved.
Show resolved Hide resolved
vpc_id = data.aws_vpc.vpc.id
tags = local.tags
ingress {
description = "Allow from anyone on port ${each.value.port}"
from_port = each.value.port
Expand All @@ -67,6 +75,7 @@ resource "aws_security_group" "alb-security-group" {
}

resource "aws_lb_target_group" "http-target-group" {
# checkov:skip=CKV_AWS_261:Health Check is Defined by copilot
name = "${var.application}-${var.environment}-http"
port = 80
protocol = "HTTP"
Expand Down
Loading