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

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

Merged
merged 1 commit into from
Feb 2, 2021
Merged

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

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
2 changes: 0 additions & 2 deletions distribution/docker/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
12 changes: 1 addition & 11 deletions gradle/run.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
}
}

Expand Down
4 changes: 0 additions & 4 deletions plugins/examples/security-authorization-engine/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
8 changes: 0 additions & 8 deletions qa/os/src/test/java/org/elasticsearch/packaging/test/PasswordToolsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {
Expand Down
2 changes: 0 additions & 2 deletions qa/remote-clusters/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down