Skip to content

fix: issue #304 layer2-aws terraform plan error #305

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

Merged
merged 4 commits into from
Oct 5, 2022
Merged

fix: issue #304 layer2-aws terraform plan error #305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a8f8161
fix: issue #304 layer2-aws terraform plan error
sviatoslav6 Oct 3, 2022
c18bc34
issue #305 fix tfsec
sviatoslav6 Oct 5, 2022
28deb0c
issue #305 fix tfsec
sviatoslav6 Oct 5, 2022
1ced812
issue #305 fix tfsec
sviatoslav6 Oct 5, 2022
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
4 changes: 2 additions & 2 deletions terraform/layer1-aws/aws-cloudtrail.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#tfsec:ignore:aws-cloudtrail-enable-at-rest-encryption
#tfsec:ignore:aws-cloudtrail-enable-at-rest-encryption tfsec:ignore:aws-cloudtrail-ensure-cloudwatch-integration
resource "aws_cloudtrail" "main" {
name = local.name
s3_bucket_name = aws_s3_bucket.cloudtrail.id
Expand All @@ -10,7 +10,7 @@ resource "aws_cloudtrail" "main" {
tags = local.tags
}

#tfsec:ignore:aws-s3-enable-bucket-logging tfsec:ignore:aws-s3-enable-versioning
#tfsec:ignore:aws-s3-enable-bucket-logging tfsec:ignore:aws-s3-enable-versioning tfsec:ignore:aws-cloudtrail-require-bucket-access-logging
resource "aws_s3_bucket" "cloudtrail" {
bucket = "${local.name}-aws-cloudtrail-logs"

Expand Down
1 change: 1 addition & 0 deletions terraform/layer1-aws/aws-vpc.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ data "aws_security_group" "default" {
vpc_id = module.vpc.vpc_id
}

#tfsec:ignore:aws-ec2-no-public-ip-subnet
module "vpc" {
source = "terraform-aws-modules/vpc/aws"
version = "3.12.0"
Expand Down
2 changes: 2 additions & 0 deletions terraform/layer2-k8s/eks-gitlab-runner.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,8 @@ resource "aws_s3_bucket_server_side_encryption_configuration" "gitlab_runner_enc
}

resource "aws_s3_bucket_lifecycle_configuration" "gitlab_runner_lifecycle" {
count = local.gitlab_runner.enabled ? 1 : 0

bucket = aws_s3_bucket.gitlab_runner_cache[0].id

rule {
Expand Down