From e8992126e4a773692529ed4e739d15d82698ce02 Mon Sep 17 00:00:00 2001
From: Nemo <me@captnemo.in>
Date: Wed, 5 Aug 2020 18:10:30 +0530
Subject: [PATCH] Revert "Removes Montreal and Sydney GCP regions"

This reverts commit 22dc5115d8e4f641e4522f286540b202dea28c64.
---
 CHANGELOG.md |  8 --------
 locals.tf    | 11 +++++++++++
 outputs.tf   | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe1688a..47927f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,20 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-### Removed
-- Removes Montreal and Sydney GCP regions, as they are no longer on the [official list](https://docs.looker.com/setup-and-management/enabling-secure-db).
-
 ## [1.3.0][1.3.0] - 2020-07-12
-
-### Added
 - Adds support for new EKS hosting
 
 ## [1.2.3][1.2.3] - 2020-06-21
 
-### Added
 - New Looker IP for GCP/Canada region
-
-### Fixed
 - Fixes output variable name for Sydney regions
 
 ## [1.2.2][1.2.2] - 2020-06-13
diff --git a/locals.tf b/locals.tf
index edb27e7..ce7510e 100644
--- a/locals.tf
+++ b/locals.tf
@@ -41,6 +41,17 @@ locals {
     "35.185.184.54"
   ]
 
+  # Canada / Montreal
+  gcp-northamerica-northeast1 = [
+    "35.203.16.100",
+    "35.203.92.116",
+  ]
+
+  # Sydney
+  gcp-australia-southeast1 = [
+    "35.189.54.47"
+  ]
+
   us = [
     "54.208.10.167",
     "54.209.116.191",
diff --git a/outputs.tf b/outputs.tf
index dba5343..1f0a144 100644
--- a/outputs.tf
+++ b/outputs.tf
@@ -116,6 +116,12 @@ output "gcp_us_west1_ips" {
   value       = "${local.gcp-us-west1}"
 }
 
+// Canada/Montreal
+output "gcp_northamerica_northeast1_ips" {
+  description = "IP addresses for instances hosted on GCP (Canada / Montreal / gcp-northamerica-northeast1)"
+  value       = "${local.gcp-northamerica-northeast1}"
+}
+
 // London
 output "gcp_europe_west2_ips" {
   description = "IP addresses for instances hosted on GCP (London / europe-west2)"
@@ -134,6 +140,13 @@ output "gcp_asia_southeast1_ips" {
   value       = "${local.gcp-asia-southeast1}"
 }
 
+// Sydney
+output "gcp_australia_southeast1_ips" {
+  description = "IP addresses for instances hosted on GCP (Sydney / australia-southeast1)"
+  value       = "${local.gcp-australia-southeast1}"
+}
+
+
 ##### GCP CIDRs #####
 
 // South Carolina
@@ -154,6 +167,13 @@ output "gcp_us_west1_cidr" {
   value       = ["${formatlist("%s/32", local.gcp-us-west1)}"]
 }
 
+
+// Canada / Montreal
+output "gcp_northamerica_northeast1_cidr" {
+  description = "CIDRs for instances hosted on GCP (Canada / Montreal / gcp-northamerica-northeast1)"
+  value       = ["${formatlist("%s/32", local.gcp-northamerica-northeast1)}"]
+}
+
 // London
 output "gcp_europe_west2_cidr" {
   description = "CIDRs for instances hosted on GCP (London / europe-west2)"
@@ -172,6 +192,12 @@ output "gcp_asia_southeast1_cidr" {
   value       = ["${formatlist("%s/32", local.gcp-us-east1)}"]
 }
 
+// Singapore
+output "gcp_australia_southeast1_cidr" {
+  description = "CIDRs for instances hosted on GCP (Sydney / australia-southeast1)"
+  value       = ["${formatlist("%s/32", local.gcp-australia-southeast1)}"]
+}
+
 ##### GCP Common ####
 
 output "gcp_cidr" {
@@ -181,9 +207,11 @@ output "gcp_cidr" {
     local.gcp-us-east1,
     local.gcp-us-east4,
     local.gcp-us-west1,
+    local.gcp-northamerica-northeast1,
     local.gcp-europe-west2,
     local.gcp-europe-west3,
     local.gcp-asia-southeast1,
+    local.gcp-australia-southeast1
   ))}"
 }
 
@@ -194,9 +222,11 @@ output "gcp_ips" {
     local.gcp-us-east1,
     local.gcp-us-east4,
     local.gcp-us-west1,
+    local.gcp-northamerica-northeast1,
     local.gcp-europe-west2,
     local.gcp-europe-west3,
     local.gcp-asia-southeast1,
+    local.gcp-australia-southeast1
   )}"
 }
 
@@ -291,9 +321,11 @@ output "all_cidr" {
     local.gcp-us-east1,
     local.gcp-us-east4,
     local.gcp-us-west1,
+    local.gcp-northamerica-northeast1,
     local.gcp-europe-west2,
     local.gcp-europe-west3,
     local.gcp-asia-southeast1,
+    local.gcp-australia-southeast1,
     local.us,
     local.ca,
     local.as,
@@ -318,9 +350,11 @@ output "all_ips" {
     local.gcp-us-east1,
     local.gcp-us-east4,
     local.gcp-us-west1,
+    local.gcp-northamerica-northeast1,
     local.gcp-europe-west2,
     local.gcp-europe-west3,
     local.gcp-asia-southeast1,
+    local.gcp-australia-southeast1,
     local.us,
     local.ca,
     local.as,