diff --git a/Makefile b/Makefile index 12510f6a6763b5046d71b5da19df3b20a3a48ebc..d8e4a949bbc2e92f795b060b89ade979c57141ff 100644 --- a/Makefile +++ b/Makefile @@ -1,19 +1,7 @@ -# ------------------------------------ -# Common variables -# ------------------------------------ -CURRENT_DATE=$(shell eval "date -u +'%Y-%m-%d at %H:%M:%S'") -GIT_COMMIT=$(shell eval "git rev-parse HEAD") -BUILD_FLAGS=-ldflags="-X 'gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/common/buildversion.buildDate=$(CURRENT_DATE)' -X 'gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/common/buildversion.gitCommit=$(GIT_COMMIT)'" -BUILD_DIR=build -BUILD_DIR_ABS=$(PWD)/$(BUILD_DIR) +# Make sure these variables match what's defined in server module's Makefile! +BUILD_DIR=server/build SERVER_BINARY=nexus-server -NEXUSH_BINARY=nexush -NEXUSCLI_BINARY=nexus-cli -GENPWD_BINARY=genpwd -# ------------------------------------ -# Server variables -# ------------------------------------ SERVER_BASEDIR=$(PREFIX)/nexus-server SERVER_CERTS_DIR=$(SERVER_BASEDIR)/certs SERVER_CERT=$(SERVER_CERTS_DIR)/server-cert.pem @@ -23,38 +11,33 @@ SERVER_CA_CERT=$(SERVER_CERTS_DIR)/$(CA_CERT_FILE) GEN_CERT=$(PWD)/config/certs/gen-cert.sh USER=nexus -help: help_srv help_client - -help_srv: +help: @echo "┌──────────────────────────────────────────────────────────────────────────────â”" - @echo "│ BUILD nexus-server (in $(BUILD_DIR) directory) │" + @echo "│ BUILD nexus-server │" @echo "└──────────────────────────────────────────────────────────────────────────────┘" - @echo " build_srv Build nexus-server binaries" - @echo " clean_srv Delete nexus-server binaries" + @echo " build Build nexus-server" + @echo " clean Delete generated files" @echo "" @echo "┌──────────────────────────────────────────────────────────────────────────────â”" @echo "│ INSTALL/UPDATE nexus-server in a development environment │" @echo "└──────────────────────────────────────────────────────────────────────────────┘" - @echo " install_dev_srv Install nexus-server; require PREFIX variable" - @echo " update_srv Update nexus-server binaries; require PREFIX variable" - @echo " uninstall_dev_srv Uninstall nexus-server; require PREFIX variable" + @echo " install_dev Install nexus-server; require PREFIX variable" + @echo " update Update nexus-server binary; require PREFIX variable" + @echo " uninstall_dev Uninstall nexus-server; require PREFIX variable" @echo "" @echo "┌──────────────────────────────────────────────────────────────────────────────â”" @echo "│ INSTALL/UPDATE nexus-server in a production environment │" @echo "└──────────────────────────────────────────────────────────────────────────────┘" - @echo " install_prod_srv Install nexus-server; require PREFIX variable" - @echo " update_srv Update nexus-server binaries; require PREFIX variable" - @echo " uninstall_prod_srv Uninstall nexus-server; require PREFIX variable" + @echo " install_prod Install nexus-server; require PREFIX variable" + @echo " update Update nexus-server binary; require PREFIX variable" + @echo " uninstall_prod Uninstall nexus-server; require PREFIX variable" @echo "" @echo " The 3 targets above must be run as root or with sudo -E" @echo "" @echo "┌──────────────────────────────────────────────────────────────────────────────â”" @echo "│ RUN nexus-server in a development environment │" @echo "└──────────────────────────────────────────────────────────────────────────────┘" - @echo " run_srv Run nexus-server; require PREFIX variable" - -$(BUILD_DIR): - mkdir -p $@ + @echo " run Run nexus-server; require PREFIX variable" #------------------------------------------------------------------------- # Obscure code that checks whether a variable is defined at runtime. @@ -75,35 +58,28 @@ check_prefix_var: #------------------------------------------------------------------------- # Server targets shared between dev and prod -build_srv: $(BUILD_DIR) server tools/genpwd - @echo "[Building nexus-server]" - @cd server && go build -o $(BUILD_DIR_ABS)/$(SERVER_BINARY) $(BUILD_FLAGS) - @echo "OK" - @echo "Building genpwd" - @cd tools/genpwd && go build -o $(BUILD_DIR_ABS) $(BUILD_FLAGS) - @echo "OK" +build: + make -C server $@ -clean_srv: - @echo "[Cleaning nexus-server]" - @/bin/rm -f $(BUILD_DIR)/$(SERVER_BINARY) - @/bin/rm -f $(BUILD_DIR)/$(GENPWD_BINARY) - @cd server && go clean . - @echo "OK" - @echo "Cleaning genpwd" - @cd tools/genpwd && go clean . +build_genpwd: + @echo "[Building genpwd]" + @cd tools/genpwd && go build . @echo "OK" +clean: + make -C server $@ + create_certs: @echo "[Generating certificates in $(SERVER_BASEDIR)/certs]" cd $(SERVER_BASEDIR) && $(GEN_CERT) $(PWD)/config/certs/ca.info $(PWD)/config/certs/nexus-server.info certs @echo "OK" -remove_files_srv: +remove_files: @echo "Removing nexus-server files in $(SERVER_BASEDIR)" @/bin/rm -rf $(SERVER_BASEDIR) @echo "OK" -create_files_srv: +create_files: @echo "Creating nexus-server file hierarchy in $(SERVER_BASEDIR)" @mkdir $(SERVER_BASEDIR) @mkdir $(SERVER_BASEDIR)/bin @@ -114,61 +90,58 @@ create_files_srv: @mkdir $(SERVER_BASEDIR)/data/tmp @echo "OK" -copy_config_srv: +copy_config: @echo "Copying global and users config in $(SERVER_BASEDIR)/config" @cp -n config/server/users.json config/server/nexus.conf $(SERVER_BASEDIR)/config/ @echo "OK" # Save the previous nexus-server binary (in case a revert were needed) -save_old_srv_binaries: - @echo "Saving old server binaries" +save_old_binary: + @echo "Saving old server binary" @cp -p $(SERVER_BASEDIR)/bin/nexus-server $(SERVER_BASEDIR)/bin/nexus-server.old -copy_binaries_srv: - @echo "Copying server binaries" +copy_binary: + @echo "Copying server binary" @cp $(BUILD_DIR)/$(SERVER_BINARY) $(SERVER_BASEDIR)/bin - @cp $(BUILD_DIR)/$(GENPWD_BINARY) $(SERVER_BASEDIR)/bin - @cp tools/template_creator $(SERVER_BASEDIR)/bin - @cp tools/vm_run $(SERVER_BASEDIR)/bin @echo "OK" -update_srv: check_prefix_var prepare_update_srv save_old_srv_binaries copy_binaries_srv +update: check_prefix_var prepare_update save_old_binary copy_binary @echo "Successfully updated nexus-server in $(SERVER_BASEDIR)" -prepare_update_srv: +prepare_update: @echo "[Updating nexus-server in $(SERVER_BASEDIR)]" #------------------------------------------------------------------------- # Server targets for dev environment -install_dev_srv: check_prefix_var prepare_install_dev_srv server/nexus-server tools/genpwd/genpwd create_files_srv create_certs copy_config_srv copy_binaries_srv +install_dev: check_prefix_var prepare_install_dev server/nexus-server tools/genpwd/genpwd create_files create_certs copy_config copy_binary @echo "Successfully installed nexus-server into $(SERVER_BASEDIR)" -prepare_install_dev_srv: +prepare_install_dev: @echo "[Installing nexus-server in a development environment in $(SERVER_BASEDIR)]" -uninstall_dev_srv: check_prefix_var prepare_uninstall_dev_srv remove_files_srv +uninstall_dev: check_prefix_var prepare_uninstall_dev remove_files @echo "Successfully uninstalled development nexus-server" -prepare_uninstall_dev_srv: +prepare_uninstall_dev: @echo "[Uninstalling nexus-server development environment in $(SERVER_BASEDIR)]" -run_srv: check_prefix_var $(SERVER_BASEDIR)/bin/nexus-server +run: check_prefix_var $(SERVER_BASEDIR)/bin/nexus-server @cd $(SERVER_BASEDIR)/bin && ./nexus-server #------------------------------------------------------------------------- # Server targets for prod environment -install_prod_srv: check_prefix_var prepare_install_prod_srv server/nexus-server tools/genpwd/genpwd create_files_srv create_certs copy_config_srv create_user copy_binaries_srv set_permissions_srv install_service_srv +install_prod: check_prefix_var prepare_install_prod server/nexus-server tools/genpwd/genpwd create_files create_certs copy_config create_user copy_binary set_permissions install_service @echo "Successfully installed nexus-server into $(SERVER_BASEDIR)" -prepare_install_prod_srv: +prepare_install_prod: @echo "[Installing nexus-server in a production environment in $(SERVER_BASEDIR)]" -uninstall_prod_srv: check_prefix_var prepare_uninstall_prod_srv remove_service_srv remove_files_srv del_user +uninstall_prod: check_prefix_var prepare_uninstall_prod remove_service remove_files del_user @echo "Successfully uninstalled production nexus-server" -prepare_uninstall_prod_srv: +prepare_uninstall_prod: @echo "[Uninstalling nexus-server production environment in $(SERVER_BASEDIR)]" create_user: @@ -184,7 +157,7 @@ del_user: @userdel $(USER) @echo "OK" -install_service_srv: +install_service: @echo "Copying nexus-server crond task" @cp config/server/cron/nexus-server /etc/cron.d/ @echo "OK" @@ -195,7 +168,7 @@ install_service_srv: @systemctl daemon-reload @echo "OK" -remove_service_srv: +remove_service: @echo "Disabling and stopping nexus-server service" @systemctl disable nexus-server.service @systemctl stop nexus-server.service @@ -207,7 +180,7 @@ remove_service_srv: @/bin/rm -f /etc/cron.d/nexus-server @echo "OK" -set_permissions_srv: +set_permissions: @echo "Setting file permissions and owner" @chown -R $(USER):$(USER) $(SERVER_BASEDIR) @find $(SERVER_BASEDIR) -type f -exec chmod 640 {} \; @@ -218,142 +191,4 @@ set_permissions_srv: @chmod 400 $(SERVER_KEY) @echo "OK" -.PHONY: clean_srv build_srv - -#------------------------------------------------------------------------- - -# ------------------------------------ -# Clients variables -# ------------------------------------ - -BUILD_CLIENT_FLAGS=-buildvcs=false -# To force a full recompile: -# BUILD_FLAGS=build -a -SRC_CLIENT=client -SRC_ABS_CLIENT=$(PWD)/$(SRC_CLIENT) -OSES_CLIENT=linux windows darwin -ARCHES_CLIENT=amd64 arm64 386 -RESOURCES_DIR_CLIENT=client/defaults/resources - -check_bin_var: - $(call check_defined, BIN) - -check_server_var: - $(call check_defined, SERVER) - -check_cert_var: - $(call check_defined, CERT) - -check_login_var: - $(call check_defined, LOGIN) - -check_nexus_exam_vars: - $(call check_defined, EXAM_USER) - $(call check_defined, EXAM_PWD) - -help_client: - @echo "" - @echo "┌──────────────────────────────────────────────────────────────────────────────â”" - @echo "│ BUILD nexus clients (in $(BUILD_DIR) directory) │" - @echo "└──────────────────────────────────────────────────────────────────────────────┘" - @echo " xbuild_client Cross-build $(BIN) for Linux, Windows, Darwin (OSX)" - @echo " Require the BIN variable which specifies which client to" - @echo " cross-build: nexush or nexus-cli" - @echo " Require SERVER environment variable (see below)" - @echo " build_nexush Build nexush for Linux/amd64; require SERVER environment" - @echo " variable (see below)" - @echo " build_nexus-cli Build nexus-cli for Linux/amd64; same as above" - @echo " clean_clients Delete all generated client binaries" - @echo "" - @echo "┌──────────────────────────────────────────────────────────────────────────────â”" - @echo "│ RUN nexus clients │" - @echo "└──────────────────────────────────────────────────────────────────────────────┘" - @echo " run_nexush Run nexush for Linux/amd64; require LOGIN variable" - @echo " Example: make run_nexush LOGIN=janedoe@nexus.org" - @echo "" - @echo "┌──────────────────────────────────────────────────────────────────────────────â”" - @echo "│ VALIDATION tests │" - @echo "└──────────────────────────────────────────────────────────────────────────────┘" - @echo " tests Run validation tests using nexus-cli" - @echo " Require LOGIN variable." - @echo "" - @echo "────────────────────────────────────────────────────────────────────────────────" - @echo " SERVER: server ip address and port, separated by a colon," - @echo " for instance: SERVER=127.0.0.1:1077" - -copy_resources_client: - @mkdir -p $(RESOURCES_DIR_CLIENT) - @echo -n "$(SERVER)" > $(RESOURCES_DIR_CLIENT)/server - -xbuild_client: check_bin_var check_server_var check_cert_var copy_resources_client $(SRC_CLIENT)/nexush $(SRC_CLIENT)/nexus-cli - @echo "[Cross-building $(BIN) into $(BUILD_DIR) directory]" - @for os in $(OSES_CLIENT); do \ - for arch in $(ARCHES_CLIENT); do \ - if [ $$os != "darwin" ] || [ $$arch != "386" ]; then \ - mkdir -p $(BUILD_DIR_ABS)/$$arch/$$os ;\ - echo "[Cross-building for $$os $$arch]" ;\ - cd $(SRC_ABS_CLIENT)/$(BIN) ;\ - go clean . ;\ - if [ $$os = "linux" ]; then \ - GOARCH=$$arch GOOS=$$os CGO_ENABLED=0 go build $(BUILD_FLAGS) $(BUILD_CLIENT_FLAGS) -o $(BUILD_DIR_ABS)/$$arch/$$os/ ;\ - #strip -s $(BUILD_DIR_ABS)/$$arch/$$os/$(BIN) ;\ - #upx $(BUILD_DIR_ABS)/$$arch/$$os/$(BIN) ;\ - else \ - GOARCH=$$arch GOOS=$$os go build $(BUILD_FLAGS) $(BUILD_CLIENT_FLAGS) -o $(BUILD_DIR_ABS)/$$arch/$$os/ ;\ - fi \ - fi \ - done \ - done - -build_nexush: check_server_var copy_resources_client $(BUILD_DIR) $(SRC_CLIENT)/nexush - @echo "[Building nexush into $(BUILD_DIR) directory]" - @cd $(SRC_CLIENT)/nexush && go build $(BUILD_FLAGS) $(BUILD_CLIENT_FLAGS) && mv $(NEXUSH_BINARY) $(BUILD_DIR_ABS) - -build_nexus-cli: check_server_var copy_resources_client $(BUILD_DIR) $(SRC_CLIENT)/nexus-cli - @echo "[Building nexus-cli into $(BUILD_DIR) directory]" - @cd $(SRC_CLIENT)/nexus-cli && go build $(BUILD_FLAGS) $(BUILD_CLIENT_FLAGS) && mv $(NEXUSCLI_BINARY) $(BUILD_DIR_ABS) - -clean_clients: - @for arch in $(ARCHES_CLIENT); do \ - /bin/rm -rf $(BUILD_DIR)/$$arch ;\ - done - @/bin/rm -f $(BUILD_DIR)/$(NEXUSH_BINARY) $(BUILD_DIR)/$(NEXUSCLI_BINARY) - -run_nexush: check_login_var $(BUILD_DIR)/$(NEXUSH_BINARY) - $< $(LOGIN) - -tests: check_login_var tests/run_tests build_nexus-cli $(BUILD_DIR)/$(NEXUSCLI_BINARY) - @cd tests && ./run_tests $< $(LOGIN) - -.PHONY: clean_clients tests - -# To build a static executable: -# CGO_ENABLED=0 go build $(BUILD_FLAGS) - -# @echo " build_client build $(BIN) binaries for the specified OS/architecture" -# @echo " valid OS values: linux, windows, darwin" -# @echo " valid ARCH values: amd64, arm64, 386" - -# build_dir_client_arch_os: -# $(if $(OS),,$(error Please define the OS environment variable: supported values are linux, windows, darwin)) -# $(if $(ARCH),,$(error Please define the ARCH environment variable: supported values are amd64, arm64, 386)) -# @mkdir -p $(BUILD_DIR)/$(ARCH)/$(OS) - -# build_client: check_bin_var build_dir_client_arch_os copy_resources_client -# @echo "[Building client into $(BUILD_DIR)] directory" -# @echo "[Building for $(OS) $(ARCH)]" ;\ -# if [ $(OS) = "linux" ]; then \ -# cd $(SRC_ABS_CLIENT)/$(BIN) ;\ -# go clean . ;\ -# GOARCH=$(ARCH) GOOS=$(OS) CGO_ENABLED=0 go $(BUILD_FLAGS) -o $(BUILD_DIR_ABS)/$(ARCH)/$(OS)/ ;\ -# #strip -s $(BUILD_DIR_ABS)/$(ARCH)/$(OS)/$(BIN) ;\ -# #upx $(BUILD_DIR_ABS)/$(ARCH)/$(OS)/$(BIN) ;\ -# else \ -# GOARCH=$(ARCH) GOOS=$(OS) go $(BUILD_FLAGS) -o $(BUILD_DIR_ABS)/$(ARCH)/$(OS)/ ;\ -# fi - -# To list all supported platforms: -# go tool dist list - -# To display current OS and arch: -# go env GOOS GOARCH +.PHONY: clean diff --git a/client/common.mk b/client/common.mk deleted file mode 100644 index b27febd343e54d2c49a288a57374849e0aa43eee..0000000000000000000000000000000000000000 --- a/client/common.mk +++ /dev/null @@ -1,91 +0,0 @@ -build_flags=build -OSES=linux windows darwin -ARCHES=amd64 arm64 386 -CA_CERT_NAME=ca-cert.pem -CA_CERT_DEV=../../../certs.dev/$(CA_CERT_NAME) -CA_CERT_PROD=../../../certs.prod/$(CA_CERT_NAME) -RESOURCES_DIR=../defaults/resources -DEFAULT_PORT=1077 - -bin=nexush - -help: - @echo "Supported targets:" - @echo " prepare_dev copy public certificate and server file for development (localhost)" - @echo " prepare_prod copy public certificate and server file for production" - @echo " build_dev build $(bin) development (localhost) binaries for the specified OS/arch" - @echo " build_dev_all build $(bin) development binaries (localhost) for Linux, Windows and Darwin (OSX)" - @echo " build_prod build $(bin) production binaries for the specified OS/arch" - @echo " build_prod_all build $(bin) production binaries for Linux, Windows and Darwin (OSX)" - @echo " clean delete generated binaries" - @echo "The build target requires OS and ARCH variables to be specified:" - @echo " valid OS values: linux, windows, darwin" - @echo " valid ARCH values: amd64, arm64, 386" - -prepare_dev: copy_dev_cert set_dev_server - -prepare_prod: copy_prod_cert set_prod_server - -copy_dev_cert: $(CA_CERT_DEV) - @(mkdir $(RESOURCES_DIR) 2>/dev/null || true) - @cp $< $(RESOURCES_DIR) - -copy_prod_cert: $(CA_CERT_PROD) - @(mkdir $(RESOURCES_DIR) 2>/dev/null || true) - @cp $< $(RESOURCES_DIR) - -set_prod_server: ../../../config/certs/nexus-server.info.prod - @grep ^ip_address $<|awk -F" = " '{print $$2":$(DEFAULT_PORT)"}'|tr -d "\n" > $(RESOURCES_DIR)/server - -set_dev_server: - @printf "127.0.0.1:$(DEFAULT_PORT)" > $(RESOURCES_DIR)/server - -build_dir: - $(if $(OS),,$(error Please define the OS environment variable: supported values are linux, windows, darwin)) - $(if $(ARCH),,$(error Please define the ARCH environment variable: supported values are amd64, arm64, 386)) - @echo "[Creating output directory $(OS)/$(ARCH)]" - @mkdir -p build/$(ARCH)/$(OS) - -build_prod: build_dir prepare_prod build - -build_dev: build_dir prepare_dev build - -build: - @echo "[Building for $(OS) $(ARCH)]" ;\ - if [ $(OS) = "linux" ]; then \ - GOARCH=$(ARCH) GOOS=$(OS) CGO_ENABLED=0 go $(build_flags) -o build/$(ARCH)/$(OS)/ ;\ - #strip -s build/$(ARCH)/$(OS)/$(bin) ;\ - #upx build/$(ARCH)/$(OS)/$(bin) ;\ - else \ - echo "GOARCH=$(ARCH) GOOS=$(OS) go $(build_flags) -o build/$(ARCH)/$(OS)/" ;\ - GOARCH=$(ARCH) GOOS=$(OS) go $(build_flags) -o build/$(ARCH)/$(OS)/ ;\ - fi - -build_prod_all: copy_prod_cert set_prod_server build_all - -build_dev_all: copy_dev_cert set_dev_server build_all - -build_all: - @for os in $(OSES); do \ - for arch in $(ARCHES); do \ - if [ $$os != "darwin" ] || [ $$arch != "386" ]; then \ - echo "[Creating output directory $$os/$$arch]" ;\ - mkdir -p build/$$arch/$$os ;\ - echo "[Building for $$os $$arch]" ;\ - if [ $$os = "linux" ]; then \ - GOARCH=$$arch GOOS=$$os CGO_ENABLED=0 go $(build_flags) -o build/$$arch/$$os/ ;\ - #strip -s build/$$arch/$$os/$(bin) ;\ - #upx build/$$arch/$$os/$(bin) ;\ - else \ - echo "GOARCH=$$arch GOOS=$$os go $(build_flags) -o build/$$arch/$$os/" ;\ - GOARCH=$$arch GOOS=$$os go $(build_flags) -o build/$$arch/$$os/ ;\ - fi \ - fi \ - done \ - done - -clean: - @/bin/rm -rf build $(bin) $(RESOURCES_DIR)/server $(RESOURCES_DIR)/$(CA_CERT_NAME) - @go clean . - -.PHONY: build clean diff --git a/client/defaults/Defaults.go b/client/defaults/Defaults.go deleted file mode 100644 index 21e5879657367f0717da356df2ff41e93d38fdad..0000000000000000000000000000000000000000 --- a/client/defaults/Defaults.go +++ /dev/null @@ -1,10 +0,0 @@ -package defaults - -import ( - _ "embed" -) - -var ( - //go:embed resources/server - NexusServer string -) diff --git a/client/go.mod b/client/go.mod deleted file mode 100644 index 4de57f5a36df6c0bef6d13f654a77267f73d8ed1..0000000000000000000000000000000000000000 --- a/client/go.mod +++ /dev/null @@ -1,56 +0,0 @@ -module gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client - -go 1.22.2 - -replace gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient => ../libclient - -require ( - fyne.io/fyne/v2 v2.5.5 - gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/common v0.0.0-20250320135605-9ac7ec3df57a - gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient v0.0.0-20250320135605-9ac7ec3df57a - github.com/go-pdf/fpdf v0.9.0 - github.com/google/uuid v1.6.0 - github.com/peterh/liner v1.2.2 - golang.org/x/crypto v0.32.0 - golang.org/x/term v0.28.0 -) - -require ( - fyne.io/systray v1.11.0 // indirect - github.com/BurntSushi/toml v1.4.0 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect - github.com/fredbi/uri v1.1.0 // indirect - github.com/fsnotify/fsnotify v1.7.0 // indirect - github.com/fyne-io/gl-js v0.0.0-20220119005834-d2da28d9ccfe // indirect - github.com/fyne-io/glfw-js v0.0.0-20241126112943-313d8a0fe1d0 // indirect - github.com/fyne-io/image v0.0.0-20220602074514-4956b0afb3d2 // indirect - github.com/gabriel-vasile/mimetype v1.4.8 // indirect - github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6 // indirect - github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a // indirect - github.com/go-playground/locales v0.14.1 // indirect - github.com/go-playground/universal-translator v0.18.1 // indirect - github.com/go-playground/validator/v10 v10.25.0 // indirect - github.com/go-resty/resty/v2 v2.16.5 // indirect - github.com/go-text/render v0.2.0 // indirect - github.com/go-text/typesetting v0.2.0 // indirect - github.com/godbus/dbus/v5 v5.1.0 // indirect - github.com/gopherjs/gopherjs v1.17.2 // indirect - github.com/jeandeaual/go-locale v0.0.0-20240223122105-ce5225dcaa49 // indirect - github.com/jsummers/gobmp v0.0.0-20151104160322-e2ba15ffa76e // indirect - github.com/leodido/go-urn v1.4.0 // indirect - github.com/mattn/go-runewidth v0.0.3 // indirect - github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect - github.com/nicksnyder/go-i18n/v2 v2.4.0 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/rymdport/portal v0.3.0 // indirect - github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c // indirect - github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef // indirect - github.com/stretchr/testify v1.8.4 // indirect - github.com/yuin/goldmark v1.7.1 // indirect - golang.org/x/image v0.18.0 // indirect - golang.org/x/mobile v0.0.0-20231127183840-76ac6878050a // indirect - golang.org/x/net v0.34.0 // indirect - golang.org/x/sys v0.29.0 // indirect - golang.org/x/text v0.21.0 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect -) diff --git a/client/go.sum b/client/go.sum deleted file mode 100644 index 6f0583623389eb3f599d57e6456e8916f902857a..0000000000000000000000000000000000000000 --- a/client/go.sum +++ /dev/null @@ -1,689 +0,0 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= -cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= -cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= -cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= -cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= -cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= -cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= -cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= -cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= -cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= -cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= -cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= -cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= -cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= -cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= -cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= -cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= -cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= -cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= -cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= -cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= -cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= -cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= -cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= -cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= -cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= -cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= -cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= -cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= -cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= -cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= -cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= -cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= -cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= -cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= -dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -fyne.io/fyne/v2 v2.5.5 h1:IhS8Vf1EtSHS94/i41D9Rh4s1rG1habkGN/oISA0kTU= -fyne.io/fyne/v2 v2.5.5/go.mod h1:0GOXKqyvNwk3DLmsFu9v0oYM0ZcD1ysGnlHCerKoAmo= -fyne.io/systray v1.11.0 h1:D9HISlxSkx+jHSniMBR6fCFOUjk1x/OOOJLa9lJYAKg= -fyne.io/systray v1.11.0/go.mod h1:RVwqP9nYMo7h5zViCBHri2FgjXF7H2cub7MAq4NSoLs= -gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/common v0.0.0-20250320135605-9ac7ec3df57a h1:D4M2OnN+9vUALGPo6yNyWmcpvgGIzo/2HJj8SA4bGls= -gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/common v0.0.0-20250320135605-9ac7ec3df57a/go.mod h1:HzVsiYhPk7BhhvspjLchF3HlY1z+qIF89jG6+Hs8m3c= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0= -github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= -github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= -github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= -github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= -github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= -github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= -github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= -github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= -github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/felixge/fgprof v0.9.3 h1:VvyZxILNuCiUCSXtPtYmmtGvb65nqXh2QFWc0Wpf2/g= -github.com/felixge/fgprof v0.9.3/go.mod h1:RdbpDgzqYVh/T9fPELJyV7EYJuHB55UTEULNun8eiPw= -github.com/fredbi/uri v1.1.0 h1:OqLpTXtyRg9ABReqvDGdJPqZUxs8cyBDOMXBbskCaB8= -github.com/fredbi/uri v1.1.0/go.mod h1:aYTUoAXBOq7BLfVJ8GnKmfcuURosB1xyHDIfWeC/iW4= -github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= -github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= -github.com/fyne-io/gl-js v0.0.0-20220119005834-d2da28d9ccfe h1:A/wiwvQ0CAjPkuJytaD+SsXkPU0asQ+guQEIg1BJGX4= -github.com/fyne-io/gl-js v0.0.0-20220119005834-d2da28d9ccfe/go.mod h1:d4clgH0/GrRwWjRzJJQXxT/h1TyuNSfF/X64zb/3Ggg= -github.com/fyne-io/glfw-js v0.0.0-20241126112943-313d8a0fe1d0 h1:/1YRWFv9bAWkoo3SuxpFfzpXH0D/bQnTjNXyF4ih7Os= -github.com/fyne-io/glfw-js v0.0.0-20241126112943-313d8a0fe1d0/go.mod h1:gsGA2dotD4v0SR6PmPCYvS9JuOeMwAtmfvDE7mbYXMY= -github.com/fyne-io/image v0.0.0-20220602074514-4956b0afb3d2 h1:hnLq+55b7Zh7/2IRzWCpiTcAvjv/P8ERF+N7+xXbZhk= -github.com/fyne-io/image v0.0.0-20220602074514-4956b0afb3d2/go.mod h1:eO7W361vmlPOrykIg+Rsh1SZ3tQBaOsfzZhsIOb/Lm0= -github.com/gabriel-vasile/mimetype v1.4.8 h1:FfZ3gj38NjllZIeJAmMhr+qKL8Wu+nOoI3GqacKw1NM= -github.com/gabriel-vasile/mimetype v1.4.8/go.mod h1:ByKUIKGjh1ODkGM1asKUbQZOLGrPjydw3hYPU2YU9t8= -github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6 h1:zDw5v7qm4yH7N8C8uWd+8Ii9rROdgWxQuGoJ9WDXxfk= -github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6/go.mod h1:9YTyiznxEY1fVinfM7RvRcjRHbw2xLBJ3AAGIT0I4Nw= -github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a h1:vxnBhFDDT+xzxf1jTJKMKZw3H0swfWk9RpWbBbDK5+0= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-pdf/fpdf v0.9.0 h1:PPvSaUuo1iMi9KkaAn90NuKi+P4gwMedWPHhj8YlJQw= -github.com/go-pdf/fpdf v0.9.0/go.mod h1:oO8N111TkmKb9D7VvWGLvLJlaZUQVPM+6V42pp3iV4Y= -github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= -github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= -github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= -github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= -github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= -github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= -github.com/go-playground/validator/v10 v10.25.0 h1:5Dh7cjvzR7BRZadnsVOzPhWsrwUr0nmsZJxEAnFLNO8= -github.com/go-playground/validator/v10 v10.25.0/go.mod h1:GGzBIJMuE98Ic/kJsBXbz1x/7cByt++cQ+YOuDM5wus= -github.com/go-resty/resty/v2 v2.16.5 h1:hBKqmWrr7uRc3euHVqmh1HTHcKn99Smr7o5spptdhTM= -github.com/go-resty/resty/v2 v2.16.5/go.mod h1:hkJtXbA2iKHzJheXYvQ8snQES5ZLGKMwQ07xAwp/fiA= -github.com/go-text/render v0.2.0 h1:LBYoTmp5jYiJ4NPqDc2pz17MLmA3wHw1dZSVGcOdeAc= -github.com/go-text/render v0.2.0/go.mod h1:CkiqfukRGKJA5vZZISkjSYrcdtgKQWRa2HIzvwNN5SU= -github.com/go-text/typesetting v0.2.0 h1:fbzsgbmk04KiWtE+c3ZD4W2nmCRzBqrqQOvYlwAOdho= -github.com/go-text/typesetting v0.2.0/go.mod h1:2+owI/sxa73XA581LAzVuEBZ3WEEV2pXeDswCH/3i1I= -github.com/go-text/typesetting-utils v0.0.0-20240317173224-1986cbe96c66 h1:GUrm65PQPlhFSKjLPGOZNPNxLCybjzjYBzjfoBGaDUY= -github.com/go-text/typesetting-utils v0.0.0-20240317173224-1986cbe96c66/go.mod h1:DDxDdQEnB70R8owOx3LVpEFvpMK9eeH1o2r0yZhFI9o= -github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk= -github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= -github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= -github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= -github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= -github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20211214055906-6f57359322fd h1:1FjCyPC+syAzJ5/2S8fqdZK1R22vvA0J7JZKcuOIQ7Y= -github.com/google/pprof v0.0.0-20211214055906-6f57359322fd/go.mod h1:KgnwoLYCZ8IQu3XUZ8Nc/bM9CCZFOyjUNOSygVozoDg= -github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= -github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= -github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gopherjs/gopherjs v0.0.0-20211219123610-ec9572f70e60/go.mod h1:cz9oNYuRUWGdHmLF2IodMLkAhcPtXeULvcBNagUrxTI= -github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g= -github.com/gopherjs/gopherjs v1.17.2/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k= -github.com/goxjs/gl v0.0.0-20210104184919-e3fafc6f8f2a/go.mod h1:dy/f2gjY09hwVfIyATps4G2ai7/hLwLkc5TrPqONuXY= -github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= -github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= -github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= -github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= -github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= -github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= -github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= -github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= -github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= -github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= -github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= -github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= -github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= -github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= -github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/jeandeaual/go-locale v0.0.0-20240223122105-ce5225dcaa49 h1:Po+wkNdMmN+Zj1tDsJQy7mJlPlwGNQd9JZoPjObagf8= -github.com/jeandeaual/go-locale v0.0.0-20240223122105-ce5225dcaa49/go.mod h1:YiutDnxPRLk5DLUFj6Rw4pRBBURZY07GFr54NdV9mQg= -github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= -github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= -github.com/jsummers/gobmp v0.0.0-20151104160322-e2ba15ffa76e h1:LvL4XsI70QxOGHed6yhQtAU34Kx3Qq2wwBzGFKY8zKk= -github.com/jsummers/gobmp v0.0.0-20151104160322-e2ba15ffa76e/go.mod h1:kLgvv7o6UM+0QSf0QjAse3wReFDsb9qbZJdfexWlrQw= -github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= -github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= -github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= -github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-runewidth v0.0.3 h1:a+kO+98RDGEfo6asOGMmpodZq4FNtnGP54yps8BzLR4= -github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= -github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= -github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= -github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= -github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= -github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo= -github.com/neelance/sourcemap v0.0.0-20200213170602-2833bce08e4c/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM= -github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ= -github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8= -github.com/nicksnyder/go-i18n/v2 v2.4.0 h1:3IcvPOAvnCKwNm0TB0dLDTuawWEj+ax/RERNC+diLMM= -github.com/nicksnyder/go-i18n/v2 v2.4.0/go.mod h1:nxYSZE9M0bf3Y70gPQjN9ha7XNHX7gMc814+6wVyEI4= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/peterh/liner v1.2.2 h1:aJ4AOodmL+JxOZZEL2u9iJf8omNRpqHc/EbrK+3mAXw= -github.com/peterh/liner v1.2.2/go.mod h1:xFwJyiKIXJZUKItq5dGHZSTBRAuG/CpeNpWLyiNRNwI= -github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/profile v1.7.0 h1:hnbDkaNWPCLMO9wGLdBFTIZvzDrDfBM2072E1S9gJkA= -github.com/pkg/profile v1.7.0/go.mod h1:8Uer0jas47ZQMJ7VD+OHknK4YDY07LPUC6dEvqDjvNo= -github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= -github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= -github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/rymdport/portal v0.3.0 h1:QRHcwKwx3kY5JTQcsVhmhC3TGqGQb9LFghVNUy8AdB8= -github.com/rymdport/portal v0.3.0/go.mod h1:kFF4jslnJ8pD5uCi17brj/ODlfIidOxlgUDTO5ncnC4= -github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/shurcooL/go v0.0.0-20200502201357-93f07166e636/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= -github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg= -github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= -github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw= -github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= -github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk= -github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= -github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= -github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c h1:km8GpoQut05eY3GiYWEedbTT0qnSxrCjsVbb7yKY1KE= -github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c/go.mod h1:cNQ3dwVJtS5Hmnjxy6AgTPd0Inb3pW05ftPSX7NZO7Q= -github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef h1:Ch6Q+AZUxDBCVqdkI8FSpFyZDtCVBc2VmejdNrm5rRQ= -github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef/go.mod h1:nXTWP6+gD5+LUJ8krVhhoeHjvHTutPxMYl5SvkcnJNE= -github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= -github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -github.com/yuin/goldmark v1.7.1 h1:3bajkSilaCbjdKVsKdZjZCLBNPL9pYzrCakKaf4U49U= -github.com/yuin/goldmark v1.7.1/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E= -go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= -go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= -go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= -go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= -go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= -go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= -golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc= -golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= -golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4= -golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= -golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= -golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= -golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= -golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/image v0.18.0 h1:jGzIakQa/ZXI1I0Fxvaa9W7yP25TqT6cHIHn+6CqvSQ= -golang.org/x/image v0.18.0/go.mod h1:4yyo5vMFQjVjUcVk4jEQcU9MGy/rulF5WvUILseCM2E= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= -golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= -golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= -golang.org/x/mobile v0.0.0-20211207041440-4e6c2922fdee/go.mod h1:pe2sM7Uk+2Su1y7u/6Z8KJ24D7lepUjFZbhFOrmDfuQ= -golang.org/x/mobile v0.0.0-20231127183840-76ac6878050a h1:sYbmY3FwUWCBTodZL1S3JUuOvaW6kM2o+clDzzDNBWg= -golang.org/x/mobile v0.0.0-20231127183840-76ac6878050a/go.mod h1:Ede7gF0KGoHlj822RtphAHK1jLdrcuRBZg0sF1Q+SPc= -golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= -golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= -golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0= -golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211117180635-dee7805ff2e1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU= -golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg= -golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek= -golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= -golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= -golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U= -golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= -golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= -golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= -golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.8-0.20211022200916-316ba0b74098/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= -google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= -google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= -google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= -google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= -google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= -google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= -google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= -google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= -google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= -google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= -google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= -google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= -google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= -google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= -google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= -google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= -google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= -google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= -google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= -google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= -google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= -gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= -gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= -gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= -rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= -rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/nexus-exam/Makefile b/nexus-exam/Makefile index 7b5d64f0d62168531df28ef9457149bc7919cfc9..fc7349903270da0d6e74dfe79b72af8b11477a84 100644 --- a/nexus-exam/Makefile +++ b/nexus-exam/Makefile @@ -3,10 +3,7 @@ GIT_COMMIT=$(shell eval "git rev-parse HEAD") BUILD_FLAGS=-ldflags="-X 'gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexus-exam/buildversion.buildDate=$(CURRENT_DATE)' -X 'gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexus-exam/buildversion.gitCommit=$(GIT_COMMIT)'" BUILD_DIR=build BUILD_DIR_ABS=$(PWD)/$(BUILD_DIR) -NEXUSH_BINARY=nexush -NEXUSCLI_BINARY=nexus-cli NEXUS_EXAM_BINARY=nexus-exam -GENPWD_BINARY=genpwd BUILD_FLAGS+=-buildvcs=false # To force a full recompile: @@ -40,7 +37,7 @@ help: @echo " EXAM_USER and EXAM_PWD define credentials for the user used by" @echo " nexus-exam to connect to nexus server." @echo "" - @echo "clean Delete generated binary" + @echo "clean Delete all generated files (delete $(BUILD_DIR) directory)" @echo "" @echo "run Run nexus-exam" @@ -61,8 +58,8 @@ $(BUILD_DIR): check_server_var check_nexus_exam_vars @echo "[Building nexus-exam into $(BUILD_DIR) directory]" go build $(BUILD_FLAGS) -o $(BUILD_DIR)/$(NEXUS_EXAM_BINARY) @strip -s $(BUILD_DIR)/$(NEXUS_EXAM_BINARY) - @echo "OK" # @upx -q $(NEXUS_EXAM_BINARY) + @echo "OK" @echo "[Deleting resources]" @/bin/rm -f $(SERVER_FILE) $(NEXUS_EXAM_USER_CREDS_FILE) $(NEXUS_EXAM_PWD_CREDS_FILE) @echo "OK" diff --git a/nexush/Makefile b/nexush/Makefile new file mode 100644 index 0000000000000000000000000000000000000000..096ad1eda6d6882546e997d45155133cf4d4e674 --- /dev/null +++ b/nexush/Makefile @@ -0,0 +1,122 @@ +CURRENT_DATE=$(shell eval "date -u +'%Y-%m-%d at %H:%M:%S'") +GIT_COMMIT=$(shell eval "git rev-parse HEAD") +BUILD_FLAGS=-ldflags="-X 'gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/buildversion.buildDate=$(CURRENT_DATE)' -X 'gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/buildversion.gitCommit=$(GIT_COMMIT)'" +BUILD_DIR=build +NEXUSH_BINARY=nexush +OSES_CLIENT=linux windows darwin +ARCHES_CLIENT=amd64 arm64 386 + +BUILD_FLAGS+=-buildvcs=false +# To force a full recompile: +# BUILD_FLAGS=build -a + +# These resource files MUST match what's defined in the go code! +SERVER_FILE=$(BUILD_DIR)/server + +#------------------------------------------------------------------------- +# Obscure code that checks whether a variable is defined at runtime. +# This function overcomes the limitation of #ifndef ... which is always +# parsed by make regardess of the target it's called from. +# +# Usage: $(call check_defined, some_variable_to_test) +check_defined = \ + $(strip $(foreach 1,$1, \ + $(call __check_defined,$1,$(strip $(value 2))))) +__check_defined = \ + $(if $(value $1),, \ + $(error Environment variable $1$(if $2, ($2)) must be set)) + +help: + @echo "Available targets:" + @echo "" + @echo " xbuild Cross-build nexush for Linux, Windows, Darwin (OSX)" + @echo " Require the SERVER environment variable which specifies" + @echo " the server ip address and port, separated by a colon," + @echo " e.g. SERVER=127.0.0.1:1077" + @echo "" + @echo " build Build nexush for Linux/amd64; require the SERVER env. variable" + @echo "" + @echo " clean Delete all generated files (delete $(BUILD_DIR) directory)" + +unused: + # @echo "" + # @echo " tests Run validation tests using nexus-cli" + # @echo " Require LOGIN variable, e.g. LOGIN=janedoe@nexus.org" + +check_server_var: + $(call check_defined, SERVER) + +copy_resources: + @echo "[Creating resources]" + @mkdir -p $(BUILD_DIR) + @echo -n "$(SERVER)" > $(SERVER_FILE) + @echo "OK" + +xbuild: check_server_var copy_resources + @echo "[Cross-building nexush into $(BUILD_DIR) directory]" + @for os in $(OSES_CLIENT); do \ + for arch in $(ARCHES_CLIENT); do \ + if [ $$os != "darwin" ] || [ $$arch != "386" ]; then \ + mkdir -p $(BUILD_DIR)/$$arch/$$os ;\ + echo "[Cross-building for $$os $$arch]" ;\ + go clean . ;\ + if [ $$os = "linux" ]; then \ + GOARCH=$$arch GOOS=$$os CGO_ENABLED=0 go build $(BUILD_FLAGS) -o $(BUILD_DIR)/$$arch/$$os/ ;\ + #strip -s $(BUILD_DIR)/$$arch/$$os/$(NEXUSH_BINARY) ;\ + #upx $(BUILD_DIR)/$$arch/$$os/$(NEXUSH_BINARY) ;\ + else \ + GOARCH=$$arch GOOS=$$os go build $(BUILD_FLAGS) -o $(BUILD_DIR)/$$arch/$$os/ ;\ + fi \ + fi \ + done \ + done + +build: check_server_var copy_resources + @echo "[Building nexush into $(BUILD_DIR) directory]" + go build $(BUILD_FLAGS) -o $(BUILD_DIR)/$(NEXUSH_BINARY) + @strip -s $(BUILD_DIR)/$(NEXUSH_BINARY) +# @upx -q $(NEXUS_EXAM_BINARY) + @echo "OK" + @echo "[Deleting resources]" + @/bin/rm -f $(SERVER_FILE) + @echo "OK" + +# tests: check_login_var tests/run_tests build_nexus-cli $(BUILD_DIR)/$(NEXUSCLI_BINARY) +# @cd tests && ./run_tests $< $(LOGIN) + +clean: + @/bin/rm -rf $(BUILD_DIR) + @echo "OK" + +.PHONY: clean + +# To build a static executable: +# CGO_ENABLED=0 go build $(BUILD_FLAGS) + +# @echo " build_client build $(BIN) binaries for the specified OS/architecture" +# @echo " valid OS values: linux, windows, darwin" +# @echo " valid ARCH values: amd64, arm64, 386" + +# build_dir_client_arch_os: +# $(if $(OS),,$(error Please define the OS environment variable: supported values are linux, windows, darwin)) +# $(if $(ARCH),,$(error Please define the ARCH environment variable: supported values are amd64, arm64, 386)) +# @mkdir -p $(BUILD_DIR)/$(ARCH)/$(OS) + +# build_client: check_bin_var build_dir_client_arch_os copy_resources +# @echo "[Building client into $(BUILD_DIR)] directory" +# @echo "[Building for $(OS) $(ARCH)]" ;\ +# if [ $(OS) = "linux" ]; then \ +# cd $(SRC_ABS_CLIENT)/$(BIN) ;\ +# go clean . ;\ +# GOARCH=$(ARCH) GOOS=$(OS) CGO_ENABLED=0 go $(BUILD_FLAGS) -o $(BUILD_DIR_ABS)/$(ARCH)/$(OS)/ ;\ +# #strip -s $(BUILD_DIR_ABS)/$(ARCH)/$(OS)/$(BIN) ;\ +# #upx $(BUILD_DIR_ABS)/$(ARCH)/$(OS)/$(BIN) ;\ +# else \ +# GOARCH=$(ARCH) GOOS=$(OS) go $(BUILD_FLAGS) -o $(BUILD_DIR_ABS)/$(ARCH)/$(OS)/ ;\ +# fi + +# To list all supported platforms: +# go tool dist list + +# To display current OS and arch: +# go env GOOS GOARCH diff --git a/nexush/buildversion/version.go b/nexush/buildversion/version.go new file mode 100644 index 0000000000000000000000000000000000000000..f23cfbe7bbcac10d7a4f2d1e056bb0d07f1c3e4a --- /dev/null +++ b/nexush/buildversion/version.go @@ -0,0 +1,15 @@ +package buildversion + +var ( + // These variables are replaced by ldflags at build time + gitCommit = "n/a" + buildDate = "n/a" +) + +func GitCommit() string { + return gitCommit +} + +func BuildDate() string { + return buildDate +} diff --git a/client/cmd/Command.go b/nexush/cmd/Command.go similarity index 94% rename from client/cmd/Command.go rename to nexush/cmd/Command.go index 59a30babb31a2cf59c14e6b6b7afbe6f26e73f83..b5479bb5c78a98561963b12a735a875d59636f2d 100644 --- a/client/cmd/Command.go +++ b/nexush/cmd/Command.go @@ -3,8 +3,8 @@ package cmd import ( "strings" - u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/utils" nc "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/nexusclient" + u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/utils" ) // Dirty HACK: diff --git a/client/cmdLogin/login.go b/nexush/cmdLogin/login.go similarity index 95% rename from client/cmdLogin/login.go rename to nexush/cmdLogin/login.go index 82e424c990f5bbe87d0cf37b27f9108c69ba6020..bbb6fa98c5f0d75c010ba1c6c66e405ee14f7beb 100644 --- a/client/cmdLogin/login.go +++ b/nexush/cmdLogin/login.go @@ -3,8 +3,8 @@ package cmdLogin import ( "syscall" - u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/utils" nc "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/nexusclient" + u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/utils" "golang.org/x/term" ) diff --git a/client/cmdMisc/helpHeader.go b/nexush/cmdMisc/helpHeader.go similarity index 100% rename from client/cmdMisc/helpHeader.go rename to nexush/cmdMisc/helpHeader.go diff --git a/client/cmdMisc/ls.go b/nexush/cmdMisc/ls.go similarity index 95% rename from client/cmdMisc/ls.go rename to nexush/cmdMisc/ls.go index c7282b8daf302d9bfcbe241e67f31d6110433d17..a87c3e16b797b1ae0562efd323eede052d7c954e 100644 --- a/client/cmdMisc/ls.go +++ b/nexush/cmdMisc/ls.go @@ -3,8 +3,8 @@ package cmdMisc import ( "os" - u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/utils" nc "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/nexusclient" + u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/utils" ) type Ls struct { diff --git a/client/cmdTemplate/templateCreate.go b/nexush/cmdTemplate/templateCreate.go similarity index 96% rename from client/cmdTemplate/templateCreate.go rename to nexush/cmdTemplate/templateCreate.go index 13e36d455a6e7e2cb70e90041bd74e89e5820c0e..f2d69f00a7391b3d4627dfaaa707ee41f0deb34d 100644 --- a/client/cmdTemplate/templateCreate.go +++ b/nexush/cmdTemplate/templateCreate.go @@ -1,8 +1,8 @@ package cmdTemplate import ( - u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/utils" nc "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/nexusclient" + u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/utils" "github.com/google/uuid" ) diff --git a/client/cmdTemplate/templateCreate.go.new b/nexush/cmdTemplate/templateCreate.go.new similarity index 100% rename from client/cmdTemplate/templateCreate.go.new rename to nexush/cmdTemplate/templateCreate.go.new diff --git a/client/cmdTemplate/templateDel.go b/nexush/cmdTemplate/templateDel.go similarity index 95% rename from client/cmdTemplate/templateDel.go rename to nexush/cmdTemplate/templateDel.go index ba4d28c730818971cd7cd7d3904f28394d8cc773..92f5a334d06835118c84f568e8265a72959316a7 100644 --- a/client/cmdTemplate/templateDel.go +++ b/nexush/cmdTemplate/templateDel.go @@ -1,8 +1,8 @@ package cmdTemplate import ( - u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/utils" nc "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/nexusclient" + u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/utils" ) type Del struct { diff --git a/client/cmdTemplate/templateEdit.go b/nexush/cmdTemplate/templateEdit.go similarity index 97% rename from client/cmdTemplate/templateEdit.go rename to nexush/cmdTemplate/templateEdit.go index fbb5421f7f892db25025508296c6e03df9366ce0..107ffb18a21a91560ea86d3200bc53403ecd36e7 100644 --- a/client/cmdTemplate/templateEdit.go +++ b/nexush/cmdTemplate/templateEdit.go @@ -4,9 +4,9 @@ import ( "errors" "strings" - u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/utils" "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/common/params" nc "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/nexusclient" + u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/utils" ) type Edit struct { diff --git a/client/cmdTemplate/templateExportDisk.go b/nexush/cmdTemplate/templateExportDisk.go similarity index 96% rename from client/cmdTemplate/templateExportDisk.go rename to nexush/cmdTemplate/templateExportDisk.go index d79f940b3e573fc7069ca06bda59aaa14e0027bc..bf55c94f7d5af704d9609a1c518b52f7069dab36 100644 --- a/client/cmdTemplate/templateExportDisk.go +++ b/nexush/cmdTemplate/templateExportDisk.go @@ -1,8 +1,8 @@ package cmdTemplate import ( - u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/utils" nc "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/nexusclient" + u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/utils" ) type ExportDisk struct { diff --git a/client/cmdTemplate/templateList.go b/nexush/cmdTemplate/templateList.go similarity index 98% rename from client/cmdTemplate/templateList.go rename to nexush/cmdTemplate/templateList.go index 1ec8dd3307c9265f4b5fb84c6a47a0b365b68a9e..f2bb21b110ef08af369c5216128b92610724262a 100644 --- a/client/cmdTemplate/templateList.go +++ b/nexush/cmdTemplate/templateList.go @@ -6,10 +6,10 @@ import ( "regexp" "strings" - u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/utils" t "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/common/template" nc "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/nexusclient" "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/utils" + u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/utils" "github.com/google/uuid" ) diff --git a/client/cmdTemplate/templateListSingle.go b/nexush/cmdTemplate/templateListSingle.go similarity index 95% rename from client/cmdTemplate/templateListSingle.go rename to nexush/cmdTemplate/templateListSingle.go index 4bdac43b3f8ec5c5866c9804291b5a575b8472c5..df1571966ef42cdc67ee733ce2e879550ce341d2 100644 --- a/client/cmdTemplate/templateListSingle.go +++ b/nexush/cmdTemplate/templateListSingle.go @@ -1,8 +1,8 @@ package cmdTemplate import ( - u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/utils" nc "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/nexusclient" + u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/utils" ) type ListSingle struct { diff --git a/client/cmdToken/tokenRefresh.go b/nexush/cmdToken/tokenRefresh.go similarity index 94% rename from client/cmdToken/tokenRefresh.go rename to nexush/cmdToken/tokenRefresh.go index 58a2e457d55b0ed0e542d28dcb108df2246da761..0947b66eb346c4aff63bfc4b1f5a0764e63cd35e 100644 --- a/client/cmdToken/tokenRefresh.go +++ b/nexush/cmdToken/tokenRefresh.go @@ -1,8 +1,8 @@ package cmdToken import ( - u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/utils" nc "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/nexusclient" + u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/utils" ) type Refresh struct { diff --git a/client/cmdUser/userCreate.go b/nexush/cmdUser/userCreate.go similarity index 98% rename from client/cmdUser/userCreate.go rename to nexush/cmdUser/userCreate.go index 39102d71ceeda96824cc1dcb67efa40ab6190553..58d336703797a9cd74729bbceaa21de7831ad7f0 100644 --- a/client/cmdUser/userCreate.go +++ b/nexush/cmdUser/userCreate.go @@ -6,12 +6,12 @@ import ( "os" "strings" - u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/utils" "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/common/caps" "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/common/params" g "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/globals" nc "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/nexusclient" "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/utils" + u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/utils" ) type Add struct { diff --git a/client/cmdUser/userDel.go b/nexush/cmdUser/userDel.go similarity index 97% rename from client/cmdUser/userDel.go rename to nexush/cmdUser/userDel.go index 0f0fce17927a9acba8b1f00a6da0c34b042ef8aa..44f53594d56fb7757af6e88ff17795cbc89ff1d0 100644 --- a/client/cmdUser/userDel.go +++ b/nexush/cmdUser/userDel.go @@ -5,10 +5,10 @@ import ( "io" "os" - u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/utils" g "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/globals" nc "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/nexusclient" "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/utils" + u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/utils" ) type Del struct { diff --git a/client/cmdUser/userList.go b/nexush/cmdUser/userList.go similarity index 98% rename from client/cmdUser/userList.go rename to nexush/cmdUser/userList.go index 2c6c6e3bce41b9349732baed1cb39f96ed74ae59..41e5d9ad3992317d7577f1986a9199c818460b9e 100644 --- a/client/cmdUser/userList.go +++ b/nexush/cmdUser/userList.go @@ -5,10 +5,10 @@ import ( "regexp" "strings" - u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/utils" "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/common/params" nc "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/nexusclient" "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/utils" + u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/utils" ) type List struct { diff --git a/client/cmdUser/userResetPwd.go b/nexush/cmdUser/userResetPwd.go similarity index 95% rename from client/cmdUser/userResetPwd.go rename to nexush/cmdUser/userResetPwd.go index aeb5aad5b3a9a0da243271d9690a100c6a565369..699d76771b83208b7912901c3457b023b509c644 100644 --- a/client/cmdUser/userResetPwd.go +++ b/nexush/cmdUser/userResetPwd.go @@ -1,8 +1,8 @@ package cmdUser import ( - u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/utils" nc "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/nexusclient" + u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/utils" ) type ResetPwd struct { diff --git a/client/cmdUser/userSetCaps.go b/nexush/cmdUser/userSetCaps.go similarity index 98% rename from client/cmdUser/userSetCaps.go rename to nexush/cmdUser/userSetCaps.go index 14ef4b4214ab44193a0c327ca7c6e7d06f2961ef..32d5c2d20b7e0fb64617b7eee045828a0f2fe8a9 100644 --- a/client/cmdUser/userSetCaps.go +++ b/nexush/cmdUser/userSetCaps.go @@ -6,12 +6,12 @@ import ( "os" "strings" - u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/utils" "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/common/caps" "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/common/params" g "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/globals" nc "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/nexusclient" "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/utils" + u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/utils" ) type SetCaps struct { diff --git a/client/cmdUser/userUnlock.go b/nexush/cmdUser/userUnlock.go similarity index 95% rename from client/cmdUser/userUnlock.go rename to nexush/cmdUser/userUnlock.go index 57d337aa33d22f30dbf0aea849f789b55ff88b53..3ed5563237015ad37cb5bb7d4b3ec1aa438a079e 100644 --- a/client/cmdUser/userUnlock.go +++ b/nexush/cmdUser/userUnlock.go @@ -1,8 +1,8 @@ package cmdUser import ( - u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/utils" nc "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/nexusclient" + u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/utils" ) type Unlock struct { diff --git a/client/cmdUser/userUpdatePwd.go b/nexush/cmdUser/userUpdatePwd.go similarity index 96% rename from client/cmdUser/userUpdatePwd.go rename to nexush/cmdUser/userUpdatePwd.go index 2904af5c86eeeb695e36179598c099dfd4a9494c..7d977408e7a5c9ecbe8f1a85f0673ca656ffa6f2 100644 --- a/client/cmdUser/userUpdatePwd.go +++ b/nexush/cmdUser/userUpdatePwd.go @@ -3,8 +3,8 @@ package cmdUser import ( "bytes" - u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/utils" nc "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/nexusclient" + u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/utils" "golang.org/x/crypto/ssh/terminal" ) diff --git a/client/cmdUser/userWhoami.go b/nexush/cmdUser/userWhoami.go similarity index 94% rename from client/cmdUser/userWhoami.go rename to nexush/cmdUser/userWhoami.go index 50e6288472fcb76d71af8615738a58d7b91990bf..069c90bafb39f4976a33e3de9541ad8f2fc140dc 100644 --- a/client/cmdUser/userWhoami.go +++ b/nexush/cmdUser/userWhoami.go @@ -1,8 +1,8 @@ package cmdUser import ( - u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/utils" nc "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/nexusclient" + u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/utils" ) type Whoami struct { diff --git a/client/cmdVM/helper.go b/nexush/cmdVM/helper.go similarity index 97% rename from client/cmdVM/helper.go rename to nexush/cmdVM/helper.go index 43df1a3f394b4ce4f5d75ab257518730e6b5669b..8f592cc97f529550420a4fb8423dada07ef9ebd8 100644 --- a/client/cmdVM/helper.go +++ b/nexush/cmdVM/helper.go @@ -5,10 +5,10 @@ import ( "regexp" "strings" - "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/cmd" - u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/utils" "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/common/vm" nc "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/nexusclient" + "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/cmd" + u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/utils" "github.com/google/uuid" ) diff --git a/client/cmdVM/resources/cmuntb.ttf b/nexush/cmdVM/resources/cmuntb.ttf similarity index 100% rename from client/cmdVM/resources/cmuntb.ttf rename to nexush/cmdVM/resources/cmuntb.ttf diff --git a/client/cmdVM/vmAddAccess.go b/nexush/cmdVM/vmAddAccess.go similarity index 98% rename from client/cmdVM/vmAddAccess.go rename to nexush/cmdVM/vmAddAccess.go index 519f6aea9960147f681b0231a36b31aa79489c6d..48d3af174f988b445e99b116df808de54b5b6fea 100644 --- a/client/cmdVM/vmAddAccess.go +++ b/nexush/cmdVM/vmAddAccess.go @@ -8,12 +8,12 @@ import ( "os" "strings" - u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/utils" "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/common/caps" "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/common/params" g "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/globals" nc "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/nexusclient" "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/utils" + u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/utils" ) type AddAccess struct { diff --git a/client/cmdVM/vmAttach.go b/nexush/cmdVM/vmAttach.go similarity index 94% rename from client/cmdVM/vmAttach.go rename to nexush/cmdVM/vmAttach.go index 9f889b47ef4120a5e6972d7bf29c781b7404166b..4d29f7894da312d0a90ad13e989e3596967da131 100644 --- a/client/cmdVM/vmAttach.go +++ b/nexush/cmdVM/vmAttach.go @@ -1,8 +1,8 @@ package cmdVM import ( - u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/utils" nc "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/nexusclient" + u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/utils" ) type Attach struct { diff --git a/client/cmdVM/vmAttachFromPwd.go b/nexush/cmdVM/vmAttachFromPwd.go similarity index 95% rename from client/cmdVM/vmAttachFromPwd.go rename to nexush/cmdVM/vmAttachFromPwd.go index 5b161108eb49381bf61b1905e1b342da66499278..3eb198313560c1fc9d806fb617550a3be352654a 100644 --- a/client/cmdVM/vmAttachFromPwd.go +++ b/nexush/cmdVM/vmAttachFromPwd.go @@ -1,8 +1,8 @@ package cmdVM import ( - u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/utils" nc "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/nexusclient" + u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/utils" ) type AttachFromPwd struct { diff --git a/client/cmdVM/vmAttachSingle.go b/nexush/cmdVM/vmAttachSingle.go similarity index 95% rename from client/cmdVM/vmAttachSingle.go rename to nexush/cmdVM/vmAttachSingle.go index 4c638ba4a59799ebbd86c91b46b59c4bc7a256c7..a7c52ce7ed5caced8efe89fa46322624ab76f3e8 100644 --- a/client/cmdVM/vmAttachSingle.go +++ b/nexush/cmdVM/vmAttachSingle.go @@ -1,8 +1,8 @@ package cmdVM import ( - u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/utils" nc "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/nexusclient" + u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/utils" ) type AttachSingle struct { diff --git a/client/cmdVM/vmAttachSync.go b/nexush/cmdVM/vmAttachSync.go similarity index 95% rename from client/cmdVM/vmAttachSync.go rename to nexush/cmdVM/vmAttachSync.go index eb6d7db4c138b27b0a066499ff4685c6af9ba794..4f29c44ebfbe27099f999cff7e76075ba3bf73fd 100644 --- a/client/cmdVM/vmAttachSync.go +++ b/nexush/cmdVM/vmAttachSync.go @@ -3,8 +3,8 @@ package cmdVM import ( "sync" - u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/utils" nc "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/nexusclient" + u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/utils" ) type AttachSync struct { diff --git a/client/cmdVM/vmCreate.go b/nexush/cmdVM/vmCreate.go similarity index 98% rename from client/cmdVM/vmCreate.go rename to nexush/cmdVM/vmCreate.go index bdfe851d56e7d7a93a99dabc1f238e9d2d3e6ab1..212b6fc14a0e692de7532c9775f4b3f12f3de5c1 100644 --- a/client/cmdVM/vmCreate.go +++ b/nexush/cmdVM/vmCreate.go @@ -4,11 +4,11 @@ import ( "fmt" "strconv" - u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/utils" "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/common/params" "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/common/vm" nc "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/nexusclient" "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/utils" + u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/utils" "github.com/google/uuid" ) diff --git a/client/cmdVM/vmCreds2csv.go b/nexush/cmdVM/vmCreds2csv.go similarity index 97% rename from client/cmdVM/vmCreds2csv.go rename to nexush/cmdVM/vmCreds2csv.go index 146afa06abc3506dbc0095ba3a1801e9feaa51e5..87c9edb16c0d9f94d6829837be9e1242b913fb1a 100644 --- a/client/cmdVM/vmCreds2csv.go +++ b/nexush/cmdVM/vmCreds2csv.go @@ -4,9 +4,9 @@ import ( "fmt" "os" - u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/utils" g "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/globals" nc "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/nexusclient" + u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/utils" ) type Creds2csv struct { diff --git a/client/cmdVM/vmCreds2pdf.go b/nexush/cmdVM/vmCreds2pdf.go similarity index 98% rename from client/cmdVM/vmCreds2pdf.go rename to nexush/cmdVM/vmCreds2pdf.go index 41706d34a6d4120bcd14c3a30b27fdfb0047ce74..4ac3ff62a91c9f9464003fc4b581f86042bba86b 100644 --- a/client/cmdVM/vmCreds2pdf.go +++ b/nexush/cmdVM/vmCreds2pdf.go @@ -3,8 +3,8 @@ package cmdVM import ( _ "embed" - u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/utils" nc "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/nexusclient" + u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/utils" "github.com/go-pdf/fpdf" ) diff --git a/client/cmdVM/vmDel.go b/nexush/cmdVM/vmDel.go similarity index 94% rename from client/cmdVM/vmDel.go rename to nexush/cmdVM/vmDel.go index bf3d81ff86b062761a9c9e548753795ca3a3055f..11e12b310ab88e675a95bfeee13a1007d7a690b0 100644 --- a/client/cmdVM/vmDel.go +++ b/nexush/cmdVM/vmDel.go @@ -1,8 +1,8 @@ package cmdVM import ( - u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/utils" nc "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/nexusclient" + u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/utils" ) type Del struct { diff --git a/client/cmdVM/vmDelAccess.go b/nexush/cmdVM/vmDelAccess.go similarity index 98% rename from client/cmdVM/vmDelAccess.go rename to nexush/cmdVM/vmDelAccess.go index 80a35c9cdc74fed7e2fc89b322957f1010df9ebe..134b547f59b545dd41a4de7e33af8c4d2d872b5c 100644 --- a/client/cmdVM/vmDelAccess.go +++ b/nexush/cmdVM/vmDelAccess.go @@ -7,10 +7,10 @@ import ( "net/mail" "os" - u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/utils" g "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/globals" nc "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/nexusclient" "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/utils" + u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/utils" ) type DelAccess struct { diff --git a/client/cmdVM/vmEdit.go b/nexush/cmdVM/vmEdit.go similarity index 98% rename from client/cmdVM/vmEdit.go rename to nexush/cmdVM/vmEdit.go index 9770c590089dae8401a6b8ed15d61bcd3678a9fc..af2af63b8f3626a343b396e5e6812309010f6b55 100644 --- a/client/cmdVM/vmEdit.go +++ b/nexush/cmdVM/vmEdit.go @@ -5,11 +5,11 @@ import ( "strconv" "strings" - u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/utils" "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/common/params" "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/common/vm" nc "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/nexusclient" "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/utils" + u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/utils" ) type Edit struct { diff --git a/client/cmdVM/vmExportDir.go b/nexush/cmdVM/vmExportDir.go similarity index 96% rename from client/cmdVM/vmExportDir.go rename to nexush/cmdVM/vmExportDir.go index 8b6a50a80302475ca17a70c62a98abb6b91564ce..4cc7aa261c4d2d7c662e5338f83e5ec4a0811a1e 100644 --- a/client/cmdVM/vmExportDir.go +++ b/nexush/cmdVM/vmExportDir.go @@ -1,8 +1,8 @@ package cmdVM import ( - u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/utils" nc "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/nexusclient" + u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/utils" ) type ExportDir struct { diff --git a/client/cmdVM/vmImportDir.go b/nexush/cmdVM/vmImportDir.go similarity index 97% rename from client/cmdVM/vmImportDir.go rename to nexush/cmdVM/vmImportDir.go index 1ff21c7d2352ea7ec5ab900f0d83566040733289..207d236545f1db893203627c106061caabd1b81e 100644 --- a/client/cmdVM/vmImportDir.go +++ b/nexush/cmdVM/vmImportDir.go @@ -3,9 +3,9 @@ package cmdVM import ( "os" - u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/utils" cu "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/common/utils" nc "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/nexusclient" + u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/utils" ) type ImportDir struct { diff --git a/client/cmdVM/vmList.go b/nexush/cmdVM/vmList.go similarity index 97% rename from client/cmdVM/vmList.go rename to nexush/cmdVM/vmList.go index aa7519fe7f7bcdec5722d2dc83941ae477b463f4..e34603ce208a37aa1022f6c89b22c7e154d27248 100644 --- a/client/cmdVM/vmList.go +++ b/nexush/cmdVM/vmList.go @@ -3,9 +3,9 @@ package cmdVM import ( "fmt" - u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/utils" nc "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/nexusclient" "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/utils" + u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/utils" ) type List struct { diff --git a/client/cmdVM/vmListSingle.go b/nexush/cmdVM/vmListSingle.go similarity index 95% rename from client/cmdVM/vmListSingle.go rename to nexush/cmdVM/vmListSingle.go index c7728d8d00155555d5e88ba94902bb592fad4652..99e01bfc11a50ff23398adaa446c467ebb04541c 100644 --- a/client/cmdVM/vmListSingle.go +++ b/nexush/cmdVM/vmListSingle.go @@ -1,8 +1,8 @@ package cmdVM import ( - u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/utils" nc "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/nexusclient" + u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/utils" ) type ListSingle struct { diff --git a/client/cmdVM/vmReboot.go b/nexush/cmdVM/vmReboot.go similarity index 94% rename from client/cmdVM/vmReboot.go rename to nexush/cmdVM/vmReboot.go index f252fe4ed3a17afb9bd19c4337117a580ad42820..defa41344cf3c94ae330a884df99d3cbb2c27ed0 100644 --- a/client/cmdVM/vmReboot.go +++ b/nexush/cmdVM/vmReboot.go @@ -1,8 +1,8 @@ package cmdVM import ( - u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/utils" nc "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/nexusclient" + u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/utils" ) type Reboot struct { diff --git a/client/cmdVM/vmShutdown.go b/nexush/cmdVM/vmShutdown.go similarity index 94% rename from client/cmdVM/vmShutdown.go rename to nexush/cmdVM/vmShutdown.go index 22c680b01a45c0cdacd9fc54c67e5305003689f6..eb2c9d6b9aeff6a024a027b30b3b402b4e55d9c8 100644 --- a/client/cmdVM/vmShutdown.go +++ b/nexush/cmdVM/vmShutdown.go @@ -1,8 +1,8 @@ package cmdVM import ( - u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/utils" nc "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/nexusclient" + u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/utils" ) type Shutdown struct { diff --git a/client/cmdVM/vmStart.go b/nexush/cmdVM/vmStart.go similarity index 93% rename from client/cmdVM/vmStart.go rename to nexush/cmdVM/vmStart.go index bb042997a17d1ff25d0b1ca0f68476a701b2faa6..1b123228d26e6049e2b0a45fbf0f296c3da48d96 100644 --- a/client/cmdVM/vmStart.go +++ b/nexush/cmdVM/vmStart.go @@ -1,8 +1,8 @@ package cmdVM import ( - u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/utils" nc "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/nexusclient" + u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/utils" ) type Start struct { diff --git a/client/cmdVM/vmStartAttach.go b/nexush/cmdVM/vmStartAttach.go similarity index 96% rename from client/cmdVM/vmStartAttach.go rename to nexush/cmdVM/vmStartAttach.go index 41d3dbb9d6d9d3a2c5b9c05b92a4a09a0f16ff3a..10fbfd821b4de16500f775beb35c01a44e82a936 100644 --- a/client/cmdVM/vmStartAttach.go +++ b/nexush/cmdVM/vmStartAttach.go @@ -1,8 +1,8 @@ package cmdVM import ( - u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/utils" nc "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/nexusclient" + u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/utils" ) type StartAttach struct { diff --git a/client/cmdVM/vmStartWithCreds.go b/nexush/cmdVM/vmStartWithCreds.go similarity index 97% rename from client/cmdVM/vmStartWithCreds.go rename to nexush/cmdVM/vmStartWithCreds.go index 905fab8aa199fd9ee1075aba37b8a19a64a0abe6..a5795f3ce697fe5ce734d711dede55433ad533e8 100644 --- a/client/cmdVM/vmStartWithCreds.go +++ b/nexush/cmdVM/vmStartWithCreds.go @@ -3,10 +3,10 @@ package cmdVM import ( "errors" - u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/utils" "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/common/params" nc "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/nexusclient" "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/utils" + u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/utils" ) type StartWithCreds struct { diff --git a/client/cmdVM/vmStop.go b/nexush/cmdVM/vmStop.go similarity index 94% rename from client/cmdVM/vmStop.go rename to nexush/cmdVM/vmStop.go index e5dac65926e786eed5b8f34a729e70ae05bdbb00..7095dc4021023293024081e9edebe93ceac6e673 100644 --- a/client/cmdVM/vmStop.go +++ b/nexush/cmdVM/vmStop.go @@ -1,8 +1,8 @@ package cmdVM import ( - u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/utils" nc "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/nexusclient" + u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/utils" ) type Stop struct { diff --git a/client/cmdVersion/version.go b/nexush/cmdVersion/version.go similarity index 97% rename from client/cmdVersion/version.go rename to nexush/cmdVersion/version.go index d4c1690180967bfe08e61cb64fbd9ba56608683e..9fc25030fffd852306f22cdd26ad8f7e18e42250 100644 --- a/client/cmdVersion/version.go +++ b/nexush/cmdVersion/version.go @@ -1,9 +1,9 @@ package cmdVersion import ( - u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/utils" nc "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/nexusclient" "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/version" + u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/utils" ) type Version struct { diff --git a/nexush/go.mod b/nexush/go.mod new file mode 100644 index 0000000000000000000000000000000000000000..804a2edf4714d6adddf3b0bd3f8fd4eb1b4fb1ab --- /dev/null +++ b/nexush/go.mod @@ -0,0 +1,28 @@ +module gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush + +go 1.22.2 + +replace gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient => ../libclient + +require ( + gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/common v0.0.0-20250320135605-9ac7ec3df57a + gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient v0.0.0-20250320135605-9ac7ec3df57a + github.com/go-pdf/fpdf v0.9.0 + github.com/google/uuid v1.6.0 + github.com/peterh/liner v1.2.2 + golang.org/x/crypto v0.32.0 + golang.org/x/term v0.28.0 +) + +require ( + github.com/gabriel-vasile/mimetype v1.4.8 // indirect + github.com/go-playground/locales v0.14.1 // indirect + github.com/go-playground/universal-translator v0.18.1 // indirect + github.com/go-playground/validator/v10 v10.25.0 // indirect + github.com/go-resty/resty/v2 v2.16.5 // indirect + github.com/leodido/go-urn v1.4.0 // indirect + github.com/mattn/go-runewidth v0.0.3 // indirect + golang.org/x/net v0.34.0 // indirect + golang.org/x/sys v0.29.0 // indirect + golang.org/x/text v0.21.0 // indirect +) diff --git a/nexush/go.sum b/nexush/go.sum new file mode 100644 index 0000000000000000000000000000000000000000..699f27e948a12240c52da4ad9599c6a383a0132f --- /dev/null +++ b/nexush/go.sum @@ -0,0 +1,45 @@ +gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/common v0.0.0-20250320135605-9ac7ec3df57a h1:D4M2OnN+9vUALGPo6yNyWmcpvgGIzo/2HJj8SA4bGls= +gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/common v0.0.0-20250320135605-9ac7ec3df57a/go.mod h1:HzVsiYhPk7BhhvspjLchF3HlY1z+qIF89jG6+Hs8m3c= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/gabriel-vasile/mimetype v1.4.8 h1:FfZ3gj38NjllZIeJAmMhr+qKL8Wu+nOoI3GqacKw1NM= +github.com/gabriel-vasile/mimetype v1.4.8/go.mod h1:ByKUIKGjh1ODkGM1asKUbQZOLGrPjydw3hYPU2YU9t8= +github.com/go-pdf/fpdf v0.9.0 h1:PPvSaUuo1iMi9KkaAn90NuKi+P4gwMedWPHhj8YlJQw= +github.com/go-pdf/fpdf v0.9.0/go.mod h1:oO8N111TkmKb9D7VvWGLvLJlaZUQVPM+6V42pp3iV4Y= +github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= +github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= +github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= +github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= +github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= +github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= +github.com/go-playground/validator/v10 v10.25.0 h1:5Dh7cjvzR7BRZadnsVOzPhWsrwUr0nmsZJxEAnFLNO8= +github.com/go-playground/validator/v10 v10.25.0/go.mod h1:GGzBIJMuE98Ic/kJsBXbz1x/7cByt++cQ+YOuDM5wus= +github.com/go-resty/resty/v2 v2.16.5 h1:hBKqmWrr7uRc3euHVqmh1HTHcKn99Smr7o5spptdhTM= +github.com/go-resty/resty/v2 v2.16.5/go.mod h1:hkJtXbA2iKHzJheXYvQ8snQES5ZLGKMwQ07xAwp/fiA= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= +github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= +github.com/mattn/go-runewidth v0.0.3 h1:a+kO+98RDGEfo6asOGMmpodZq4FNtnGP54yps8BzLR4= +github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= +github.com/peterh/liner v1.2.2 h1:aJ4AOodmL+JxOZZEL2u9iJf8omNRpqHc/EbrK+3mAXw= +github.com/peterh/liner v1.2.2/go.mod h1:xFwJyiKIXJZUKItq5dGHZSTBRAuG/CpeNpWLyiNRNwI= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc= +golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc= +golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0= +golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k= +golang.org/x/sys v0.0.0-20211117180635-dee7805ff2e1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU= +golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg= +golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek= +golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= +golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U= +golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/client/nexus-cli/nexus-cli.go b/nexush/nexus-cli.go.unused similarity index 89% rename from client/nexus-cli/nexus-cli.go rename to nexush/nexus-cli.go.unused index bc9cf4b4ba70941c54a4af45254be01b7ed8ba15..d351abcca60989e32f190c63223f68ad77fd2bdf 100644 --- a/client/nexus-cli/nexus-cli.go +++ b/nexush/nexus-cli.go.unused @@ -4,20 +4,20 @@ import ( "os" "path" - "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/cmd" - "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/cmdLogin" - "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/cmdMisc" - "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/cmdTemplate" - "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/cmdToken" - "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/cmdUser" - "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/cmdVM" - "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/cmdVersion" - "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/defaults" - u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/utils" "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/common/buildversion" g "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/globals" nc "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/nexusclient" "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/version" + "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/cmd" + "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/cmdLogin" + "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/cmdMisc" + "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/cmdTemplate" + "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/cmdToken" + "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/cmdUser" + "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/cmdVM" + "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/cmdVersion" + "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/defaults" + u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/utils" ) var cmdList = []cmd.Command{ diff --git a/client/nexush/nexush.go b/nexush/nexush.go similarity index 66% rename from client/nexush/nexush.go rename to nexush/nexush.go index c7068a2ca4e8511a013f0866a394e356d5f61437..f9029982d2ff68c67b9052b42573b2695dddf1dd 100644 --- a/client/nexush/nexush.go +++ b/nexush/nexush.go @@ -1,6 +1,7 @@ package main import ( + _ "embed" "errors" "fmt" "io" @@ -9,76 +10,80 @@ import ( "strings" "syscall" - "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/cmd" - "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/cmdMisc" - "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/cmdTemplate" - "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/cmdToken" - "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/cmdUser" - "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/cmdVM" - "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/cmdVersion" - "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/defaults" - u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/utils" "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/common/buildversion" g "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/globals" nc "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/nexusclient" "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/version" + "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/cmd" + "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/cmdMisc" + "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/cmdTemplate" + "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/cmdToken" + "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/cmdUser" + "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/cmdVM" + "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/cmdVersion" + u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/utils" "github.com/peterh/liner" "golang.org/x/term" ) -var cmdList = []cmd.Command{ - &cmdMisc.HelpHeader{Name: "!â•â•â•â•â•â•¡ GENERAL commands ╞â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•"}, - // Commands in this block are specific to nexush: - &cmdMisc.Ls{Name: "ls"}, - // End of nexush specific commands - - &cmdToken.Refresh{Name: "refresh"}, - &cmdVersion.Version{Name: "version"}, - - &cmdMisc.HelpHeader{Name: "!â•â•â•â•â•â•¡ USER commands ╞â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•"}, - &cmdUser.Whoami{Name: "whoami"}, - &cmdUser.UpdatePwd{Name: "passwd"}, - &cmdUser.List{Name: "userlist"}, - &cmdUser.Add{Name: "usercreate"}, - &cmdUser.Del{Name: "userdel"}, - &cmdUser.ResetPwd{Name: "userresetpwd"}, - &cmdUser.SetCaps{Name: "usersetcaps"}, - &cmdUser.Unlock{Name: "userunlock"}, - - &cmdMisc.HelpHeader{Name: "!â•â•â•â•â•â•¡ TEMPLATE commands ╞â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•"}, - &cmdTemplate.Create{Name: "tplcreate"}, - &cmdTemplate.Del{Name: "tpldel"}, - &cmdTemplate.Edit{Name: "tpledit"}, - &cmdTemplate.ExportDisk{Name: "tplexportdisk"}, - &cmdTemplate.List{Name: "tpllist"}, - // &cmdTemplate.ListSingle{Name: "tpllistsingle"}, // for testing the route only - - &cmdMisc.HelpHeader{Name: "!â•â•â•â•â•â•¡ VM commands ╞â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•"}, - &cmdVM.AddAccess{Name: "vmaddaccess"}, - &cmdVM.Attach{Name: "vmattach"}, - // &cmdVM.AttachSingle{Name: "vmattachsingle"}, // for testing the route only - // &cmdVM.AttachFromPwd{Name: "vmattachfrompwd"}, // for testing the route only - &cmdVM.Create{Name: "vmcreate"}, - &cmdVM.Creds2pdf{Name: "vmcreds2pdf"}, - &cmdVM.Creds2csv{Name: "vmcreds2csv"}, - &cmdVM.Del{Name: "vmdel"}, - &cmdVM.DelAccess{Name: "vmdelaccess"}, - &cmdVM.Edit{Name: "vmedit"}, - &cmdVM.ExportDir{Name: "vmexportdir"}, - &cmdVM.ImportDir{Name: "vmimportdir"}, - &cmdVM.Stop{Name: "vmkill"}, - &cmdVM.List{Name: "vmlist"}, - // &cmdVM.ListSingle{Name: "vmlistsingle"}, // for testing the route only - &cmdVM.Reboot{Name: "vmreboot"}, - &cmdVM.Shutdown{Name: "vmshutdown"}, - &cmdVM.Start{Name: "vmstart"}, - &cmdVM.StartAttach{Name: "vmstartattach"}, - &cmdVM.StartWithCreds{Name: "vmstartwithcreds"}, -} +var ( + //go:embed build/server + nexus_server string + + cmdList = []cmd.Command{ + &cmdMisc.HelpHeader{Name: "!â•â•â•â•â•â•¡ GENERAL commands ╞â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•"}, + // Commands in this block are specific to nexush: + &cmdMisc.Ls{Name: "ls"}, + // End of nexush specific commands + + &cmdToken.Refresh{Name: "refresh"}, + &cmdVersion.Version{Name: "version"}, + + &cmdMisc.HelpHeader{Name: "!â•â•â•â•â•â•¡ USER commands ╞â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•"}, + &cmdUser.Whoami{Name: "whoami"}, + &cmdUser.UpdatePwd{Name: "passwd"}, + &cmdUser.List{Name: "userlist"}, + &cmdUser.Add{Name: "usercreate"}, + &cmdUser.Del{Name: "userdel"}, + &cmdUser.ResetPwd{Name: "userresetpwd"}, + &cmdUser.SetCaps{Name: "usersetcaps"}, + &cmdUser.Unlock{Name: "userunlock"}, + + &cmdMisc.HelpHeader{Name: "!â•â•â•â•â•â•¡ TEMPLATE commands ╞â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•"}, + &cmdTemplate.Create{Name: "tplcreate"}, + &cmdTemplate.Del{Name: "tpldel"}, + &cmdTemplate.Edit{Name: "tpledit"}, + &cmdTemplate.ExportDisk{Name: "tplexportdisk"}, + &cmdTemplate.List{Name: "tpllist"}, + // &cmdTemplate.ListSingle{Name: "tpllistsingle"}, // for testing the route only + + &cmdMisc.HelpHeader{Name: "!â•â•â•â•â•â•¡ VM commands ╞â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•â•"}, + &cmdVM.AddAccess{Name: "vmaddaccess"}, + &cmdVM.Attach{Name: "vmattach"}, + // &cmdVM.AttachSingle{Name: "vmattachsingle"}, // for testing the route only + // &cmdVM.AttachFromPwd{Name: "vmattachfrompwd"}, // for testing the route only + &cmdVM.Create{Name: "vmcreate"}, + &cmdVM.Creds2pdf{Name: "vmcreds2pdf"}, + &cmdVM.Creds2csv{Name: "vmcreds2csv"}, + &cmdVM.Del{Name: "vmdel"}, + &cmdVM.DelAccess{Name: "vmdelaccess"}, + &cmdVM.Edit{Name: "vmedit"}, + &cmdVM.ExportDir{Name: "vmexportdir"}, + &cmdVM.ImportDir{Name: "vmimportdir"}, + &cmdVM.Stop{Name: "vmkill"}, + &cmdVM.List{Name: "vmlist"}, + // &cmdVM.ListSingle{Name: "vmlistsingle"}, // for testing the route only + &cmdVM.Reboot{Name: "vmreboot"}, + &cmdVM.Shutdown{Name: "vmshutdown"}, + &cmdVM.Start{Name: "vmstart"}, + &cmdVM.StartAttach{Name: "vmstartattach"}, + &cmdVM.StartWithCreds{Name: "vmstartwithcreds"}, + } -var exitFn func() -var prompt *liner.State = nil -var savedTermState *term.State = nil + exitFn func() + prompt *liner.State = nil + savedTermState *term.State = nil +) func exit(code int) { if exitFn != nil { @@ -101,7 +106,7 @@ func run() int { serverEnvVar, found := os.LookupEnv(g.ENV_NEXUS_SERVER) if !found { - serverEnvVar = defaults.NexusServer + serverEnvVar = nexus_server // u.PrintlnErr("Environment variable \""+g.ENV_NEXUS_SERVER+"\" must be set!") // u.PrintlnErr("It defines the nexus server to connect to along the port number.") // u.PrintlnErr("Example: export "+g.ENV_NEXUS_SERVER+"=192.168.1.42:1077") diff --git a/client/utils/print.go b/nexush/utils/print.go similarity index 100% rename from client/utils/print.go rename to nexush/utils/print.go diff --git a/client/utils/signal.go b/nexush/utils/signal.go similarity index 100% rename from client/utils/signal.go rename to nexush/utils/signal.go diff --git a/server/Makefile b/server/Makefile index 29794de2104b742c1cf960ee6154ff4db26ac847..29fa5b8638ca7259725669e437cec58363440819 100644 --- a/server/Makefile +++ b/server/Makefile @@ -6,13 +6,13 @@ SERVER_BINARY=nexus-server help: @echo "Available targets:" - @echo " build Build nexus-server binaries" - @echo " clean Delete nexus-server binaries" + @echo " build Build nexus-server" + @echo " clean Delete all generated files (delete $(BUILD_DIR) directory)" $(BUILD_DIR): @mkdir -p $@ @echo "[Building nexus-server]" - @go build $(BUILD_FLAGS) -o $(BUILD_DIR)/$(SERVER_BINARY) + go build $(BUILD_FLAGS) -o $(BUILD_DIR)/$(SERVER_BINARY) @echo "OK" clean: