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.

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

[backport -> release/3.6.x] fix(dao): allow shorthand fields to be in response #12543

Merged
merged 2 commits into from
Feb 6, 2024

Conversation

team-gateway-bot
Copy link
Collaborator

Automated backport to release/3.6.x, triggered by a label in #12537.

Original description

Summary

Shorthand fields are stripped out of response but we're using them when we want to rename some of the fields. This commit adds an option expand_shortfields as well as some some options to shorthand_fields schema that would allow us to include them back in the schema while using the latest data

Checklist

  • The Pull Request has tests
  • N/A A changelog file has been created under changelog/unreleased/kong or skip-changelog label added on PR if changelog is unnecessary. README.md
  • N/A There is a user-facing docs PR against https://github.com/Kong/docs.konghq.com - PUT DOCS PR HERE

Issue reference

KAG-3677

Shorthand fields are stripped out of response but we're
using them when we want to rename some of the fields.
This commit adds an option `expand_shortfields` as well
as some some options to shorthand_fields schema that would allow
us to include them back in the schema while using the latest data

KAG-3677

(cherry picked from commit c76b943)
This commits simplifies translate_backwards feature by
switching from function that retrieves value approach
to a table with a path to the necessary key.

It also adds tests for other paths (GET, POST, PUT, PATCH)
for querying admin api.

KAG-3677

(cherry picked from commit 4e51583)
@jschmid1 jschmid1 merged commit 97c25a0 into release/3.6.x Feb 6, 2024
63 of 64 checks passed
@jschmid1 jschmid1 deleted the backport-12537-to-release/3.6.x branch February 6, 2024 15:23
@team-gateway-bot
Copy link
Collaborator Author

Cherry-pick failed for release/3.6.x: couldn't find remote ref release/3.6.x.
Please ensure that this Github repo has a branch named release/3.6.x.

@team-gateway-bot
Copy link
Collaborator Author

Cherry-pick failed for release/3.6.x, because it was unable to create a new branch.

Please cherry-pick the changes locally.

git remote add upstream https://github.com/kong/kong-ee
git fetch upstream release/3.6.x
git worktree add -d .worktree/cherry-pick-12543-to-release/3.6.x-to-upstream upstream/release/3.6.x
cd .worktree/cherry-pick-12543-to-release/3.6.x-to-upstream
git checkout -b cherry-pick-12543-to-release/3.6.x-to-upstream
ancref=$(git merge-base 1ec5948565b83ebc9bcc5405b7d2a52369716a01 ceba9857d48e91c9263101dec50c0a1f1effa48b)
git cherry-pick -x $ancref..ceba9857d48e91c9263101dec50c0a1f1effa48b

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants