Merge pull request #243 from moul/dev/moul/fix-v3-imports

fix: v3 imports

AUTHORS

@@ -4,5 +4,6 @@
 ahh <[email protected]>
 Alexandra Grasland <[email protected]>
 ImgBotApp <[email protected]>
+Lucas Germano <[email protected]>
 Manfred Touron <[email protected]>
 Renovate Bot <[email protected]>

Makefile

@@ -59,6 +59,10 @@ generate_local:
 	    --gogofaster_out="plugins=grpc:$(GOPATH)/src" \
 	    "$$proto" \
 	); done
+	@# CUSTOM CHANGE
+	@# due to go module versionning (currently) incompatible with automatic protobuf generated imports
+	sed -i [email protected]/depviz/@moul.io/depviz/v3/@g internal/dvserver/dvserver.pb.go
+	@# END OF CUSTOM CHANGE
 	goimports -w ./pkg ./cmd ./internal
 	shasum $(GEN_DEPS) | sort > gen.sum.tmp
 	mv gen.sum.tmp gen.sum

api/dvserver.proto

@@ -52,4 +52,4 @@ message Status {
   message Output {
     bool everything_is_ok = 1 [(gogoproto.customname) = "EverythingIsOK"];
   }
-}
+}

cmd/depviz/main.go

@@ -20,10 +20,10 @@ import (
 	"github.com/peterbourgon/ff/ffcli"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
-	"moul.io/depviz/internal/dvcore"
-	"moul.io/depviz/internal/dvparser"
-	"moul.io/depviz/internal/dvserver"
-	"moul.io/depviz/internal/dvstore"
+	"moul.io/depviz/v3/internal/dvcore"
+	"moul.io/depviz/v3/internal/dvparser"
+	"moul.io/depviz/v3/internal/dvserver"
+	"moul.io/depviz/v3/internal/dvstore"
 	"moul.io/godev"
 )
 

internal/dvcore/doc.go

@@ -1 +1 @@
-package dvcore // import "moul.io/depviz/internal/dvcore"
+package dvcore // import "moul.io/depviz/v3/internal/dvcore"

internal/dvcore/run.go

