Skip to content

Commit

Permalink
Cleanup build script to exclude security-authorization-engine (#8) (#8)
Browse files Browse the repository at this point in the history
* Cleanup build-scan, remove publish scan to elastic server

* Cleanup build script to exclude security-authorization-engine which test has dependency on xpack

* Cleanup build script to exclude security-authorization-engine which test has dependency on xpack

Co-authored-by: Huan Jiang <huanji@amazon.com>
  • Loading branch information
nknize and seraphjiang authored Jan 30, 2021
1 parent 4bdad9f commit 6744e35
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 37 deletions.
1 change: 0 additions & 1 deletion gradle/formatting.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ def projectPathsToExclude = [
':example-plugins:rescore',
':example-plugins:rest-handler',
':example-plugins:script-expert-scoring',
':example-plugins:security-authorization-engine',
':libs:elasticsearch-cli',
':libs:elasticsearch-core',
':libs:elasticsearch-dissect',
Expand Down
7 changes: 0 additions & 7 deletions plugins/examples/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,3 @@ configure(project('painless-whitelist')) {
}
}

configure(project('security-authorization-engine')) {
configurations.all {
resolutionStrategy.dependencySubstitution {
substitute module('org.elasticsearch.test:logger-usage') with project(':test:logger-usage')
}
}
}
58 changes: 29 additions & 29 deletions plugins/examples/security-authorization-engine/build.gradle
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
apply plugin: 'elasticsearch.esplugin'
apply plugin: 'elasticsearch.java-rest-test'
// apply plugin: 'elasticsearch.esplugin'
// apply plugin: 'elasticsearch.java-rest-test'

esplugin {
name 'security-authorization-engine'
description 'An example spi extension plugin for security that implements an Authorization Engine'
classname 'org.elasticsearch.example.AuthorizationEnginePlugin'
licenseFile rootProject.file('licenses/APACHE-LICENSE-2.0.txt')
noticeFile rootProject.file('NOTICE.txt')
}
// esplugin {
// name 'security-authorization-engine'
// description 'An example spi extension plugin for security that implements an Authorization Engine'
// classname 'org.elasticsearch.example.AuthorizationEnginePlugin'
// licenseFile rootProject.file('licenses/APACHE-LICENSE-2.0.txt')
// noticeFile rootProject.file('NOTICE.txt')
// }

dependencies {
// let the javaRestTest see the classpath of main
javaRestTestImplementation project.sourceSets.main.runtimeClasspath
}
//no unit tests
test.enabled = false
javaRestTest {
dependsOn buildZip
systemProperty 'tests.security.manager', 'false'
}
// dependencies {
// // let the javaRestTest see the classpath of main
// javaRestTestImplementation project.sourceSets.main.runtimeClasspath
// }
// //no unit tests
// test.enabled = false
// javaRestTest {
// dependsOn buildZip
// systemProperty 'tests.security.manager', 'false'
// }

testClusters.javaRestTest {
setting 'xpack.security.enabled', 'true'
setting 'xpack.ml.enabled', 'false'
setting 'xpack.license.self_generated.type', 'trial'
// 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.
testDistribution = 'DEFAULT'
// // 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.
// testDistribution = 'DEFAULT'

user role: 'custom_superuser'
}
// user role: 'custom_superuser'
// }

0 comments on commit 6744e35

Please sign in to comment.