Skip to content

Commit

Permalink
Merge pull request #30 from kqzh/rename_module_v3
Browse files Browse the repository at this point in the history 
rename module v3
  • Loading branch information
@kqzh
kqzh authored Feb 6, 2023
2 parents 7276760 + 8cf348a commit f5fa4bb
Show file tree
Hide file tree
Showing 16 changed files with 31 additions and 31 deletions.
10 changes: 5 additions & 5 deletions cmd/agent.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (
log "github.com/sirupsen/logrus"
"google.golang.org/grpc"

"github.com/vesoft-inc/nebula-agent/internal/clients"
"github.com/vesoft-inc/nebula-agent/internal/limiter"
_ "github.com/vesoft-inc/nebula-agent/internal/log"
"github.com/vesoft-inc/nebula-agent/internal/server"
pb "github.com/vesoft-inc/nebula-agent/pkg/proto"
"github.com/vesoft-inc/nebula-agent/v3/internal/clients"
"github.com/vesoft-inc/nebula-agent/v3/internal/limiter"
_ "github.com/vesoft-inc/nebula-agent/v3/internal/log"
"github.com/vesoft-inc/nebula-agent/v3/internal/server"
pb "github.com/vesoft-inc/nebula-agent/v3/pkg/proto"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions examples/storage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import (
"context"

log "github.com/sirupsen/logrus"
_ "github.com/vesoft-inc/nebula-agent/internal/log"
_ "github.com/vesoft-inc/nebula-agent/v3/internal/log"
"github.com/vesoft-inc/nebula-go/v3/nebula"

agent "github.com/vesoft-inc/nebula-agent/pkg/client"
pb "github.com/vesoft-inc/nebula-agent/pkg/proto"
agent "github.com/vesoft-inc/nebula-agent/v3/pkg/client"
pb "github.com/vesoft-inc/nebula-agent/v3/pkg/proto"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/vesoft-inc/nebula-agent
module github.com/vesoft-inc/nebula-agent/v3

go 1.16

Expand Down
2 changes: 1 addition & 1 deletion internal/clients/daemon.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strings"

log "github.com/sirupsen/logrus"
pb "github.com/vesoft-inc/nebula-agent/pkg/proto"
pb "github.com/vesoft-inc/nebula-agent/v3/pkg/proto"
)

type ServiceName string
Expand Down
2 changes: 1 addition & 1 deletion internal/clients/daemon_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"testing"

"github.com/stretchr/testify/assert"
pb "github.com/vesoft-inc/nebula-agent/pkg/proto"
pb "github.com/vesoft-inc/nebula-agent/v3/pkg/proto"
)

func TestDaemon(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion internal/clients/meta.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/facebook/fbthrift/thrift/lib/go/thrift"
log "github.com/sirupsen/logrus"
"github.com/vesoft-inc/nebula-agent/internal/utils"
"github.com/vesoft-inc/nebula-agent/v3/internal/utils"
"github.com/vesoft-inc/nebula-go/v3/nebula"
"github.com/vesoft-inc/nebula-go/v3/nebula/meta"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/clients/playback.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"os/exec"

log "github.com/sirupsen/logrus"
pb "github.com/vesoft-inc/nebula-agent/pkg/proto"
pb "github.com/vesoft-inc/nebula-agent/v3/pkg/proto"
)

type ServicePlayBack struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/clients/stop.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package clients

import (
pb "github.com/vesoft-inc/nebula-agent/pkg/proto"
pb "github.com/vesoft-inc/nebula-agent/v3/pkg/proto"
)

var StopChan = make(chan struct{})
Expand Down
4 changes: 2 additions & 2 deletions internal/server/agent.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"fmt"

"github.com/vesoft-inc/nebula-agent/internal/clients"
pb "github.com/vesoft-inc/nebula-agent/pkg/proto"
"github.com/vesoft-inc/nebula-agent/v3/internal/clients"
pb "github.com/vesoft-inc/nebula-agent/v3/pkg/proto"
)

// AgentServer act as an agent to interactive with services in agent machine
Expand Down
4 changes: 2 additions & 2 deletions internal/server/storage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"github.com/golang/groupcache/lru"
log "github.com/sirupsen/logrus"

pb "github.com/vesoft-inc/nebula-agent/pkg/proto"
"github.com/vesoft-inc/nebula-agent/pkg/storage"
pb "github.com/vesoft-inc/nebula-agent/v3/pkg/proto"
"github.com/vesoft-inc/nebula-agent/v3/pkg/storage"
)

// StorageServer provide service:
Expand Down
6 changes: 3 additions & 3 deletions pkg/client/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (

"github.com/google/uuid"
log "github.com/sirupsen/logrus"
"github.com/vesoft-inc/nebula-agent/internal/utils"
pb "github.com/vesoft-inc/nebula-agent/pkg/proto"
"github.com/vesoft-inc/nebula-agent/pkg/storage"
"github.com/vesoft-inc/nebula-agent/v3/internal/utils"
pb "github.com/vesoft-inc/nebula-agent/v3/pkg/proto"
"github.com/vesoft-inc/nebula-agent/v3/pkg/storage"
"github.com/vesoft-inc/nebula-go/v3/nebula"
)

Expand Down
6 changes: 3 additions & 3 deletions pkg/storage/local.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import (

log "github.com/sirupsen/logrus"

"github.com/vesoft-inc/nebula-agent/internal/limiter"
"github.com/vesoft-inc/nebula-agent/internal/utils"
pb "github.com/vesoft-inc/nebula-agent/pkg/proto"
"github.com/vesoft-inc/nebula-agent/v3/internal/limiter"
"github.com/vesoft-inc/nebula-agent/v3/internal/utils"
pb "github.com/vesoft-inc/nebula-agent/v3/pkg/proto"
)

type Local struct {
Expand Down
4 changes: 2 additions & 2 deletions pkg/storage/local_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"testing"

"github.com/stretchr/testify/assert"
_ "github.com/vesoft-inc/nebula-agent/internal/log"
pb "github.com/vesoft-inc/nebula-agent/pkg/proto"
_ "github.com/vesoft-inc/nebula-agent/v3/internal/log"
pb "github.com/vesoft-inc/nebula-agent/v3/pkg/proto"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions pkg/storage/s3.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
"github.com/aws/aws-sdk-go/service/s3/s3manager"
log "github.com/sirupsen/logrus"

"github.com/vesoft-inc/nebula-agent/internal/limiter"
"github.com/vesoft-inc/nebula-agent/internal/utils"
pb "github.com/vesoft-inc/nebula-agent/pkg/proto"
"github.com/vesoft-inc/nebula-agent/v3/internal/limiter"
"github.com/vesoft-inc/nebula-agent/v3/internal/utils"
pb "github.com/vesoft-inc/nebula-agent/v3/pkg/proto"
)

type S3 struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/storage/storage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"

log "github.com/sirupsen/logrus"
pb "github.com/vesoft-inc/nebula-agent/pkg/proto"
pb "github.com/vesoft-inc/nebula-agent/v3/pkg/proto"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion scripts/gen_proto.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ GO111MODULE=off go get google.golang.org/grpc


echo "collect proto..."
GO_PREFIX_PATH=github.com/vesoft-inc/nebula-agent/pkg/proto
GO_PREFIX_PATH=github.com/vesoft-inc/nebula-agent/v3/pkg/proto
export PATH=$NEBULA_AGENT_ROOT/_tools/bin:$GOPATH/bin:$PATH

function collect() {
Expand Down

0 comments on commit f5fa4bb

Please sign in to comment.