Convert license tools to use unified cli entrypoint (#85919)

The license tools exists separate from the normal cli tools since they
are not part of the Elasticsearch distribution. However, they still
utilize the Elasticsearch cli infrastructure. This commit adds a common
cli base script that calls the cli launcher and converts each of the
license tools to use it.

relates #85758

x-pack/license-tools/bin/key-pair-generator

@@ -1,39 +1,3 @@
 #!/bin/bash
 
-# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-# or more contributor license agreements. Licensed under the Elastic License
-# 2.0; you may not use this file except in compliance with the Elastic License
-# 2.0.
-
-CDPATH=""
-SCRIPT="$0"
-
-# SCRIPT may be an arbitrarily deep series of symlinks. Loop until we have the concrete path.
-while [ -h "$SCRIPT" ] ; do
-  ls=`ls -ld "$SCRIPT"`
-  # Drop everything prior to ->
-  link=`expr "$ls" : '.*-> \(.*\)$'`
-  if expr "$link" : '/.*' > /dev/null; then
-    SCRIPT="$link"
-  else
-    SCRIPT=`dirname "$SCRIPT"`/"$link"
-  fi
-done
-
-# determine license home
-LICENSE_HOME=`dirname "$SCRIPT"`/..
-
-# make LICENSE_HOME absolute
-LICENSE_HOME=`cd "$LICENSE_HOME"; pwd`
-
-# setup classpath
-LICENSE_CLASSPATH=$LICENSE_CLASSPATH:$LICENSE_HOME/lib/*
-
-if [ -x "$JAVA_HOME/bin/java" ]; then
-    JAVA=$JAVA_HOME/bin/java
-else
-    JAVA=`which java`
-fi
-
-exec "$JAVA" $JAVA_OPTS -Xmx64m -Xms16m -cp "$LICENSE_CLASSPATH" -Des.path.home="`pwd`" org.elasticsearch.license.licensor.tools.KeyPairGeneratorTool "$@"
-
+source "`dirname "$0"`"/license-cli

x-pack/license-tools/bin/license-cli

@@ -0,0 +1,47 @@
+#!/bin/bash
+
+# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+# or more contributor license agreements. Licensed under the Elastic License
+# 2.0; you may not use this file except in compliance with the Elastic License
+# 2.0.
+
+CDPATH=""
+SCRIPT="$0"
+
+# SCRIPT may be an arbitrarily deep series of symlinks. Loop until we have the concrete path.
+while [ -h "$SCRIPT" ] ; do
+  ls=`ls -ld "$SCRIPT"`
+  # Drop everything prior to ->
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    SCRIPT="$link"
+  else
+    SCRIPT=`dirname "$SCRIPT"`/"$link"
+  fi
+done
+
+# determine license home
+LICENSE_HOME=`dirname "$SCRIPT"`/..
+# make LICENSE_HOME absolute
+LICENSE_HOME=`cd "$LICENSE_HOME"; pwd`
+
+# setup classpath
+LICENSE_CLASSPATH=$LICENSE_CLASSPATH:$LICENSE_HOME/lib/*
+
+if [ -x "$JAVA_HOME/bin/java" ]; then
+    JAVA=$JAVA_HOME/bin/java
+else
+    JAVA=`which java`
+fi
+
+JAVA_OPTS="$JAVA_OPTS -Xmx64m -Xms16m"
+CLI_NAME=$(basename $0)
+
+exec \
+  "$JAVA" \
+  $JAVA_OPTS \
+  -Dcli.name="$CLI_NAME" \
+  -Des.path.home="`pwd`" \
+  -cp "$LICENSE_CLASSPATH" \
+  org.elasticsearch.launcher.CliToolLauncher \
+  "$@"

x-pack/license-tools/bin/license-generator

@@ -1,38 +1,3 @@
 #!/bin/bash
 
-# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-# or more contributor license agreements. Licensed under the Elastic License
-# 2.0; you may not use this file except in compliance with the Elastic License
-# 2.0.
-
-CDPATH=""
-SCRIPT="$0"
-
-# SCRIPT may be an arbitrarily deep series of symlinks. Loop until we have the concrete path.
-while [ -h "$SCRIPT" ] ; do
-  ls=`ls -ld "$SCRIPT"`
-  # Drop everything prior to ->
-  link=`expr "$ls" : '.*-> \(.*\)$'`
-  if expr "$link" : '/.*' > /dev/null; then
-    SCRIPT="$link"
-  else
-    SCRIPT=`dirname "$SCRIPT"`/"$link"
-  fi
-done
-
-# determine license home
-LICENSE_HOME=`dirname "$SCRIPT"`/..
-
-# make LICENSE_HOME absolute
-LICENSE_HOME=`cd "$LICENSE_HOME"; pwd`
-
-# setup classpath
-LICENSE_CLASSPATH=$LICENSE_CLASSPATH:$LICENSE_HOME/lib/*
-
-if [ -x "$JAVA_HOME/bin/java" ]; then
-    JAVA=$JAVA_HOME/bin/java
-else
-    JAVA=`which java`
-fi
-
-exec "$JAVA" $JAVA_OPTS -Xmx64m -Xms16m -cp "$LICENSE_CLASSPATH" -Des.path.home="`pwd`" org.elasticsearch.license.licensor.tools.LicenseGeneratorTool "$@"
+source "`dirname "$0"`"/license-cli

x-pack/license-tools/bin/verify-license

@@ -1,39 +1,3 @@
 #!/bin/bash
 
-# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
-# or more contributor license agreements. Licensed under the Elastic License
-# 2.0; you may not use this file except in compliance with the Elastic License
-# 2.0.
-
-CDPATH=""
-SCRIPT="$0"
-
-# SCRIPT may be an arbitrarily deep series of symlinks. Loop until we have the concrete path.
-while [ -h "$SCRIPT" ] ; do
-  ls=`ls -ld "$SCRIPT"`
-  # Drop everything prior to ->
-  link=`expr "$ls" : '.*-> \(.*\)$'`
-  if expr "$link" : '/.*' > /dev/null; then
-    SCRIPT="$link"
-  else
-    SCRIPT=`dirname "$SCRIPT"`/"$link"
-  fi
-done
-
-# determine license home
-LICENSE_HOME=`dirname "$SCRIPT"`/..
-
-# make LICENSE_HOME absolute
-LICENSE_HOME=`cd "$LICENSE_HOME"; pwd`
-
-# setup classpath
-LICENSE_CLASSPATH=$LICENSE_CLASSPATH:$LICENSE_HOME/lib/*
-
-if [ -x "$JAVA_HOME/bin/java" ]; then
-    JAVA=$JAVA_HOME/bin/java
-else
-    JAVA=`which java`
-fi
-
-exec "$JAVA" $JAVA_OPTS -Xmx64m -Xms16m -cp "$LICENSE_CLASSPATH" -Des.path.home="`pwd`" org.elasticsearch.license.licensor.tools.LicenseVerificationTool "$@"
-
+source "`dirname "$0"`"/license-cli

x-pack/license-tools/build.gradle

@@ -3,6 +3,7 @@ apply plugin: 'elasticsearch.build'
 dependencies {
   api project(':x-pack:plugin:core')
   api project(':server')
+  api project(':distribution:tools:cli-launcher')
   testImplementation project(':test:framework')
 }
 

x-pack/license-tools/src/main/java/org/elasticsearch/license/licensor/tools/KeyPairGeneratorTool.java

@@ -36,10 +36,6 @@ public KeyPairGeneratorTool() {
         this.privateKeyPathOption = parser.accepts("privateKeyPath", "private key path").withRequiredArg().required();
     }
 
-    public static void main(String[] args) throws Exception {
-        exit(new KeyPairGeneratorTool().main(args, Terminal.DEFAULT));
-    }
-
     @Override
     protected void printAdditionalHelp(Terminal terminal) {
         terminal.println("This tool generates and saves a key pair to the provided publicKeyPath");

x-pack/license-tools/src/main/java/org/elasticsearch/license/licensor/tools/KeyPairGeneratorToolProvider.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.license.licensor.tools;
+
+import org.elasticsearch.cli.CliToolProvider;
+import org.elasticsearch.cli.Command;
+
+public class KeyPairGeneratorToolProvider implements CliToolProvider {
+    @Override
+    public String name() {
+        return "key-pair-generator";
+    }
+
+    @Override
+    public Command create() {
+        return new KeyPairGeneratorTool();
+    }
+}

x-pack/license-tools/src/main/java/org/elasticsearch/license/licensor/tools/LicenseGeneratorTool.java

@@ -45,10 +45,6 @@ public LicenseGeneratorTool() {
         licenseFileOption = parser.accepts("licenseFile", "license json spec file").withRequiredArg();
     }
 
-    public static void main(String[] args) throws Exception {
-        exit(new LicenseGeneratorTool().main(args, Terminal.DEFAULT));
-    }
-
     @Override
     protected void printAdditionalHelp(Terminal terminal) {
         terminal.println("This tool generate elasticsearch license(s) for the provided");

x-pack/license-tools/src/main/java/org/elasticsearch/license/licensor/tools/LicenseGeneratorToolProvider.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.license.licensor.tools;
+
+import org.elasticsearch.cli.CliToolProvider;
+import org.elasticsearch.cli.Command;
+
+public class LicenseGeneratorToolProvider implements CliToolProvider {
+    @Override
+    public String name() {
+        return "license-generator";
+    }
+
+    @Override
+    public Command create() {
+        return new LicenseGeneratorTool();
+    }
+}

x-pack/license-tools/src/main/java/org/elasticsearch/license/licensor/tools/LicenseVerificationTool.java

@@ -44,10 +44,6 @@ public LicenseVerificationTool() {
         licenseFileOption = parser.accepts("licenseFile", "license json spec file").withRequiredArg();
     }
 
-    public static void main(String[] args) throws Exception {
-        exit(new LicenseVerificationTool().main(args, Terminal.DEFAULT));
-    }
-
     @Override
     protected void execute(Terminal terminal, OptionSet options) throws Exception {
         Path publicKeyPath = parsePath(publicKeyPathOption.value(options));

x-pack/license-tools/src/main/java/org/elasticsearch/license/licensor/tools/LicenseVerificationToolProvider.java

@@ -0,0 +1,23 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.license.licensor.tools;
+
+import org.elasticsearch.cli.CliToolProvider;
+import org.elasticsearch.cli.Command;
+
+public class LicenseVerificationToolProvider implements CliToolProvider {
+    @Override
+    public String name() {
+        return "verify-license";
+    }
+
+    @Override
+    public Command create() {
+        return new LicenseVerificationTool();
+    }
+}

x-pack/license-tools/src/main/resources/META-INF/services/org.elasticsearch.cli.CliToolProvider

@@ -0,0 +1,3 @@
+org.elasticsearch.license.licensor.tools.LicenseGeneratorToolProvider
+org.elasticsearch.license.licensor.tools.LicenseVerificationToolProvider
+org.elasticsearch.license.licensor.tools.KeyPairGeneratorToolProvider