Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(response-rewrite): support filters #6750

Merged
merged 23 commits into from
Apr 11, 2022
Merged

feat(response-rewrite): support filters #6750

merged 23 commits into from
Apr 11, 2022

Conversation

kwanhur
Copy link
Contributor

@kwanhur kwanhur commented Mar 29, 2022

Description

Support filters to do substitute.

Change: add property filters.

  • match pattern can be regex or fixed string
  • match mode can be once or global, default once
  • ngx.re.sub(gsub) default options jo

Fixes #5451

Checklist

  • I have explained the need for this PR and the problem it solves
  • I have explained the changes or the new features added to this PR
  • I have added tests corresponding to this change
  • I have updated the documentation to reflect this change
  • I have verified that this change is backward compatible (If not, please discuss on the APISIX mailing list first)

@kwanhur kwanhur force-pushed the feat-resp-filter branch 3 times, most recently from ae7b211 to d6ae58d Compare March 30, 2022 10:45
@kwanhur
feat(response-rewrite): support filters
5bcf2f5 
* match pattern can be regex or fixed string
* match mode can be once or global, default once
* ngx.re.sub(gsub) default options jo

Signed-off-by: kwanhur <huang_hua2012@163.com>
@kwanhur kwanhur marked this pull request as ready for review March 31, 2022 13:40
spacewander
spacewander reviewed Apr 1, 2022
View reviewed changes
apisix/plugins/response-rewrite.lua Outdated Show resolved Hide resolved
apisix/plugins/response-rewrite.lua Outdated Show resolved Hide resolved
docs/en/latest/plugins/response-rewrite.md Outdated Show resolved Hide resolved
t/plugin/response-rewrite.t Outdated Show resolved Hide resolved
apisix/plugins/response-rewrite.lua Outdated Show resolved Hide resolved
apisix/plugins/response-rewrite.lua Show resolved Hide resolved
apisix/plugins/response-rewrite.lua Outdated Show resolved Hide resolved
kwanhur and others added 11 commits April 1, 2022 13:59
@kwanhur
test(plugin): split response-rewrite test cases into two parts
89b67f4 
Signed-off-by: kwanhur <huang_hua2012@163.com>
@kwanhur
feat(response-rewrite): remove filters field type checking
0f70eeb 
Signed-off-by: kwanhur <huang_hua2012@163.com>
@kwanhur
feat(response-rewrite): return at the end of conf.filters
e505e6d 
Signed-off-by: kwanhur <huang_hua2012@163.com>
@kwanhur @spacewander
chore(annotation): remove improper fixme
9177cd4 
Co-authored-by: 罗泽轩 <spacewanderlzx@gmail.com>
@kwanhur
feat(response-rewrite): remove conf.filters field type and value chec…
562adb1 
…king

Signed-off-by: kwanhur <huang_hua2012@163.com>
@kwanhur
feat(response-rewrite): check filter.regex invalid when empty
d3e82b7 
Signed-off-by: kwanhur <huang_hua2012@163.com>
@kwanhur
feat(response-rewrite): add prefix message at filter.regex and option…
5d2978a 
…s valid err

