Make rate limiter parameters configurable via CB (#217)

* Add two more variable replacements in cloudbuild.yaml

* Add vars to app.yaml

Author: robertodauria

cloudbuild/app.yaml.mlab-ns.template

@@ -38,5 +38,7 @@ env_variables:
   MAXMIND_URL: gs://downloader-{{PLATFORM_PROJECT}}/Maxmind/current/GeoLite2-City.tar.gz
   REDIS_ADDRESS: {{REDIS_ADDRESS}}
   RATE_LIMIT_REDIS_ADDRESS: {{RATE_LIMIT_REDIS_ADDRESS}}
+  RATE_LIMIT_INTERVAL: {{RATE_LIMIT_INTERVAL}}
+  RATE_LIMIT_MAX: {{RATE_LIMIT_MAX}}
   PROMETHEUSX_LISTEN_ADDRESS: ':9090' # Must match one of the forwarded_ports above.
   PROMETHEUS_URL: 'https://prometheus-basicauth.{{PLATFORM_PROJECT}}.measurementlab.net/'

cloudbuild/app.yaml.template

@@ -37,5 +37,7 @@ env_variables:
   MAXMIND_URL: gs://downloader-{{PLATFORM_PROJECT}}/Maxmind/current/GeoLite2-City.tar.gz
   REDIS_ADDRESS: {{REDIS_ADDRESS}}
   RATE_LIMIT_REDIS_ADDRESS: {{RATE_LIMIT_REDIS_ADDRESS}}
+  RATE_LIMIT_INTERVAL: {{RATE_LIMIT_INTERVAL}}
+  RATE_LIMIT_MAX: {{RATE_LIMIT_MAX}}
   PROMETHEUSX_LISTEN_ADDRESS: ':9090' # Must match one of the forwarded_ports above.
   PROMETHEUS_URL: 'https://prometheus-basicauth.{{PLATFORM_PROJECT}}.measurementlab.net/'

cloudbuild/cloudbuild.yaml

@@ -2,55 +2,59 @@ timeout: 3600s
 
 options:
   env:
-  - PROJECT_ID=$PROJECT_ID
-  - WORKSPACE_LINK=/go/src/github.com/m-lab/locate
+    - PROJECT_ID=$PROJECT_ID
+    - WORKSPACE_LINK=/go/src/github.com/m-lab/locate
 
 steps:
-# Run unit tests for environment.
-- name: gcr.io/$PROJECT_ID/golang-cbif:1.20
-  env:
-  - GONOPROXY=github.com/m-lab/go/*
-  args:
-  - go version
-  - go get -v -t ./...
-  - go vet ./...
-  - go test ./... -race
-  - go test -v ./...
+  # Run unit tests for environment.
+  - name: gcr.io/$PROJECT_ID/golang-cbif:1.20
+    env:
+      - GONOPROXY=github.com/m-lab/go/*
+    args:
+      - go version
+      - go get -v -t ./...
+      - go vet ./...
+      - go test ./... -race
+      - go test -v ./...
 
-# Deployment of APIs in sandbox & staging.
-- name: gcr.io/$PROJECT_ID/gcloud-jsonnet-cbif:1.1
-  env:
-  # Use cbif condition: only run these steps in one of these projects.
-  - PROJECT_IN=mlab-sandbox,mlab-staging
-  args:
-  - cp cloudbuild/app.yaml.template app.yaml
-  - >
-    sed -i
-    -e 's/{{PROJECT}}/$PROJECT_ID/g'
-    -e 's/{{PLATFORM_PROJECT}}/$_PLATFORM_PROJECT/'
-    -e 's/{{REDIS_ADDRESS}}/$_REDIS_ADDRESS/'
-    -e 's/{{RATE_LIMIT_REDIS_ADDRESS}}/$_RATE_LIMIT_REDIS_ADDRESS/'
-    app.yaml
-  - gcloud --project $PROJECT_ID app deploy --promote app.yaml
-  # After deploying the new service, deploy the openapi spec.
-  - sed -i -e 's/{{PROJECT}}/$PROJECT_ID/' -e 's/{{DEPLOYMENT}}/$PROJECT_ID/' openapi.yaml
-  - gcloud endpoints services deploy openapi.yaml
+  # Deployment of APIs in sandbox & staging.
+  - name: gcr.io/$PROJECT_ID/gcloud-jsonnet-cbif:1.1
+    env:
+      # Use cbif condition: only run these steps in one of these projects.
+      - PROJECT_IN=mlab-sandbox,mlab-staging
+    args:
+      - cp cloudbuild/app.yaml.template app.yaml
+      - >
+        sed -i
+        -e 's/{{PROJECT}}/$PROJECT_ID/g'
+        -e 's/{{PLATFORM_PROJECT}}/$_PLATFORM_PROJECT/'
+        -e 's/{{REDIS_ADDRESS}}/$_REDIS_ADDRESS/'
+        -e 's/{{RATE_LIMIT_REDIS_ADDRESS}}/$_RATE_LIMIT_REDIS_ADDRESS/'
+        -e 's/{{RATE_LIMIT_INTERVAL}}/$_RATE_LIMIT_INTERVAL/'
+        -e 's/{{RATE_LIMIT_MAX}}/$_RATE_LIMIT_MAX/'
+        app.yaml
+      - gcloud --project $PROJECT_ID app deploy --promote app.yaml
+      # After deploying the new service, deploy the openapi spec.
+      - sed -i -e 's/{{PROJECT}}/$PROJECT_ID/' -e 's/{{DEPLOYMENT}}/$PROJECT_ID/' openapi.yaml
+      - gcloud endpoints services deploy openapi.yaml
 
-# Deployment of APIs in mlab-ns.
-- name: gcr.io/$PROJECT_ID/gcloud-jsonnet-cbif:1.1
-  env:
-  # Use cbif condition: only run these steps in this project.
-  - PROJECT_IN=mlab-ns
-  args:
-  - cp cloudbuild/app.yaml.mlab-ns.template app.yaml
-  - >
-    sed -i
-    -e 's/{{PROJECT}}/$PROJECT_ID/g'
-    -e 's/{{PLATFORM_PROJECT}}/$_PLATFORM_PROJECT/'
-    -e 's/{{REDIS_ADDRESS}}/$_REDIS_ADDRESS/'
-    -e 's/{{RATE_LIMIT_REDIS_ADDRESS}}/$_RATE_LIMIT_REDIS_ADDRESS/'
-    app.yaml
-  - gcloud --project $PROJECT_ID app deploy --no-promote app.yaml
-  # After deploying the new service, deploy the openapi spec.
-  - sed -i -e 's/{{PROJECT}}/$PROJECT_ID/' -e 's/{{DEPLOYMENT}}/Production/' openapi.yaml
-  - gcloud endpoints services deploy openapi.yaml
+  # Deployment of APIs in mlab-ns.
+  - name: gcr.io/$PROJECT_ID/gcloud-jsonnet-cbif:1.1
+    env:
+      # Use cbif condition: only run these steps in this project.
+      - PROJECT_IN=mlab-ns
+    args:
+      - cp cloudbuild/app.yaml.mlab-ns.template app.yaml
+      - >
+        sed -i
+        -e 's/{{PROJECT}}/$PROJECT_ID/g'
+        -e 's/{{PLATFORM_PROJECT}}/$_PLATFORM_PROJECT/'
+        -e 's/{{REDIS_ADDRESS}}/$_REDIS_ADDRESS/'
+        -e 's/{{RATE_LIMIT_REDIS_ADDRESS}}/$_RATE_LIMIT_REDIS_ADDRESS/'
+        -e 's/{{RATE_LIMIT_INTERVAL}}/$_RATE_LIMIT_INTERVAL/'
+        -e 's/{{RATE_LIMIT_MAX}}/$_RATE_LIMIT_MAX/'
+        app.yaml
+      - gcloud --project $PROJECT_ID app deploy --no-promote app.yaml
+      # After deploying the new service, deploy the openapi spec.
+      - sed -i -e 's/{{PROJECT}}/$PROJECT_ID/' -e 's/{{DEPLOYMENT}}/Production/' openapi.yaml
+      - gcloud endpoints services deploy openapi.yaml