From 681436cc90ad4184d6e1e041bbc7407d7bf187a2 Mon Sep 17 00:00:00 2001 From: sxh <1048005417@qq.com> Date: Mon, 17 Aug 2020 09:33:02 +0800 Subject: [PATCH] fix module path --- cmd/bblfshctl/cmd/base.go | 2 +- cmd/bblfshctl/cmd/driver_install.go | 4 ++-- cmd/bblfshctl/cmd/driver_list.go | 2 +- cmd/bblfshctl/cmd/driver_remove.go | 2 +- cmd/bblfshctl/cmd/instances.go | 2 +- cmd/bblfshctl/cmd/status.go | 2 +- cmd/bblfshctl/main.go | 2 +- cmd/bblfshd/main.go | 4 ++-- daemon/common_test.go | 2 +- daemon/daemon.go | 4 ++-- daemon/daemon_test.go | 2 +- daemon/driver.go | 4 ++-- daemon/driver_test.go | 4 ++-- daemon/errors.go | 2 +- daemon/pool.go | 2 +- daemon/pool_test.go | 2 +- daemon/protocol/types.go | 2 +- daemon/service.go | 2 +- go.mod | 2 +- 19 files changed, 24 insertions(+), 24 deletions(-) diff --git a/cmd/bblfshctl/cmd/base.go b/cmd/bblfshctl/cmd/base.go index a9df0b3..7deec58 100644 --- a/cmd/bblfshctl/cmd/base.go +++ b/cmd/bblfshctl/cmd/base.go @@ -6,7 +6,7 @@ import ( "net" "time" - "github.com/bblfsh/bblfshd/daemon/protocol" + "github.com/bblfsh/bblfshd/v2/daemon/protocol" "google.golang.org/grpc" sdk "gopkg.in/bblfsh/sdk.v1/protocol" diff --git a/cmd/bblfshctl/cmd/driver_install.go b/cmd/bblfshctl/cmd/driver_install.go index b5e5060..bf0123c 100644 --- a/cmd/bblfshctl/cmd/driver_install.go +++ b/cmd/bblfshctl/cmd/driver_install.go @@ -10,11 +10,11 @@ import ( "sync" "time" - "github.com/bblfsh/bblfshd/daemon" + "github.com/bblfsh/bblfshd/v2/daemon" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/bblfsh/bblfshd/daemon/protocol" + "github.com/bblfsh/bblfshd/v2/daemon/protocol" "github.com/bblfsh/sdk/v3/driver/manifest/discovery" "github.com/briandowns/spinner" diff --git a/cmd/bblfshctl/cmd/driver_list.go b/cmd/bblfshctl/cmd/driver_list.go index 89eda8a..8dad4e7 100644 --- a/cmd/bblfshctl/cmd/driver_list.go +++ b/cmd/bblfshctl/cmd/driver_list.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/bblfsh/bblfshd/daemon/protocol" + "github.com/bblfsh/bblfshd/v2/daemon/protocol" "github.com/docker/go-units" "github.com/olekukonko/tablewriter" diff --git a/cmd/bblfshctl/cmd/driver_remove.go b/cmd/bblfshctl/cmd/driver_remove.go index 84f2669..6821a86 100644 --- a/cmd/bblfshctl/cmd/driver_remove.go +++ b/cmd/bblfshctl/cmd/driver_remove.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "github.com/bblfsh/bblfshd/daemon/protocol" + "github.com/bblfsh/bblfshd/v2/daemon/protocol" ) const ( diff --git a/cmd/bblfshctl/cmd/instances.go b/cmd/bblfshctl/cmd/instances.go index 6f9e8fd..7e5d3d8 100644 --- a/cmd/bblfshctl/cmd/instances.go +++ b/cmd/bblfshctl/cmd/instances.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/bblfsh/bblfshd/daemon/protocol" + "github.com/bblfsh/bblfshd/v2/daemon/protocol" "github.com/docker/go-units" "github.com/olekukonko/tablewriter" diff --git a/cmd/bblfshctl/cmd/status.go b/cmd/bblfshctl/cmd/status.go index c21eccf..42c39a5 100644 --- a/cmd/bblfshctl/cmd/status.go +++ b/cmd/bblfshctl/cmd/status.go @@ -6,7 +6,7 @@ import ( "os" "strings" - "github.com/bblfsh/bblfshd/daemon/protocol" + "github.com/bblfsh/bblfshd/v2/daemon/protocol" "github.com/olekukonko/tablewriter" ) diff --git a/cmd/bblfshctl/main.go b/cmd/bblfshctl/main.go index d409b68..1aa1f19 100644 --- a/cmd/bblfshctl/main.go +++ b/cmd/bblfshctl/main.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/bblfsh/bblfshd/cmd/bblfshctl/cmd" + "github.com/bblfsh/bblfshd/v2/cmd/bblfshctl/cmd" "github.com/jessevdk/go-flags" ) diff --git a/cmd/bblfshd/main.go b/cmd/bblfshd/main.go index 987003f..f432a7f 100644 --- a/cmd/bblfshd/main.go +++ b/cmd/bblfshd/main.go @@ -16,8 +16,8 @@ import ( "gopkg.in/src-d/go-log.v1" - "github.com/bblfsh/bblfshd/daemon" - "github.com/bblfsh/bblfshd/runtime" + "github.com/bblfsh/bblfshd/v2/daemon" + "github.com/bblfsh/bblfshd/v2/runtime" cmdutil "github.com/bblfsh/sdk/v3/cmd" "github.com/bblfsh/sdk/v3/driver/manifest/discovery" diff --git a/daemon/common_test.go b/daemon/common_test.go index 2c585cf..3ee4bc3 100644 --- a/daemon/common_test.go +++ b/daemon/common_test.go @@ -8,7 +8,7 @@ import ( "path/filepath" "github.com/bblfsh/bblfshd/daemon/protocol" - "github.com/bblfsh/bblfshd/runtime" + "github.com/bblfsh/bblfshd/v2/runtime" protocol2 "github.com/bblfsh/sdk/v3/protocol" "github.com/containers/image/types" diff --git a/daemon/daemon.go b/daemon/daemon.go index acf2cad..974a39f 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go @@ -15,8 +15,8 @@ import ( "github.com/opentracing/opentracing-go" "gopkg.in/src-d/go-log.v1" - "github.com/bblfsh/bblfshd/daemon/protocol" - "github.com/bblfsh/bblfshd/runtime" + "github.com/bblfsh/bblfshd/v2/daemon/protocol" + "github.com/bblfsh/bblfshd/v2/runtime" "github.com/bblfsh/sdk/v3/driver" "github.com/bblfsh/sdk/v3/driver/manifest" diff --git a/daemon/daemon_test.go b/daemon/daemon_test.go index 7903783..52fd0a9 100644 --- a/daemon/daemon_test.go +++ b/daemon/daemon_test.go @@ -15,7 +15,7 @@ import ( "google.golang.org/grpc" "gopkg.in/bblfsh/sdk.v1/protocol" - "github.com/bblfsh/bblfshd/runtime" + "github.com/bblfsh/bblfshd/v2/runtime" ) // actual date format used in bblfshd is different diff --git a/daemon/driver.go b/daemon/driver.go index 003ab4d..974a1f6 100644 --- a/daemon/driver.go +++ b/daemon/driver.go @@ -13,8 +13,8 @@ import ( "syscall" "time" - "github.com/bblfsh/bblfshd/daemon/protocol" - "github.com/bblfsh/bblfshd/runtime" + "github.com/bblfsh/bblfshd/v2/daemon/protocol" + "github.com/bblfsh/bblfshd/v2/runtime" protocol2 "github.com/bblfsh/sdk/v3/protocol" "github.com/opencontainers/runc/libcontainer/configs" diff --git a/daemon/driver_test.go b/daemon/driver_test.go index 3230c9d..40bd5d9 100644 --- a/daemon/driver_test.go +++ b/daemon/driver_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/bblfsh/bblfshd/daemon/protocol" - "github.com/bblfsh/bblfshd/runtime" + "github.com/bblfsh/bblfshd/v2/daemon/protocol" + "github.com/bblfsh/bblfshd/v2/runtime" "github.com/stretchr/testify/require" ) diff --git a/daemon/errors.go b/daemon/errors.go index 885fedb..50c688e 100644 --- a/daemon/errors.go +++ b/daemon/errors.go @@ -1,7 +1,7 @@ package daemon import ( - "github.com/bblfsh/bblfshd/daemon/protocol" + "github.com/bblfsh/bblfshd/v2/daemon/protocol" "github.com/bblfsh/sdk/v3/driver" "gopkg.in/src-d/go-errors.v1" ) diff --git a/daemon/pool.go b/daemon/pool.go index c49e381..4fdf861 100644 --- a/daemon/pool.go +++ b/daemon/pool.go @@ -18,7 +18,7 @@ import ( "github.com/opentracing/opentracing-go" "github.com/prometheus/client_golang/prometheus" - "github.com/bblfsh/bblfshd/daemon/protocol" + "github.com/bblfsh/bblfshd/v2/daemon/protocol" "gopkg.in/src-d/go-errors.v1" ) diff --git a/daemon/pool_test.go b/daemon/pool_test.go index 86cc8d5..902ce00 100644 --- a/daemon/pool_test.go +++ b/daemon/pool_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/bblfsh/bblfshd/daemon/protocol" + "github.com/bblfsh/bblfshd/v2/daemon/protocol" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/daemon/protocol/types.go b/daemon/protocol/types.go index 8d4f159..d69012b 100644 --- a/daemon/protocol/types.go +++ b/daemon/protocol/types.go @@ -1,4 +1,4 @@ -//go:generate proteus -f $GOPATH/src/ -p github.com/bblfsh/bblfshd/daemon/protocol --verbose +//go:generate proteus -f $GOPATH/src/ -p github.com/bblfsh/bblfshd/v2/daemon/protocol --verbose //go:generate stringer -type=Status -output stringer.go package protocol diff --git a/daemon/service.go b/daemon/service.go index f56eaf1..433bb6b 100644 --- a/daemon/service.go +++ b/daemon/service.go @@ -18,7 +18,7 @@ import ( "github.com/opentracing/opentracing-go" "github.com/prometheus/client_golang/prometheus" - "github.com/bblfsh/bblfshd/daemon/protocol" + "github.com/bblfsh/bblfshd/v2/daemon/protocol" "github.com/bblfsh/sdk/v3/driver/manifest" protocol2 "github.com/bblfsh/sdk/v3/protocol" xcontext "golang.org/x/net/context" diff --git a/go.mod b/go.mod index 5db239a..1488666 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/bblfsh/bblfshd +module github.com/bblfsh/bblfshd/v2 go 1.12