diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-09-07 23:46:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-07 23:46:02 +0200 |
| commit | 26b723b14c3a5abb6bd023cbd4cbcfa276f0566a (patch) | |
| tree | ab011c6af08d0a03a8e33a7e8ff286c7b02f8dea | |
| parent | ceb337dea57c909ac83bc168e1b79872eae6dbfe (diff) | |
Revert "switch to script-utils for security-env"
| -rw-r--r-- | client/go/script-utils/main.go | 5 | ||||
| -rwxr-xr-x | security-tools/src/main/sh/vespa-curl-wrapper | 4 | ||||
| -rwxr-xr-x | vespaclient/src/sh/vespa-get-cluster-state | 2 | ||||
| -rwxr-xr-x | vespaclient/src/sh/vespa-get-node-state | 2 | ||||
| -rwxr-xr-x | vespaclient/src/sh/vespa-set-node-state | 2 |
5 files changed, 6 insertions, 9 deletions
diff --git a/client/go/script-utils/main.go b/client/go/script-utils/main.go index 52f52356c69..7ab16a6f831 100644 --- a/client/go/script-utils/main.go +++ b/client/go/script-utils/main.go @@ -27,8 +27,6 @@ func main() { switch action { case "export-env": vespa.ExportDefaultEnvToSh() - case "security-env": - vespa.ExportSecurityEnvToSh() case "ipv6-only": if vespa.HasOnlyIpV6() { os.Exit(0) @@ -45,7 +43,6 @@ func main() { cobra.Execute() default: fmt.Fprintf(os.Stderr, "unknown action '%s'\n", action) - fmt.Fprintln(os.Stderr, "actions: export-env, ipv6-only, security-env") - fmt.Fprintln(os.Stderr, "(also: vespa-deploy, vespa-logfmt)") + fmt.Fprintln(os.Stderr, "actions: export-env, ipv6-only, vespa-deploy, vespa-logfmt") } } diff --git a/security-tools/src/main/sh/vespa-curl-wrapper b/security-tools/src/main/sh/vespa-curl-wrapper index a6327f3be92..359a22bda20 100755 --- a/security-tools/src/main/sh/vespa-curl-wrapper +++ b/security-tools/src/main/sh/vespa-curl-wrapper @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -# Uses security-env to call curl with paths to credentials. +# Uses vespa-security-env to call curl with paths to credentials. # This script should be installed in libexec only. It is not public api. # BEGIN environment bootstrap section @@ -79,7 +79,7 @@ findhost set -e -eval $($VESPA_HOME/libexec/vespa/script-utils security-env) +eval $($VESPA_HOME/bin/vespa-security-env) CURL_PARAMETERS=("$@") diff --git a/vespaclient/src/sh/vespa-get-cluster-state b/vespaclient/src/sh/vespa-get-cluster-state index d6e451853de..106254c6e3a 100755 --- a/vespaclient/src/sh/vespa-get-cluster-state +++ b/vespaclient/src/sh/vespa-get-cluster-state @@ -74,6 +74,6 @@ findhost # END environment bootstrap section -eval $($VESPA_HOME/libexec/vespa/script-utils security-env) +eval $($VESPA_HOME/bin/vespa-security-env) exec $VESPA_HOME/libexec/vespa/GetClusterState.pl "$@" diff --git a/vespaclient/src/sh/vespa-get-node-state b/vespaclient/src/sh/vespa-get-node-state index 4021aecf76c..b2b4bdbc864 100755 --- a/vespaclient/src/sh/vespa-get-node-state +++ b/vespaclient/src/sh/vespa-get-node-state @@ -74,6 +74,6 @@ findhost # END environment bootstrap section -eval $($VESPA_HOME/libexec/vespa/script-utils security-env) +eval $($VESPA_HOME/bin/vespa-security-env) exec $VESPA_HOME/libexec/vespa/GetNodeState.pl "$@" diff --git a/vespaclient/src/sh/vespa-set-node-state b/vespaclient/src/sh/vespa-set-node-state index 0e19f6b0de0..a1e65984deb 100755 --- a/vespaclient/src/sh/vespa-set-node-state +++ b/vespaclient/src/sh/vespa-set-node-state @@ -74,6 +74,6 @@ findhost # END environment bootstrap section -eval $($VESPA_HOME/libexec/vespa/script-utils security-env) +eval $($VESPA_HOME/bin/vespa-security-env) exec $VESPA_HOME/libexec/vespa/SetNodeState.pl "$@" |