Update templates with new ratelimit configuration (envoyproxy#344)

kyessenov · Jan 11, 2017 · c0deb5b · c0deb5b
1 parent bcdb68b
commit c0deb5b
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 23 deletions.
diff --git a/configs/envoy_service_to_service.template.json b/configs/envoy_service_to_service.template.json
@@ -130,6 +130,16 @@
                 {
                   "prefix": "/",
                   {{ helper.make_route_internal(service, options) }}
+                  {% if options.get('service_to_service_rate_limit', False) %}
+                  ,
+                  "rate_limits":[
+                    {
+                      "actions": [
+                        {"type": "service_to_service"}
+                      ]
+                    }
+                  ]
+                  {% endif %}
                 }
               ]
             }{% if not loop.last %},{% endif -%}
@@ -139,10 +149,7 @@
         "filters": [
           {"type": "decoder", "name": "rate_limit",
             "config": {
-              "domain": "envoy_service_to_service",
-              "actions": [
-                {"type": "service_to_service"}
-              ]
+              "domain": "envoy_service_to_service"
             }
           },
           {"type": "both", "name": "grpc_http1_bridge", "config": {}},

diff --git a/configs/routing_helper.template.json b/configs/routing_helper.template.json
@@ -5,11 +5,6 @@
   "retry_policy": {
     "retry_on": "{{ options.get('retry_on', 'connect-failure') }}"
   },
-  {% if 'global_rate_limit' in options %}
-  "rate_limit": {
-    "global": true
-  },
-  {% endif %}
   "cluster": "{{ cluster }}"
 {% endmacro %}
 

diff --git a/test/config/integration/server.json b/test/config/integration/server.json
@@ -63,9 +63,13 @@
                 {
                   "prefix": "/test/long/url",
                   "cluster": "cluster_1",
-                  "rate_limit": {
-                    "global": true
-                  }
+                  "rate_limits": [
+                    {
+                      "actions": [
+                        {"type": "service_to_service"}
+                      ]
+                    }
+                  ]
                 },
                 {
                   "prefix": "/test/",
@@ -83,10 +87,7 @@
           },
           { "type": "decoder", "name": "rate_limit",
             "config": {
-              "domain": "foo",
-              "actions": [
-                {"type": "service_to_service"}
-              ]
+              "domain": "foo"
             }
           },
           { "type": "decoder", "name": "router", "config": {} }
@@ -144,9 +145,13 @@
                 {
                   "prefix": "/test/long/url",
                   "cluster": "cluster_1",
-                  "rate_limit": {
-                    "global": true
-                  }
+                  "rate_limits": [
+                    {
+                      "actions": [
+                        {"type": "service_to_service"}
+                      ]
+                    }
+                  ]
                 },
                 {
                   "prefix": "/test/",
@@ -164,10 +169,7 @@
           },
           { "type": "decoder", "name": "rate_limit",
             "config": {
-              "domain": "foo",
-              "actions": [
-                {"type": "service_to_service"}
-              ]
+              "domain": "foo"
             }
           },
           { "type": "decoder", "name": "buffer",