License removal leads back to a basic license #52407
Conversation
ywangd
added
>enhancement
:Security/License
|
Pinging @elastic/es-security (:Security/License) |
|
@bytebilly FYI |
| License selfGeneratedLicense = SelfGeneratedLicense.create(specBuilder, currentState.nodes()); | ||
| LicensesMetaData newLicensesMetadata = new LicensesMetaData(selfGeneratedLicense, | ||
| currentLicensesMetadata == null ? null : currentLicensesMetadata.getMostRecentTrialVersion()); | ||
| mdBuilder.putCustom(LicensesMetaData.TYPE, newLicensesMetadata); |
There was a problem hiding this comment.
Can we merge this code and the duplicate from StartBasicClusterTask into a single generateNewBasicLicense() method?
| final StartBasicClusterTask startBasicClusterTask = | ||
| new StartBasicClusterTask(logger, clusterService.getClusterName().value(), clock, | ||
| new PostStartBasicRequest().acknowledge(true), null); | ||
| return startBasicClusterTask.execute(currentState); |
There was a problem hiding this comment.
This feels weird to me.
We run a task, that just creates another task and executes that, and it feels like that's just so we can change the response object.
Why not change this to something like:
public void removeLicense(final DeleteLicenseRequest request, final ActionListener<PostStartBasicResponse> listener) {
PostStartBasicRequest startBasicRequest = new PostStartBasicRequest().acknowledge(true);
startBasicLicense(startBasicRequest, listener);
}
and then have the Transport action translate the PostStartBasicResponse into the AcknowledgedResponse it needs to keep compatibilty with the API.
There was a problem hiding this comment.
Makes sense. I'll update it with a small change: instead of delegating to startBasicLicense() method, I'll keep the task submission part so that the context is not lost, i.e. clusterService.submitStateUpdateTask("delete license", new StartBasicClusterTask(...))
A new basic license will be generated when existing license is deleted. In addition, deleting an existing basic license is a no-op. Resolves: elastic#45022
|
backported:
|
A new basic license will be generated when existing license is deleted.
In addition, deleting an existing basic license is a no-op.
Resolves: #45022