SQL: Shift sql-cli into its proper home
The old home made sense before x-pack was split. The new home lines up with where security keeps its scripts. The jar file wasn't being included any more so this re-adds that. Original commit: elastic/x-pack-elasticsearch@d3ec941397
This commit is contained in:
parent
a2f1ed3f62
commit
10efd82694
|
@ -12,9 +12,14 @@ esplugin {
|
|||
noticeFile project(':x-pack-elasticsearch').file('NOTICE.txt')
|
||||
}
|
||||
|
||||
configurations {
|
||||
// Bundles the sql-cli.jar into the distribution
|
||||
bin
|
||||
}
|
||||
|
||||
archivesBaseName = 'x-pack-sql'
|
||||
|
||||
// TODO: enable this once we have tests
|
||||
// All integration tests live in qa modules
|
||||
integTest.enabled = false
|
||||
|
||||
dependencies {
|
||||
|
@ -28,6 +33,20 @@ dependencies {
|
|||
testCompile project(path: ':modules:reindex', configuration: 'runtime')
|
||||
testCompile project(path: ':modules:parent-join', configuration: 'runtime')
|
||||
testCompile project(path: ':modules:analysis-common', configuration: 'runtime')
|
||||
|
||||
bin(project(path: xpackModule('sql:sql-cli'))) {
|
||||
// sql-cli bundles all of its dependencies into a single executable jar
|
||||
transitive = false
|
||||
}
|
||||
}
|
||||
|
||||
/* Bundle the sql-cli into the binary files. This is useful
|
||||
* because it is an executable jar that can be moved wherever
|
||||
* it is needed. */
|
||||
bundlePlugin {
|
||||
from (configurations.bin) {
|
||||
into 'elasticsearch/bin'
|
||||
}
|
||||
}
|
||||
|
||||
dependencyLicenses {
|
||||
|
@ -107,7 +126,3 @@ task regen {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
//project(xpackModule('core')).bundlePlugin {
|
||||
// from jar
|
||||
//}
|
||||
|
|
|
@ -131,7 +131,7 @@ SETUP_OK
|
|||
|
||||
password=$(grep "PASSWORD elastic = " /tmp/setup-passwords-output-with-bootstrap | sed "s/PASSWORD elastic = //")
|
||||
|
||||
run $ESHOME/bin/x-pack/sql-cli --debug true "http://elastic@127.0.0.1:9200" <<SQL
|
||||
run $ESHOME/bin/x-pack/sql-cli --debug "http://elastic@127.0.0.1:9200" <<SQL
|
||||
$password
|
||||
SELECT * FROM library;
|
||||
SQL
|
||||
|
|
|
@ -31,6 +31,7 @@ verify_xpack_installation() {
|
|||
'setup-passwords.bat'
|
||||
'sql-cli'
|
||||
'sql-cli.bat'
|
||||
"sql-cli-$(cat version).jar" # This jar is executable so we pitch it in bin so folks will find it
|
||||
'syskeygen'
|
||||
'syskeygen.bat'
|
||||
'users'
|
||||
|
@ -45,6 +46,7 @@ verify_xpack_installation() {
|
|||
|
||||
local binaryFilesCount=0
|
||||
for binaryFile in ${binaryFiles[@]}; do
|
||||
echo "checking for bin file $name/${binaryFile}"
|
||||
assert_file "$ESHOME/bin/$name/${binaryFile}" f $user $group 755
|
||||
binaryFilesCount=$(( binaryFilesCount + 1 ))
|
||||
done
|
||||
|
|
Loading…
Reference in New Issue