From 40613e08b68e4341f1a0e491ee9822b7b63e2228 Mon Sep 17 00:00:00 2001
From: shnee <shnee@shnee.net>
Date: Wed, 15 Dec 2021 09:38:11 -0500
Subject: [PATCH] Cleaned up some TODOs.

---
 main.tf                                   |  8 +++++---
 modules/aws-network-existing/main.tf      |  4 ++++
 modules/aws-network-existing/outputs.tf   |  6 +++++-
 modules/aws-network-existing/variables.tf |  5 ++++-
 modules/aws-nodes/main.tf                 |  2 --
 variables.tf                              | 10 ++++++++++
 6 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/main.tf b/main.tf
index fdcc3a2..ba9a35f 100644
--- a/main.tf
+++ b/main.tf
@@ -59,7 +59,9 @@ module "cloud-init-config" {
 # }
 
 module "aws-network-existing" {
-  source = "./modules/aws-network-existing"
+  source                      = "./modules/aws-network-existing"
+  default-vpc-name            = var.aws-existing-vpc-name
+  default-security-group-name = var.aws-existing-sg-name
 }
 
 ################################################################################
@@ -79,8 +81,8 @@ module "nodes" {
   source             = "./modules/aws-nodes"
   ami                = each.value.base-image
   ec2-instance-type  = var.aws-ec2-instance-type
-  subnet-id          = module.aws-network-existing.k8s-subnets[0]
-  security-group-ids = [data.aws_security_group.default.id]
+  subnet-id          = module.aws-network-existing.k8s-subnets-ids[0]
+  security-group-ids = [module.aws-network-existing.default-sg.id]
   user-datas         = lookup(module.cloud-init-config, each.key, null).user-datas
   num-nodes          = each.value.num
   name-prefix        = "${var.vm-name-prefix}-${each.key}"
diff --git a/modules/aws-network-existing/main.tf b/modules/aws-network-existing/main.tf
index 81d25c3..19fff56 100644
--- a/modules/aws-network-existing/main.tf
+++ b/modules/aws-network-existing/main.tf
@@ -21,3 +21,7 @@ data "aws_subnet" "subnets" {
   for_each = toset(data.aws_subnets.subnet-ids.ids)
   id = each.key
 }
+
+data "aws_security_group" "default" {
+  name = var.default-security-group-name
+}
diff --git a/modules/aws-network-existing/outputs.tf b/modules/aws-network-existing/outputs.tf
index f16e968..affe10d 100644
--- a/modules/aws-network-existing/outputs.tf
+++ b/modules/aws-network-existing/outputs.tf
@@ -2,12 +2,16 @@ output "default-vpc" {
   value = data.aws_vpc.default
 }
 
+output "default-sg" {
+  value = data.aws_security_group.default
+}
+
 output "subnets" {
   description = "An array of all subnets in default-vpc."
   value = data.aws_subnet.subnets
 }
 
-output "k8s-subnets" {
+output "k8s-subnets-ids" {
   description = "An array of subnets to be used for k8s VMs. These subnets were chosen by selecting a single subnet from each availability_zone."
   value = [for k,v in local.az-to-subnets : v[0]]
 }
diff --git a/modules/aws-network-existing/variables.tf b/modules/aws-network-existing/variables.tf
index b03ebd1..9add409 100644
--- a/modules/aws-network-existing/variables.tf
+++ b/modules/aws-network-existing/variables.tf
@@ -1,4 +1,7 @@
+variable "default-security-group-name" {
+  description = "The name of the existing default security group. This module will query AWS for a security group with this name,"
+}
+
 variable "default-vpc-name" {
   description = "The name of the existing default VPC. This module will query AWS for a VPC with this name,"
-  default = "Managed VPC"
 }
diff --git a/modules/aws-nodes/main.tf b/modules/aws-nodes/main.tf
index 8a0f793..a9f0c1e 100644
--- a/modules/aws-nodes/main.tf
+++ b/modules/aws-nodes/main.tf
@@ -1,8 +1,6 @@
 resource "aws_instance" "nodes" {
   ami                         = var.ami
   instance_type               = var.ec2-instance-type
-  # TODO REM double check this key.
-  # key_name                    = aws_key_pair.debug1.key_name
   # TODO Make this a variable.
   associate_public_ip_address = true
   subnet_id                   = var.subnet-id
diff --git a/variables.tf b/variables.tf
index 94c8bd6..fed0de5 100644
--- a/variables.tf
+++ b/variables.tf
@@ -9,6 +9,16 @@ variable "aws-ec2-instance-type" {
   description = "The AWS instance type to use for all nodes."
 }
 
+variable "aws-existing-sg-name" {
+  default = "change-me-if-using-aws-network-existing"
+  description = "The name of the existing security group when using aws-network-existing."
+}
+
+variable "aws-existing-vpc-name" {
+  default = "change-me-if-using-aws-network-existing"
+  description = "The name of the existing VPC when using aws-network-existing."
+}
+
 variable "aws-region" {
   default = "us-east-1"
   description = "The AWS region to use."