From 81f8531ffe3c48971da6116bc54de156001c7919 Mon Sep 17 00:00:00 2001
From: Jeremy Cook <jeremy.cook@cloudacademy.com>
Date: Thu, 6 Jun 2024 21:27:44 +1200
Subject: [PATCH] updates

---
 labfiles/main.tf                       | 50 +++++++++++++++++++++++---
 terraform/modules/vpc-endpoint/main.tf | 10 +++---
 2 files changed, 51 insertions(+), 9 deletions(-)

diff --git a/labfiles/main.tf b/labfiles/main.tf
index 474056a..77e6a99 100644
--- a/labfiles/main.tf
+++ b/labfiles/main.tf
@@ -26,6 +26,26 @@ resource "aws_subnet" "region1" {
   cidr_block = "10.201.0.0/24"
 }
 
+resource "aws_security_group" "vpc_endpoint_s3_region1" {
+  provider = aws
+
+  vpc_id = aws_vpc.region1.id
+
+  ingress {
+    from_port   = 0
+    to_port     = 0
+    protocol    = "-1"
+    cidr_blocks = ["0.0.0.0/0"]
+  }
+
+  egress {
+    from_port   = 0
+    to_port     = 0
+    protocol    = "-1"
+    cidr_blocks = ["0.0.0.0/0"]
+  }
+}
+
 module "vpc-endpoint-s3-global-region1" {
   providers = {
     aws = aws
@@ -39,8 +59,9 @@ module "vpc-endpoint-s3-global-region1" {
     region       = "us-east-1"
   }
 
-  vpc_id     = aws_vpc.region1.id
-  subnet_ids = [aws_subnet.region1.id]
+  vpc_id             = aws_vpc.region1.id
+  subnet_ids         = [aws_subnet.region1.id]
+  security_group_ids = [aws_security_group.vpc_endpoint_s3_region1.id]
 }
 
 resource "aws_route_table" "region1" {
@@ -151,6 +172,26 @@ resource "aws_subnet" "region2" {
   cidr_block = "10.202.0.0/24"
 }
 
+resource "aws_security_group" "vpc_endpoint_s3_region2" {
+  provider = aws.us-west-2
+
+  vpc_id = aws_vpc.region2.id
+
+  ingress {
+    from_port   = 0
+    to_port     = 0
+    protocol    = "-1"
+    cidr_blocks = ["0.0.0.0/0"]
+  }
+
+  egress {
+    from_port   = 0
+    to_port     = 0
+    protocol    = "-1"
+    cidr_blocks = ["0.0.0.0/0"]
+  }
+}
+
 module "vpc-endpoint-s3-global-region2" {
   providers = {
     aws = aws.us-west-2
@@ -164,8 +205,9 @@ module "vpc-endpoint-s3-global-region2" {
     region       = "us-west-2"
   }
 
-  vpc_id     = aws_vpc.region2.id
-  subnet_ids = [aws_subnet.region2.id]
+  vpc_id             = aws_vpc.region2.id
+  subnet_ids         = [aws_subnet.region2.id]
+  security_group_ids = [aws_security_group.vpc_endpoint_s3_region2.id]
 }
 
 resource "aws_route_table" "region2" {
diff --git a/terraform/modules/vpc-endpoint/main.tf b/terraform/modules/vpc-endpoint/main.tf
index 53d6a68..8a85f10 100644
--- a/terraform/modules/vpc-endpoint/main.tf
+++ b/terraform/modules/vpc-endpoint/main.tf
@@ -8,10 +8,10 @@ terraform {
 }
 
 resource "aws_vpc_endpoint" "endpoint" {
-  vpc_endpoint_type = "Interface"
-  vpc_id            = var.vpc_id
-  service_name      = var.configuration.service_name
-  subnet_ids        = var.subnet_ids
-  # security_group_ids  = var.security_group_ids
+  vpc_endpoint_type   = "Interface"
+  vpc_id              = var.vpc_id
+  service_name        = var.configuration.service_name
+  subnet_ids          = var.subnet_ids
+  security_group_ids  = var.security_group_ids
   private_dns_enabled = var.private_dns_only_for_inbound_resolver_endpoint
 }