github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-06-28 17:34:17 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix configuration cache compatibility issues (#124073)

Browse source 
- for running :plugins:discovery-ec2:check
- checking if in idea in build scan background action
This commit is contained in:
Rene Groeschke 2025-03-05 11:06:31 +01:00 • committed by GitHub
parent badfc93596
commit cfa98f30e5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build-tools-internal/src/main/groovy/elasticsearch.build-scan.gradle
View file

@ -133,7 +133,7 @@ develocity {
}
} else {
tag 'LOCAL'
if (providers.systemProperty('idea.active').present) {
if (System.getProperty('idea.active') == 'true') {
tag 'IDEA'
}
}

15
plugins/discovery-ec2/build.gradle
View file

@ -46,13 +46,12 @@ esplugin.bundleSpec.from('config/discovery-ec2') {
}
tasks.register("writeTestJavaPolicy") {
boolean inFips = buildParams.inFipsJvm
inputs.property("inFipsJvm", inFips)
final File javaPolicy = new File(layout.buildDirectory.asFile.get(), "tmp/java.policy")
outputs.file(javaPolicy)
doLast {
final File tmp = file("${buildDir}/tmp")
if (tmp.exists() == false && tmp.mkdirs() == false) {
throw new GradleException("failed to create temporary directory [${tmp}]")
}
final File javaPolicy = file("${tmp}/java.policy")
if (buildParams.inFipsJvm) {
if (inFips) {
javaPolicy.write(
[
"grant {",
@ -95,9 +94,9 @@ tasks.withType(Test).configureEach {
// this is needed to manipulate com.amazonaws.sdk.ec2MetadataServiceEndpointOverride system property
// it is better rather disable security manager at all with `systemProperty 'tests.security.manager', 'false'`
if (buildParams.inFipsJvm){
nonInputProperties.systemProperty 'java.security.policy', "=file://${buildDir}/tmp/java.policy"
nonInputProperties.systemProperty 'java.security.policy', "=file://${layout.buildDirectory.asFile.get()}/tmp/java.policy"
} else {
nonInputProperties.systemProperty 'java.security.policy', "file://${buildDir}/tmp/java.policy"
nonInputProperties.systemProperty 'java.security.policy', "file://${layout.buildDirectory.asFile.get()}/tmp/java.policy"
}
}