Reduce CLI scripts to one-liners (#30759)

This commit reduces the Linux CLI scripts to one-liners by moving all of the redundant logic to an elasticsearch-cli script. This commit is only the Linux side, a follow-up will do this for Windows too.
2018-05-21 16:37:57 -04:00 · 2018-05-21 16:37:57 -04:00 · 3ce2297dc1
parent dcf0f9f8dd
commit 3ce2297dc1
14 changed files with 42 additions and 130 deletions
--- a/distribution/src/bin/elasticsearch-cli
+++ b/distribution/src/bin/elasticsearch-cli
@ -0,0 +1,22 @@
+#!/bin/bash
+
+set -e -o pipefail
+
+source "`dirname "$0"`"/elasticsearch-env
+
+IFS=';' read -r -a additional_sources <<< "$ES_ADDITIONAL_SOURCES"
+for additional_source in "${additional_sources[@]}"
+do
+  source "`dirname "$0"`"/$additional_source
+done
+
+exec \
+  "$JAVA" \
+  $ES_JAVA_OPTS \
+  -Des.path.home="$ES_HOME" \
+  -Des.path.conf="$ES_PATH_CONF" \
+  -Des.distribution.flavor="$ES_DISTRIBUTION_FLAVOR" \
+  -Des.distribution.type="$ES_DISTRIBUTION_TYPE" \
+  -cp "$ES_CLASSPATH" \
+  $1 \
+  "${@:2}"
--- a/distribution/src/bin/elasticsearch-keystore
+++ b/distribution/src/bin/elasticsearch-keystore
@ -1,14 +1,5 @@
 #!/bin/bash

-source "`dirname "$0"`"/elasticsearch-env
-
-exec \
-  "$JAVA" \
-  $ES_JAVA_OPTS \
-  -Des.path.home="$ES_HOME" \
-  -Des.path.conf="$ES_PATH_CONF" \
-  -Des.distribution.flavor="$ES_DISTRIBUTION_FLAVOR" \
-  -Des.distribution.type="$ES_DISTRIBUTION_TYPE" \
-  -cp "$ES_CLASSPATH" \
+"`dirname "$0"`"/elasticsearch-cli \
  org.elasticsearch.common.settings.KeyStoreCli \
  "$@"
--- a/distribution/src/bin/elasticsearch-plugin
+++ b/distribution/src/bin/elasticsearch-plugin
@ -1,14 +1,5 @@
 #!/bin/bash

-source "`dirname "$0"`"/elasticsearch-env
-
-exec \
-  "$JAVA" \
-  $ES_JAVA_OPTS \
-  -Des.path.home="$ES_HOME" \
-  -Des.path.conf="$ES_PATH_CONF" \
-  -Des.distribution.flavor="$ES_DISTRIBUTION_FLAVOR" \
-  -Des.distribution.type="$ES_DISTRIBUTION_TYPE" \
-  -cp "$ES_CLASSPATH" \
+"`dirname "$0"`"/elasticsearch-cli \
  org.elasticsearch.plugins.PluginCli \
  "$@"
--- a/distribution/src/bin/elasticsearch-translog
+++ b/distribution/src/bin/elasticsearch-translog
@ -1,14 +1,5 @@
 #!/bin/bash

-source "`dirname "$0"`"/elasticsearch-env
-
-exec \
-  "$JAVA" \
-  $ES_JAVA_OPTS \
-  -Des.path.home="$ES_HOME" \
-  -Des.path.conf="$ES_PATH_CONF" \
-  -Des.distribution.flavor="$ES_DISTRIBUTION_FLAVOR" \
-  -Des.distribution.type="$ES_DISTRIBUTION_TYPE" \
-  -cp "$ES_CLASSPATH" \
+"`dirname "$0"`"/elasticsearch-cli \
  org.elasticsearch.index.translog.TranslogToolCli \
  "$@"
--- a/x-pack/plugin/security/src/main/bin/elasticsearch-certgen
+++ b/x-pack/plugin/security/src/main/bin/elasticsearch-certgen
@ -4,17 +4,7 @@
 # or more contributor license agreements. Licensed under the Elastic License;
 # you may not use this file except in compliance with the Elastic License.

-source "`dirname "$0"`"/elasticsearch-env
-
-source "`dirname "$0"`"/x-pack-security-env
-
-exec \
-  "$JAVA" \
-  $ES_JAVA_OPTS \
-  -Des.path.home="$ES_HOME" \
-  -Des.path.conf="$ES_PATH_CONF" \
-  -Des.distribution.flavor="$ES_DISTRIBUTION_FLAVOR" \
-  -Des.distribution.type="$ES_DISTRIBUTION_TYPE" \
-  -cp "$ES_CLASSPATH" \
+ES_ADDITIONAL_SOURCES="x-pack-env;x-pack-security-env" \
+  "`dirname "$0"`"/elasticsearch-cli \
  org.elasticsearch.xpack.core.ssl.CertificateGenerateTool \
  "$@"
--- a/x-pack/plugin/security/src/main/bin/elasticsearch-certutil
+++ b/x-pack/plugin/security/src/main/bin/elasticsearch-certutil
@ -4,17 +4,7 @@
 # or more contributor license agreements. Licensed under the Elastic License;
 # you may not use this file except in compliance with the Elastic License.

-source "`dirname "$0"`"/elasticsearch-env
-
-source "`dirname "$0"`"/x-pack-security-env
-
-exec \
-  "$JAVA" \
-  $ES_JAVA_OPTS \
-  -Des.path.home="$ES_HOME" \
-  -Des.path.conf="$ES_PATH_CONF" \
-  -Des.distribution.flavor="$ES_DISTRIBUTION_FLAVOR" \
-  -Des.distribution.type="$ES_DISTRIBUTION_TYPE" \
-  -cp "$ES_CLASSPATH" \
+ES_ADDITIONAL_SOURCES="x-pack-env;x-pack-security-env" \
+  "`dirname "$0"`"/elasticsearch-cli \
  org.elasticsearch.xpack.core.ssl.CertificateTool \
  "$@"
--- a/x-pack/plugin/security/src/main/bin/elasticsearch-migrate
+++ b/x-pack/plugin/security/src/main/bin/elasticsearch-migrate
@ -4,17 +4,7 @@
 # or more contributor license agreements. Licensed under the Elastic License;
 # you may not use this file except in compliance with the Elastic License.

-source "`dirname "$0"`"/elasticsearch-env
-
-source "`dirname "$0"`"/x-pack-security-env
-
-exec \
-  "$JAVA" \
-  $ES_JAVA_OPTS \
-  -Des.path.home="$ES_HOME" \
-  -Des.path.conf="$ES_PATH_CONF" \
-  -Des.distribution.flavor="$ES_DISTRIBUTION_FLAVOR" \
-  -Des.distribution.type="$ES_DISTRIBUTION_TYPE" \
-  -cp "$ES_CLASSPATH" \
+ES_ADDITIONAL_SOURCES="x-pack-env;x-pack-security-env" \
+  "`dirname "$0"`"/elasticsearch-cli \
  org.elasticsearch.xpack.security.authc.esnative.ESNativeRealmMigrateTool \
-  "$@"
+  "$@"
--- a/x-pack/plugin/security/src/main/bin/elasticsearch-saml-metadata
+++ b/x-pack/plugin/security/src/main/bin/elasticsearch-saml-metadata
@ -4,17 +4,7 @@
 # or more contributor license agreements. Licensed under the Elastic License;
 # you may not use this file except in compliance with the Elastic License.

-source "`dirname "$0"`"/elasticsearch-env
-
-source "`dirname "$0"`"/x-pack-security-env
-
-exec \
-  "$JAVA" \
-  $ES_JAVA_OPTS \
-  -Des.path.home="$ES_HOME" \
-  -Des.path.conf="$ES_PATH_CONF" \
-  -Des.distribution.flavor="$ES_DISTRIBUTION_FLAVOR" \
-  -Des.distribution.type="$ES_DISTRIBUTION_TYPE" \
-  -cp "$ES_CLASSPATH" \
+ES_ADDITIONAL_SOURCES="x-pack-env;x-pack-security-env" \
+  "`dirname "$0"`"/elasticsearch-cli \
  org.elasticsearch.xpack.security.authc.saml.SamlMetadataCommand \
  "$@"
--- a/x-pack/plugin/security/src/main/bin/elasticsearch-setup-passwords
+++ b/x-pack/plugin/security/src/main/bin/elasticsearch-setup-passwords
@ -4,17 +4,7 @@
 # or more contributor license agreements. Licensed under the Elastic License;
 # you may not use this file except in compliance with the Elastic License.

-source "`dirname "$0"`"/elasticsearch-env
-
-source "`dirname "$0"`"/x-pack-security-env
-
-exec \
-  "$JAVA" \
-  $ES_JAVA_OPTS \
-  -Des.path.home="$ES_HOME" \
-  -Des.path.conf="$ES_PATH_CONF" \
-  -Des.distribution.flavor="$ES_DISTRIBUTION_FLAVOR" \
-  -Des.distribution.type="$ES_DISTRIBUTION_TYPE" \
-  -cp "$ES_CLASSPATH" \
+ES_ADDITIONAL_SOURCES="x-pack-env;x-pack-security-env" \
+  "`dirname "$0"`"/elasticsearch-cli \
  org.elasticsearch.xpack.security.authc.esnative.tool.SetupPasswordTool \
  "$@"
--- a/x-pack/plugin/security/src/main/bin/elasticsearch-syskeygen
+++ b/x-pack/plugin/security/src/main/bin/elasticsearch-syskeygen
@ -4,17 +4,7 @@
 # or more contributor license agreements. Licensed under the Elastic License;
 # you may not use this file except in compliance with the Elastic License.

-source "`dirname "$0"`"/elasticsearch-env
-
-source "`dirname "$0"`"/x-pack-security-env
-
-exec \
-  "$JAVA" \
-  $ES_JAVA_OPTS \
-  -Des.path.home="$ES_HOME" \
-  -Des.path.conf="$ES_PATH_CONF" \
-  -Des.distribution.flavor="$ES_DISTRIBUTION_FLAVOR" \
-  -Des.distribution.type="$ES_DISTRIBUTION_TYPE" \
-  -cp "$ES_CLASSPATH" \
+ES_ADDITIONAL_SOURCES="x-pack-env;x-pack-security-env" \
+  "`dirname "$0"`"/elasticsearch-cli \
  org.elasticsearch.xpack.security.crypto.tool.SystemKeyTool \
  "$@"
--- a/x-pack/plugin/security/src/main/bin/elasticsearch-users
+++ b/x-pack/plugin/security/src/main/bin/elasticsearch-users
@ -4,17 +4,7 @@
 # or more contributor license agreements. Licensed under the Elastic License;
 # you may not use this file except in compliance with the Elastic License.

-source "`dirname "$0"`"/elasticsearch-env
-
-source "`dirname "$0"`"/x-pack-security-env
-
-exec \
-  "$JAVA" \
-  $ES_JAVA_OPTS \
-  -Des.path.home="$ES_HOME" \
-  -Des.path.conf="$ES_PATH_CONF" \
-  -Des.distribution.flavor="$ES_DISTRIBUTION_FLAVOR" \
-  -Des.distribution.type="$ES_DISTRIBUTION_TYPE" \
-  -cp "$ES_CLASSPATH" \
+ES_ADDITIONAL_SOURCES="x-pack-env;x-pack-security-env" \
+  "`dirname "$0"`"/elasticsearch-cli \
  org.elasticsearch.xpack.security.authc.file.tool.UsersTool \
  "$@"
--- a/x-pack/plugin/security/src/main/bin/x-pack-security-env
+++ b/x-pack/plugin/security/src/main/bin/x-pack-security-env
@ -4,7 +4,5 @@
 # or more contributor license agreements. Licensed under the Elastic License;
 # you may not use this file except in compliance with the Elastic License.

-source "`dirname "$0"`"/x-pack-env
-
 # include x-pack-security jars in classpath
 ES_CLASSPATH="$ES_CLASSPATH:$ES_HOME/modules/x-pack-security/*"
--- a/x-pack/plugin/watcher/src/main/bin/elasticsearch-croneval
+++ b/x-pack/plugin/watcher/src/main/bin/elasticsearch-croneval
@ -4,16 +4,7 @@
 # or more contributor license agreements. Licensed under the Elastic License;
 # you may not use this file except in compliance with the Elastic License.

-source "`dirname "$0"`"/elasticsearch-env
-
-source "`dirname "$0"`"/x-pack-watcher-env
-
-exec \
-  "$JAVA" \
-  $ES_JAVA_OPTS \
-  -Des.path.home="$ES_HOME" \
-  -Des.path.conf="$ES_PATH_CONF" \
-  -Des.distribution.flavor="$ES_DISTRIBUTION_FLAVOR" \
-  -cp "$ES_CLASSPATH" \
+ES_ADDITIONAL_SOURCES="x-pack-env;x-pack-watcher-env" \
+  "`dirname "$0"`"/elasticsearch-cli \
  org.elasticsearch.xpack.watcher.trigger.schedule.tool.CronEvalTool \
  "$@"
--- a/x-pack/plugin/watcher/src/main/bin/x-pack-watcher-env
+++ b/x-pack/plugin/watcher/src/main/bin/x-pack-watcher-env
@ -4,7 +4,5 @@
 # or more contributor license agreements. Licensed under the Elastic License;
 # you may not use this file except in compliance with the Elastic License.

-source "`dirname "$0"`"/x-pack-env
-
 # include x-pack-security jars in classpath
 ES_CLASSPATH="$ES_CLASSPATH:$ES_HOME/modules/x-pack-watcher/*"