Add second deployment for "locate" and "locate-platform" (#20)

* Add final /v2/ resources
* Add separate deployment for /v2/platform targets
* Increase cloudbuild timeout

Author: stephen-soltesz

cloudbuild/app-platform.yaml.mlab-ns

@@ -0,0 +1,16 @@
+runtime: custom
+env: flex
+service: locate-platform
+
+resources:
+  cpu: 1
+  memory_gb: 4
+
+manual_scaling:
+  instances: 2
+
+env_variables:
+  LEGACY_SERVER: https://mlab-ns.appspot.com
+  PLATFORM_PROJECT: mlab-oti
+  LOCATE_SIGNER_KEY: "CiQACaQCar+BO5frUJv1XYxMS+tjdBGdOa7tZDqb1L6zn38HWp8S3QEApOc0SqhOmXanuWUJK36obD1hA0Qg+JTkifO96fq6NnW0iMDuGVFEHp4LJkfpjcGDE5ibMhPFnb3SIGk9kMg54Qk/3HkNTGONjoY2xAKuuNG0kH3W5nvJS2AK452boMLvK74pQCCmJCvw0FTDQFrNDSdv/NMHRJCxCik2pbIbpAqGcj+6WB/jo3sqGzupdRpTdV5ErC5t0GETqopcC3XBnLJh+HbpK7rIn9dDgR8oJcSiG4xCYhZGOATbJ9V1/O3V+cuXFrH1qpqM/uSUdSO4clqUTBcpshPFY/Njiw=="
+  MONITORING_VERIFY_KEY: "CiQACaQCath3g+zc257EYcrN7fyhHDChcdlOHrgSeYMZSmd1jqsSrwEApOc0Silmr9MA0tvS+44Eo53p1tI6F9emIFYS4UP5BRhKCB4Svi5sFzGQUqgDlZq5AHGCwvIlzr4TvncpYvaBbtwccj/0W15ItNmzFwqq7mP0rqA/SVhv/8e6usfkFZIDVIuEXzjhf4jw56u2yttZgEhutOvMNUXExNh6TKZcMPaD8XX/LGgPF9qw7E8qTV7Rm7CVwyvzWR6hhpAUsRegTrH+YKgCNiox51o1HjZU"

cloudbuild/app-platform.yaml.mlab-sandbox

@@ -0,0 +1,16 @@
+runtime: custom
+env: flex
+service: locate-platform
+
+resources:
+  cpu: 1
+  memory_gb: 4
+
+manual_scaling:
+  instances: 2
+
+env_variables:
+  LEGACY_SERVER: https://mlab-ns.appspot.com
+  PLATFORM_PROJECT: mlab-oti
+  LOCATE_SIGNER_KEY: "CiQAdG57X+eNfzELY0Z4DT4kJo8H/8zHE6iAb24zrwOxS548I8US3QEAymHd3rWzCjLXVWYB9IdZQ7ZB2v7b8hSPtAX3Xuw7eeBrK/PhDRBIpJW7ziGeJZ+TfEYxek2XSfR+4hWVPZ9QD4EY5VoALMNt6uCU/DOemBwo1Sehln5sZEtjN7A/FXDun+VNraIASmOplTIyywlxJaoY2o0tJGI3WYurwL2MjkmhbMao8nlvKF7tavaNgB2KKfNkz1vWFqNskRSBfpAzZvqWSteRXMRaQdtC6+FUWmGILGzm2M6QhuL8sjnRayjO+3t5vL3hcwdcjf+lybI8N3RqUrbiBo11sWU6mA=="
+  MONITORING_VERIFY_KEY: "CiQAdG57X9xPoBQYA4RbXuNhOGXyqwH9jjQ3FiVaVZkqXtuvw54SrwEAymHd3mcGtKCAVnMj59OmrvRM6m2HgEiqoWwt8N16LjZiI6e0/Sj8V1xH9WXER5QkpBCLgdphQbpy2B8WV4AeBqujABNJkiXzWvQRbWqkZnnrCXXx3FIlMOUqe0p8qZxnOTtALDlKHphjxmccWqevZYq4LMrz+qTRSRUH7UH+VyB0TNPBncFczUMM0ysZtY/yLcXlUSMz8JTlPbKUsBn6Xty7xhwNqyOIazK6wKKh"

cloudbuild/app-platform.yaml.mlab-staging

@@ -0,0 +1,16 @@
+runtime: custom
+env: flex
+service: locate-platform
+
+resources:
+  cpu: 1
+  memory_gb: 4
+
+manual_scaling:
+  instances: 2
+
+env_variables:
+  LEGACY_SERVER: https://mlab-ns.appspot.com
+  PLATFORM_PROJECT: mlab-oti
+  LOCATE_SIGNER_KEY: "CiQA1JQH7XBe+fVeL2x2Y8de6Lt3SsB+CA4HzJSNMuac6rq01u8S3QEAIb7fPKzhq0lGB8Nw9J4CNOuGEJVfO8KDrCf4dH1X6ULIAHRBf6RLN8tg0FxXvx8aMYmu1ree5ERVkD4proREtU4Gh3Y/lZHmpdjgrjJ3pM/jNQawfqUHBlGVkAn6trrOdSG5X4molBUL7Dr+M4YFwc+40ByTagFEintSQGvLRpGsHyrj43v3kSwjzWi6UgPjXNoLJYTY10gEEm+QGhne5IUnbVcYEVqtGQKzPPQnelDDD3120XuN0tUhvVgBIq3g96SxwJN/EAoSJENHa3SZ8BetEJC7WTu/58+VpQ=="
+  MONITORING_VERIFY_KEY: "CiQA1JQH7Zp2+UW/CgEW7KIaAsjDAjZZUBcuiMVhBoJzH7xK5MwSrwEAIb7fPG/G2DN+O4DAIy0i8gOm4NsuZWqT/Nc7eYK3EJjr8/WchEFvWkKd5a8D/SQrl+Ui7oHNPjyMtFP+VjH+8DAJX/5P1lHvdl4exYr4flkDJ3GcE7eWy1YcAcuLPTqrjcYQaegqQllDDJdlNDeYn+FGRkr6nDHrGbvuYevTC5Tz+MTBYLVQrgNnRGlQ54BMK9UPmmcO6bHSjnSUlC4y2FZmCIiq2IERJquMwOfK"

app.yaml.mlab-ns cloudbuild/app.yaml.mlab-nsapp.yaml.mlab-ns renamed to cloudbuild/app.yaml.mlab-ns

@@ -1,4 +1,4 @@
-timeout: 1800s
+timeout: 3600s
 
 options:
   env:
@@ -17,11 +17,21 @@ steps:
   - go test ./... -race
   - go test -v ./...
 
-# Perform deployment in sandbox & staging & mlab-ns.
+# Deployment of platform specific APIs in sandbox & staging & mlab-ns.
+# NOTE: these services are not meant for the public, e.g. /v2/platform/*
 - name: gcr.io/$PROJECT_ID/gcloud-jsonnet-cbif
   env:
   # Use cbif condition: only run these steps in one of these projects.
   - PROJECT_IN=mlab-sandbox,mlab-staging,mlab-ns
   args:
-  - cp app.yaml.$PROJECT_ID app.yaml
+  - cp cloudbuild/app-platform.yaml.$PROJECT_ID app.yaml
+  - gcloud --project $PROJECT_ID app deploy --promote app.yaml
+
+# Deployment of public APIs in sandbox & staging & mlab-ns. e.g. /v2/nearest/*
+- name: gcr.io/$PROJECT_ID/gcloud-jsonnet-cbif
+  env:
+  # Use cbif condition: only run these steps in one of these projects.
+  - PROJECT_IN=mlab-sandbox,mlab-staging,mlab-ns
+  args:
+  - cp cloudbuild/app.yaml.$PROJECT_ID app.yaml
   - gcloud --project $PROJECT_ID app deploy --promote app.yaml

app.yaml.mlab-sandbox cloudbuild/app.yaml.mlab-sandboxapp.yaml.mlab-sandbox renamed to cloudbuild/app.yaml.mlab-sandbox

@@ -71,16 +71,22 @@ func main() {
 	// TODO: add verifier for optional access tokens to support NextRequest.
 
 	mux := http.NewServeMux()
+	// PLATFORM APIs
 	// Services report their health to the heartbeat service.
-	mux.HandleFunc("/v2/heartbeat/", http.HandlerFunc(c.Heartbeat))
+	mux.HandleFunc("/v2/platform/heartbeat/", http.HandlerFunc(c.Heartbeat))
 	// End to end monitoring requests access tokens for specific targets.
-	mux.Handle("/v2/monitoring/", monitoringChain)
-	// Clients request access tokens for specific services.
-	mux.HandleFunc("/v2beta1/query/", http.HandlerFunc(c.TranslatedQuery))
+	mux.Handle("/v2/platform/monitoring/", monitoringChain)
 
+	// USER APIs
+	// Clients request access tokens for specific services.
+	mux.HandleFunc("/v2/nearest/", http.HandlerFunc(c.TranslatedQuery))
 	// REQUIRED: API keys parameters required for priority requests.
 	mux.HandleFunc("/v2/priority/nearest/", http.HandlerFunc(c.TranslatedQuery))
 
+	// DEPRECATED APIs: TODO: retire after migrating clients.
+	mux.Handle("/v2/monitoring/", monitoringChain)
+	mux.HandleFunc("/v2beta1/query/", http.HandlerFunc(c.TranslatedQuery))
+
 	srv := &http.Server{
 		Addr:    ":" + listenPort,
 		Handler: mux,