Strip versions from ibis paths (#2167)

* Strip versions for nginz paths outside wire-server * Add CHANGELOG entry
wireapp · Mar 9, 2022 · 998cec1 · 998cec1
1 parent c968c4a
commit 998cec1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/changelog.d/1-api-changes/strip-ibis-paths b/changelog.d/1-api-changes/strip-ibis-paths
@@ -0,0 +1,3 @@
+The `/billing` and `/teams/.*/billing` endpoints are now available on a versioned path (e.g. `/v1/billing`)
+
+
diff --git a/charts/nginz/templates/conf/_nginx.conf.tpl b/charts/nginz/templates/conf/_nginx.conf.tpl
@@ -224,9 +224,15 @@ http {
           {{- if or (eq $env $.Values.nginx_conf.env) (eq $env "all") -}}
 
             {{- if and (not (eq $.Values.nginx_conf.env "prod")) ($location.doc) -}}
+
     rewrite ^/api-docs{{ $location.path }}  {{ $location.path }}/api-docs?base_url=https://{{ $.Values.nginx_conf.env }}-nginz-https.{{ $.Values.nginx_conf.external_env_domain }}/ break;
             {{- end }}
 
+            {{- if $location.strip_version }}
+
+    rewrite ^/v[0-9]+({{ $location.path }}) $1;
+            {{- end }}
+
     {{- $versioned := ternary $location.versioned true (hasKey $location "versioned") -}}
     {{- $path := printf "%s%s" (ternary "(/v[0-9]+)?" "" $versioned) $location.path }}
 

diff --git a/charts/nginz/values.yaml b/charts/nginz/values.yaml
@@ -456,9 +456,13 @@ nginx_conf:
       envs:
       - all
       disable_zauth: true
+      versioned: false
+      strip_version: true
     - path: /teams/([^/]*)/billing(.*)
       envs:
       - all
+      versioned: false
+      strip_version: true
     calling-test:
     - path: /calling-test
       envs:
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		The `/billing` and `/teams/.*/billing` endpoints are now available on a versioned path (e.g. `/v1/billing`)