Merge pull request pathwar#536 from pathwar/dev/moul/change-import-path

feat: switch to pathwar.land/pathwar/v2 go import path
cdeleeuwe · Jun 11, 2020 · 86b841a · 86b841a
2 parents 7f0ba05 + 110dd7a
commit 86b841a
Show file tree

Hide file tree

Showing 85 changed files with 160 additions and 160 deletions.
diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module pathwar.land/v2
+module pathwar.land/pathwar/v2
 
 require (
 	cloud.google.com/go v0.37.4 // indirect

diff --git a/go/Makefile b/go/Makefile
@@ -6,7 +6,7 @@ GOBINS = ./cmd/pathwar ./cmd/pwinit
 DOCKER_IMAGE = pathwar/pathwar
 DOCKERFILE_PATH = ../Dockerfile
 
-GO_INSTALL_OPTS = -v -ldflags "-s -w -X pathwar.land/v2/go/pkg/pwversion.Version=`git describe --tags --abbrev` -X pathwar.land/go/pkg/pwversion.Commit=`git rev-parse HEAD` -X pathwar.land/go/pkg/pwversion.Date=`date +%s` -X pathwar.land/go/pkg/pwversion.BuiltBy=makefile"
+GO_INSTALL_OPTS = -v -ldflags "-s -w -X pathwar.land/pathwar/v2/go/pkg/pwversion.Version=`git describe --tags --abbrev` -X pathwar.land/go/pkg/pwversion.Commit=`git rev-parse HEAD` -X pathwar.land/go/pkg/pwversion.Date=`date +%s` -X pathwar.land/go/pkg/pwversion.BuiltBy=makefile"
 PRE_INSTALL_STEPS += generate
 PRE_UNITTEST_STEPS += generate
 PRE_TEST_STEPS += generate
@@ -137,7 +137,7 @@ generate_local:
 	  protoc -I ../vendor/github.com/grpc-ecosystem/grpc-gateway:../api:../vendor:/protobuf --grpc-gateway_out=logtostderr=true:"$(GOPATH)/src" --gogofaster_out="plugins=grpc:$(GOPATH)/src" "$$proto" \
 	); done
 	@### custom
-	sed -i [email protected]/go/[email protected]/v2/go/pkg@ ./pkg/*/*.pb.go
+	sed -i [email protected]/go/[email protected]/pathwar/v2/go/pkg@ ./pkg/*/*.pb.go
 	@### end of custom
 	goimports -w ./pkg ./cmd ./internal
 	shasum $(GEN_SRC) | sort > gen.sum.tmp