@@ -11,10 +11,10 @@ import (
 	"github.com/cayleygraph/cayley/schema"
 	"go.uber.org/zap"
 	"gopkg.in/yaml.v2"
-	"moul.io/depviz/internal/dvmodel"
-	"moul.io/depviz/internal/dvparser"
-	"moul.io/depviz/internal/dvstore"
-	"moul.io/depviz/internal/githubprovider"
+	"moul.io/depviz/v3/internal/dvmodel"
+	"moul.io/depviz/v3/internal/dvparser"
+	"moul.io/depviz/v3/internal/dvstore"
+	"moul.io/depviz/v3/internal/githubprovider"
 	"moul.io/graphman"
 	"moul.io/graphman/viz"
 	"moul.io/multipmuri"

internal/dvcore/run_test.go

@@ -9,8 +9,8 @@ import (
 	"github.com/cayleygraph/cayley/graph"
 	"github.com/cayleygraph/quad"
 	"github.com/stretchr/testify/assert"
-	"moul.io/depviz/internal/dvstore"
-	"moul.io/depviz/internal/testutil"
+	"moul.io/depviz/v3/internal/dvstore"
+	"moul.io/depviz/v3/internal/testutil"
 	"moul.io/multipmuri"
 )
 

internal/dvcore/store.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/cayleygraph/cayley"
 	"github.com/cayleygraph/cayley/schema"
-	"moul.io/depviz/internal/dvmodel"
+	"moul.io/depviz/v3/internal/dvmodel"
 )
 
 func StoreDumpQuads(h *cayley.Handle) error {

internal/dvmodel/doc.go

@@ -1 +1 @@
-package dvmodel // import "moul.io/depviz/internal/dvmodel"
+package dvmodel // import "moul.io/depviz/v3/internal/dvmodel"

internal/dvparser/doc.go

@@ -1 +1 @@
-package dvparser // import "moul.io/depviz/internal/dvparser"
+package dvparser // import "moul.io/depviz/v3/internal/dvparser"

internal/dvserver/api.go

@@ -5,10 +5,10 @@ import (
 	"fmt"
 
 	"go.uber.org/zap"
-	"moul.io/depviz/internal/dvcore"
-	"moul.io/depviz/internal/dvmodel"
-	"moul.io/depviz/internal/dvparser"
-	"moul.io/depviz/internal/dvstore"
+	"moul.io/depviz/v3/internal/dvcore"
+	"moul.io/depviz/v3/internal/dvmodel"
+	"moul.io/depviz/v3/internal/dvparser"
+	"moul.io/depviz/v3/internal/dvstore"
 )
 
 func (s *service) Graph(ctx context.Context, in *Graph_Input) (*Graph_Output, error) {

internal/dvserver/doc.go

@@ -1 +1 @@
-package dvserver // import "moul.io/depviz/internal/dvserver"
+package dvserver // import "moul.io/depviz/v3/internal/dvserver"

internal/dvserver/server.go

@@ -25,8 +25,8 @@ import (
 	chilogger "github.com/treastech/logger"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
-	"moul.io/depviz/internal/dvcore"
-	"moul.io/depviz/pkg/chiutil"
+	"moul.io/depviz/v3/internal/dvcore"
+	"moul.io/depviz/v3/pkg/chiutil"
 	"moul.io/multipmuri"
 )
 

internal/dvstore/doc.go

@@ -1 +1 @@
-package dvstore // import "moul.io/depviz/internal/dvstore"
+package dvstore // import "moul.io/depviz/v3/internal/dvstore"

internal/dvstore/query.go

@@ -11,7 +11,7 @@ import (
 	"github.com/cayleygraph/cayley/schema"
 	"github.com/cayleygraph/quad"
 	"go.uber.org/zap"
-	"moul.io/depviz/internal/dvmodel"
+	"moul.io/depviz/v3/internal/dvmodel"
 	"moul.io/multipmuri"
 )
 

internal/dvstore/query_test.go

@@ -8,8 +8,8 @@ import (
 
 	_ "github.com/cayleygraph/quad/json"
 	"github.com/stretchr/testify/assert"
-	"moul.io/depviz/internal/dvparser"
-	"moul.io/depviz/internal/testutil"
+	"moul.io/depviz/v3/internal/dvparser"
+	"moul.io/depviz/v3/internal/testutil"
 	"moul.io/godev"
 	"moul.io/multipmuri"
 )

internal/dvstore/schema.go

@@ -2,7 +2,7 @@ package dvstore
 
 import (
 	"github.com/cayleygraph/cayley/schema"
-	"moul.io/depviz/internal/dvmodel"
+	"moul.io/depviz/v3/internal/dvmodel"
 )
 
 func Schema() *schema.Config {

internal/githubprovider/doc.go

@@ -1 +1 @@
-package githubprovider // import "moul.io/depviz/internal/githubprovider"
+package githubprovider // import "moul.io/depviz/v3/internal/githubprovider"

internal/githubprovider/github.go

@@ -8,7 +8,7 @@ import (
 	"github.com/google/go-github/v28/github"
 	"go.uber.org/zap"
 	"golang.org/x/oauth2"
-	"moul.io/depviz/internal/dvmodel"
+	"moul.io/depviz/v3/internal/dvmodel"
 	"moul.io/multipmuri"
 )
 

internal/githubprovider/model.go

@@ -6,8 +6,8 @@ import (
 	"github.com/cayleygraph/quad"
 	"github.com/google/go-github/v28/github"
 	"go.uber.org/zap"
-	"moul.io/depviz/internal/dvmodel"
-	"moul.io/depviz/internal/dvparser"
+	"moul.io/depviz/v3/internal/dvmodel"
+	"moul.io/depviz/v3/internal/dvparser"
 	"moul.io/multipmuri"
 	"moul.io/multipmuri/pmbodyparser"
 )

internal/testutil/doc.go

@@ -1 +1 @@
-package testutil // import "moul.io/depviz/internal/testutil"
+package testutil // import "moul.io/depviz/v3/internal/testutil"

pkg/chiutil/doc.go

@@ -1 +1 @@
-package chiutil // import "moul.io/depviz/pkg/chiutil"
+package chiutil // import "moul.io/depviz/v3/pkg/chiutil"