[PURIFY] Remove remaining x-pack license. (#25)

Signed-off-by: Peter Nied <[email protected]>
opensearch-project · Mar 13, 2021 · c856534 · c856534
1 parent 82300bb
commit c856534
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 27 deletions.
diff --git a/distribution/docker/docker-compose.yml b/distribution/docker/docker-compose.yml
@@ -16,7 +16,6 @@ services:
        - cluster.routing.allocation.disk.watermark.high=1b
        - cluster.routing.allocation.disk.watermark.flood_stage=1b
        - node.store.allow_mmap=false
-       - xpack.license.self_generated.type=trial
     volumes:
        - ./build/repo:/tmp/es-repo
        - ./build/certs/testnode.jks:/usr/share/elasticsearch/config/testnode.jks
@@ -44,7 +43,6 @@ services:
        - cluster.routing.allocation.disk.watermark.high=1b
        - cluster.routing.allocation.disk.watermark.flood_stage=1b
        - node.store.allow_mmap=false
-       - xpack.license.self_generated.type=trial
     volumes:
        - ./build/repo:/tmp/es-repo
        - ./build/certs/testnode.jks:/usr/share/elasticsearch/config/testnode.jks

diff --git a/gradle/run.gradle b/gradle/run.gradle
@@ -22,17 +22,7 @@ apply plugin: 'elasticsearch.testclusters'
 
 testClusters {
   runTask {
-    testDistribution = System.getProperty('run.distribution', 'default')
-    if (System.getProperty('run.distribution', 'default') == 'default') {
-      String licenseType = System.getProperty("run.license_type", "basic")
-      if (licenseType == 'trial') {
-        setting 'xpack.license.self_generated.type', 'trial'
-      } else if (licenseType != 'basic') {
-        throw new IllegalArgumentException("Unsupported self-generated license type: [" + licenseType + "[basic] or [trial].")
-      }
-      keystore 'bootstrap.password', 'password'
-      user username: 'elastic-admin', password: 'elastic-password', role: 'superuser'
-    }
+    testDistribution = System.getProperty('run.distribution', 'oss')
   }
 }
 

diff --git a/plugins/examples/security-authorization-engine/build.gradle b/plugins/examples/security-authorization-engine/build.gradle
@@ -21,10 +21,6 @@
 // }
 
 // testClusters.javaRestTest {
-//   setting 'xpack.security.enabled', 'true'
-//   setting 'xpack.ml.enabled', 'false'
-//   setting 'xpack.license.self_generated.type', 'trial'
-
 //   // This is important, so that all the modules are available too.
 //   // There are index templates that use token filters that are in analysis-module and
 //   // processors are being used that are in ingest-common module.

diff --git a/qa/os/src/test/java/org/elasticsearch/packaging/test/PasswordToolsTests.java b/qa/os/src/test/java/org/elasticsearch/packaging/test/PasswordToolsTests.java
@@ -28,10 +28,7 @@
 
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.StandardOpenOption;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -55,11 +52,6 @@ public void filterDistros() {
 
     public void test010Install() throws Exception {
         install();
-
-        List<String> lines = new ArrayList<>();
-        lines.add("xpack.license.self_generated.type: trial");
-
-        Files.write(installation.config("elasticsearch.yml"), lines, StandardOpenOption.APPEND);
     }
 
     public void test20GeneratePasswords() throws Exception {

diff --git a/qa/remote-clusters/docker-compose.yml b/qa/remote-clusters/docker-compose.yml
@@ -16,7 +16,6 @@ services:
        - cluster.routing.allocation.disk.watermark.high=1b
        - cluster.routing.allocation.disk.watermark.flood_stage=1b
        - node.store.allow_mmap=false
-       - xpack.license.self_generated.type=trial
     volumes:
        - ./build/repo:/tmp/es-repo
        - ./build/certs/testnode.jks:/usr/share/elasticsearch/config/testnode.jks
@@ -54,7 +53,6 @@ services:
        - cluster.routing.allocation.disk.watermark.high=1b
        - cluster.routing.allocation.disk.watermark.flood_stage=1b
        - node.store.allow_mmap=false
-       - xpack.license.self_generated.type=trial
     volumes:
        - ./build/repo:/tmp/es-repo
        - ./build/certs/testnode.jks:/usr/share/elasticsearch/config/testnode.jks