From b6d9b664052e60de54a34695124f66e82545356a Mon Sep 17 00:00:00 2001 From: Enes Ozcan Date: Fri, 24 Jul 2020 13:34:58 +0300 Subject: [PATCH 1/4] Change max_body_bytes type to uint64. Signed-off-by: Enes Ozcan --- api/envoy/config/filter/http/cache/v2alpha/cache.proto | 2 +- api/envoy/extensions/filters/http/cache/v3alpha/cache.proto | 2 +- api/envoy/extensions/filters/http/cache/v4alpha/cache.proto | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api/envoy/config/filter/http/cache/v2alpha/cache.proto b/api/envoy/config/filter/http/cache/v2alpha/cache.proto index d08b5462fd88e..7d050aa449b82 100644 --- a/api/envoy/config/filter/http/cache/v2alpha/cache.proto +++ b/api/envoy/config/filter/http/cache/v2alpha/cache.proto @@ -76,5 +76,5 @@ message CacheConfig { // // Max body size the cache filter will insert into a cache. 0 means unlimited (though the cache // storage implementation may have its own limit beyond which it will reject insertions). - uint32 max_body_bytes = 4; + uint64 max_body_bytes = 4; } diff --git a/api/envoy/extensions/filters/http/cache/v3alpha/cache.proto b/api/envoy/extensions/filters/http/cache/v3alpha/cache.proto index f78b1d24ac2ce..1c626a6b29cb2 100644 --- a/api/envoy/extensions/filters/http/cache/v3alpha/cache.proto +++ b/api/envoy/extensions/filters/http/cache/v3alpha/cache.proto @@ -80,5 +80,5 @@ message CacheConfig { // // Max body size the cache filter will insert into a cache. 0 means unlimited (though the cache // storage implementation may have its own limit beyond which it will reject insertions). - uint32 max_body_bytes = 4; + uint64 max_body_bytes = 4; } diff --git a/api/envoy/extensions/filters/http/cache/v4alpha/cache.proto b/api/envoy/extensions/filters/http/cache/v4alpha/cache.proto index 19921edb0310b..24da26f89f843 100644 --- a/api/envoy/extensions/filters/http/cache/v4alpha/cache.proto +++ b/api/envoy/extensions/filters/http/cache/v4alpha/cache.proto @@ -80,5 +80,5 @@ message CacheConfig { // // Max body size the cache filter will insert into a cache. 0 means unlimited (though the cache // storage implementation may have its own limit beyond which it will reject insertions). - uint32 max_body_bytes = 4; + uint64 max_body_bytes = 4; } From e04f9c614a9670aaf560b3250b618221aeb8670d Mon Sep 17 00:00:00 2001 From: Enes Ozcan Date: Sat, 25 Jul 2020 01:39:42 +0300 Subject: [PATCH 2/4] Generate shadow api. Signed-off-by: Enes Ozcan --- api/BUILD | 1 - .../envoy/config/filter/http/cache/v2alpha/cache.proto | 2 +- .../envoy/extensions/filters/http/cache/v3alpha/cache.proto | 2 +- .../envoy/extensions/filters/http/cache/v4alpha/cache.proto | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/api/BUILD b/api/BUILD index 50835fb0b1c4f..9d4f802dfe5f4 100644 --- a/api/BUILD +++ b/api/BUILD @@ -245,7 +245,6 @@ proto_library( "//envoy/service/discovery/v3:pkg", "//envoy/service/endpoint/v3:pkg", "//envoy/service/event_reporting/v3:pkg", - "//envoy/service/extension/v3:pkg", "//envoy/service/health/v3:pkg", "//envoy/service/listener/v3:pkg", "//envoy/service/load_stats/v3:pkg", diff --git a/generated_api_shadow/envoy/config/filter/http/cache/v2alpha/cache.proto b/generated_api_shadow/envoy/config/filter/http/cache/v2alpha/cache.proto index d08b5462fd88e..7d050aa449b82 100644 --- a/generated_api_shadow/envoy/config/filter/http/cache/v2alpha/cache.proto +++ b/generated_api_shadow/envoy/config/filter/http/cache/v2alpha/cache.proto @@ -76,5 +76,5 @@ message CacheConfig { // // Max body size the cache filter will insert into a cache. 0 means unlimited (though the cache // storage implementation may have its own limit beyond which it will reject insertions). - uint32 max_body_bytes = 4; + uint64 max_body_bytes = 4; } diff --git a/generated_api_shadow/envoy/extensions/filters/http/cache/v3alpha/cache.proto b/generated_api_shadow/envoy/extensions/filters/http/cache/v3alpha/cache.proto index f78b1d24ac2ce..1c626a6b29cb2 100644 --- a/generated_api_shadow/envoy/extensions/filters/http/cache/v3alpha/cache.proto +++ b/generated_api_shadow/envoy/extensions/filters/http/cache/v3alpha/cache.proto @@ -80,5 +80,5 @@ message CacheConfig { // // Max body size the cache filter will insert into a cache. 0 means unlimited (though the cache // storage implementation may have its own limit beyond which it will reject insertions). - uint32 max_body_bytes = 4; + uint64 max_body_bytes = 4; } diff --git a/generated_api_shadow/envoy/extensions/filters/http/cache/v4alpha/cache.proto b/generated_api_shadow/envoy/extensions/filters/http/cache/v4alpha/cache.proto index 19921edb0310b..24da26f89f843 100644 --- a/generated_api_shadow/envoy/extensions/filters/http/cache/v4alpha/cache.proto +++ b/generated_api_shadow/envoy/extensions/filters/http/cache/v4alpha/cache.proto @@ -80,5 +80,5 @@ message CacheConfig { // // Max body size the cache filter will insert into a cache. 0 means unlimited (though the cache // storage implementation may have its own limit beyond which it will reject insertions). - uint32 max_body_bytes = 4; + uint64 max_body_bytes = 4; } From 9f8f32746f29cd5e17014652e44ace920d6b1c78 Mon Sep 17 00:00:00 2001 From: Enes Ozcan Date: Mon, 10 Aug 2020 10:49:41 +0300 Subject: [PATCH 3/4] Run proto_format after master merge. Signed-off-by: Enes Ozcan --- api/BUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/api/BUILD b/api/BUILD index 8ec38a5295218..3ac2738ebc3e4 100644 --- a/api/BUILD +++ b/api/BUILD @@ -249,6 +249,7 @@ proto_library( "//envoy/service/discovery/v3:pkg", "//envoy/service/endpoint/v3:pkg", "//envoy/service/event_reporting/v3:pkg", + "//envoy/service/extension/v3:pkg", "//envoy/service/health/v3:pkg", "//envoy/service/listener/v3:pkg", "//envoy/service/load_stats/v3:pkg", From c86bc41a2bbd8360c3a50cfa002856f78cb71546 Mon Sep 17 00:00:00 2001 From: Enes Ozcan Date: Tue, 1 Sep 2020 11:11:26 +0300 Subject: [PATCH 4/4] Revert v2 changes. Signed-off-by: Enes Ozcan --- api/envoy/config/filter/http/cache/v2alpha/cache.proto | 2 +- .../envoy/config/filter/http/cache/v2alpha/cache.proto | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/envoy/config/filter/http/cache/v2alpha/cache.proto b/api/envoy/config/filter/http/cache/v2alpha/cache.proto index 7d050aa449b82..d08b5462fd88e 100644 --- a/api/envoy/config/filter/http/cache/v2alpha/cache.proto +++ b/api/envoy/config/filter/http/cache/v2alpha/cache.proto @@ -76,5 +76,5 @@ message CacheConfig { // // Max body size the cache filter will insert into a cache. 0 means unlimited (though the cache // storage implementation may have its own limit beyond which it will reject insertions). - uint64 max_body_bytes = 4; + uint32 max_body_bytes = 4; } diff --git a/generated_api_shadow/envoy/config/filter/http/cache/v2alpha/cache.proto b/generated_api_shadow/envoy/config/filter/http/cache/v2alpha/cache.proto index 7d050aa449b82..d08b5462fd88e 100644 --- a/generated_api_shadow/envoy/config/filter/http/cache/v2alpha/cache.proto +++ b/generated_api_shadow/envoy/config/filter/http/cache/v2alpha/cache.proto @@ -76,5 +76,5 @@ message CacheConfig { // // Max body size the cache filter will insert into a cache. 0 means unlimited (though the cache // storage implementation may have its own limit beyond which it will reject insertions). - uint64 max_body_bytes = 4; + uint32 max_body_bytes = 4; }