Move modules to root

27 files changed, 10 insertions, 25 deletions

diff --git a/client/go/build.sh b/client/go/build.sh
index 9edc5df4002..08d8f1d8983 100755
--- a/client/go/build.sh
+++ b/client/go/build.sh
@@ -1,7 +1,14 @@
 # Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 # Execute from this directory to build the command-line client to bin/vespa
-export GOPATH=`pwd`
-cd "$GOPATH/src/"
-go test ./...
+cd util
+go test
+cd ..
+
+cd cmd
+go test
+cd ..
+
+export GOBIN=`pwd`/bin
 go install
+
diff --git a/client/go/src/cmd/command_tester.go b/client/go/cmd/command_tester.go
index f1d4b52d0bb..f1d4b52d0bb 100644
--- a/client/go/src/cmd/command_tester.go
+++ b/client/go/cmd/command_tester.go
diff --git a/client/go/src/cmd/config.go b/client/go/cmd/config.go
index 2c10eaf8f02..2c10eaf8f02 100644
--- a/client/go/src/cmd/config.go
+++ b/client/go/cmd/config.go
diff --git a/client/go/src/cmd/deploy.go b/client/go/cmd/deploy.go
index bfd3837cd5a..bfd3837cd5a 100644
--- a/client/go/src/cmd/deploy.go
+++ b/client/go/cmd/deploy.go
diff --git a/client/go/src/cmd/deploy_test.go b/client/go/cmd/deploy_test.go
index 64ede50546c..64ede50546c 100644
--- a/client/go/src/cmd/deploy_test.go
+++ b/client/go/cmd/deploy_test.go
diff --git a/client/go/src/cmd/document.go b/client/go/cmd/document.go
index f48a3965d01..f48a3965d01 100644
--- a/client/go/src/cmd/document.go
+++ b/client/go/cmd/document.go
diff --git a/client/go/src/cmd/document_test.go b/client/go/cmd/document_test.go
index 9d0ae6e505e..9d0ae6e505e 100644
--- a/client/go/src/cmd/document_test.go
+++ b/client/go/cmd/document_test.go
diff --git a/client/go/src/cmd/init.go b/client/go/cmd/init.go
index 64e8b342309..64e8b342309 100644
--- a/client/go/src/cmd/init.go
+++ b/client/go/cmd/init.go
diff --git a/client/go/src/cmd/init_test.go b/client/go/cmd/init_test.go
index 3cb526ad0f1..3cb526ad0f1 100644
--- a/client/go/src/cmd/init_test.go
+++ b/client/go/cmd/init_test.go
diff --git a/client/go/src/cmd/query.go b/client/go/cmd/query.go
index 58828dbb7cf..58828dbb7cf 100644
--- a/client/go/src/cmd/query.go
+++ b/client/go/cmd/query.go
diff --git a/client/go/src/cmd/query_test.go b/client/go/cmd/query_test.go
index ab48c482a7d..ab48c482a7d 100644
--- a/client/go/src/cmd/query_test.go
+++ b/client/go/cmd/query_test.go
diff --git a/client/go/src/cmd/root.go b/client/go/cmd/root.go
index 8f33cb47c43..8f33cb47c43 100644
--- a/client/go/src/cmd/root.go
+++ b/client/go/cmd/root.go
diff --git a/client/go/src/cmd/status.go b/client/go/cmd/status.go
index a011678be09..a011678be09 100644
--- a/client/go/src/cmd/status.go
+++ b/client/go/cmd/status.go
diff --git a/client/go/src/cmd/status_test.go b/client/go/cmd/status_test.go
index 0910a6007b9..0910a6007b9 100644
--- a/client/go/src/cmd/status_test.go
+++ b/client/go/cmd/status_test.go
diff --git a/client/go/src/cmd/target.go b/client/go/cmd/target.go
index 4c1ead7f74e..4c1ead7f74e 100644
--- a/client/go/src/cmd/target.go
+++ b/client/go/cmd/target.go
diff --git a/client/go/src/cmd/testdata/A-Head-Full-of-Dreams.json b/client/go/cmd/testdata/A-Head-Full-of-Dreams.json
index b68872a961e..b68872a961e 100644
--- a/client/go/src/cmd/testdata/A-Head-Full-of-Dreams.json
+++ b/client/go/cmd/testdata/A-Head-Full-of-Dreams.json
diff --git a/client/go/src/cmd/testdata/application.zip b/client/go/cmd/testdata/application.zip
index b017db6472d..b017db6472d 100644
--- a/client/go/src/cmd/testdata/application.zip
+++ b/client/go/cmd/testdata/application.zip
diff --git a/client/go/src/cmd/testdata/sample-apps-master.zip b/client/go/cmd/testdata/sample-apps-master.zip
index 6ad49361072..6ad49361072 100644
--- a/client/go/src/cmd/testdata/sample-apps-master.zip
+++ b/client/go/cmd/testdata/sample-apps-master.zip
diff --git a/client/go/src/cmd/testdata/src/main/application/hosts.xml b/client/go/cmd/testdata/src/main/application/hosts.xml
index 5dd3ed0dded..5dd3ed0dded 100644
--- a/client/go/src/cmd/testdata/src/main/application/hosts.xml
+++ b/client/go/cmd/testdata/src/main/application/hosts.xml
diff --git a/client/go/src/cmd/testdata/src/main/application/schemas/msmarco.sd b/client/go/cmd/testdata/src/main/application/schemas/msmarco.sd
index 183e1a6421f..183e1a6421f 100644
--- a/client/go/src/cmd/testdata/src/main/application/schemas/msmarco.sd
+++ b/client/go/cmd/testdata/src/main/application/schemas/msmarco.sd
diff --git a/client/go/src/cmd/testdata/src/main/application/services.xml b/client/go/cmd/testdata/src/main/application/services.xml
index 766434798f0..766434798f0 100644
--- a/client/go/src/cmd/testdata/src/main/application/services.xml
+++ b/client/go/cmd/testdata/src/main/application/services.xml
diff --git a/client/go/src/go.mod b/client/go/src/go.mod
deleted file mode 100644
index 40499f09e04..00000000000
--- a/client/go/src/go.mod
+++ /dev/null
@@ -1,9 +0,0 @@
-module github.com/vespa-engine/vespa
-
-go 1.16
-
-require (
-	github.com/spf13/cobra v1.2.1
-	github.com/spf13/viper v1.8.1
-	github.com/stretchr/testify v1.7.0
-)
diff --git a/client/go/src/main.go b/client/go/src/main.go
deleted file mode 100644
index 3803ee357b2..00000000000
--- a/client/go/src/main.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-// Cobra commands main file
-// Author: bratseth
-
-package main
-
-import (
-    "github.com/vespa-engine/vespa/cmd"
-)
-
-func main() {
-    cmd.Execute()
-}
diff --git a/client/go/src/util/http.go b/client/go/util/http.go
index 24e2416117c..24e2416117c 100644
--- a/client/go/src/util/http.go
+++ b/client/go/util/http.go
diff --git a/client/go/src/util/http_test.go b/client/go/util/http_test.go
index 03b155488d9..03b155488d9 100644
--- a/client/go/src/util/http_test.go
+++ b/client/go/util/http_test.go
diff --git a/client/go/src/util/io.go b/client/go/util/io.go
index 217beb085d1..217beb085d1 100644
--- a/client/go/src/util/io.go
+++ b/client/go/util/io.go
diff --git a/client/go/src/util/print.go b/client/go/util/print.go
index 76912094f6e..76912094f6e 100644
--- a/client/go/src/util/print.go
+++ b/client/go/util/print.go