From 39925e70fcfca6732130b6e8b551ff1a7adaad67 Mon Sep 17 00:00:00 2001
From: Tim Gross <tgross@hashicorp.com>
Date: Wed, 26 Aug 2020 17:00:36 -0400
Subject: [PATCH] e2e: minor TF refactor to split out vars and outputs (#8752)

---
 e2e/terraform/compute.tf      |  30 ++++++++
 e2e/terraform/main.tf         | 139 +---------------------------------
 e2e/terraform/outputs.tf      |  43 +++++++++++
 e2e/terraform/provisioning.tf |   9 ---
 e2e/terraform/variables.tf    |  59 +++++++++++++++
 5 files changed, 135 insertions(+), 145 deletions(-)
 create mode 100644 e2e/terraform/outputs.tf
 create mode 100644 e2e/terraform/variables.tf

diff --git a/e2e/terraform/compute.tf b/e2e/terraform/compute.tf
index ee98b72d7..beedb99e5 100644
--- a/e2e/terraform/compute.tf
+++ b/e2e/terraform/compute.tf
@@ -73,3 +73,33 @@ resource "aws_instance" "client_windows" {
     delete_on_termination = "true"
   }
 }
+
+data "aws_ami" "linux" {
+  most_recent = true
+  owners      = ["self"]
+
+  filter {
+    name   = "name"
+    values = ["nomad-e2e-*"]
+  }
+
+  filter {
+    name   = "tag:OS"
+    values = ["Ubuntu"]
+  }
+}
+
+data "aws_ami" "windows" {
+  most_recent = true
+  owners      = ["self"]
+
+  filter {
+    name   = "name"
+    values = ["nomad-e2e-windows-2016*"]
+  }
+
+  filter {
+    name   = "tag:OS"
+    values = ["Windows2016"]
+  }
+}
diff --git a/e2e/terraform/main.tf b/e2e/terraform/main.tf
index e1ae99fa4..50383c283 100644
--- a/e2e/terraform/main.tf
+++ b/e2e/terraform/main.tf
@@ -1,63 +1,3 @@
-variable "name" {
-  description = "Used to name various infrastructure components"
-  default     = "nomad-e2e"
-}
-
-variable "region" {
-  description = "The AWS region to deploy to."
-  default     = "us-east-1"
-}
-
-variable "availability_zone" {
-  description = "The AWS availability zone to deploy to."
-  default     = "us-east-1a"
-}
-
-variable "indexed" {
-  description = "Different configurations per client/server"
-  default     = true
-}
-
-variable "instance_type" {
-  description = "The AWS instance type to use for both clients and servers."
-  default     = "t2.medium"
-}
-
-variable "server_count" {
-  description = "The number of servers to provision."
-  default     = "3"
-}
-
-variable "client_count" {
-  description = "The number of clients to provision."
-  default     = "4"
-}
-
-variable "windows_client_count" {
-  description = "The number of windows clients to provision."
-  default     = "1"
-}
-
-variable "nomad_sha" {
-  description = "The sha of Nomad to write to provisioning output"
-  default     = ""
-}
-
-variable "aws_assume_role_arn" {
-  description = "The AWS IAM role to assume (not used by human users)"
-  default     = ""
-}
-
-variable "aws_assume_role_session_name" {
-  description = "The AWS IAM session name to assume (not used by human users)"
-  default     = ""
-}
-
-variable "aws_assume_role_external_id" {
-  description = "The AWS IAM external ID to assume (not used by human users)"
-  default     = ""
-}
-
 provider "aws" {
   region = var.region
 
@@ -68,6 +8,9 @@ provider "aws" {
   }
 }
 
+data "aws_caller_identity" "current" {
+}
+
 resource "random_pet" "e2e" {
 }
 
@@ -88,79 +31,3 @@ module "keys" {
   source  = "mitchellh/dynamic-keys/aws"
   version = "v2.0.0"
 }
