diff --git a/build.gradle b/build.gradle index fa3b5ad7b9f..a7fae48248c 100644 --- a/build.gradle +++ b/build.gradle @@ -39,6 +39,8 @@ plugins { id "com.dorongold.task-tree" version "2.1.0" } +apply from: "${projectDir}/x-pack/distributions/internal/observabilitySRE/build-ext.gradle" + apply plugin: 'de.undercouch.download' apply from: "rubyUtils.gradle" @@ -51,16 +53,6 @@ import org.logstash.gradle.tooling.SignAliasDefinitions import org.logstash.gradle.tooling.ToolingUtils import org.logstash.gradle.tooling.SnapshotArtifactURLs -ext { - runTestsInFIPSMode = project.hasProperty('runTestsInFIPSMode') ? project.property('runTestsInFIPSMode').toBoolean() : false -} - -subprojects { - ext { - runTestsInFIPSMode = rootProject.runTestsInFIPSMode - } -} - allprojects { group = 'org.logstash' diff --git a/logstash-core/build.gradle b/logstash-core/build.gradle index d080daf0171..0ce2ff2f2dd 100644 --- a/logstash-core/build.gradle +++ b/logstash-core/build.gradle @@ -124,20 +124,6 @@ tasks.register("javaTests", Test) { exclude '/org/logstash/plugins/factory/PluginFactoryExtTest.class' exclude '/org/logstash/execution/ObservedExecutionTest.class' - if (runTestsInFIPSMode) { - systemProperty "java.security.properties", System.getenv("JAVA_SECURITY_PROPERTIES") - systemProperty "javax.net.ssl.keyStore", "/etc/java/security/keystore.bcfks" - systemProperty "javax.net.ssl.keyStoreType", "BCFKS" - systemProperty "javax.net.ssl.keyStoreProvider", "BCFIPS" - systemProperty "javax.net.ssl.keyStorePassword", "changeit" - systemProperty "javax.net.ssl.trustStore", "/etc/java/security/cacerts.bcfks" - systemProperty "javax.net.ssl.trustStoreType", "BCFKS" - systemProperty "javax.net.ssl.trustStoreProvider", "BCFIPS" - systemProperty "javax.net.ssl.trustStorePassword", "changeit" - systemProperty "ssl.KeyManagerFactory.algorithm", "PKIX" - systemProperty "ssl.TrustManagerFactory.algorithm", "PKIX" - systemProperty "org.bouncycastle.fips.approved_only", "true" - } jacoco { enabled = true destinationFile = layout.buildDirectory.file('jacoco/test.exec').get().asFile @@ -170,21 +156,6 @@ tasks.register("rubyTests", Test) { include '/org/logstash/plugins/CounterMetricImplTest.class' include '/org/logstash/plugins/factory/PluginFactoryExtTest.class' include '/org/logstash/execution/ObservedExecutionTest.class' - - if (runTestsInFIPSMode) { - systemProperty "java.security.properties", System.getenv("JAVA_SECURITY_PROPERTIES") - systemProperty "javax.net.ssl.keyStore", "/etc/java/security/keystore.bcfks" - systemProperty "javax.net.ssl.keyStoreType", "BCFKS" - systemProperty "javax.net.ssl.keyStoreProvider", "BCFIPS" - systemProperty "javax.net.ssl.keyStorePassword", "changeit" - systemProperty "javax.net.ssl.trustStore", "/etc/java/security/cacerts.bcfks" - systemProperty "javax.net.ssl.trustStoreType", "BCFKS" - systemProperty "javax.net.ssl.trustStoreProvider", "BCFIPS" - systemProperty "javax.net.ssl.trustStorePassword", "changeit" - systemProperty "ssl.KeyManagerFactory.algorithm", "PKIX" - systemProperty "ssl.TrustManagerFactory.algorithm", "PKIX" - systemProperty "org.bouncycastle.fips.approved_only", "true" - } } test { diff --git a/qa/integration/build.gradle b/qa/integration/build.gradle index 0408bc1bdc8..3cf9a5455b3 100644 --- a/qa/integration/build.gradle +++ b/qa/integration/build.gradle @@ -72,20 +72,6 @@ tasks.register("integrationTests", Test) { inputs.files fileTree("${projectDir}/specs") systemProperty 'logstash.root.dir', projectDir.toPath().getParent().getParent().toString() - if (runTestsInFIPSMode) { - systemProperty "java.security.properties", System.getenv("JAVA_SECURITY_PROPERTIES") - systemProperty "javax.net.ssl.keyStore", "/etc/java/security/keystore.bcfks" - systemProperty "javax.net.ssl.keyStoreType", "BCFKS" - systemProperty "javax.net.ssl.keyStoreProvider", "BCFIPS" - systemProperty "javax.net.ssl.keyStorePassword", "changeit" - systemProperty "javax.net.ssl.trustStore", "/etc/java/security/cacerts.bcfks" - systemProperty "javax.net.ssl.trustStoreType", "BCFKS" - systemProperty "javax.net.ssl.trustStoreProvider", "BCFIPS" - systemProperty "javax.net.ssl.trustStorePassword", "changeit" - systemProperty "ssl.KeyManagerFactory.algorithm", "PKIX" - systemProperty "ssl.TrustManagerFactory.algorithm", "PKIX" - systemProperty "org.bouncycastle.fips.approved_only", "true" - } include '/org/logstash/integration/RSpecTests.class' outputs.upToDateWhen { diff --git a/x-pack/distributions/internal/observabilitySRE/build-ext.gradle b/x-pack/distributions/internal/observabilitySRE/build-ext.gradle new file mode 100644 index 00000000000..b5c5b87c75d --- /dev/null +++ b/x-pack/distributions/internal/observabilitySRE/build-ext.gradle @@ -0,0 +1,31 @@ +ext { + runTestsInFIPSMode = project.hasProperty('runTestsInFIPSMode') ? project.property('runTestsInFIPSMode').toBoolean() : false +} + +subprojects { + ext { + runTestsInFIPSMode = rootProject.runTestsInFIPSMode + } +} + +allprojects { + afterEvaluate { + tasks.withType(Test) { + if (runTestsInFIPSMode) { + logger.debug("configuring ${it} to run in FIPSMode ") + systemProperty "java.security.properties", System.getenv("JAVA_SECURITY_PROPERTIES") + systemProperty "javax.net.ssl.keyStore", "/etc/java/security/keystore.bcfks" + systemProperty "javax.net.ssl.keyStoreType", "BCFKS" + systemProperty "javax.net.ssl.keyStoreProvider", "BCFIPS" + systemProperty "javax.net.ssl.keyStorePassword", "changeit" + systemProperty "javax.net.ssl.trustStore", "/etc/java/security/cacerts.bcfks" + systemProperty "javax.net.ssl.trustStoreType", "BCFKS" + systemProperty "javax.net.ssl.trustStoreProvider", "BCFIPS" + systemProperty "javax.net.ssl.trustStorePassword", "changeit" + systemProperty "ssl.KeyManagerFactory.algorithm", "PKIX" + systemProperty "ssl.TrustManagerFactory.algorithm", "PKIX" + systemProperty "org.bouncycastle.fips.approved_only", "true" + } + } + } +} \ No newline at end of file