diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b4c1146b..713c46c36 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,7 @@ with many services might have experienced issues with this policy because the size of those dictionaries was not enough to store everything the policy needs to function correctly. [PR #1231](https://github.com/3scale/APIcast/pull/1231) - Fixed issue with Camel service over HTTPs when Routing Policy [PR #1230](https://github.com/3scale/APIcast/pull/1230) [THREESCALE-5891](https://issues.redhat.com/browse/THREESCALE-5891) +- Fixed doc issue on SERVICES_FILTER parameter [PR #1233](https://github.com/3scale/APIcast/pull/1233) [THREESCALE-5421](https://issues.redhat.com/browse/THREESCALE-5421) diff --git a/Makefile b/Makefile index 58dc09206..1370007e9 100644 --- a/Makefile +++ b/Makefile @@ -253,7 +253,7 @@ node_modules/.bin/markdown-link-check: yarn install test-doc: node_modules/.bin/markdown-link-check - @find . \( -name node_modules -o -name .git -o -name t \) -prune -o -name "*.md" -print0 | xargs -0 -n1 -I % sh -c 'echo; echo ====================; echo Checking: %; node_modules/.bin/markdown-link-check %' \; + @find . \( -name node_modules -o -name .git -o -name t \) -prune -o -name "*.md" -print0 | xargs -0 -n1 -I % sh -c 'echo; echo ====================; echo Checking: %; node_modules/.bin/markdown-link-check -q --config travis/config.json %' \; benchmark: export IMAGE_TAG ?= master benchmark: export COMPOSE_FILE ?= docker-compose.benchmark.yml diff --git a/doc/parameters.md b/doc/parameters.md index 173524e61..8a9298b76 100644 --- a/doc/parameters.md +++ b/doc/parameters.md @@ -232,22 +232,22 @@ Find more information about the Response Codes feature on the [3scale support si **Example:** .*.example.com Used to filter the service configured in the 3scale API Manager, the filter -matches with the public base URL. Services that do not match the filter will be -discarded. If the regular expression cannot be compiled no services will be -loaded. +matches with the public base URL (Staging or production). Services that do not +match the filter will be discarded. If the regular expression cannot be compiled +no services will be loaded. Note: If a service does not match, but is included in the `APICAST_SERVICES_LIST`, service will not be discarded Example: -Regexp Filter: http:\/\/.*.google.com -Service 1: backend endpoint http://www.google.com -Service 2: backend endpoint http://www.yahoo.com -Service 3: backend endpoint http://mail.google.com -Service 4: backend endpoint http://mail.yahoo.com +Regexp Filter: http:\/\/.*.api.foo +Service 1: backend endpoint http://www.api.foo +Service 2: backend endpoint http://www.api.bar +Service 3: backend endpoint http://mail.api.foo +Service 4: backend endpoint http://mail.api.bar -The services that will be configured in Apicast will be 1 and 3. Services 2 and +The services that will be configured in APIcast will be 1 and 3. Services 2 and 4 will be discarded. ### `APICAST_SERVICES_LIST` diff --git a/travis/config.json b/travis/config.json new file mode 100644 index 000000000..569cfe2af --- /dev/null +++ b/travis/config.json @@ -0,0 +1,10 @@ +{ + "ignorePatterns": [ + { + "pattern": "^.*.foo" + }, + { + "pattern": "^.*.bar" + } + ] +}