diff options
author | Martin Polden <mpolden@mpolden.no> | 2023-02-03 15:45:56 +0100 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2023-02-06 10:00:32 +0100 |
commit | 519daa77057387c60a015340b871a62c65fb04ac (patch) | |
tree | 45bbb727745d04598a19d5f87f6b80a9878e4df3 /client | |
parent | 043e07eafa1c70f7bf92ad192b87680d1a1f130d (diff) |
Rename script-utils -> vespa-wrapper
Diffstat (limited to 'client')
-rw-r--r-- | client/CMakeLists.txt | 60 | ||||
-rw-r--r-- | client/go/internal/admin/vespa-wrapper/configserver/check.go (renamed from client/go/internal/admin/script-utils/configserver/check.go) | 0 | ||||
-rw-r--r-- | client/go/internal/admin/vespa-wrapper/configserver/env.go (renamed from client/go/internal/admin/script-utils/configserver/env.go) | 0 | ||||
-rw-r--r-- | client/go/internal/admin/vespa-wrapper/configserver/fix_dirs_and_files.go (renamed from client/go/internal/admin/script-utils/configserver/fix_dirs_and_files.go) | 0 | ||||
-rw-r--r-- | client/go/internal/admin/vespa-wrapper/configserver/logd.go (renamed from client/go/internal/admin/script-utils/configserver/logd.go) | 0 | ||||
-rw-r--r-- | client/go/internal/admin/vespa-wrapper/configserver/runserver.go (renamed from client/go/internal/admin/script-utils/configserver/runserver.go) | 0 | ||||
-rw-r--r-- | client/go/internal/admin/vespa-wrapper/configserver/start.go (renamed from client/go/internal/admin/script-utils/configserver/start.go) | 2 | ||||
-rw-r--r-- | client/go/internal/admin/vespa-wrapper/configserver/zk.go (renamed from client/go/internal/admin/script-utils/configserver/zk.go) | 0 | ||||
-rw-r--r-- | client/go/internal/admin/vespa-wrapper/logfmt/cmd.go (renamed from client/go/internal/admin/script-utils/logfmt/cmd.go) | 0 | ||||
-rw-r--r-- | client/go/internal/admin/vespa-wrapper/logfmt/formatflags.go (renamed from client/go/internal/admin/script-utils/logfmt/formatflags.go) | 0 | ||||
-rw-r--r-- | client/go/internal/admin/vespa-wrapper/logfmt/formatflags_test.go (renamed from client/go/internal/admin/script-utils/logfmt/formatflags_test.go) | 0 | ||||
-rw-r--r-- | client/go/internal/admin/vespa-wrapper/logfmt/handleline.go (renamed from client/go/internal/admin/script-utils/logfmt/handleline.go) | 0 | ||||
-rw-r--r-- | client/go/internal/admin/vespa-wrapper/logfmt/internal.go (renamed from client/go/internal/admin/script-utils/logfmt/internal.go) | 0 | ||||
-rw-r--r-- | client/go/internal/admin/vespa-wrapper/logfmt/internal_names.txt (renamed from client/go/internal/admin/script-utils/logfmt/internal_names.txt) | 0 | ||||
-rw-r--r-- | client/go/internal/admin/vespa-wrapper/logfmt/internal_notnames.txt (renamed from client/go/internal/admin/script-utils/logfmt/internal_notnames.txt) | 0 | ||||
-rw-r--r-- | client/go/internal/admin/vespa-wrapper/logfmt/internal_test.go (renamed from client/go/internal/admin/script-utils/logfmt/internal_test.go) | 0 | ||||
-rw-r--r-- | client/go/internal/admin/vespa-wrapper/logfmt/levelflags.go (renamed from client/go/internal/admin/script-utils/logfmt/levelflags.go) | 0 | ||||
-rw-r--r-- | client/go/internal/admin/vespa-wrapper/logfmt/levelflags_test.go (renamed from client/go/internal/admin/script-utils/logfmt/levelflags_test.go) | 0 | ||||
-rw-r--r-- | client/go/internal/admin/vespa-wrapper/logfmt/options.go (renamed from client/go/internal/admin/script-utils/logfmt/options.go) | 0 | ||||
-rw-r--r-- | client/go/internal/admin/vespa-wrapper/logfmt/plusminusflag.go (renamed from client/go/internal/admin/script-utils/logfmt/plusminusflag.go) | 0 | ||||
-rw-r--r-- | client/go/internal/admin/vespa-wrapper/logfmt/regexflag.go (renamed from client/go/internal/admin/script-utils/logfmt/regexflag.go) | 0 | ||||
-rw-r--r-- | client/go/internal/admin/vespa-wrapper/logfmt/regexflag_test.go (renamed from client/go/internal/admin/script-utils/logfmt/regexflag_test.go) | 0 | ||||
-rw-r--r-- | client/go/internal/admin/vespa-wrapper/logfmt/runlogfmt.go (renamed from client/go/internal/admin/script-utils/logfmt/runlogfmt.go) | 0 | ||||
-rw-r--r-- | client/go/internal/admin/vespa-wrapper/logfmt/showflags.go (renamed from client/go/internal/admin/script-utils/logfmt/showflags.go) | 0 | ||||
-rw-r--r-- | client/go/internal/admin/vespa-wrapper/logfmt/showflags_test.go (renamed from client/go/internal/admin/script-utils/logfmt/showflags_test.go) | 0 | ||||
-rw-r--r-- | client/go/internal/admin/vespa-wrapper/logfmt/tail.go (renamed from client/go/internal/admin/script-utils/logfmt/tail.go) | 0 | ||||
-rw-r--r-- | client/go/internal/admin/vespa-wrapper/logfmt/tail_not_unix.go (renamed from client/go/internal/admin/script-utils/logfmt/tail_not_unix.go) | 0 | ||||
-rw-r--r-- | client/go/internal/admin/vespa-wrapper/logfmt/tail_unix.go (renamed from client/go/internal/admin/script-utils/logfmt/tail_unix.go) | 0 | ||||
-rw-r--r-- | client/go/internal/admin/vespa-wrapper/main.go (renamed from client/go/internal/admin/script-utils/main.go) | 13 | ||||
-rw-r--r-- | client/go/internal/admin/vespa-wrapper/services/configproxy.go (renamed from client/go/internal/admin/script-utils/services/configproxy.go) | 2 | ||||
-rw-r--r-- | client/go/internal/admin/vespa-wrapper/services/env.go (renamed from client/go/internal/admin/script-utils/services/env.go) | 0 | ||||
-rw-r--r-- | client/go/internal/admin/vespa-wrapper/services/prechecks.go (renamed from client/go/internal/admin/script-utils/services/prechecks.go) | 0 | ||||
-rw-r--r-- | client/go/internal/admin/vespa-wrapper/services/sentinel.go (renamed from client/go/internal/admin/script-utils/services/sentinel.go) | 0 | ||||
-rw-r--r-- | client/go/internal/admin/vespa-wrapper/services/start.go (renamed from client/go/internal/admin/script-utils/services/start.go) | 0 | ||||
-rw-r--r-- | client/go/internal/admin/vespa-wrapper/services/stop.go (renamed from client/go/internal/admin/script-utils/services/stop.go) | 0 | ||||
-rw-r--r-- | client/go/internal/admin/vespa-wrapper/services/tuning.go (renamed from client/go/internal/admin/script-utils/services/tuning.go) | 0 | ||||
-rw-r--r-- | client/go/internal/admin/vespa-wrapper/standalone/start.go (renamed from client/go/internal/admin/script-utils/standalone/start.go) | 0 | ||||
-rw-r--r-- | client/go/internal/admin/vespa-wrapper/startcbinary/cmd.go (renamed from client/go/internal/admin/script-utils/startcbinary/cmd.go) | 0 | ||||
-rw-r--r-- | client/go/internal/admin/vespa-wrapper/startcbinary/common_env.go (renamed from client/go/internal/admin/script-utils/startcbinary/common_env.go) | 0 | ||||
-rwxr-xr-x | client/go/internal/admin/vespa-wrapper/startcbinary/mockbin/bad-numactl (renamed from client/go/internal/admin/script-utils/startcbinary/mockbin/bad-numactl) | 0 | ||||
-rwxr-xr-x | client/go/internal/admin/vespa-wrapper/startcbinary/mockbin/good-numactl (renamed from client/go/internal/admin/script-utils/startcbinary/mockbin/good-numactl) | 0 | ||||
-rwxr-xr-x | client/go/internal/admin/vespa-wrapper/startcbinary/mockbin/has-valgrind (renamed from client/go/internal/admin/script-utils/startcbinary/mockbin/has-valgrind) | 0 | ||||
-rwxr-xr-x | client/go/internal/admin/vespa-wrapper/startcbinary/mockbin/no-numactl (renamed from client/go/internal/admin/script-utils/startcbinary/mockbin/no-numactl) | 0 | ||||
-rwxr-xr-x | client/go/internal/admin/vespa-wrapper/startcbinary/mockbin/no-valgrind (renamed from client/go/internal/admin/script-utils/startcbinary/mockbin/no-valgrind) | 0 | ||||
-rw-r--r-- | client/go/internal/admin/vespa-wrapper/startcbinary/numactl.go (renamed from client/go/internal/admin/script-utils/startcbinary/numactl.go) | 0 | ||||
-rw-r--r-- | client/go/internal/admin/vespa-wrapper/startcbinary/numactl_test.go (renamed from client/go/internal/admin/script-utils/startcbinary/numactl_test.go) | 0 | ||||
-rw-r--r-- | client/go/internal/admin/vespa-wrapper/startcbinary/progspec.go (renamed from client/go/internal/admin/script-utils/startcbinary/progspec.go) | 0 | ||||
-rw-r--r-- | client/go/internal/admin/vespa-wrapper/startcbinary/progspec_test.go (renamed from client/go/internal/admin/script-utils/startcbinary/progspec_test.go) | 0 | ||||
-rw-r--r-- | client/go/internal/admin/vespa-wrapper/startcbinary/startcbinary.go (renamed from client/go/internal/admin/script-utils/startcbinary/startcbinary.go) | 0 | ||||
-rw-r--r-- | client/go/internal/admin/vespa-wrapper/startcbinary/tuning.go (renamed from client/go/internal/admin/script-utils/startcbinary/tuning.go) | 0 | ||||
-rw-r--r-- | client/go/internal/admin/vespa-wrapper/startcbinary/valgrind.go (renamed from client/go/internal/admin/script-utils/startcbinary/valgrind.go) | 0 | ||||
-rw-r--r-- | client/go/internal/admin/vespa-wrapper/startcbinary/valgrind_test.go (renamed from client/go/internal/admin/script-utils/startcbinary/valgrind_test.go) | 0 | ||||
-rw-r--r-- | client/go/internal/admin/vespa-wrapper/startcbinary/vespamalloc.go (renamed from client/go/internal/admin/script-utils/startcbinary/vespamalloc.go) | 0 | ||||
-rw-r--r-- | client/go/internal/cli/cmd/vespa/main.go | 2 | ||||
-rw-r--r-- | client/go/internal/vespa/find_home.go | 2 | ||||
-rw-r--r-- | client/go/internal/vespa/switch_user.go | 2 |
56 files changed, 42 insertions, 41 deletions
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index a029af876f0..b73f4e153ff 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -4,37 +4,37 @@ set(GODIR ${CMAKE_CURRENT_SOURCE_DIR}/go) file(GLOB_RECURSE GOSRCFILES ${GODIR}/*.go) -add_custom_command(OUTPUT ${GODIR}/bin/vespa ${GODIR}/bin/script-utils +add_custom_command(OUTPUT ${GODIR}/bin/vespa ${GODIR}/bin/vespa-wrapper COMMAND make DEPENDS ${GODIR}/Makefile ${GOSRCFILES} WORKING_DIRECTORY ${GODIR}) -add_custom_target(client_go_binaries ALL DEPENDS ${GODIR}/bin/vespa ${GODIR}/bin/script-utils) - -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) -install_symlink(libexec/vespa/script-utils bin/vespa-start-configserver) -install_symlink(libexec/vespa/script-utils bin/vespa-start-services bin) -install_symlink(libexec/vespa/script-utils bin/vespa-stop-services bin) - -install_symlink(libexec/vespa/script-utils bin/vespa-get-config) -install_symlink(libexec/vespa/script-utils bin/vespa-verify-ranksetup) -install_symlink(libexec/vespa/script-utils bin/vespa-config-status) -install_symlink(libexec/vespa/script-utils bin/vespa-configproxy-cmd) -install_symlink(libexec/vespa/script-utils bin/vespa-doclocator) -install_symlink(libexec/vespa/script-utils bin/vespa-model-inspect) -install_symlink(libexec/vespa/script-utils bin/vespa-proton-cmd) -install_symlink(libexec/vespa/script-utils bin/vespa-rpc-invoke) -install_symlink(libexec/vespa/script-utils bin/vespa-sentinel-cmd) -install_symlink(libexec/vespa/script-utils bin/vespa-route) -install_symlink(libexec/vespa/script-utils bin/vespa-transactionlog-inspect) - -install_symlink(libexec/vespa/script-utils sbin/vespa-distributord) -install_symlink(libexec/vespa/script-utils sbin/vespa-proton) -install_symlink(libexec/vespa/script-utils sbin/vespa-storaged) +add_custom_target(client_go_binaries ALL DEPENDS ${GODIR}/bin/vespa ${GODIR}/bin/vespa-wrapper) + +install(PROGRAMS ${GODIR}/bin/vespa-wrapper DESTINATION libexec/vespa) + +install_symlink(libexec/vespa/vespa-wrapper bin/vespa-logfmt) +install_symlink(libexec/vespa/vespa-wrapper bin/vespa-deploy) +install_symlink(libexec/vespa/vespa-wrapper bin/vespa-security-env) +install_symlink(libexec/vespa/vespa-wrapper bin/vespa-get-cluster-state) +install_symlink(libexec/vespa/vespa-wrapper bin/vespa-get-node-state) +install_symlink(libexec/vespa/vespa-wrapper bin/vespa-set-node-state) +install_symlink(libexec/vespa/vespa-wrapper bin/vespa-start-configserver) +install_symlink(libexec/vespa/vespa-wrapper bin/vespa-start-services bin) +install_symlink(libexec/vespa/vespa-wrapper bin/vespa-stop-services bin) + +install_symlink(libexec/vespa/vespa-wrapper bin/vespa-get-config) +install_symlink(libexec/vespa/vespa-wrapper bin/vespa-verify-ranksetup) +install_symlink(libexec/vespa/vespa-wrapper bin/vespa-config-status) +install_symlink(libexec/vespa/vespa-wrapper bin/vespa-configproxy-cmd) +install_symlink(libexec/vespa/vespa-wrapper bin/vespa-doclocator) +install_symlink(libexec/vespa/vespa-wrapper bin/vespa-model-inspect) +install_symlink(libexec/vespa/vespa-wrapper bin/vespa-proton-cmd) +install_symlink(libexec/vespa/vespa-wrapper bin/vespa-rpc-invoke) +install_symlink(libexec/vespa/vespa-wrapper bin/vespa-sentinel-cmd) +install_symlink(libexec/vespa/vespa-wrapper bin/vespa-route) +install_symlink(libexec/vespa/vespa-wrapper bin/vespa-transactionlog-inspect) + +install_symlink(libexec/vespa/vespa-wrapper sbin/vespa-distributord) +install_symlink(libexec/vespa/vespa-wrapper sbin/vespa-proton) +install_symlink(libexec/vespa/vespa-wrapper sbin/vespa-storaged) diff --git a/client/go/internal/admin/script-utils/configserver/check.go b/client/go/internal/admin/vespa-wrapper/configserver/check.go index a0248dd128f..a0248dd128f 100644 --- a/client/go/internal/admin/script-utils/configserver/check.go +++ b/client/go/internal/admin/vespa-wrapper/configserver/check.go diff --git a/client/go/internal/admin/script-utils/configserver/env.go b/client/go/internal/admin/vespa-wrapper/configserver/env.go index 1c4c33f5628..1c4c33f5628 100644 --- a/client/go/internal/admin/script-utils/configserver/env.go +++ b/client/go/internal/admin/vespa-wrapper/configserver/env.go diff --git a/client/go/internal/admin/script-utils/configserver/fix_dirs_and_files.go b/client/go/internal/admin/vespa-wrapper/configserver/fix_dirs_and_files.go index 8410d3f657c..8410d3f657c 100644 --- a/client/go/internal/admin/script-utils/configserver/fix_dirs_and_files.go +++ b/client/go/internal/admin/vespa-wrapper/configserver/fix_dirs_and_files.go diff --git a/client/go/internal/admin/script-utils/configserver/logd.go b/client/go/internal/admin/vespa-wrapper/configserver/logd.go index 39a2100b20f..39a2100b20f 100644 --- a/client/go/internal/admin/script-utils/configserver/logd.go +++ b/client/go/internal/admin/vespa-wrapper/configserver/logd.go diff --git a/client/go/internal/admin/script-utils/configserver/runserver.go b/client/go/internal/admin/vespa-wrapper/configserver/runserver.go index bef50009d8d..bef50009d8d 100644 --- a/client/go/internal/admin/script-utils/configserver/runserver.go +++ b/client/go/internal/admin/vespa-wrapper/configserver/runserver.go diff --git a/client/go/internal/admin/script-utils/configserver/start.go b/client/go/internal/admin/vespa-wrapper/configserver/start.go index 8ea3e9603a2..e2ea6a11357 100644 --- a/client/go/internal/admin/script-utils/configserver/start.go +++ b/client/go/internal/admin/vespa-wrapper/configserver/start.go @@ -69,7 +69,7 @@ func runConfigserverWithRunserver() int { ServiceName: SERVICE_NAME, Args: []string{"just-start-configserver"}, } - rs.Exec("libexec/vespa/script-utils") + rs.Exec("libexec/vespa/vespa-wrapper") return 1 } diff --git a/client/go/internal/admin/script-utils/configserver/zk.go b/client/go/internal/admin/vespa-wrapper/configserver/zk.go index 91ddf522848..91ddf522848 100644 --- a/client/go/internal/admin/script-utils/configserver/zk.go +++ b/client/go/internal/admin/vespa-wrapper/configserver/zk.go diff --git a/client/go/internal/admin/script-utils/logfmt/cmd.go b/client/go/internal/admin/vespa-wrapper/logfmt/cmd.go index a8675c37356..a8675c37356 100644 --- a/client/go/internal/admin/script-utils/logfmt/cmd.go +++ b/client/go/internal/admin/vespa-wrapper/logfmt/cmd.go diff --git a/client/go/internal/admin/script-utils/logfmt/formatflags.go b/client/go/internal/admin/vespa-wrapper/logfmt/formatflags.go index 097746d696f..097746d696f 100644 --- a/client/go/internal/admin/script-utils/logfmt/formatflags.go +++ b/client/go/internal/admin/vespa-wrapper/logfmt/formatflags.go diff --git a/client/go/internal/admin/script-utils/logfmt/formatflags_test.go b/client/go/internal/admin/vespa-wrapper/logfmt/formatflags_test.go index 53c47d24208..53c47d24208 100644 --- a/client/go/internal/admin/script-utils/logfmt/formatflags_test.go +++ b/client/go/internal/admin/vespa-wrapper/logfmt/formatflags_test.go diff --git a/client/go/internal/admin/script-utils/logfmt/handleline.go b/client/go/internal/admin/vespa-wrapper/logfmt/handleline.go index 813ca82acb4..813ca82acb4 100644 --- a/client/go/internal/admin/script-utils/logfmt/handleline.go +++ b/client/go/internal/admin/vespa-wrapper/logfmt/handleline.go diff --git a/client/go/internal/admin/script-utils/logfmt/internal.go b/client/go/internal/admin/vespa-wrapper/logfmt/internal.go index 992c537f939..992c537f939 100644 --- a/client/go/internal/admin/script-utils/logfmt/internal.go +++ b/client/go/internal/admin/vespa-wrapper/logfmt/internal.go diff --git a/client/go/internal/admin/script-utils/logfmt/internal_names.txt b/client/go/internal/admin/vespa-wrapper/logfmt/internal_names.txt index cc554546fcc..cc554546fcc 100644 --- a/client/go/internal/admin/script-utils/logfmt/internal_names.txt +++ b/client/go/internal/admin/vespa-wrapper/logfmt/internal_names.txt diff --git a/client/go/internal/admin/script-utils/logfmt/internal_notnames.txt b/client/go/internal/admin/vespa-wrapper/logfmt/internal_notnames.txt index 49543758ac3..49543758ac3 100644 --- a/client/go/internal/admin/script-utils/logfmt/internal_notnames.txt +++ b/client/go/internal/admin/vespa-wrapper/logfmt/internal_notnames.txt diff --git a/client/go/internal/admin/script-utils/logfmt/internal_test.go b/client/go/internal/admin/vespa-wrapper/logfmt/internal_test.go index 9b6b0f8404c..9b6b0f8404c 100644 --- a/client/go/internal/admin/script-utils/logfmt/internal_test.go +++ b/client/go/internal/admin/vespa-wrapper/logfmt/internal_test.go diff --git a/client/go/internal/admin/script-utils/logfmt/levelflags.go b/client/go/internal/admin/vespa-wrapper/logfmt/levelflags.go index 4e6c1284753..4e6c1284753 100644 --- a/client/go/internal/admin/script-utils/logfmt/levelflags.go +++ b/client/go/internal/admin/vespa-wrapper/logfmt/levelflags.go diff --git a/client/go/internal/admin/script-utils/logfmt/levelflags_test.go b/client/go/internal/admin/vespa-wrapper/logfmt/levelflags_test.go index 186ea2d96b0..186ea2d96b0 100644 --- a/client/go/internal/admin/script-utils/logfmt/levelflags_test.go +++ b/client/go/internal/admin/vespa-wrapper/logfmt/levelflags_test.go diff --git a/client/go/internal/admin/script-utils/logfmt/options.go b/client/go/internal/admin/vespa-wrapper/logfmt/options.go index 864868d4ce5..864868d4ce5 100644 --- a/client/go/internal/admin/script-utils/logfmt/options.go +++ b/client/go/internal/admin/vespa-wrapper/logfmt/options.go diff --git a/client/go/internal/admin/script-utils/logfmt/plusminusflag.go b/client/go/internal/admin/vespa-wrapper/logfmt/plusminusflag.go index 1768cf0e7be..1768cf0e7be 100644 --- a/client/go/internal/admin/script-utils/logfmt/plusminusflag.go +++ b/client/go/internal/admin/vespa-wrapper/logfmt/plusminusflag.go diff --git a/client/go/internal/admin/script-utils/logfmt/regexflag.go b/client/go/internal/admin/vespa-wrapper/logfmt/regexflag.go index 8f7d2a91373..8f7d2a91373 100644 --- a/client/go/internal/admin/script-utils/logfmt/regexflag.go +++ b/client/go/internal/admin/vespa-wrapper/logfmt/regexflag.go diff --git a/client/go/internal/admin/script-utils/logfmt/regexflag_test.go b/client/go/internal/admin/vespa-wrapper/logfmt/regexflag_test.go index 489439863a2..489439863a2 100644 --- a/client/go/internal/admin/script-utils/logfmt/regexflag_test.go +++ b/client/go/internal/admin/vespa-wrapper/logfmt/regexflag_test.go diff --git a/client/go/internal/admin/script-utils/logfmt/runlogfmt.go b/client/go/internal/admin/vespa-wrapper/logfmt/runlogfmt.go index 6557461598e..6557461598e 100644 --- a/client/go/internal/admin/script-utils/logfmt/runlogfmt.go +++ b/client/go/internal/admin/vespa-wrapper/logfmt/runlogfmt.go diff --git a/client/go/internal/admin/script-utils/logfmt/showflags.go b/client/go/internal/admin/vespa-wrapper/logfmt/showflags.go index b69860e0312..b69860e0312 100644 --- a/client/go/internal/admin/script-utils/logfmt/showflags.go +++ b/client/go/internal/admin/vespa-wrapper/logfmt/showflags.go diff --git a/client/go/internal/admin/script-utils/logfmt/showflags_test.go b/client/go/internal/admin/vespa-wrapper/logfmt/showflags_test.go index d1b66118afd..d1b66118afd 100644 --- a/client/go/internal/admin/script-utils/logfmt/showflags_test.go +++ b/client/go/internal/admin/vespa-wrapper/logfmt/showflags_test.go diff --git a/client/go/internal/admin/script-utils/logfmt/tail.go b/client/go/internal/admin/vespa-wrapper/logfmt/tail.go index 75e7cbb0693..75e7cbb0693 100644 --- a/client/go/internal/admin/script-utils/logfmt/tail.go +++ b/client/go/internal/admin/vespa-wrapper/logfmt/tail.go diff --git a/client/go/internal/admin/script-utils/logfmt/tail_not_unix.go b/client/go/internal/admin/vespa-wrapper/logfmt/tail_not_unix.go index 7030572575d..7030572575d 100644 --- a/client/go/internal/admin/script-utils/logfmt/tail_not_unix.go +++ b/client/go/internal/admin/vespa-wrapper/logfmt/tail_not_unix.go diff --git a/client/go/internal/admin/script-utils/logfmt/tail_unix.go b/client/go/internal/admin/vespa-wrapper/logfmt/tail_unix.go index 7703844da48..7703844da48 100644 --- a/client/go/internal/admin/script-utils/logfmt/tail_unix.go +++ b/client/go/internal/admin/vespa-wrapper/logfmt/tail_unix.go diff --git a/client/go/internal/admin/script-utils/main.go b/client/go/internal/admin/vespa-wrapper/main.go index 78948908a64..eed8ac5b57b 100644 --- a/client/go/internal/admin/script-utils/main.go +++ b/client/go/internal/admin/vespa-wrapper/main.go @@ -1,4 +1,5 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Entrypoint for internal Vespa commands: vespa-logfmt, vespa-deploy etc. // Author: arnej package main @@ -11,11 +12,11 @@ import ( "github.com/vespa-engine/vespa/client/go/internal/admin/clusterstate" "github.com/vespa-engine/vespa/client/go/internal/admin/deploy" "github.com/vespa-engine/vespa/client/go/internal/admin/jvm" - "github.com/vespa-engine/vespa/client/go/internal/admin/script-utils/configserver" - "github.com/vespa-engine/vespa/client/go/internal/admin/script-utils/logfmt" - "github.com/vespa-engine/vespa/client/go/internal/admin/script-utils/services" - "github.com/vespa-engine/vespa/client/go/internal/admin/script-utils/standalone" - "github.com/vespa-engine/vespa/client/go/internal/admin/script-utils/startcbinary" + "github.com/vespa-engine/vespa/client/go/internal/admin/vespa-wrapper/configserver" + "github.com/vespa-engine/vespa/client/go/internal/admin/vespa-wrapper/logfmt" + "github.com/vespa-engine/vespa/client/go/internal/admin/vespa-wrapper/services" + "github.com/vespa-engine/vespa/client/go/internal/admin/vespa-wrapper/standalone" + "github.com/vespa-engine/vespa/client/go/internal/admin/vespa-wrapper/startcbinary" "github.com/vespa-engine/vespa/client/go/internal/util" "github.com/vespa-engine/vespa/client/go/internal/vespa" ) @@ -29,7 +30,7 @@ func main() { defer handleSimplePanic() _ = vespa.FindAndVerifyVespaHome() action := basename(os.Args[0]) - if action == "script-utils" && len(os.Args) > 1 { + if action == "vespa-wrapper" && len(os.Args) > 1 { action = os.Args[1] os.Args = os.Args[1:] } diff --git a/client/go/internal/admin/script-utils/services/configproxy.go b/client/go/internal/admin/vespa-wrapper/services/configproxy.go index 877de387efd..9807d8d4591 100644 --- a/client/go/internal/admin/script-utils/services/configproxy.go +++ b/client/go/internal/admin/vespa-wrapper/services/configproxy.go @@ -52,7 +52,7 @@ func startProxyWithRunserver() { "-s", PROXY_SERVICE_NAME, "-p", CONFIGPROXY_PIDFILE, "--", - "libexec/vespa/script-utils", "just-run-configproxy", + "libexec/vespa/vespa-wrapper", "just-run-configproxy", } cmd := exec.Command("vespa-runserver", args...) cmd.Stdin = nil diff --git a/client/go/internal/admin/script-utils/services/env.go b/client/go/internal/admin/vespa-wrapper/services/env.go index 65dd583b766..65dd583b766 100644 --- a/client/go/internal/admin/script-utils/services/env.go +++ b/client/go/internal/admin/vespa-wrapper/services/env.go diff --git a/client/go/internal/admin/script-utils/services/prechecks.go b/client/go/internal/admin/vespa-wrapper/services/prechecks.go index 690447a9fee..690447a9fee 100644 --- a/client/go/internal/admin/script-utils/services/prechecks.go +++ b/client/go/internal/admin/vespa-wrapper/services/prechecks.go diff --git a/client/go/internal/admin/script-utils/services/sentinel.go b/client/go/internal/admin/vespa-wrapper/services/sentinel.go index 1017924263b..1017924263b 100644 --- a/client/go/internal/admin/script-utils/services/sentinel.go +++ b/client/go/internal/admin/vespa-wrapper/services/sentinel.go diff --git a/client/go/internal/admin/script-utils/services/start.go b/client/go/internal/admin/vespa-wrapper/services/start.go index f47d99714f1..f47d99714f1 100644 --- a/client/go/internal/admin/script-utils/services/start.go +++ b/client/go/internal/admin/vespa-wrapper/services/start.go diff --git a/client/go/internal/admin/script-utils/services/stop.go b/client/go/internal/admin/vespa-wrapper/services/stop.go index f5b764d122e..f5b764d122e 100644 --- a/client/go/internal/admin/script-utils/services/stop.go +++ b/client/go/internal/admin/vespa-wrapper/services/stop.go diff --git a/client/go/internal/admin/script-utils/services/tuning.go b/client/go/internal/admin/vespa-wrapper/services/tuning.go index f922495812f..f922495812f 100644 --- a/client/go/internal/admin/script-utils/services/tuning.go +++ b/client/go/internal/admin/vespa-wrapper/services/tuning.go diff --git a/client/go/internal/admin/script-utils/standalone/start.go b/client/go/internal/admin/vespa-wrapper/standalone/start.go index a26ac8e9d8c..a26ac8e9d8c 100644 --- a/client/go/internal/admin/script-utils/standalone/start.go +++ b/client/go/internal/admin/vespa-wrapper/standalone/start.go diff --git a/client/go/internal/admin/script-utils/startcbinary/cmd.go b/client/go/internal/admin/vespa-wrapper/startcbinary/cmd.go index 9580a9240bb..9580a9240bb 100644 --- a/client/go/internal/admin/script-utils/startcbinary/cmd.go +++ b/client/go/internal/admin/vespa-wrapper/startcbinary/cmd.go diff --git a/client/go/internal/admin/script-utils/startcbinary/common_env.go b/client/go/internal/admin/vespa-wrapper/startcbinary/common_env.go index 6bc730b5119..6bc730b5119 100644 --- a/client/go/internal/admin/script-utils/startcbinary/common_env.go +++ b/client/go/internal/admin/vespa-wrapper/startcbinary/common_env.go diff --git a/client/go/internal/admin/script-utils/startcbinary/mockbin/bad-numactl b/client/go/internal/admin/vespa-wrapper/startcbinary/mockbin/bad-numactl index 1b08bb19b95..1b08bb19b95 100755 --- a/client/go/internal/admin/script-utils/startcbinary/mockbin/bad-numactl +++ b/client/go/internal/admin/vespa-wrapper/startcbinary/mockbin/bad-numactl diff --git a/client/go/internal/admin/script-utils/startcbinary/mockbin/good-numactl b/client/go/internal/admin/vespa-wrapper/startcbinary/mockbin/good-numactl index f861809b382..f861809b382 100755 --- a/client/go/internal/admin/script-utils/startcbinary/mockbin/good-numactl +++ b/client/go/internal/admin/vespa-wrapper/startcbinary/mockbin/good-numactl diff --git a/client/go/internal/admin/script-utils/startcbinary/mockbin/has-valgrind b/client/go/internal/admin/vespa-wrapper/startcbinary/mockbin/has-valgrind index 8716209928e..8716209928e 100755 --- a/client/go/internal/admin/script-utils/startcbinary/mockbin/has-valgrind +++ b/client/go/internal/admin/vespa-wrapper/startcbinary/mockbin/has-valgrind diff --git a/client/go/internal/admin/script-utils/startcbinary/mockbin/no-numactl b/client/go/internal/admin/vespa-wrapper/startcbinary/mockbin/no-numactl index dfe583abaca..dfe583abaca 100755 --- a/client/go/internal/admin/script-utils/startcbinary/mockbin/no-numactl +++ b/client/go/internal/admin/vespa-wrapper/startcbinary/mockbin/no-numactl diff --git a/client/go/internal/admin/script-utils/startcbinary/mockbin/no-valgrind b/client/go/internal/admin/vespa-wrapper/startcbinary/mockbin/no-valgrind index 7a74e29b84b..7a74e29b84b 100755 --- a/client/go/internal/admin/script-utils/startcbinary/mockbin/no-valgrind +++ b/client/go/internal/admin/vespa-wrapper/startcbinary/mockbin/no-valgrind diff --git a/client/go/internal/admin/script-utils/startcbinary/numactl.go b/client/go/internal/admin/vespa-wrapper/startcbinary/numactl.go index fe091dedba9..fe091dedba9 100644 --- a/client/go/internal/admin/script-utils/startcbinary/numactl.go +++ b/client/go/internal/admin/vespa-wrapper/startcbinary/numactl.go diff --git a/client/go/internal/admin/script-utils/startcbinary/numactl_test.go b/client/go/internal/admin/vespa-wrapper/startcbinary/numactl_test.go index 65f52be988e..65f52be988e 100644 --- a/client/go/internal/admin/script-utils/startcbinary/numactl_test.go +++ b/client/go/internal/admin/vespa-wrapper/startcbinary/numactl_test.go diff --git a/client/go/internal/admin/script-utils/startcbinary/progspec.go b/client/go/internal/admin/vespa-wrapper/startcbinary/progspec.go index 9975f6c3c90..9975f6c3c90 100644 --- a/client/go/internal/admin/script-utils/startcbinary/progspec.go +++ b/client/go/internal/admin/vespa-wrapper/startcbinary/progspec.go diff --git a/client/go/internal/admin/script-utils/startcbinary/progspec_test.go b/client/go/internal/admin/vespa-wrapper/startcbinary/progspec_test.go index be113e4e350..be113e4e350 100644 --- a/client/go/internal/admin/script-utils/startcbinary/progspec_test.go +++ b/client/go/internal/admin/vespa-wrapper/startcbinary/progspec_test.go diff --git a/client/go/internal/admin/script-utils/startcbinary/startcbinary.go b/client/go/internal/admin/vespa-wrapper/startcbinary/startcbinary.go index f5e58e59808..f5e58e59808 100644 --- a/client/go/internal/admin/script-utils/startcbinary/startcbinary.go +++ b/client/go/internal/admin/vespa-wrapper/startcbinary/startcbinary.go diff --git a/client/go/internal/admin/script-utils/startcbinary/tuning.go b/client/go/internal/admin/vespa-wrapper/startcbinary/tuning.go index 57230629d7a..57230629d7a 100644 --- a/client/go/internal/admin/script-utils/startcbinary/tuning.go +++ b/client/go/internal/admin/vespa-wrapper/startcbinary/tuning.go diff --git a/client/go/internal/admin/script-utils/startcbinary/valgrind.go b/client/go/internal/admin/vespa-wrapper/startcbinary/valgrind.go index 43a1ed602bd..43a1ed602bd 100644 --- a/client/go/internal/admin/script-utils/startcbinary/valgrind.go +++ b/client/go/internal/admin/vespa-wrapper/startcbinary/valgrind.go diff --git a/client/go/internal/admin/script-utils/startcbinary/valgrind_test.go b/client/go/internal/admin/vespa-wrapper/startcbinary/valgrind_test.go index 48cc78474ed..48cc78474ed 100644 --- a/client/go/internal/admin/script-utils/startcbinary/valgrind_test.go +++ b/client/go/internal/admin/vespa-wrapper/startcbinary/valgrind_test.go diff --git a/client/go/internal/admin/script-utils/startcbinary/vespamalloc.go b/client/go/internal/admin/vespa-wrapper/startcbinary/vespamalloc.go index c6d53e1d03c..c6d53e1d03c 100644 --- a/client/go/internal/admin/script-utils/startcbinary/vespamalloc.go +++ b/client/go/internal/admin/vespa-wrapper/startcbinary/vespamalloc.go diff --git a/client/go/internal/cli/cmd/vespa/main.go b/client/go/internal/cli/cmd/vespa/main.go index cca35ba8368..ade27680230 100644 --- a/client/go/internal/cli/cmd/vespa/main.go +++ b/client/go/internal/cli/cmd/vespa/main.go @@ -1,5 +1,5 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -// Cobra commands main file +// Entrypoint for Vespa CLI // Author: bratseth package main diff --git a/client/go/internal/vespa/find_home.go b/client/go/internal/vespa/find_home.go index 672d3d18724..89b5f5a7e21 100644 --- a/client/go/internal/vespa/find_home.go +++ b/client/go/internal/vespa/find_home.go @@ -16,7 +16,7 @@ import ( const ( defaultVespaInstallDir = "/opt/vespa" - scriptUtilsFilename = "libexec/vespa/script-utils" + scriptUtilsFilename = "libexec/vespa/vespa-wrapper" ) func FindHome() string { diff --git a/client/go/internal/vespa/switch_user.go b/client/go/internal/vespa/switch_user.go index 01e8794953d..ccfe7c4e7c3 100644 --- a/client/go/internal/vespa/switch_user.go +++ b/client/go/internal/vespa/switch_user.go @@ -58,7 +58,7 @@ func CheckCorrectUser() { util.JustExitMsg("running as wrong user. Check your VESPA_USER setting") } -// re-execute a script-utils action after switching to the vespa user +// re-execute a vespa-wrapper action after switching to the vespa user // (used by vespa-start-configserver and vespa-start-services) func MaybeSwitchUser(action string) error { const SU_PROG = "vespa-run-as-vespa-user" |