Update outputs and repoint label module to aws-ia

README.md

@@ -16,7 +16,7 @@ Generate terraform cloud token
 
 `terraform login` 
 
-Export TERRAFORM_CONFIG
+Export the TERRAFORM_CONFIG variable
 
 `export TERRAFORM_CONFIG="$HOME/.terraform.d/credentials.tfrc.json"`
 
@@ -41,7 +41,7 @@ Note: STS-based credentials _are optional_ but *highly recommended*.
 
 Clone the aws-ia/terraform-aws-vpc repository.
 
-git clone https://github.com/aws-ia/terraform-aws-vpc
+`git clone https://github.com/aws-ia/terraform-aws-vpc`
 
 Change directory to the root directory.
 

deploy/main.tf

@@ -21,7 +21,7 @@ resource "random_string" "rand4" {
 }
 
 module "vpc_label" {
-  source    = "aws-quickstart/label/aws"
+  source    = "aws-ia/label/aws"
   version   = "0.0.1"
   region    = var.region
   namespace = var.namespace
@@ -35,7 +35,7 @@ module "vpc_label" {
 ######################################
 # Create VPC
 ######################################
-module "quickstart_vpc" {
+module "aws-ia_vpc" {
   source            = "../modules/vpc"
   create_vpc        = var.create_vpc
   name              = module.vpc_label.id

deploy/outputs.tf

@@ -1,198 +1,198 @@
 # VPC
 output "vpc_cidr" {
   description = "VPC_CIDR "
-  value       = module.quickstart_vpc.vpc_cidr
+  value       = module.aws-ia_vpc.vpc_cidr
 }
 output "vpc_id" {
   description = "The ID of the VPC"
-  value       = module.quickstart_vpc.vpc_id
+  value       = module.aws-ia_vpc.vpc_id
 }
 output "NAT1EIP" {
   description = "NAT 1 IP address"
-  value       = module.quickstart_vpc.NAT1EIP
+  value       = module.aws-ia_vpc.NAT1EIP
 }
 
 output "NAT2EIP" {
   description = " NAT 2 IP address"
-  value       = module.quickstart_vpc.NAT2EIP
+  value       = module.aws-ia_vpc.NAT2EIP
 }
 
 output "NAT3EIP" {
   description = " NAT 3 IP address"
-  value       = module.quickstart_vpc.NAT3EIP
+  value       = module.aws-ia_vpc.NAT3EIP
 }
 
 output "NAT4EIP" {
   description = " NAT 4 IP address"
-  value       = module.quickstart_vpc.NAT4EIP
+  value       = module.aws-ia_vpc.NAT4EIP
 }
 
 output "PrivateSubnet1ACIDR" {
   description = " Private subnet 1A CIDR in Availability Zone 1"
-  value       = module.quickstart_vpc.PrivateSubnet1ACIDR
+  value       = module.aws-ia_vpc.PrivateSubnet1ACIDR
 }
 
 output "PrivateSubnet1AID" {
   description = " Private subnet 1A ID in Availability Zone 1"
-  value       = module.quickstart_vpc.PrivateSubnet1AID
+  value       = module.aws-ia_vpc.PrivateSubnet1AID
 }
 
 output "PrivateSubnet1BCIDR" {
   description = " Private subnet 1B CIDR in Availability Zone 1"
-  value       = module.quickstart_vpc.PrivateSubnet1BCIDR
+  value       = module.aws-ia_vpc.PrivateSubnet1BCIDR
 }
 
 output "PrivateSubnet1BID" {
   description = " Private subnet 1B ID in Availability Zone 1"
-  value       = module.quickstart_vpc.PrivateSubnet1BID
+  value       = module.aws-ia_vpc.PrivateSubnet1BID
 }
 
 output "PrivateSubnet2ACIDR" {
   description = " Private subnet 2A CIDR in Availability Zone 2"
-  value       = module.quickstart_vpc.PrivateSubnet2ACIDR
+  value       = module.aws-ia_vpc.PrivateSubnet2ACIDR
 }
 
 output "PrivateSubnet2AID" {
   description = " Private subnet 2A ID in Availability Zone 2"
-  value       = module.quickstart_vpc.PrivateSubnet2AID
+  value       = module.aws-ia_vpc.PrivateSubnet2AID
 }
 
 output "PrivateSubnet2BCIDR" {
   description = " Private subnet 2B CIDR in Availability Zone 2"
-  value       = module.quickstart_vpc.PrivateSubnet2BCIDR
+  value       = module.aws-ia_vpc.PrivateSubnet2BCIDR
 }
 
 output "PrivateSubnet2BID" {
   description = " Private subnet 2B ID in Availability Zone 2"
-  value       = module.quickstart_vpc.PrivateSubnet2BID
+  value       = module.aws-ia_vpc.PrivateSubnet2BID
 }
 
 output "PrivateSubnet3ACIDR" {
   description = " Private subnet 3A CIDR in Availability Zone 3"
-  value       = module.quickstart_vpc.PrivateSubnet3ACIDR
+  value       = module.aws-ia_vpc.PrivateSubnet3ACIDR
 }
 
 output "PrivateSubnet3AID" {
   description = " Private subnet 3A ID in Availability Zone 3"
-  value       = module.quickstart_vpc.PrivateSubnet3AID
+  value       = module.aws-ia_vpc.PrivateSubnet3AID
 }
 
 output "PrivateSubnet3BCIDR" {
   description = " Private subnet 3B CIDR in Availability Zone 3"
-  value       = module.quickstart_vpc.PrivateSubnet3BCIDR
+  value       = module.aws-ia_vpc.PrivateSubnet3BCIDR
 }
 
 output "PrivateSubnet3BID" {
   description = " Private subnet 3B ID in Availability Zone 3"
-  value       = module.quickstart_vpc.PrivateSubnet3BID
+  value       = module.aws-ia_vpc.PrivateSubnet3BID
 }
 
 output "PrivateSubnet4ACIDR" {
   description = " Private subnet 4A CIDR in Availability Zone 4"
-  value       = module.quickstart_vpc.PrivateSubnet4ACIDR
+  value       = module.aws-ia_vpc.PrivateSubnet4ACIDR
 }
 
 output "PrivateSubnet4AID" {
   description = " Private subnet 4A ID in Availability Zone 4"
-  value       = module.quickstart_vpc.PrivateSubnet4AID
+  value       = module.aws-ia_vpc.PrivateSubnet4AID
 }
 
 output "PrivateSubnet4BCIDR" {
   description = " Private subnet 4B CIDR in Availability Zone 4"
-  value       = module.quickstart_vpc.PrivateSubnet4BCIDR
+  value       = module.aws-ia_vpc.PrivateSubnet4BCIDR
 }
 
 output "PrivateSubnet4BID" {
   description = " Private subnet 4B ID in Availability Zone 4"
-  value       = module.quickstart_vpc.PrivateSubnet4BID
+  value       = module.aws-ia_vpc.PrivateSubnet4BID
 }
 
 output "PublicSubnet1CIDR" {
   description = " Public subnet 1 CIDR in Availability Zone 1"
-  value       = module.quickstart_vpc.PublicSubnet1CIDR
+  value       = module.aws-ia_vpc.PublicSubnet1CIDR
 }
 
 output "PublicSubnet1ID" {
   description = " Public subnet 1 ID in Availability Zone 1"
-  value       = module.quickstart_vpc.PublicSubnet1ID
+  value       = module.aws-ia_vpc.PublicSubnet1ID
 }
 
 output "PublicSubnet2CIDR" {
   description = " Public subnet 2 CIDR in Availability Zone 2"
-  value       = module.quickstart_vpc.PublicSubnet2CIDR
+  value       = module.aws-ia_vpc.PublicSubnet2CIDR
 }
 
 output "PublicSubnet2ID" {
   description = " Public subnet 2 ID in Availability Zone 2"
-  value       = module.quickstart_vpc.PublicSubnet2ID
+  value       = module.aws-ia_vpc.PublicSubnet2ID
 }
 
 output "PublicSubnet3CIDR" {
   description = " Public subnet 3 CIDR in Availability Zone 3"
-  value       = module.quickstart_vpc.PublicSubnet3CIDR
+  value       = module.aws-ia_vpc.PublicSubnet3CIDR
 }
 
 output "PublicSubnet3ID" {
   description = " Public subnet 3 ID in Availability Zone 3"
-  value       = module.quickstart_vpc.PublicSubnet3ID
+  value       = module.aws-ia_vpc.PublicSubnet3ID
 }
 
 output "PublicSubnet4CIDR" {
   description = " Public subnet 4 CIDR in Availability Zone 4"
-  value       = module.quickstart_vpc.PublicSubnet4CIDR
+  value       = module.aws-ia_vpc.PublicSubnet4CIDR
 }
 
 output "PublicSubnet4ID" {
   description = " Public subnet 4 ID in Availability Zone 4"
-  value       = module.quickstart_vpc.PublicSubnet4ID
+  value       = module.aws-ia_vpc.PublicSubnet4ID
 }
 
 output "S3VPCEndpoint" {
   description = " S3 VPC Endpoint"
-  value       = module.quickstart_vpc.S3VPCEndpoint
+  value       = module.aws-ia_vpc.S3VPCEndpoint
 }
 
 output "PrivateSubnet1ARouteTable" {
   description = " Private subnet 1A route table"
-  value       = module.quickstart_vpc.PrivateSubnet1ARouteTable
+  value       = module.aws-ia_vpc.PrivateSubnet1ARouteTable
 }
 
 output "PrivateSubnet1BRouteTable" {
   description = " Private subnet 1B route table"
-  value       = module.quickstart_vpc.PrivateSubnet1BRouteTable
+  value       = module.aws-ia_vpc.PrivateSubnet1BRouteTable
 }
 
 output "PrivateSubnet2ARouteTable" {
   description = " Private subnet 2A route table"
-  value       = module.quickstart_vpc.PrivateSubnet2ARouteTable
+  value       = module.aws-ia_vpc.PrivateSubnet2ARouteTable
 }
 
 output "PrivateSubnet2BRouteTable" {
   description = " Private subnet 2B route table"
-  value       = module.quickstart_vpc.PrivateSubnet2BRouteTable
+  value       = module.aws-ia_vpc.PrivateSubnet2BRouteTable
 }
 
 output "PrivateSubnet3ARouteTable" {
   description = " Private subnet 3A route table"
-  value       = module.quickstart_vpc.PrivateSubnet3ARouteTable
+  value       = module.aws-ia_vpc.PrivateSubnet3ARouteTable
 }
 
 output "PrivateSubnet3BRouteTable" {
   description = " Private subnet 3B route table"
-  value       = module.quickstart_vpc.PrivateSubnet3BRouteTable
+  value       = module.aws-ia_vpc.PrivateSubnet3BRouteTable
 }
 
 output "PrivateSubnet4ARouteTable" {
   description = " Private subnet 4A route table"
-  value       = module.quickstart_vpc.PrivateSubnet4ARouteTable
+  value       = module.aws-ia_vpc.PrivateSubnet4ARouteTable
 }
 
 output "PrivateSubnet4BRouteTable" {
   description = " Private subnet 4B route table"
-  value       = module.quickstart_vpc.PrivateSubnet4BRouteTable
+  value       = module.aws-ia_vpc.PrivateSubnet4BRouteTable
 }
 
 output "PublicSubnetRouteTable" {
   description = " Public subnet route table"
-  value       = module.quickstart_vpc.PublicSubnetRouteTable
+  value       = module.aws-ia_vpc.PublicSubnetRouteTable
 }

setup_workspace/workspace.tf

@@ -1,5 +1,5 @@
 terraform {
-  required_version = ">= 0.15.1"
+  required_version = ">= 1.0.0"
 }
 
 resource "random_pet" "name" {
@@ -10,8 +10,8 @@ resource "random_pet" "name" {
 # Generate new terraform org and workspace
 
 module "tfc_workspace" {
-  source                = "aws-quickstart/tfc_workspace/aws"
-  version               = "0.0.12"
+  source                = "aws-ia/cloud_workspace/hashicorp"
+  version               = "0.0.1"
   tfe_email             = var.tfe_email
   tfe_organization      = var.tfe_organization
   tfe_workspace         = var.tfe_workspace