From b291536bc9c871c53f4b221bbcf5d3413551ee72 Mon Sep 17 00:00:00 2001 From: Renuka Fernando Date: Tue, 7 Jan 2025 14:36:53 +0530 Subject: [PATCH 1/2] Fix typo Signed-off-by: Renuka Fernando --- .../oasparser/envoyconf/envoyconf_internal_test.go | 8 ++++---- .../internal/oasparser/envoyconf/routes_with_clusters.go | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/adapter/internal/oasparser/envoyconf/envoyconf_internal_test.go b/adapter/internal/oasparser/envoyconf/envoyconf_internal_test.go index bc90f34b0a..e2348f4ce9 100644 --- a/adapter/internal/oasparser/envoyconf/envoyconf_internal_test.go +++ b/adapter/internal/oasparser/envoyconf/envoyconf_internal_test.go @@ -326,8 +326,8 @@ func TestCreateRouteClusterSpecifier(t *testing.T) { // Test the same scenario with endpointBasePath as empty string and API Resource with root slash // If endpointBasepath is empty enforce the path to be "/" to avoid setting empty path to upstream. - // https://dev-us-east-azure/dlif/request-info/v1.0 -> https://bachendhost/ - // https://dev-us-east-azure/dlif/request-info/v1.0/ -> https://bachendhost/ + // https://dev-us-east-azure/dlif/request-info/v1.0 -> https://backendhost/ + // https://dev-us-east-azure/dlif/request-info/v1.0/ -> https://backendhost/ routeWithRootSlash := createRoute(generateRouteCreateParamsForUnitTests(title, apiType, vHost, xWso2BasePath, version, "", "/", resourceWithGet.GetMethodList(), prodClusterName, nil, false)) assert.NotNil(t, routeWithRootSlash, "Route should not be null") @@ -342,8 +342,8 @@ func TestCreateRouteClusterSpecifier(t *testing.T) { // if endpointBasepath is not empty, enforce the path to be the endpointBasepath and allow the downnstream to handle trailing slash. // if downstream sends the trailing slash, send the trailing slash to the upstream otherwise send the path without the trailing slash. - // https://dev-us-east-azure/dlif/request-info/v1.0 -> https://bachendhost/context - // https://dev-us-east-azure/dlif/request-info/v1.0/ -> https://bachendhost/context/ + // https://dev-us-east-azure/dlif/request-info/v1.0 -> https://backendhost/context + // https://dev-us-east-azure/dlif/request-info/v1.0/ -> https://backendhost/context/ routeWithRootSlashNonEmptyEp := createRoute(generateRouteCreateParamsForUnitTests(title, apiType, vHost, xWso2BasePath, version, "/foo", "/", resourceWithGet.GetMethodList(), prodClusterName, nil, false)) assert.NotNil(t, routeWithRootSlashNonEmptyEp, "Route should not be null") diff --git a/adapter/internal/oasparser/envoyconf/routes_with_clusters.go b/adapter/internal/oasparser/envoyconf/routes_with_clusters.go index c625750945..eb920abc4d 100644 --- a/adapter/internal/oasparser/envoyconf/routes_with_clusters.go +++ b/adapter/internal/oasparser/envoyconf/routes_with_clusters.go @@ -952,15 +952,15 @@ func createRoute(params *routeCreateParams) *routev3.Route { // Hence doing the special logic here. if endpointBasepath == "" { // If endpointBasepath is empty enforce the path to be "/" to avoid setting empty path to upstream. - // https://dev-us-east-azure/dlif/request-info/v1.0 -> https://bachendhost/ - // https://dev-us-east-azure/dlif/request-info/v1.0/ -> https://bachendhost/ + // https://dev-us-east-azure/dlif/request-info/v1.0 -> https://backendhost/ + // https://dev-us-east-azure/dlif/request-info/v1.0/ -> https://backendhost/ resourceRegex = "/?" substitutionString = "/" } else { // if endpointBasepath is not empty, enforce the path to be the endpointBasepath and allow the downnstream to handle trailing slash. // if downstream sends the trailing slash, send the trailing slash to the upstream otherwise send the path without the trailing slash. - // https://dev-us-east-azure/dlif/request-info/v1.0 -> https://bachendhost/context - // https://dev-us-east-azure/dlif/request-info/v1.0/ -> https://bachendhost/context/ + // https://dev-us-east-azure/dlif/request-info/v1.0 -> https://backendhost/context + // https://dev-us-east-azure/dlif/request-info/v1.0/ -> https://backendhost/context/ resourceRegex = "" substitutionString = endpointBasepath } From 0be2a2a36559469d07236b762b65b4b62e742013 Mon Sep 17 00:00:00 2001 From: Renuka Fernando Date: Tue, 7 Jan 2025 14:37:21 +0530 Subject: [PATCH 2/2] Update Rate Limiter Docker image Signed-off-by: Renuka Fernando --- enforcer-parent/enforcer/src/main/resources/Dockerfile | 2 +- rate-limiter/src/main/resources/Dockerfile | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/enforcer-parent/enforcer/src/main/resources/Dockerfile b/enforcer-parent/enforcer/src/main/resources/Dockerfile index 5cff3172d2..4597238b8f 100644 --- a/enforcer-parent/enforcer/src/main/resources/Dockerfile +++ b/enforcer-parent/enforcer/src/main/resources/Dockerfile @@ -14,7 +14,7 @@ # limitations under the License. # ----------------------------------------------------------------------- -FROM adoptopenjdk/openjdk11:jre-11.0.23_9-alpine +FROM adoptopenjdk/openjdk11:jre-11.0.25_9-alpine LABEL maintainer="WSO2 Docker Maintainers " RUN apk update && apk upgrade --no-cache diff --git a/rate-limiter/src/main/resources/Dockerfile b/rate-limiter/src/main/resources/Dockerfile index d4e4d68fa9..7c3ce51399 100644 --- a/rate-limiter/src/main/resources/Dockerfile +++ b/rate-limiter/src/main/resources/Dockerfile @@ -14,7 +14,7 @@ # limitations under the License. # ----------------------------------------------------------------------- -FROM envoyproxy/ratelimit:19f2079f +FROM envoyproxy/ratelimit:87adad26 LABEL maintainer="WSO2 Docker Maintainers " RUN apk update && apk upgrade --no-cache @@ -45,6 +45,8 @@ ENV CONFIG_GRPC_XDS_CLIENT_TLS_KEY=/home/wso2/security/keystore/rate-limiter.key ENV CONFIG_GRPC_XDS_CLIENT_TLS_CERT=/home/wso2/security/keystore/rate-limiter.pem ENV CONFIG_GRPC_XDS_SERVER_TLS_CACERT=/home/wso2/security/truststore/mg.pem +ENV XDS_CLIENT_MAX_MSG_SIZE_IN_BYTES=41943040 + ARG MOTD="\n\ Welcome to WSO2 Docker Resources \n\ --------------------------------- \n\