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(admin): correct the count field of plugin-metadata/global-rule #6155

Merged
merged 8 commits into from
Jan 23, 2022

Conversation

mangoGoForward
Copy link
Contributor

What this PR does / why we need it:

Correct the count field of plugin-metadata. please see comment

Pre-submission checklist:

  • Did you explain what problem does this PR solve? Or what new features have been added?
  • Have you added corresponding test cases?
  • Have you modified the corresponding document?
  • Is this PR backward compatible? If it is not backward compatible, please discuss on the mailing list first

@mangoGoForward mangoGoForward marked this pull request as draft January 19, 2022 15:40
@mangoGoForward mangoGoForward marked this pull request as ready for review January 19, 2022 15:48
Copy link
Member

@spacewander spacewander left a comment

Choose a reason for hiding this comment

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

Could you also solve the global_rules in this PR?

@mangoGoForward
Copy link
Contributor Author

mangoGoForward commented Jan 20, 2022

Could you also solve the global_rules in this PR?

Ok, I will be commit later.

@mangoGoForward
Copy link
Contributor Author

Could you also solve the global_rules in this PR?

Already done. please see 7a2ce71.


__DATA__

=== TEST 1: list empty resources
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we add some test cases for non-empty resources?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done. please see b94a86c.

}
--- response_body
{"action":"set","node":{"key":"/apisix/global_rules/1","value":{"id":"1","plugins":{"proxy-rewrite":{"uri":"/"}}}}}
--- request
Copy link
Member

Choose a reason for hiding this comment

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

There is no need to repeat the two sections below?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I want to add a test cases for non-empty resources like TEST 3, so put a new global rules.

Copy link
Member

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Got it, I have removed request and error log phrase.

@spacewander spacewander changed the title fix(admin): correct the count field of plugin-metadata fix(admin): correct the count field of plugin-metadata/global-rule Jan 21, 2022
@spacewander spacewander merged commit a813b5a into apache:master Jan 23, 2022
@mangoGoForward mangoGoForward deleted the fix/unfiy-count-type branch January 24, 2022 01:11
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.

5 participants