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

fix(plugins): add realm to removed fields #13042

Merged
merged 1 commit into from
May 31, 2024

Conversation

nowNick
Copy link
Contributor

@nowNick nowNick commented May 16, 2024

Summary

Basic-auth and key-auth added new field "realm" but it was not added to "removed_fields" which breaks backwards compat between new CPs and old DPs. Adding realm to removed fields fixes the issue.

Checklist

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

Issue reference

KAG-4516

@github-actions github-actions bot added core/clustering cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee labels May 16, 2024
@nowNick nowNick force-pushed the fix/backwards-compat-auth-plugin-realms branch 2 times, most recently from 4bb59b0 to 357d4d7 Compare May 21, 2024 14:37
Basic-auth and key-auth added new field "realm"
but it was not added to "removed_fields" which breaks backwards compat
between new CPs and old DPs. Adding realm to removed fields
fixes the issue.

KAG-4516
@nowNick nowNick force-pushed the fix/backwards-compat-auth-plugin-realms branch from 357d4d7 to 00abf10 Compare May 21, 2024 15:47
@nowNick nowNick marked this pull request as ready for review May 22, 2024 07:29
@nowNick nowNick requested review from jschmid1 and hanshuebner May 22, 2024 17:41
@jschmid1 jschmid1 merged commit 420b3b6 into master May 31, 2024
41 checks passed
@jschmid1 jschmid1 deleted the fix/backwards-compat-auth-plugin-realms branch May 31, 2024 08:24
@team-gateway-bot
Copy link
Collaborator

Backport failed for release/3.6.x, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release/3.6.x
git worktree add -d .worktree/backport-13042-to-release/3.6.x origin/release/3.6.x
cd .worktree/backport-13042-to-release/3.6.x
git switch --create backport-13042-to-release/3.6.x
git cherry-pick -x 420b3b6ceb17d84fb84486e0de72635fb4408c45

@team-gateway-bot
Copy link
Collaborator

Successfully created backport PR for release/3.7.x:

@team-gateway-bot
Copy link
Collaborator

Cherry-pick failed for master, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally.

git remote add upstream https://github.com/kong/kong-ee
git fetch upstream master
git worktree add -d .worktree/cherry-pick-13042-to-master-to-upstream upstream/master
cd .worktree/cherry-pick-13042-to-master-to-upstream
git checkout -b cherry-pick-13042-to-master-to-upstream
ancref=$(git merge-base a11338a8f1ac7f869967fc74660380f11b051bb0 00abf103c277a3c74985b40db6647c615fb9efe6)
git cherry-pick -x $ancref..00abf103c277a3c74985b40db6647c615fb9efe6

@github-actions github-actions bot added the incomplete-cherry-pick A cherry-pick was incomplete and needs manual intervention label May 31, 2024
@kikito
Copy link
Member

kikito commented Jun 4, 2024

@nowNick I am not sure we need to backport this to 3.6 in CE

@nowNick
Copy link
Contributor Author

nowNick commented Jun 10, 2024

@kikito I think we do. However the backport needs to be tweaked a little because it'll only need basic-auth changes (the other - key-auth was changed in 3.7).

@AndyZhang0707 AndyZhang0707 removed the incomplete-cherry-pick A cherry-pick was incomplete and needs manual intervention label Jun 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release/3.7.x cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee core/clustering size/M
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants