Refactor license checking (#52118) (#52859)

Improve code resuse and readility. Add convenience checking method which covers most use cases without having to pass many boolean arguments.
elastic · Feb 27, 2020 · f5c4e92 · f5c4e92
1 parent bc9c3f0
commit f5c4e92
Show file tree

Hide file tree

Showing 4 changed files with 133 additions and 236 deletions.
diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/license/LicenseService.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/license/LicenseService.java
@@ -255,9 +255,7 @@ && isProductionMode(settings, clusterService.localNode())) {
                     throw new IllegalStateException("Cannot install a [" + newLicense.operationMode() +
                         "] license unless TLS is configured or security is disabled");
                 } else if (XPackSettings.FIPS_MODE_ENABLED.get(settings)
-                    && newLicense.operationMode() != License.OperationMode.PLATINUM
-                    && newLicense.operationMode() != License.OperationMode.ENTERPRISE
-                    && newLicense.operationMode() != License.OperationMode.TRIAL) {
+                    && false == XPackLicenseState.isFipsAllowedForOperationMode(newLicense.operationMode())) {
                     throw new IllegalStateException("Cannot install a [" + newLicense.operationMode() +
                         "] license unless FIPS mode is disabled");
                 }