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

[4.5.x] fix: force default value for endpoint weight #10132

Merged
merged 1 commit into from
Dec 13, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 13, 2024

This is an automatic copy of pull request #10124 done by Mergify.


Issue

https://gravitee.atlassian.net/browse/APIM-7954

Description

  • in order to avoid having endpoint weight to 0, validation is done on service side and a protection is applied on gateway side

Additional context


Cherry-pick of fda81d7 has failed:

On branch mergify/bp/4.5.x/pr-10124
Your branch is up to date with 'origin/4.5.x'.

You are currently cherry-picking commit fda81d72f1.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/EndpointDeserializer.java
	modified:   gravitee-apim-gateway/gravitee-apim-gateway-core/src/main/java/io/gravitee/gateway/core/loadbalancer/WeightedLoadBalancer.java
	modified:   gravitee-apim-gateway/gravitee-apim-gateway-core/src/main/java/io/gravitee/gateway/reactive/core/v4/endpoint/loadbalancer/WeightedLoadBalancer.java
	new file:   gravitee-apim-gateway/gravitee-apim-gateway-core/src/test/java/io/gravitee/gateway/core/loadbalancer/WeightedRoundRobinLoadBalancerTest.java
	modified:   gravitee-apim-gateway/gravitee-apim-gateway-core/src/test/java/io/gravitee/gateway/reactive/core/v4/endpoint/loadbalancer/WeightedRoundRobinLoadBalancerTest.java
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/java/io/gravitee/rest/api/service/v4/impl/validation/EndpointGroupsValidationServiceImplTest.java

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   gravitee-apim-definition/gravitee-apim-definition-model/src/main/java/io/gravitee/definition/model/v4/endpointgroup/AbstractEndpoint.java
	both modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/main/java/io/gravitee/rest/api/service/v4/impl/validation/EndpointGroupsValidationServiceImpl.java

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


📚  View the storybook of this branch here

@mergify mergify bot requested a review from a team as a code owner December 13, 2024 15:13
@mergify mergify bot added the conflicts label Dec 13, 2024
Copy link
Contributor Author

mergify bot commented Dec 13, 2024

Cherry-pick of fda81d7 has failed:

On branch mergify/bp/4.5.x/pr-10124
Your branch is up to date with 'origin/4.5.x'.

You are currently cherry-picking commit fda81d72f1.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   gravitee-apim-definition/gravitee-apim-definition-jackson/src/main/java/io/gravitee/definition/jackson/datatype/api/deser/EndpointDeserializer.java
	modified:   gravitee-apim-gateway/gravitee-apim-gateway-core/src/main/java/io/gravitee/gateway/core/loadbalancer/WeightedLoadBalancer.java
	modified:   gravitee-apim-gateway/gravitee-apim-gateway-core/src/main/java/io/gravitee/gateway/reactive/core/v4/endpoint/loadbalancer/WeightedLoadBalancer.java
	new file:   gravitee-apim-gateway/gravitee-apim-gateway-core/src/test/java/io/gravitee/gateway/core/loadbalancer/WeightedRoundRobinLoadBalancerTest.java
	modified:   gravitee-apim-gateway/gravitee-apim-gateway-core/src/test/java/io/gravitee/gateway/reactive/core/v4/endpoint/loadbalancer/WeightedRoundRobinLoadBalancerTest.java
	modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/test/java/io/gravitee/rest/api/service/v4/impl/validation/EndpointGroupsValidationServiceImplTest.java

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   gravitee-apim-definition/gravitee-apim-definition-model/src/main/java/io/gravitee/definition/model/v4/endpointgroup/AbstractEndpoint.java
	both modified:   gravitee-apim-rest-api/gravitee-apim-rest-api-service/src/main/java/io/gravitee/rest/api/service/v4/impl/validation/EndpointGroupsValidationServiceImpl.java

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

  - in order to avoid having endpoint weight to 0, validation is done on service side and a protection is applied on gateway side
@guillaumelamirand guillaumelamirand force-pushed the mergify/bp/4.5.x/pr-10124 branch from d97b571 to a6fcd96 Compare December 13, 2024 16:40
@guillaumelamirand guillaumelamirand merged commit 1a1c798 into 4.5.x Dec 13, 2024
39 of 40 checks passed
@guillaumelamirand guillaumelamirand deleted the mergify/bp/4.5.x/pr-10124 branch December 13, 2024 17:40
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.

1 participant