Merge pull request #53 from ollymaunder-dnv/allow-rewriteUrlPrefix

Add support for uriRegexRewrite.

Author: swjungade

charts/platform-service/Chart.yaml

@@ -2,4 +2,4 @@ apiVersion: v1
 appVersion: "1.1"
 description: Platform service chart
 name: platform-service
-version: 1.4.7
+version: 1.5.0

charts/platform-service/templates/_helpers.tpl

@@ -152,8 +152,17 @@ http:
     {{- end }}
   {{- end }}
 {{- if $.Values.defaultRouting.rewriteUrlPrefix.enabled }}
+  {{- if $.Values.defaultRouting.rewriteUrlPrefix.regexRewrite }}
+    rewrite:
+      uriRegexRewrite:
+        match: {{ required "match is required" $.Values.defaultRouting.rewriteUrlPrefix.regexRewrite.match }}
+        rewrite: {{ required "rewrite is required" $.Values.defaultRouting.rewriteUrlPrefix.regexRewrite.rewrite }}
+  {{- else if $.Values.defaultRouting.rewriteUrlPrefix.replaceWith }}
     rewrite:
       uri: {{ required "rewriteUri is required" $.Values.defaultRouting.rewriteUrlPrefix.replaceWith }}
-{{- end}}
+  {{- else }}
+    {{- fail "Either replaceWith or regexRewrite are required" }}
+  {{- end }}
+{{- end }}
 
 {{- end -}}

charts/platform-service/values.yaml

@@ -132,6 +132,11 @@ defaultRouting:
     # alternate prefixes should begin and end with a "/"
     # examples: "/", "/api/"
     replaceWith: "/"
+    # Alternatively, use a regex to rewrite the URL path. See https://istio.io/latest/docs/reference/config/networking/virtual-service/#RegexRewrite
+    # e.g. to rewrite the URL path '/service/update/v1/api' to '/customprefix/v1/api/update', use:
+    # regexRewrite:
+    #   match: '^\/service\/([^\/]+)(\/.*)$'
+    #   rewrite: '\/customprefix\/\2\/\1'
 
   # Load balancer policy
   # Also supported are: