Updating for interfaces, adding auto vars and restructuring for getting started

Author: FraserPol

self-serve-infrastructure/getting-started/terraform-aws/_interface.tf

@@ -0,0 +1,19 @@
+variable "region" {
+  default     = ""
+  description = "The default AZ to provision to for the provider"
+}
+
+variable "vpc_cidr_block" {
+  default     = ""
+  description = "The default CIDR block for the VPC demo"
+}
+
+variable "subnet_cidr_block" {
+  default     = ""
+  description = "The default CIDR block for the subnet demo"
+}
+
+variable "subnet_availability_zone" {
+  default     = ""
+  description = "The default AZ for the subnet"
+}

self-serve-infrastructure/getting-started/terraform-aws/outputs.tf

@@ -1,9 +1,9 @@
 output "vpc_id_consumable" {
-  value = "${aws_vpc.demo_vpc.id}"
+  value       = "${aws_vpc.demo_vpc.id}"
   description = "This is the VPC ID for later use"
 }
 
 output "demo_subnet_id" {
-  value = "${aws_subnet.demo_subnet.id}"
+  value       = "${aws_subnet.demo_subnet.id}"
   description = "This is the Subnet ID for later use"
 }

self-serve-infrastructure/getting-started/terraform-azure/_interface.tf

@@ -0,0 +1,29 @@
+variable "rg_name" {
+  default     = ""
+  description = "The default name for the Resource Group"
+}
+
+variable "rg_location" {
+  default     = ""
+  description = "The default name for the Resource Group"
+}
+
+variable "vn_name" {
+  default     = ""
+  description = "The default name for the Virtual Network"
+}
+
+variable "vn_address_space" {
+  default     = ""
+  description = "The default address space for the Virtual Network"
+}
+
+variable "sb_name" {
+  default     = ""
+  description = "The default name for the subnet"
+}
+
+variable "sb_address_prefix" {
+  default     = ""
+  description = "The default address prefix for the Subnet"
+}

self-serve-infrastructure/getting-started/terraform-azure/outputs.tf

@@ -1,19 +1,19 @@
 output "resource_group_consumable" {
-  value = "${azurerm_resource_group.demo_resource_group.name}"
+  value       = "${azurerm_resource_group.demo_resource_group.name}"
   description = "The Demo VPC Name for later use"
 }
 
 output "virtual_network_consumable_name" {
-  value = "${azurerm_virtual_network.demo_virtual_network.name}"
+  value       = "${azurerm_virtual_network.demo_virtual_network.name}"
   description = "The Demo Virtaul Network name for later use"
 }
 
 output "virtual_network_consumable_address_space" {
-  value = "${azurerm_virtual_network.demo_virtual_network.address_space}"
+  value       = "${azurerm_virtual_network.demo_virtual_network.address_space}"
   description = "The Demo Virtaul Network address space for later use"
 }
 
 output "subnet_consumable" {
-  value = "${azurerm_subnet.demo_subnet.address_prefix}"
+  value       = "${azurerm_subnet.demo_subnet.address_prefix}"
   description = "The Demo Subnet for later use"
 }

self-serve-infrastructure/getting-started/terraform-gcp/_interface.tf

@@ -0,0 +1,19 @@
+variable "gn_name" {
+  default     = ""
+  description = "The default name for the Compute Network"
+}
+
+variable "sn_name" {
+  default     = ""
+  description = "The default name for the subnet"
+}
+
+variable "sn_region" {
+  default     = ""
+  description = "The default region for the subnet"
+}
+
+variable "sn_cidr_range" {
+  default     = ""
+  description = "The default Subnet Cidr Range"
+}

self-serve-infrastructure/getting-started/terraform-gcp/main.tf

@@ -1,30 +1,17 @@
-# Need to add actual script inline with HEREDOC - below path doesn't exist
-/*
-data "template_file" "php-startup-script" {
-  template = "${file("${format("%s/../scripts/gceme.sh.tpl", path.module)}")}"
-  vars {
-    PROXY_PATH = ""
-  }
+provider "google" {
+  project = "terraform-gcp-module-test"
+  region  = "us-central1"
+  project = "terraform-gcp-module-test"
 }
-*/
 
-module "mig1" {
-  source            = "GoogleCloudPlatform/managed-instance-group/google"
-  region            = "${var.region}"
-  zone              = "${var.zone}"
-  name              = "${var.name}"
-  size              = 2
-  service_port      = "${var.service_port}"
-  service_port_name = "http"
-  target_pools      = ["${module.gce-lb-fr.target_pool}"]
-  target_tags       = ["${var.tags}"]
-  startup_script    = "${data.template_file.php-startup-script.rendered}"
+resource "google_compute_network" "demo_network" {
+  name                    = "${var.gn_name}"
+  auto_create_subnetworks = "false"
 }
 
-module "gce-lb-fr" {
-  source       = "GoogleCloudPlatform/lb/google"
-  region       = "${var.region}"
-  name         = "${var.name}"
-  service_port = "${var.service_port}"
-  target_tags  = ["${var.tags}"]
+resource "google_compute_subnetwork" "demo_subnetwork" {
+  network       = "${google_compute_network.demo_network.name}"
+  name          = "${var.sn_name}"
+  region        = "${var.sn_region}"
+  ip_cidr_range = "${var.sn_cidr_range}"
 }

self-serve-infrastructure/getting-started/terraform-gcp/outputs.tf

@@ -1,11 +1,14 @@
-output "instance_template" {
-  value = "${module.mig1.google_compute_instance_template.default}"
+output "compute_network_consumable" {
+  value       = "${google_compute_network.demo_network.name}"
+  description = "The Network Name"
 }
 
-output "instance_group_manager" {
-  value = "${module.mig1.google_compute_instance_group_manager.default}"
+output "subnetwork_consumable_name" {
+  value       = "${google_compute_subnetwork.demo_subnetwork.name}"
+  description = "The Subnet Name"
 }
 
-output "firewall" {
-  value = "${module.mig1.google_compute_firewall.default-ssh}"
+output "subnetwork_consumable_ip_cidr_range" {
+  value       = "${google_compute_subnetwork.demo_subnetwork.ip_cidr_range}"
+  description = "The default Cidr Range"
 }