Skip to content

refactor(google-cloud-logging): unify google-cloud-oauth.lua file#11596

Merged
moonming merged 35 commits into
apache:masterfrom
HuanXin-Chen:refactor-gcp-log
Oct 3, 2024
Merged

refactor(google-cloud-logging): unify google-cloud-oauth.lua file#11596
moonming merged 35 commits into
apache:masterfrom
HuanXin-Chen:refactor-gcp-log

Conversation

@HuanXin-Chen

Copy link
Copy Markdown
Contributor

Description

Issue: unify google-cloud-logging/oauth.lua and utils/google-cloud-oauth.lua file · Issue #11576 · apache/apisix (github.com)

What I do :
● scopes -> scope : according to OAuth2/OIDC rules, scope should not be used in the plural
● using utils/google-cloud-oauth.lua replace google-cloud-logging/oauth.lua

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)

HuanXin-Chen and others added 30 commits July 25, 2024 20:08
@HuanXin-Chen

Copy link
Copy Markdown
Contributor Author

@shreemaan-abhishek Sorry, I forgot to update the document before. Please reiview it again when you have time.Thanks.

moonming
moonming previously approved these changes Sep 26, 2024
@dosubot dosubot Bot added size:L This PR changes 100-499 lines, ignoring generated files. and removed size:M This PR changes 30-99 lines, ignoring generated files. labels Oct 2, 2024
@HuanXin-Chen

Copy link
Copy Markdown
Contributor Author

@bzp2010 @moonming @shreemaan-abhishek

About Discussion

I have made some new changes: I added a scopes field without a default value to maintain compatibility with existing apisix users.

When the user originally configured the scopes, the scopes will be assigned to the scope, ensuring compatibility. If the user did not configure the scopes, they will use the default value of scope or the scope value configured by the user.

Please reiview it again when you have time.Thanks.

bzp2010
bzp2010 previously approved these changes Oct 3, 2024
moonming
moonming previously approved these changes Oct 3, 2024
@HuanXin-Chen

Copy link
Copy Markdown
Contributor Author

All fixed🫡

@juzhiyuan juzhiyuan left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@moonming
moonming merged commit 561e8e8 into apache:master Oct 3, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

doc Documentation things plugin size:L This PR changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants