Merge pull request #24596 from vespa-engine/arnej/swap-vespa-security-env

switch fully to "go" version of vespa-security-env

5 files changed, 2 insertions, 86 deletions

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index ad4c1524644..2507215e70d 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -15,6 +15,7 @@ install(PROGRAMS ${GODIR}/bin/script-utils DESTINATION libexec/vespa)
 
 install_symlink(libexec/vespa/script-utils bin/vespa-logfmt)
 install_symlink(libexec/vespa/script-utils bin/vespa-deploy)
+install_symlink(libexec/vespa/script-utils bin/vespa-security-env)
 install_symlink(libexec/vespa/script-utils bin/vespa-get-cluster-state)
 install_symlink(libexec/vespa/script-utils bin/vespa-get-node-state)
 install_symlink(libexec/vespa/script-utils bin/vespa-set-node-state)
diff --git a/client/go/script-utils/main.go b/client/go/script-utils/main.go
index a27e94a76a7..3be527cdf0c 100644
--- a/client/go/script-utils/main.go
+++ b/client/go/script-utils/main.go
@@ -34,7 +34,7 @@ func main() {
 		os.Exit(startcbinary.Run(os.Args[1:]))
 	case "export-env":
 		vespa.ExportDefaultEnvToSh()
-	case "security-env":
+	case "security-env", "vespa-security-env":
 		vespa.ExportSecurityEnvToSh()
 	case "ipv6-only":
 		if vespa.HasOnlyIpV6() {
diff --git a/security-tools/CMakeLists.txt b/security-tools/CMakeLists.txt
index 8341f57b9cc..cc85473f758 100644
--- a/security-tools/CMakeLists.txt
+++ b/security-tools/CMakeLists.txt
@@ -1,6 +1,4 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 install_jar(security-tools-jar-with-dependencies.jar)
 
-vespa_install_script(src/main/sh/vespa-security-env vespa-security-env bin)
 vespa_install_script(src/main/sh/vespa-curl-wrapper vespa-curl-wrapper libexec/vespa)
-
diff --git a/security-tools/README.md b/security-tools/README.md
index 3dc33c7a86c..a5267e88fc2 100644
--- a/security-tools/README.md
+++ b/security-tools/README.md
@@ -1,4 +1,2 @@
 <!-- Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 # security-tools
-
-Contains the "vespa-security-env" command line tool for Vespa.
diff --git a/security-tools/src/main/sh/vespa-security-env b/security-tools/src/main/sh/vespa-security-env
deleted file mode 100755
index b8f972653d6..00000000000
--- a/security-tools/src/main/sh/vespa-security-env
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/usr/bin/env bash
-# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-# BEGIN environment bootstrap section
-# Do not edit between here and END as this section should stay identical in all scripts
-
-findpath () {
-    myname=${0}
-    mypath=${myname%/*}
-    myname=${myname##*/}
-    empty_if_start_slash=${mypath%%/*}
-    if [ "${empty_if_start_slash}" ]; then
-        mypath=$(pwd)/${mypath}
-    fi
-    if [ "$mypath" ] && [ -d "$mypath" ]; then
-        return
-    fi
-    mypath=$(pwd)
-    if [ -f "${mypath}/${myname}" ]; then
-        return
-    fi
-    echo "FATAL: Could not figure out the path where $myname lives from $0"
-    exit 1
-}
-
-COMMON_ENV=libexec/vespa/common-env.sh
-
-source_common_env () {
-    if [ "$VESPA_HOME" ] && [ -d "$VESPA_HOME" ]; then
-        export VESPA_HOME
-        common_env=$VESPA_HOME/$COMMON_ENV
-        if [ -f "$common_env" ]; then
-            . $common_env
-            return
-        fi
-    fi
-    return 1
-}
-
-findroot () {
-    source_common_env && return
-    if [ "$VESPA_HOME" ]; then
-        echo "FATAL: bad VESPA_HOME value '$VESPA_HOME'"
-        exit 1
-    fi
-    if [ "$ROOT" ] && [ -d "$ROOT" ]; then
-        VESPA_HOME="$ROOT"
-        source_common_env && return
-    fi
-    findpath
-    while [ "$mypath" ]; do
-        VESPA_HOME=${mypath}
-        source_common_env && return
-        mypath=${mypath%/*}
-    done
-    echo "FATAL: missing VESPA_HOME environment variable"
-    echo "Could not locate $COMMON_ENV anywhere"
-    exit 1
-}
-
-findhost () {
-    if [ "${VESPA_HOSTNAME}" = "" ]; then
-        VESPA_HOSTNAME=$(vespa-detect-hostname || hostname -f || hostname || echo "localhost") || exit 1
-    fi
-    validate="${VESPA_HOME}/bin/vespa-validate-hostname"
-    if [ -f "$validate" ]; then
-        "$validate" "${VESPA_HOSTNAME}" || exit 1
-    fi
-    export VESPA_HOSTNAME
-}
-
-findroot
-findhost
-
-ROOT=${VESPA_HOME%/}
-export ROOT
-
-# END environment bootstrap section
-
-exec java -Djava.awt.headless=true -cp ${VESPA_HOME}/lib/jars/security-tools-jar-with-dependencies.jar com.yahoo.vespa.security.tool.securityenv.Main "$@"
-