diff --git a/go/cmd/pathwar/main.go b/go/cmd/pathwar/main.go
@@ -32,14 +32,14 @@ import (
 	"golang.org/x/oauth2"
 	"moul.io/godev"
 	"moul.io/srand"
-	"pathwar.land/v2/go/pkg/errcode"
-	"pathwar.land/v2/go/pkg/pwagent"
-	"pathwar.land/v2/go/pkg/pwapi"
-	"pathwar.land/v2/go/pkg/pwcompose"
-	"pathwar.land/v2/go/pkg/pwdb"
-	"pathwar.land/v2/go/pkg/pwinit"
-	"pathwar.land/v2/go/pkg/pwsso"
-	"pathwar.land/v2/go/pkg/pwversion"
+	"pathwar.land/pathwar/v2/go/pkg/errcode"
+	"pathwar.land/pathwar/v2/go/pkg/pwagent"
+	"pathwar.land/pathwar/v2/go/pkg/pwapi"
+	"pathwar.land/pathwar/v2/go/pkg/pwcompose"
+	"pathwar.land/pathwar/v2/go/pkg/pwdb"
+	"pathwar.land/pathwar/v2/go/pkg/pwinit"
+	"pathwar.land/pathwar/v2/go/pkg/pwsso"
+	"pathwar.land/pathwar/v2/go/pkg/pwversion"
 )
 
 const (

diff --git a/go/cmd/pwinit/main.go b/go/cmd/pwinit/main.go
@@ -13,8 +13,8 @@ import (
 	"syscall"
 
 	"github.com/peterbourgon/ff/ffcli"
-	"pathwar.land/v2/go/pkg/errcode"
-	"pathwar.land/v2/go/pkg/pwinit"
+	"pathwar.land/pathwar/v2/go/pkg/errcode"
+	"pathwar.land/pathwar/v2/go/pkg/pwinit"
 )
 
 func main() {

diff --git a/go/gen.sum b/go/gen.sum
diff --git a/go/internal/randstring/randstring.go b/go/internal/randstring/randstring.go
@@ -1,4 +1,4 @@
-package randstring // import "pathwar.land/v2/go/internal/randstring"
+package randstring // import "pathwar.land/pathwar/v2/go/internal/randstring"
 
 import "math/rand"
 

diff --git a/go/internal/testutil/doc.go b/go/internal/testutil/doc.go
@@ -1 +1 @@
-package testutil // import "pathwar.land/v2/go/internal/testutil"
+package testutil // import "pathwar.land/pathwar/v2/go/internal/testutil"
diff --git a/go/pkg/errcode/doc.go b/go/pkg/errcode/doc.go
@@ -1 +1 @@
-package errcode // import "pathwar.land/v2/go/pkg/errcode"
+package errcode // import "pathwar.land/pathwar/v2/go/pkg/errcode"
diff --git a/go/pkg/pwagent/daemon.go b/go/pkg/pwagent/daemon.go
@@ -12,10 +12,10 @@ import (
 	"github.com/docker/docker/client"
 	"go.uber.org/zap"
 	"moul.io/godev"
-	"pathwar.land/v2/go/pkg/errcode"
-	"pathwar.land/v2/go/pkg/pwapi"
-	"pathwar.land/v2/go/pkg/pwcompose"
-	"pathwar.land/v2/go/pkg/pwversion"
+	"pathwar.land/pathwar/v2/go/pkg/errcode"
+	"pathwar.land/pathwar/v2/go/pkg/pwapi"
+	"pathwar.land/pathwar/v2/go/pkg/pwcompose"
+	"pathwar.land/pathwar/v2/go/pkg/pwversion"
 )
 
 func Daemon(ctx context.Context, cli *client.Client, apiClient *pwapi.HTTPClient, opts Opts) error {

diff --git a/go/pkg/pwagent/doc.go b/go/pkg/pwagent/doc.go
@@ -1 +1 @@
-package pwagent // import "pathwar.land/v2/go/pkg/pwagent"
+package pwagent // import "pathwar.land/pathwar/v2/go/pkg/pwagent"
diff --git a/go/pkg/pwagent/docker.go b/go/pkg/pwagent/docker.go
@@ -9,11 +9,11 @@ import (
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/client"
 	"go.uber.org/zap"
-	"pathwar.land/v2/go/pkg/errcode"
-	"pathwar.land/v2/go/pkg/pwapi"
-	"pathwar.land/v2/go/pkg/pwcompose"
-	"pathwar.land/v2/go/pkg/pwdb"
-	"pathwar.land/v2/go/pkg/pwinit"
+	"pathwar.land/pathwar/v2/go/pkg/errcode"
+	"pathwar.land/pathwar/v2/go/pkg/pwapi"
+	"pathwar.land/pathwar/v2/go/pkg/pwcompose"
+	"pathwar.land/pathwar/v2/go/pkg/pwdb"
+	"pathwar.land/pathwar/v2/go/pkg/pwinit"
 )
 
 func applyDockerConfig(ctx context.Context, apiInstances *pwapi.AgentListInstances_Output, dockerClient *client.Client, opts Opts) error {

diff --git a/go/pkg/pwagent/nginx.go b/go/pkg/pwagent/nginx.go
@@ -17,10 +17,10 @@ import (
 	"github.com/docker/go-connections/nat"
 	"github.com/moby/moby/pkg/stdcopy"
 	"go.uber.org/zap"
-	"pathwar.land/v2/go/pkg/errcode"
-	"pathwar.land/v2/go/pkg/pwapi"
-	"pathwar.land/v2/go/pkg/pwcompose"
-	"pathwar.land/v2/go/pkg/pwdb"
+	"pathwar.land/pathwar/v2/go/pkg/errcode"
+	"pathwar.land/pathwar/v2/go/pkg/pwapi"
+	"pathwar.land/pathwar/v2/go/pkg/pwcompose"
+	"pathwar.land/pathwar/v2/go/pkg/pwdb"
 )
 
 func applyNginxConfig(ctx context.Context, apiInstances *pwapi.AgentListInstances_Output, dockerClient *client.Client, opts Opts) error {

diff --git a/go/pkg/pwagent/types.go b/go/pkg/pwagent/types.go
@@ -4,7 +4,7 @@ import (
 	"time"
 
 	"go.uber.org/zap"
-	"pathwar.land/v2/go/internal/randstring"
+	"pathwar.land/pathwar/v2/go/internal/randstring"
 )
 
 type Opts struct {

diff --git a/go/pkg/pwagent/update.go b/go/pkg/pwagent/update.go
@@ -6,10 +6,10 @@ import (
 
 	"github.com/docker/docker/client"
 	"go.uber.org/zap"
-	"pathwar.land/v2/go/pkg/errcode"
-	"pathwar.land/v2/go/pkg/pwapi"
-	"pathwar.land/v2/go/pkg/pwcompose"
-	"pathwar.land/v2/go/pkg/pwdb"
+	"pathwar.land/pathwar/v2/go/pkg/errcode"
+	"pathwar.land/pathwar/v2/go/pkg/pwapi"
+	"pathwar.land/pathwar/v2/go/pkg/pwcompose"
+	"pathwar.land/pathwar/v2/go/pkg/pwdb"
 )
 
 func updateAPIState(ctx context.Context, apiInstances *pwapi.AgentListInstances_Output, cli *client.Client, apiClient *pwapi.HTTPClient, opts Opts) error {

diff --git a/go/pkg/pwapi/api_admin-challenge-add.go b/go/pkg/pwapi/api_admin-challenge-add.go
@@ -3,8 +3,8 @@ package pwapi
 import (
 	"context"
 
-	"pathwar.land/v2/go/pkg/errcode"
-	"pathwar.land/v2/go/pkg/pwdb"
+	"pathwar.land/pathwar/v2/go/pkg/errcode"
+	"pathwar.land/pathwar/v2/go/pkg/pwdb"
 )
 
 func (svc *service) AdminChallengeAdd(ctx context.Context, in *AdminChallengeAdd_Input) (*AdminChallengeAdd_Output, error) {

diff --git a/go/pkg/pwapi/api_admin-challenge-flavor-add.go b/go/pkg/pwapi/api_admin-challenge-flavor-add.go
@@ -3,8 +3,8 @@ package pwapi
 import (
 	"context"
 
-	"pathwar.land/v2/go/pkg/errcode"
-	"pathwar.land/v2/go/pkg/pwdb"
+	"pathwar.land/pathwar/v2/go/pkg/errcode"
+	"pathwar.land/pathwar/v2/go/pkg/pwdb"
 )
 
 func (svc *service) AdminChallengeFlavorAdd(ctx context.Context, in *AdminChallengeFlavorAdd_Input) (*AdminChallengeFlavorAdd_Output, error) {

diff --git a/go/pkg/pwapi/api_admin-challenge-instance-add.go b/go/pkg/pwapi/api_admin-challenge-instance-add.go
@@ -3,8 +3,8 @@ package pwapi
 import (
 	"context"
 
-	"pathwar.land/v2/go/pkg/errcode"
-	"pathwar.land/v2/go/pkg/pwdb"
+	"pathwar.land/pathwar/v2/go/pkg/errcode"
+	"pathwar.land/pathwar/v2/go/pkg/pwdb"
 )
 
 func (svc *service) AdminChallengeInstanceAdd(ctx context.Context, in *AdminChallengeInstanceAdd_Input) (*AdminChallengeInstanceAdd_Output, error) {

diff --git a/go/pkg/pwapi/api_admin-ps.go b/go/pkg/pwapi/api_admin-ps.go
@@ -3,8 +3,8 @@ package pwapi
 import (
 	"context"
 
-	"pathwar.land/v2/go/pkg/errcode"
-	"pathwar.land/v2/go/pkg/pwdb"
+	"pathwar.land/pathwar/v2/go/pkg/errcode"
+	"pathwar.land/pathwar/v2/go/pkg/pwdb"
 )
 
 func (svc *service) AdminPS(ctx context.Context, in *AdminPS_Input) (*AdminPS_Output, error) {

diff --git a/go/pkg/pwapi/api_admin-redump.go b/go/pkg/pwapi/api_admin-redump.go
@@ -5,8 +5,8 @@ import (
 	"strconv"
 
 	"go.uber.org/zap"
-	"pathwar.land/v2/go/pkg/errcode"
-	"pathwar.land/v2/go/pkg/pwdb"
+	"pathwar.land/pathwar/v2/go/pkg/errcode"
+	"pathwar.land/pathwar/v2/go/pkg/pwdb"
 )
 
 func (svc *service) AdminRedump(ctx context.Context, in *AdminRedump_Input) (*AdminRedump_Output, error) {

diff --git a/go/pkg/pwapi/api_agent-list-instances.go b/go/pkg/pwapi/api_agent-list-instances.go
@@ -3,8 +3,8 @@ package pwapi
 import (
 	"context"
 
-	"pathwar.land/v2/go/pkg/errcode"
-	"pathwar.land/v2/go/pkg/pwdb"
+	"pathwar.land/pathwar/v2/go/pkg/errcode"
+	"pathwar.land/pathwar/v2/go/pkg/pwdb"
 )
 
 func (svc *service) AgentListInstances(ctx context.Context, in *AgentListInstances_Input) (*AgentListInstances_Output, error) {

diff --git a/go/pkg/pwapi/api_agent-list-instances_test.go b/go/pkg/pwapi/api_agent-list-instances_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"pathwar.land/v2/go/internal/testutil"
-	"pathwar.land/v2/go/pkg/errcode"
+	"pathwar.land/pathwar/v2/go/internal/testutil"
+	"pathwar.land/pathwar/v2/go/pkg/errcode"
 )
 
 func TestService_AgentListInstances(t *testing.T) {

diff --git a/go/pkg/pwapi/api_agent-list.go b/go/pkg/pwapi/api_agent-list.go
@@ -3,7 +3,7 @@ package pwapi
 import (
 	"context"
 
-	"pathwar.land/v2/go/pkg/errcode"
+	"pathwar.land/pathwar/v2/go/pkg/errcode"
 )
 
 func (svc *service) AgentList(ctx context.Context, in *AgentList_Input) (*AgentList_Output, error) {

diff --git a/go/pkg/pwapi/api_agent-register.go b/go/pkg/pwapi/api_agent-register.go
@@ -5,8 +5,8 @@ import (
 	"strings"
 	"time"
 
-	"pathwar.land/v2/go/pkg/errcode"
-	"pathwar.land/v2/go/pkg/pwdb"
+	"pathwar.land/pathwar/v2/go/pkg/errcode"
+	"pathwar.land/pathwar/v2/go/pkg/pwdb"
 )
 
 func (svc *service) AgentRegister(ctx context.Context, in *AgentRegister_Input) (*AgentRegister_Output, error) {

diff --git a/go/pkg/pwapi/api_agent-register_test.go b/go/pkg/pwapi/api_agent-register_test.go
@@ -6,8 +6,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"pathwar.land/v2/go/internal/testutil"
-	"pathwar.land/v2/go/pkg/errcode"
+	"pathwar.land/pathwar/v2/go/internal/testutil"
+	"pathwar.land/pathwar/v2/go/pkg/errcode"
 )
 
 func TestService_AgentRegister(t *testing.T) {

diff --git a/go/pkg/pwapi/api_agent-update-state.go b/go/pkg/pwapi/api_agent-update-state.go
@@ -3,8 +3,8 @@ package pwapi
 import (
 	"context"
 
-	"pathwar.land/v2/go/pkg/errcode"
-	"pathwar.land/v2/go/pkg/pwdb"
+	"pathwar.land/pathwar/v2/go/pkg/errcode"
+	"pathwar.land/pathwar/v2/go/pkg/pwdb"
 )
 
 func (svc *service) AgentUpdateState(ctx context.Context, in *AgentUpdateState_Input) (*AgentUpdateState_Output, error) {

diff --git a/go/pkg/pwapi/api_challenge-get.go b/go/pkg/pwapi/api_challenge-get.go
@@ -3,8 +3,8 @@ package pwapi
 import (
 	"context"
 
-	"pathwar.land/v2/go/pkg/errcode"
-	"pathwar.land/v2/go/pkg/pwdb"
+	"pathwar.land/pathwar/v2/go/pkg/errcode"
+	"pathwar.land/pathwar/v2/go/pkg/pwdb"
 )
 
 func (svc *service) ChallengeGet(ctx context.Context, in *ChallengeGet_Input) (*ChallengeGet_Output, error) {

diff --git a/go/pkg/pwapi/api_challenge-get_test.go b/go/pkg/pwapi/api_challenge-get_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"pathwar.land/v2/go/internal/testutil"
-	"pathwar.land/v2/go/pkg/errcode"
+	"pathwar.land/pathwar/v2/go/internal/testutil"
+	"pathwar.land/pathwar/v2/go/pkg/errcode"
 )
 
 func TestService_ChallengeGet(t *testing.T) {

diff --git a/go/pkg/pwapi/api_challenge-list.go b/go/pkg/pwapi/api_challenge-list.go
@@ -3,7 +3,7 @@ package pwapi
 import (
 	"context"
 
-	"pathwar.land/v2/go/pkg/errcode"
+	"pathwar.land/pathwar/v2/go/pkg/errcode"
 )
 
 func (svc *service) ChallengeList(context.Context, *ChallengeList_Input) (*ChallengeList_Output, error) {

diff --git a/go/pkg/pwapi/api_challenge-subscription-close.go b/go/pkg/pwapi/api_challenge-subscription-close.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"time"
 
-	"pathwar.land/v2/go/pkg/errcode"
-	"pathwar.land/v2/go/pkg/pwdb"
+	"pathwar.land/pathwar/v2/go/pkg/errcode"
+	"pathwar.land/pathwar/v2/go/pkg/pwdb"
 )
 
 func (svc *service) ChallengeSubscriptionClose(ctx context.Context, in *ChallengeSubscriptionClose_Input) (*ChallengeSubscriptionClose_Output, error) {

diff --git a/go/pkg/pwapi/api_challenge-subscription-close_test.go b/go/pkg/pwapi/api_challenge-subscription-close_test.go
@@ -7,10 +7,10 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"pathwar.land/v2/go/internal/testutil"
-	"pathwar.land/v2/go/pkg/errcode"
-	"pathwar.land/v2/go/pkg/pwdb"
-	"pathwar.land/v2/go/pkg/pwinit"
+	"pathwar.land/pathwar/v2/go/internal/testutil"
+	"pathwar.land/pathwar/v2/go/pkg/errcode"
+	"pathwar.land/pathwar/v2/go/pkg/pwdb"
+	"pathwar.land/pathwar/v2/go/pkg/pwinit"
 )
 
 func TestSvc_ChallengeSubscriptionClose(t *testing.T) {

diff --git a/go/pkg/pwapi/api_challenge-subscription-validate.go b/go/pkg/pwapi/api_challenge-subscription-validate.go
@@ -6,9 +6,9 @@ import (
 	"errors"
 	"fmt"
 
-	"pathwar.land/v2/go/pkg/errcode"
-	"pathwar.land/v2/go/pkg/pwdb"
-	"pathwar.land/v2/go/pkg/pwinit"
+	"pathwar.land/pathwar/v2/go/pkg/errcode"
+	"pathwar.land/pathwar/v2/go/pkg/pwdb"
+	"pathwar.land/pathwar/v2/go/pkg/pwinit"
 )
 
 func (svc *service) ChallengeSubscriptionValidate(ctx context.Context, in *ChallengeSubscriptionValidate_Input) (*ChallengeSubscriptionValidate_Output, error) {

diff --git a/go/pkg/pwapi/api_challenge-subscription-validate_test.go b/go/pkg/pwapi/api_challenge-subscription-validate_test.go
@@ -6,9 +6,9 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"pathwar.land/v2/go/internal/testutil"
-	"pathwar.land/v2/go/pkg/errcode"
-	"pathwar.land/v2/go/pkg/pwdb"
+	"pathwar.land/pathwar/v2/go/internal/testutil"
+	"pathwar.land/pathwar/v2/go/pkg/errcode"
+	"pathwar.land/pathwar/v2/go/pkg/pwdb"
 )
 
 func TestSvc_ChallengeSubscriptionValidate(t *testing.T) {

diff --git a/go/pkg/pwapi/api_coupon-validate.go b/go/pkg/pwapi/api_coupon-validate.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/jinzhu/gorm"
-	"pathwar.land/v2/go/pkg/errcode"
-	"pathwar.land/v2/go/pkg/pwdb"
+	"pathwar.land/pathwar/v2/go/pkg/errcode"
+	"pathwar.land/pathwar/v2/go/pkg/pwdb"
 )
 
 func (svc *service) CouponValidate(ctx context.Context, in *CouponValidate_Input) (*CouponValidate_Output, error) {

diff --git a/go/pkg/pwapi/api_coupon-validate_test.go b/go/pkg/pwapi/api_coupon-validate_test.go
@@ -6,9 +6,9 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"pathwar.land/v2/go/internal/testutil"
-	"pathwar.land/v2/go/pkg/errcode"
-	"pathwar.land/v2/go/pkg/pwdb"
+	"pathwar.land/pathwar/v2/go/internal/testutil"
+	"pathwar.land/pathwar/v2/go/pkg/errcode"
+	"pathwar.land/pathwar/v2/go/pkg/pwdb"
 )
 
 func TestEngine_CouponValidate(t *testing.T) {

diff --git a/go/pkg/pwapi/api_organization-list.go b/go/pkg/pwapi/api_organization-list.go
@@ -3,8 +3,8 @@ package pwapi
 import (
 	"context"
 
-	"pathwar.land/v2/go/pkg/errcode"
-	"pathwar.land/v2/go/pkg/pwdb"
+	"pathwar.land/pathwar/v2/go/pkg/errcode"
+	"pathwar.land/pathwar/v2/go/pkg/pwdb"
 )
 
 func (svc *service) OrganizationList(context.Context, *OrganizationList_Input) (*OrganizationList_Output, error) {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		package testutil // import "pathwar.land/v2/go/internal/testutil"
		package testutil // import "pathwar.land/pathwar/v2/go/internal/testutil"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		package errcode // import "pathwar.land/v2/go/pkg/errcode"
		package errcode // import "pathwar.land/pathwar/v2/go/pkg/errcode"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		package pwagent // import "pathwar.land/v2/go/pkg/pwagent"
		package pwagent // import "pathwar.land/pathwar/v2/go/pkg/pwagent"