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.

Sign up for GitHub

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

Convert sql license objects to LicensedFeature #78539

Merged
merged 1 commit into from
Oct 4, 2021
Merged

Convert sql license objects to LicensedFeature #78539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions x-pack/plugin/core/src/main/java/org/elasticsearch/license/XPackLicenseState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,6 @@ public enum Feature {

LOGSTASH(OperationMode.STANDARD, true),

JDBC(OperationMode.PLATINUM, true),

ODBC(OperationMode.PLATINUM, true),

SPATIAL_GEO_CENTROID(OperationMode.GOLD, true),

SPATIAL_GEO_GRID(OperationMode.GOLD, true),
Expand Down
9 changes: 7 additions & 2 deletions x-pack/plugin/sql/src/main/java/org/elasticsearch/xpack/sql/plugin/SqlPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
import org.elasticsearch.env.Environment;
import org.elasticsearch.env.NodeEnvironment;
import org.elasticsearch.license.License;
import org.elasticsearch.license.LicenseUtils;
import org.elasticsearch.license.LicensedFeature;
import org.elasticsearch.license.XPackLicenseState;
import org.elasticsearch.plugins.ActionPlugin;
import org.elasticsearch.plugins.Plugin;
Expand Down Expand Up @@ -49,17 +51,20 @@

public class SqlPlugin extends Plugin implements ActionPlugin {

private final LicensedFeature.Momentary JDBC_FEATURE = LicensedFeature.momentary("sql", "jdbc", License.OperationMode.PLATINUM);
private final LicensedFeature.Momentary ODBC_FEATURE = LicensedFeature.momentary("sql", "odbc", License.OperationMode.PLATINUM);

private final SqlLicenseChecker sqlLicenseChecker = new SqlLicenseChecker(
(mode) -> {
XPackLicenseState licenseState = getLicenseState();
switch (mode) {
case JDBC:
if (licenseState.checkFeature(XPackLicenseState.Feature.JDBC) == false) {
if (JDBC_FEATURE.check(licenseState) == false) {
throw LicenseUtils.newComplianceException("jdbc");
}
break;
case ODBC:
if (licenseState.checkFeature(XPackLicenseState.Feature.ODBC) == false) {
if (ODBC_FEATURE.check(licenseState) == false) {
throw LicenseUtils.newComplianceException("odbc");
}
break;
Expand Down