From 744727a58f93239e5fe6f051072847090c201256 Mon Sep 17 00:00:00 2001
From: jianglai <jianglai@google.com>
Date: Wed, 18 Apr 2018 10:59:43 -0700
Subject: [PATCH] Update domain registry proxy terraform annealing config

1) Change annealing target to watch for sandbox terraform config instead of test.
2) Delete terraform config for test project, as this project will be turned down.
3) Do not ask annealing to watch for alpha project terraform config, as we intend to change alpha regularly and manually.
4) Make terraform output display both service account email and client id.
5) Change canary node ports to 3100X, as 4000X is out of range for kubernetes.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=193383457
---
 java/google/registry/proxy/terraform/example_config.tf     | 4 ++--
 java/google/registry/proxy/terraform/modules/input.tf      | 6 +++---
 java/google/registry/proxy/terraform/modules/output.tf     | 7 +++++--
 java/google/registry/proxy/terraform/update_named_ports.sh | 2 +-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/java/google/registry/proxy/terraform/example_config.tf b/java/google/registry/proxy/terraform/example_config.tf
index d19568bcd..518bac7ad 100644
--- a/java/google/registry/proxy/terraform/example_config.tf
+++ b/java/google/registry/proxy/terraform/example_config.tf
@@ -15,8 +15,8 @@ module "proxy" {
   proxy_certificate_bucket = "YOU_CERTIFICATE_BUCKET"
 }
 
-output "proxy_service_account_client_id" {
-  value = "${module.proxy.proxy_service_account_client_id}"
+output "proxy_service_account" {
+  value = "${module.proxy.proxy_service_account}"
 }
 
 output "proxy_name_servers" {
diff --git a/java/google/registry/proxy/terraform/modules/input.tf b/java/google/registry/proxy/terraform/modules/input.tf
index a6236b7fb..a39780e71 100644
--- a/java/google/registry/proxy/terraform/modules/input.tf
+++ b/java/google/registry/proxy/terraform/modules/input.tf
@@ -39,8 +39,8 @@ variable "proxy_ports_canary" {
   type = "map"
 
   default = {
-    health_check = 40000
-    whois        = 40001
-    epp          = 40002
+    health_check = 31000
+    whois        = 31001
+    epp          = 31002
   }
 }
diff --git a/java/google/registry/proxy/terraform/modules/output.tf b/java/google/registry/proxy/terraform/modules/output.tf
index d54c8c952..b61b422dd 100644
--- a/java/google/registry/proxy/terraform/modules/output.tf
+++ b/java/google/registry/proxy/terraform/modules/output.tf
@@ -6,8 +6,11 @@ output "proxy_instance_groups" {
   value = "${local.proxy_instance_groups}"
 }
 
-output "proxy_service_account_client_id" {
-  value = "${google_service_account.proxy_service_account.unique_id}"
+output "proxy_service_account" {
+  value = {
+    email     = "${google_service_account.proxy_service_account.email}"
+    client_id = "${google_service_account.proxy_service_account.unique_id}"
+  }
 }
 
 output "proxy_ip_addresses" {
diff --git a/java/google/registry/proxy/terraform/update_named_ports.sh b/java/google/registry/proxy/terraform/update_named_ports.sh
index f11eb69cb..1e368fe30 100755
--- a/java/google/registry/proxy/terraform/update_named_ports.sh
+++ b/java/google/registry/proxy/terraform/update_named_ports.sh
@@ -21,7 +21,7 @@
 while read line
 do
   gcloud compute instance-groups set-named-ports \
-    --named-ports whois:30001,epp:30002,whois-canary:40001,epp-canary:40002 \
+    --named-ports whois:30001,epp:30002,whois-canary:31001,epp-canary:31002 \
     $line
 done < <(terraform output proxy_instance_groups | awk '{print $3}' | \
   awk -F '/' '{print "--project", $7, "--zone", $9, $11}')