Add the /apis endpoint call with expand false flag #2985
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
VirajSalaka
changed the title
VirajSalaka
force-pushed
the
apis-ep-fix-r-2
branch
2 times, most recently
from
53002a1
to
aa16e1f
Compare
…it is the startup. The JMS/ASB event's details are used to populate the necessary maps(api-metadata) APIList object is not passed to the enforcer now, instead of that EnforcerAPI's lifecycle state is used. Any API within the api metadata map should be kept only if the API is a default API or API is in blocked state. If the API becomes unblocked, it is removed from the map. During the startup also only blocked and default versioned APIs are pulled.
VirajSalaka
force-pushed
the
apis-ep-fix-r-2
branch
from
aa16e1f
to
f3ac1b8
Compare
VirajSalaka
commented
Jul 5, 2022
| mgwSwagger.LifeCycleState = blockedStatus | ||
| return | ||
| } | ||
| mgwSwagger.LifeCycleState = nonBlockedStatus |
There was a problem hiding this comment.
Leave the lifecycleState as it is.
There was a problem hiding this comment.
Changed the lifecycle status to be published.
There was a problem hiding this comment.
Reverted to previous state as we cannot decide whether the API is in created or published state when deployed for the first time. (Cannot depend on the API.yaml to populate this field)
VirajSalaka
commented
Jul 5, 2022
...nforcer/src/main/java/org/wso2/choreo/connect/enforcer/admin/handlers/APIRequestHandler.java
Outdated
Show resolved
Hide resolved
VirajSalaka
commented
Jul 5, 2022
| @@ -20,117 +20,20 @@ | |||
|
|
|||
| import org.wso2.choreo.connect.enforcer.common.CacheableEntity; | |||
|
|
|||
| import java.util.ArrayList; | |||
There was a problem hiding this comment.
Remove the API.java as it remains unused.
VirajSalaka
commented
Jul 5, 2022
...cer-parent/enforcer/src/main/java/org/wso2/choreo/connect/enforcer/models/admin/APIInfo.java
Outdated
Show resolved
Hide resolved
VirajSalaka
commented
Jul 5, 2022
...r/src/main/java/org/wso2/choreo/connect/enforcer/subscription/SubscriptionDataStoreImpl.java
Show resolved
Hide resolved
VirajSalaka
commented
Jul 5, 2022
...r/src/main/java/org/wso2/choreo/connect/enforcer/subscription/SubscriptionDataStoreImpl.java
Outdated
Show resolved
Hide resolved
VirajSalaka
commented
Jul 5, 2022
| apiInfo.setTier(api.getApiTier()); | ||
| apiInfo.setVersion(api.getApiVersion()); | ||
| apiInfo.setProvider(api.getApiProvider()); | ||
| apiInfo.setApiUUID(api.getAPIConfig().getUuid()); |
There was a problem hiding this comment.
Extends on BasicAPIInfo
There was a problem hiding this comment.
We had to remove tier as the BasicAPIInfo class already contains the policy. Since this is just used for troubleshooting I guess it is fine.
4 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Purpose
Since the /apis endpoint call was a costly operation (due to API Manager DB operations), this was removed from the choreo branch. As a result of that, switching an API to Blocked Lifecycle state did not function.
With this PR, the /apis endpoint call will be added again. Hence the fore-mentioned limitation will be removed.
In this case, the /apis endpoint will be called with the query parameter expand=false so that it would return default APIs and blocked APIs only. This call is made during the startup. Then onwards, the blocked APIs and default APIs are identified using message events.
Issues
Fixes #2857
Automation tests
Tested environments
Not Tested
Maintainers: Check before merge