Skip to content
GitLab

Trim trailing '/' from basePathWithoutHost

Merged Administrator requested to merge github/fork/Metaswitch/trim-basePathWithoutHost into master

Created by: bjgill

PR checklist

  • Read the contribution guidelines.
  • Ran the shell script under ./bin/ to update Petstore sample so that CIs can verify the change. (For instance, only need to run ./bin/{LANG}-petstore.sh and ./bin/security/{LANG}-petstore.sh if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in .\bin\windows\.
  • Filed the PR against the correct branch: master, 3.3.x, 4.0.x. Default: master.
  • Copied the technical committee to review the pull request if your PR is targeting a particular programming language.

Description of the PR

basePath has its trailing / trimmed if present. This PR does the same thing for basePathWithoutHost as well. This fixes the common use of {{{basePathWithoutHost}}}{{{path}}} in the presence of trailing /.

This is now necessary as a result of #951, which causes basePathWithoutHost to otherwise default to /. This breaks rust-server (and probably other generators as well), which assumes that it can safely perform a string concatenation of basePathWithoutHost and path.