From 8e53650ebb0cc13e20651807d20f58d8f7331c6e Mon Sep 17 00:00:00 2001
From: Kent 'picat' Gruber <kent@hashicorp.com>
Date: Fri, 17 Jul 2020 14:37:56 -0400
Subject: [PATCH] Remove external load balancer configuration

---
 terraform/gcp/env/us-east/main.tf             | 38 ---------------
 .../gcp/modules/hashistack/hashistack.tf      | 46 -------------------
 2 files changed, 84 deletions(-)

diff --git a/terraform/gcp/env/us-east/main.tf b/terraform/gcp/env/us-east/main.tf
index 30ac00410..c2e8f9141 100644
--- a/terraform/gcp/env/us-east/main.tf
+++ b/terraform/gcp/env/us-east/main.tf
@@ -48,41 +48,3 @@ module "hashistack" {
   server_count        = var.server_count
   client_count        = var.client_count
 }
-
-output "hashistack_load_balancer_external_ip" {
-  description = "The external ip address of the HashiStack load balacner."
-  value       = module.hashistack.load_balancer_external_ip
-}
-
-output "manual_config_steps" {
-  value = <<CONFIGURATION
-Web UI:
-
-Nomad: http://${module.hashistack.load_balancer_external_ip}:4646/ui
-Consul: http://${module.hashistack.load_balancer_external_ip}:8500/ui
-Vault: http://${module.hashistack.load_balancer_external_ip}:8200/ui
-
-Exportable CLI Environment Variables:
-
-export NOMAD_ADDR="http://${module.hashistack.load_balancer_external_ip}:4646"
-export CONSUL_HTTP_ADDR="http://${module.hashistack.load_balancer_external_ip}:8500"
-export VAULT_ADDR="http://${module.hashistack.load_balancer_external_ip}:8200"
-
-Example Commands:
-
-  $ consul members
-  $ nomad status
-  $ vault status
-
-Note:
-
-If you see an error message like the following when running any of the above
-commands, it usually indicates that the configuration script has not finished
-executing:
-
-"Error querying servers: Get http://127.0.0.1:4646/v1/agent/members: dial tcp
-127.0.0.1:4646: getsockopt: connection refused"
-
-Simply wait a few seconds and rerun the command if this occurs.
-CONFIGURATION
-}
diff --git a/terraform/gcp/modules/hashistack/hashistack.tf b/terraform/gcp/modules/hashistack/hashistack.tf
index 0f0400a21..a18b03c01 100644
--- a/terraform/gcp/modules/hashistack/hashistack.tf
+++ b/terraform/gcp/modules/hashistack/hashistack.tf
@@ -32,12 +32,6 @@ variable "cidr_range" {
   description = "The IP CIDR range to use for the cluster's VPC subnetwork."
 }
 
-variable "allowlist_cidr_range" {
-    type        = string
-    default     = "0.0.0.0/0" // $IP/$SUBNET_MASK
-    description = "The IP CIDR range to allow HTTP access to Nomad, Consl, and Vault."
-}
-
 variable "router_asn" {
   type    = string
   default = "64514"
@@ -91,24 +85,6 @@ variable "client_disk_size_gb" {
   description = "The compute engine disk size in GB to use for client instances."
 }
 
-variable "only_allow_your_host_external_ip" {
-    type        = bool 
-    default     = true
-    description = "Only allow your host's external IP address to the load balancer."
-} 
-
-data "http" "ip_info" {
-  url = "https://ipinfo.io"
-  request_headers = {
-    Accept = "application/json"
-  }
-}
-
-locals {
-  ip_info_json     = jsondecode(data.http.ip_info.body)
-  host_external_ip = "${local.ip_info_json["ip"]}/32"
-}
-
 resource "google_compute_network" "hashistack" {
   name                    = var.name 
   auto_create_subnetworks = false
@@ -157,7 +133,6 @@ resource "google_compute_firewall" "allow-http-external" {
   name          = "${var.name}-allow-http-external"
   network       = google_compute_network.hashistack.name
   target_tags   = ["server"]
-  source_ranges = var.only_allow_your_host_external_ip ? [local.host_external_ip] : [var.allowlist_cidr_range]
 
   allow {
     protocol = "tcp"
@@ -286,24 +261,3 @@ resource "google_compute_instance" "client" {
 
   metadata_startup_script = local.client_metadata_startup_script
 }
-
-resource "google_compute_forwarding_rule" "load-balancer" {
-  target                = google_compute_target_pool.load-balancer.self_link
-  name                  = "${var.name}-load-balancer"
-  load_balancing_scheme = "EXTERNAL"
-  network_tier          = "STANDARD"
-  region                = var.region
-  port_range            = "4646-8500" 
-}
-
-resource "google_compute_target_pool" "load-balancer" {
-  name             = "${var.name}-lb"
-  region           = var.region
-  session_affinity = "CLIENT_IP"
-  instances        = formatlist("${format("%s-%s/${var.name}-server", var.region, var.zone)}-%d", range(var.server_count))
-}
-
-output "load_balancer_external_ip" {
-  description = "The external ip address of the HashiStack load balacner"
-  value       = google_compute_forwarding_rule.load-balancer.ip_address
-}