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

…-env

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

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)

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() {

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)
-

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.