From 1ac24f29a76ded3e1c2588df2a9bc146c388d942 Mon Sep 17 00:00:00 2001 From: Martin Polden Date: Mon, 6 Sep 2021 12:10:30 +0200 Subject: Fix module path --- client/go/cmd/api_key.go | 4 ++-- client/go/cmd/cert.go | 4 ++-- client/go/cmd/clone.go | 2 +- client/go/cmd/clone_test.go | 2 +- client/go/cmd/command_tester.go | 2 +- client/go/cmd/config.go | 4 ++-- client/go/cmd/deploy.go | 2 +- client/go/cmd/document.go | 4 ++-- client/go/cmd/document_test.go | 4 ++-- client/go/cmd/helpers.go | 2 +- client/go/cmd/query.go | 2 +- client/go/cmd/vespa/main.go | 13 +++++++++++++ client/go/go.mod | 2 +- client/go/main.go | 13 ------------- client/go/vespa/deploy.go | 2 +- client/go/vespa/document.go | 2 +- client/go/vespa/target.go | 2 +- 17 files changed, 33 insertions(+), 33 deletions(-) create mode 100644 client/go/cmd/vespa/main.go delete mode 100644 client/go/main.go (limited to 'client/go') diff --git a/client/go/cmd/api_key.go b/client/go/cmd/api_key.go index e4e217e9aed..9e9569e9f71 100644 --- a/client/go/cmd/api_key.go +++ b/client/go/cmd/api_key.go @@ -10,8 +10,8 @@ import ( "path/filepath" "github.com/spf13/cobra" - "github.com/vespa-engine/vespa/util" - "github.com/vespa-engine/vespa/vespa" + "github.com/vespa-engine/vespa/client/go/util" + "github.com/vespa-engine/vespa/client/go/vespa" ) var overwriteKey bool diff --git a/client/go/cmd/cert.go b/client/go/cmd/cert.go index ed4d65ef7ee..130fb4a0505 100644 --- a/client/go/cmd/cert.go +++ b/client/go/cmd/cert.go @@ -9,8 +9,8 @@ import ( "path/filepath" "github.com/spf13/cobra" - "github.com/vespa-engine/vespa/util" - "github.com/vespa-engine/vespa/vespa" + "github.com/vespa-engine/vespa/client/go/util" + "github.com/vespa-engine/vespa/client/go/vespa" ) var overwriteCertificate bool diff --git a/client/go/cmd/clone.go b/client/go/cmd/clone.go index 40209698478..39281d408a5 100644 --- a/client/go/cmd/clone.go +++ b/client/go/cmd/clone.go @@ -17,7 +17,7 @@ import ( "time" "github.com/spf13/cobra" - "github.com/vespa-engine/vespa/util" + "github.com/vespa-engine/vespa/client/go/util" ) // Set this to test without downloading this file from github diff --git a/client/go/cmd/clone_test.go b/client/go/cmd/clone_test.go index 313ad849038..5027c5bf972 100644 --- a/client/go/cmd/clone_test.go +++ b/client/go/cmd/clone_test.go @@ -10,7 +10,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vespa-engine/vespa/util" + "github.com/vespa-engine/vespa/client/go/util" ) func TestClone(t *testing.T) { diff --git a/client/go/cmd/command_tester.go b/client/go/cmd/command_tester.go index 834610e514c..4b084bd896c 100644 --- a/client/go/cmd/command_tester.go +++ b/client/go/cmd/command_tester.go @@ -19,7 +19,7 @@ import ( "github.com/spf13/pflag" "github.com/spf13/viper" "github.com/stretchr/testify/assert" - "github.com/vespa-engine/vespa/util" + "github.com/vespa-engine/vespa/client/go/util" ) type command struct { diff --git a/client/go/cmd/config.go b/client/go/cmd/config.go index 5662a12e334..fb30e7f00e4 100644 --- a/client/go/cmd/config.go +++ b/client/go/cmd/config.go @@ -14,8 +14,8 @@ import ( "github.com/spf13/cobra" "github.com/spf13/viper" - "github.com/vespa-engine/vespa/util" - "github.com/vespa-engine/vespa/vespa" + "github.com/vespa-engine/vespa/client/go/util" + "github.com/vespa-engine/vespa/client/go/vespa" ) const ( diff --git a/client/go/cmd/deploy.go b/client/go/cmd/deploy.go index 1b9883bf1e8..2a4f96dba0e 100644 --- a/client/go/cmd/deploy.go +++ b/client/go/cmd/deploy.go @@ -13,7 +13,7 @@ import ( "strings" "github.com/spf13/cobra" - "github.com/vespa-engine/vespa/vespa" + "github.com/vespa-engine/vespa/client/go/vespa" ) const ( diff --git a/client/go/cmd/document.go b/client/go/cmd/document.go index bfa5efa8a9a..daea27a0815 100644 --- a/client/go/cmd/document.go +++ b/client/go/cmd/document.go @@ -9,8 +9,8 @@ import ( "strings" "github.com/spf13/cobra" - "github.com/vespa-engine/vespa/util" - "github.com/vespa-engine/vespa/vespa" + "github.com/vespa-engine/vespa/client/go/util" + "github.com/vespa-engine/vespa/client/go/vespa" ) func init() { diff --git a/client/go/cmd/document_test.go b/client/go/cmd/document_test.go index d4abc173261..6e13c68f311 100644 --- a/client/go/cmd/document_test.go +++ b/client/go/cmd/document_test.go @@ -10,8 +10,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/vespa-engine/vespa/util" - "github.com/vespa-engine/vespa/vespa" + "github.com/vespa-engine/vespa/client/go/util" + "github.com/vespa-engine/vespa/client/go/vespa" ) func TestDocumentSendPut(t *testing.T) { diff --git a/client/go/cmd/helpers.go b/client/go/cmd/helpers.go index c17a8aa68fe..db43af65592 100644 --- a/client/go/cmd/helpers.go +++ b/client/go/cmd/helpers.go @@ -13,7 +13,7 @@ import ( "strings" "time" - "github.com/vespa-engine/vespa/vespa" + "github.com/vespa-engine/vespa/client/go/vespa" ) var exitFunc = os.Exit // To allow overriding Exit in tests diff --git a/client/go/cmd/query.go b/client/go/cmd/query.go index b270c1ed64b..778873b6818 100644 --- a/client/go/cmd/query.go +++ b/client/go/cmd/query.go @@ -12,7 +12,7 @@ import ( "time" "github.com/spf13/cobra" - "github.com/vespa-engine/vespa/util" + "github.com/vespa-engine/vespa/client/go/util" ) func init() { diff --git a/client/go/cmd/vespa/main.go b/client/go/cmd/vespa/main.go new file mode 100644 index 00000000000..73183da2a16 --- /dev/null +++ b/client/go/cmd/vespa/main.go @@ -0,0 +1,13 @@ +// 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/client/go/cmd" +) + +func main() { + cmd.Execute() +} diff --git a/client/go/go.mod b/client/go/go.mod index 4b72925a0d1..0558f677c72 100644 --- a/client/go/go.mod +++ b/client/go/go.mod @@ -1,4 +1,4 @@ -module github.com/vespa-engine/vespa +module github.com/vespa-engine/vespa/client/go go 1.16 diff --git a/client/go/main.go b/client/go/main.go deleted file mode 100644 index 85a9f94a59c..00000000000 --- a/client/go/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/vespa/deploy.go b/client/go/vespa/deploy.go index dbdedc400d6..04ab5916d1f 100644 --- a/client/go/vespa/deploy.go +++ b/client/go/vespa/deploy.go @@ -20,7 +20,7 @@ import ( "strings" "time" - "github.com/vespa-engine/vespa/util" + "github.com/vespa-engine/vespa/client/go/util" ) type ApplicationID struct { diff --git a/client/go/vespa/document.go b/client/go/vespa/document.go index e737fdb87f2..7b750b86728 100644 --- a/client/go/vespa/document.go +++ b/client/go/vespa/document.go @@ -13,7 +13,7 @@ import ( "os" "time" - "github.com/vespa-engine/vespa/util" + "github.com/vespa-engine/vespa/client/go/util" ) // Sends the operation given in the file diff --git a/client/go/vespa/target.go b/client/go/vespa/target.go index ae3d82429d6..33c50df9540 100644 --- a/client/go/vespa/target.go +++ b/client/go/vespa/target.go @@ -8,7 +8,7 @@ import ( "net/http" "time" - "github.com/vespa-engine/vespa/util" + "github.com/vespa-engine/vespa/client/go/util" ) const ( -- cgit v1.2.3