-
-data "aws_ami" "linux" {
-  most_recent = true
-  owners      = ["self"]
-
-  filter {
-    name   = "name"
-    values = ["nomad-e2e-*"]
-  }
-
-  filter {
-    name   = "tag:OS"
-    values = ["Ubuntu"]
-  }
-}
-
-data "aws_ami" "windows" {
-  most_recent = true
-  owners      = ["self"]
-
-  filter {
-    name   = "name"
-    values = ["nomad-e2e-windows-2016*"]
-  }
-
-  filter {
-    name   = "tag:OS"
-    values = ["Windows2016"]
-  }
-}
-
-data "aws_caller_identity" "current" {
-}
-
-output "servers" {
-  value = aws_instance.server.*.public_ip
-}
-
-output "linux_clients" {
-  value = aws_instance.client_linux.*.public_ip
-}
-
-output "windows_clients" {
-  value = aws_instance.client_windows.*.public_ip
-}
-
-output "message" {
-  value = <<EOM
-Your cluster has been provisioned! - To prepare your environment, run the
-following:
-
-```
-export NOMAD_ADDR=http://${aws_instance.server[0].public_ip}:4646
-export CONSUL_HTTP_ADDR=http://${aws_instance.server[0].public_ip}:8500
-export NOMAD_E2E=1
-```
-
-Then you can run e2e tests with:
-
-```
-go test -v ./e2e
-```
-
-ssh into nodes with:
-```
-# server
-ssh -i keys/${local.random_name}.pem ubuntu@${aws_instance.server[0].public_ip}
-
-# clients
-%{for ip in aws_instance.client_linux.*.public_ip~}
-ssh -i keys/${local.random_name}.pem ubuntu@${ip}
-%{endfor~}
-```
-EOM
-
-}
diff --git a/e2e/terraform/outputs.tf b/e2e/terraform/outputs.tf
new file mode 100644
index 000000000..fbd1e0227
--- /dev/null
+++ b/e2e/terraform/outputs.tf
@@ -0,0 +1,43 @@
+output "servers" {
+  value = aws_instance.server.*.public_ip
+}
+
+output "linux_clients" {
+  value = aws_instance.client_linux.*.public_ip
+}
+
+output "windows_clients" {
+  value = aws_instance.client_windows.*.public_ip
+}
+
+output "message" {
+  value = <<EOM
+Your cluster has been provisioned! To prepare your environment, run:
+
+   $(terraform output environment)
+
+Then you can run tests from the e2e directory with:
+
+   go test -v .
+
+ssh into servers with:
+
+   ssh -i keys/${local.random_name}.pem ubuntu@${aws_instance.server[0].public_ip}
+
+ssh into clients with:
+
+%{for ip in aws_instance.client_linux.*.public_ip~}
+    ssh -i keys/${local.random_name}.pem ubuntu@${ip}
+%{endfor~}
+
+EOM
+}
+
+output "environment" {
+  description = "get connection config by running: $(terraform output environment)"
+  value = <<EOM
+export NOMAD_ADDR=http://${aws_instance.server[0].public_ip}:4646
+export CONSUL_HTTP_ADDR=http://${aws_instance.server[0].public_ip}:8500
+export NOMAD_E2E=1
+EOM
+}
diff --git a/e2e/terraform/provisioning.tf b/e2e/terraform/provisioning.tf
index 5e68d22ca..f04c37abb 100644
--- a/e2e/terraform/provisioning.tf
+++ b/e2e/terraform/provisioning.tf
@@ -1,14 +1,5 @@
 # outputs used for E2E testing and provisioning
 
-output "environment" {
-  description = "get connection config by running: $(terraform output environment)"
-  value       = <<EOM
-export NOMAD_ADDR=http://${aws_instance.server[0].public_ip}:4646
-export CONSUL_HTTP_ADDR=http://${aws_instance.server[0].public_ip}:8500
-export NOMAD_E2E=1
-EOM
-}
-
 output "provisioning" {
   description = "output to a file to be use w/ E2E framework -provision.terraform"
   value = jsonencode(
diff --git a/e2e/terraform/variables.tf b/e2e/terraform/variables.tf
new file mode 100644
index 000000000..3e44cf470
--- /dev/null
+++ b/e2e/terraform/variables.tf
@@ -0,0 +1,59 @@
+variable "name" {
+  description = "Used to name various infrastructure components"
+  default     = "nomad-e2e"
+}
+
+variable "region" {
+  description = "The AWS region to deploy to."
+  default     = "us-east-1"
+}
+
+variable "availability_zone" {
+  description = "The AWS availability zone to deploy to."
+  default     = "us-east-1a"
+}
+
+variable "indexed" {
+  description = "Different configurations per client/server"
+  default     = true
+}
+
+variable "instance_type" {
+  description = "The AWS instance type to use for both clients and servers."
+  default     = "t2.medium"
+}
+
+variable "server_count" {
+  description = "The number of servers to provision."
+  default     = "3"
+}
+
+variable "client_count" {
+  description = "The number of clients to provision."
+  default     = "4"
+}
+
+variable "windows_client_count" {
+  description = "The number of windows clients to provision."
+  default     = "1"
+}
+
+variable "nomad_sha" {
+  description = "The sha of Nomad to write to provisioning output"
+  default     = ""
+}
+
+variable "aws_assume_role_arn" {
+  description = "The AWS IAM role to assume (not used by human users)"
+  default     = ""
+}
+
+variable "aws_assume_role_session_name" {
+  description = "The AWS IAM session name to assume (not used by human users)"
+  default     = ""
+}
+
+variable "aws_assume_role_external_id" {
+  description = "The AWS IAM external ID to assume (not used by human users)"
+  default     = ""
+}