Skip to content

feat: Use vpc cidr for efs sg unless overridden #315

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

Closed
wants to merge 2 commits into from
Closed

feat: Use vpc cidr for efs sg unless overridden #315

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07217cc
Use vpc cidr for efs sg unless overridden
nitrocode Oct 22, 2022
e4e4d66
Use more descriptive local efs_sg_ingress_cidr
nitrocode Oct 22, 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
14 changes: 10 additions & 4 deletions main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
locals {
# VPC - existing or new?
vpc_id = var.vpc_id == "" ? module.vpc.vpc_id : var.vpc_id
private_subnet_ids = coalescelist(module.vpc.private_subnets, var.private_subnet_ids, [""])
public_subnet_ids = coalescelist(module.vpc.public_subnets, var.public_subnet_ids, [""])
vpc_id = var.vpc_id == "" ? module.vpc.vpc_id : var.vpc_id
efs_sg_ingress_cidr = [ var.cidr == "" ? data.aws_vpc.this.cidr : var.cidr ]
private_subnet_ids = coalescelist(module.vpc.private_subnets, var.private_subnet_ids, [""])
public_subnet_ids = coalescelist(module.vpc.public_subnets, var.public_subnet_ids, [""])

# Atlantis
atlantis_image = var.atlantis_image == "" ? "ghcr.io/runatlantis/atlantis:${var.atlantis_version}" : var.atlantis_image
Expand Down Expand Up @@ -137,6 +138,10 @@ data "aws_route53_zone" "this" {
private_zone = var.route53_private_zone
}

data "aws_vpc" "this" {
id = local.vpc_id
}

################################################################################
# Secret for webhook
################################################################################
Expand Down Expand Up @@ -383,7 +388,8 @@ module "efs_sg" {
vpc_id = local.vpc_id
description = "Security group allowing access to the EFS storage"

ingress_cidr_blocks = [var.cidr]
ingress_cidr_blocks = local.efs_sg_ingress_cidr
Copy link
Member

@dynamike dynamike Oct 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking at this whole security group makes me think that you don't need to allow ingress to the EFS volume from the entire VPC. Instead we can just rely on https://github.com/terraform-aws-modules/terraform-aws-atlantis/blob/master/main.tf#L387-L390, which already allows nfs-tcp from the Atlantis security group.


ingress_with_source_security_group_id = [{
rule = "nfs-tcp",
source_security_group_id = module.atlantis_sg.security_group_id
Expand Down