Signed-off-by: kwanhur <huang_hua2012@163.com>
@kwanhur
test(plugin): reindex response-rewrite test cases
54a472e 
Signed-off-by: kwanhur <huang_hua2012@163.com>
@kwanhur
feat(response-rewrite): add minItems 1 limitation on conf.filters
cce127d 
Signed-off-by: kwanhur <huang_hua2012@163.com>
@kwanhur
Merge branch 'feat-resp-filter' of github.com:kwanhur/apisix into fea…
9c87396 
…t-resp-filter
@kwanhur
docs(response-rewrite): merge filters nested fields
656124d 
Signed-off-by: kwanhur <huang_hua2012@163.com>
spacewander
spacewander reviewed Apr 2, 2022
View reviewed changes
apisix/plugins/response-rewrite.lua Outdated Show resolved Hide resolved
apisix/plugins/response-rewrite.lua Outdated Show resolved Hide resolved
spacewander
spacewander reviewed Apr 2, 2022
View reviewed changes
apisix/plugins/response-rewrite.lua Outdated Show resolved Hide resolved
docs/en/latest/plugins/response-rewrite.md Outdated Show resolved Hide resolved
t/plugin/response-rewrite2.t Show resolved Hide resolved
@kwanhur
feat(response-rewrite): filters description with string concat
dc809e1 
Signed-off-by: kwanhur <huang_hua2012@163.com>
@kwanhur
feat(response-rewrite): revert to if on conf.body
93e6e23 
Signed-off-by: kwanhur <huang_hua2012@163.com>
@kwanhur
feat(response-rewrite): fix filters.scope one to once
f42d160 
Signed-off-by: kwanhur <huang_hua2012@163.com>
@kwanhur
feat(response-rewrite): add required on filter field regex and replace
f46ca71 
Signed-off-by: kwanhur <huang_hua2012@163.com>
@kwanhur
feat(response-rewrite): pcall compile invalid regex options
4d6abb8 
Signed-off-by: kwanhur <huang_hua2012@163.com>
@kwanhur kwanhur requested a review from spacewander April 6, 2022 09:58
spacewander
spacewander reviewed Apr 7, 2022
View reviewed changes
apisix/plugins/response-rewrite.lua Outdated Show resolved Hide resolved
apisix/plugins/response-rewrite.lua Outdated Show resolved Hide resolved
apisix/plugins/response-rewrite.lua Outdated Show resolved Hide resolved
apisix/plugins/response-rewrite.lua Outdated Show resolved Hide resolved
docs/en/latest/plugins/response-rewrite.md Outdated Show resolved Hide resolved
kwanhur and others added 2 commits April 7, 2022 14:59
@kwanhur
feat(response-rewrite): remove default value and update docs on requi…
451627b 
…red filed

Signed-off-by: kwanhur <huang_hua2012@163.com>
@kwanhur @spacewander
chore: place one space before filter.regex
2767308 
Co-authored-by: 罗泽轩 <spacewanderlzx@gmail.com>
tzssangglass
tzssangglass reviewed Apr 8, 2022
View reviewed changes
t/plugin/response-rewrite2.t Show resolved Hide resolved
docs/en/latest/plugins/response-rewrite.md Outdated Show resolved Hide resolved
apisix/plugins/response-rewrite.lua Outdated Show resolved Hide resolved
@kwanhur
feat(response-rewrite): filter.regex minLength 1
3ec79ac 
Signed-off-by: kwanhur <huang_hua2012@163.com>
@kwanhur
docs(response-rewrite): update filter scope option once and global usage
df3ede3 
Signed-off-by: kwanhur <huang_hua2012@163.com>
@kwanhur
docs(response-rewrite): fix regex options referece link
c42d70c 
Signed-off-by: kwanhur <huang_hua2012@163.com>
@kwanhur
feat(response-rewrite): add re_sub/gsub err log
cd3f883 
Signed-off-by: kwanhur <huang_hua2012@163.com>
@spacewander spacewander merged commit e89ab8d into apache:master Apr 11, 2022
@kwanhur kwanhur deleted the feat-resp-filter branch April 11, 2022 12:07
Liu-Junlin pushed a commit to Liu-Junlin/apisix that referenced this pull request May 20, 2022
@kwanhur @spacewander @Liu-Junlin
feat(response-rewrite): support filters (apache#6750)
5dc1831 
Co-authored-by: 罗泽轩 <spacewanderlzx@gmail.com>
@bzp2010 bzp2010 mentioned this pull request Jun 8, 2022
Merged
5 tasks
spacewander added a commit that referenced this pull request Jun 30, 2022
@kwanhur @spacewander
feat(response-rewrite): support filters (#6750)
ee8f252 
Co-authored-by: 罗泽轩 <spacewanderlzx@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@spacewander spacewander spacewander approved these changes

@tzssangglass tzssangglass tzssangglass approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

request help: Does response-rewrite plugin support partial or regular substitution
3 participants
@kwanhur @spacewander @tzssangglass