diff --git a/api/pwsso.proto b/api/pwsso.proto index 1faaff212..83264ab7d 100644 --- a/api/pwsso.proto +++ b/api/pwsso.proto @@ -41,4 +41,4 @@ message Claims { string given_name = 5; ActionToken action_token = 100; -} \ No newline at end of file +} diff --git a/docs/gen.sum b/docs/gen.sum index 4b05b1c5d..b234f7405 100644 --- a/docs/gen.sum +++ b/docs/gen.sum @@ -1,8 +1,8 @@ 4362a2715e8c2053c4bec93585b01ca252dae2e7 ../api/pwagent.proto -58eb4b1d9b5be40a69ffdab1a13b9fb90b669839 ../api/pwsso.proto 70d67f1cebb3b7f9e86fd0197d43db4c1f795f65 ../api/pwinit.proto a45fa08c595709dd752f52ded4493ceb3a191de2 ../api/pwcompose.proto b1d0de9f391f901a4a785a35abca59bac7c52872 ../api/errcode.proto b7830ceacc4030e7987231426c45753f67285fda ../api/pwapi.proto +bad04556b7233d5c8ddbcc1a3b2bfd027b694bce ../api/pwsso.proto c82d38b9b1c190688fea61507fda341ae4209349 Makefile d508c56ff122e79fec0b2b44a5de8f75353ee153 ../api/pwdb.proto diff --git a/go/Makefile b/go/Makefile index 23b6550a1..9a27deeac 100644 --- a/go/Makefile +++ b/go/Makefile @@ -4,7 +4,7 @@ GOPKG = pathwar.land/go GOBINS = ./cmd/pathwar ./cmd/pwinit DOCKER_IMAGE = pathwar/pathwar -GO_INSTALL_OPTS = -v -ldflags "-s -w -X pathwar.land/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/go/v2/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 @@ -94,6 +94,9 @@ generate_local: @set -e; for proto in $(PROTOS_SRC); do ( set -xe; \ protoc -I ../go/vendor/github.com/grpc-ecosystem/grpc-gateway:../api:../go/vendor:/protobuf --grpc-gateway_out=logtostderr=true:"$(GOPATH)/src" --gogofaster_out="plugins=grpc:$(GOPATH)/src" "$$proto" \ ); done + @### custom + sed -i s@pathwar.land/go/pkg@pathwar.land/go/v2/pkg@ ./pkg/*/*.pb.go + @### end of custom goimports -w ./pkg ./cmd ./internal shasum $(GEN_SRC) | sort > gen.sum.tmp mv gen.sum.tmp gen.sum diff --git a/go/cmd/pathwar/main.go b/go/cmd/pathwar/main.go index 4ca1365c5..99a54047e 100644 --- a/go/cmd/pathwar/main.go +++ b/go/cmd/pathwar/main.go @@ -1,4 +1,4 @@ -package main // import "pathwar.land/go/cmd/pathwar" +package main import ( "context" @@ -24,14 +24,14 @@ import ( "go.uber.org/zap" "go.uber.org/zap/zapcore" "golang.org/x/oauth2" - "pathwar.land/go/pkg/errcode" - "pathwar.land/go/pkg/pwagent" - "pathwar.land/go/pkg/pwapi" - "pathwar.land/go/pkg/pwcompose" - "pathwar.land/go/pkg/pwdb" - "pathwar.land/go/pkg/pwinit" - "pathwar.land/go/pkg/pwsso" - "pathwar.land/go/pkg/pwversion" + "pathwar.land/go/v2/pkg/errcode" + "pathwar.land/go/v2/pkg/pwagent" + "pathwar.land/go/v2/pkg/pwapi" + "pathwar.land/go/v2/pkg/pwcompose" + "pathwar.land/go/v2/pkg/pwdb" + "pathwar.land/go/v2/pkg/pwinit" + "pathwar.land/go/v2/pkg/pwsso" + "pathwar.land/go/v2/pkg/pwversion" ) const ( diff --git a/go/cmd/pwinit/main.go b/go/cmd/pwinit/main.go index 5e9788ced..e2bf42186 100644 --- a/go/cmd/pwinit/main.go +++ b/go/cmd/pwinit/main.go @@ -1,4 +1,4 @@ -package main // import "pathwar.land/go/cmd/pwinit" +package main import ( "encoding/json" @@ -13,8 +13,8 @@ import ( "syscall" "github.com/peterbourgon/ff/ffcli" - "pathwar.land/go/pkg/errcode" - "pathwar.land/go/pkg/pwinit" + "pathwar.land/go/v2/pkg/errcode" + "pathwar.land/go/v2/pkg/pwinit" ) func main() { diff --git a/go/doc.go b/go/doc.go new file mode 100644 index 000000000..911ab6ee7 --- /dev/null +++ b/go/doc.go @@ -0,0 +1 @@ +package pathwar // import "pathwar.land/go/v2" diff --git a/go/gen.sum b/go/gen.sum index 0e5a64065..6047f92c1 100644 --- a/go/gen.sum +++ b/go/gen.sum @@ -1,8 +1,8 @@ +033f9563307b21f1eec3aa6f81b4e7b1d74ea904 Makefile 4362a2715e8c2053c4bec93585b01ca252dae2e7 ../api/pwagent.proto -58eb4b1d9b5be40a69ffdab1a13b9fb90b669839 ../api/pwsso.proto 70d67f1cebb3b7f9e86fd0197d43db4c1f795f65 ../api/pwinit.proto a45fa08c595709dd752f52ded4493ceb3a191de2 ../api/pwcompose.proto b1d0de9f391f901a4a785a35abca59bac7c52872 ../api/errcode.proto b7830ceacc4030e7987231426c45753f67285fda ../api/pwapi.proto -c8444667ef9df6d47212692aac536dd272bd4c16 Makefile +bad04556b7233d5c8ddbcc1a3b2bfd027b694bce ../api/pwsso.proto d508c56ff122e79fec0b2b44a5de8f75353ee153 ../api/pwdb.proto diff --git a/go/go.mod b/go/go.mod index 05dc5ccbe..80e9bdf67 100644 --- a/go/go.mod +++ b/go/go.mod @@ -1,4 +1,4 @@ -module pathwar.land/go +module pathwar.land/go/v2 require ( github.com/Microsoft/go-winio v0.4.14 // indirect diff --git a/go/internal/randstring/randstring.go b/go/internal/randstring/randstring.go index 903531903..4a13ee844 100644 --- a/go/internal/randstring/randstring.go +++ b/go/internal/randstring/randstring.go @@ -1,4 +1,4 @@ -package randstring // import "pathwar.land/go/internal/randstring" +package randstring // import "pathwar.land/go/v2/internal/randstring" import "math/rand" diff --git a/go/internal/testutil/doc.go b/go/internal/testutil/doc.go index e6cd73f13..848bb3608 100644 --- a/go/internal/testutil/doc.go +++ b/go/internal/testutil/doc.go @@ -1 +1 @@ -package testutil // import "pathwar.land/go/internal/testutil" +package testutil // import "pathwar.land/go/v2/internal/testutil" diff --git a/go/pkg/errcode/doc.go b/go/pkg/errcode/doc.go index 1c0e87485..7d6edaddc 100644 --- a/go/pkg/errcode/doc.go +++ b/go/pkg/errcode/doc.go @@ -1 +1 @@ -package errcode // import "pathwar.land/go/pkg/errcode" +package errcode // import "pathwar.land/go/v2/pkg/errcode" diff --git a/go/pkg/pwagent/api.go b/go/pkg/pwagent/api.go index 2ff143a56..984b9f8bc 100644 --- a/go/pkg/pwagent/api.go +++ b/go/pkg/pwagent/api.go @@ -8,8 +8,8 @@ import ( "github.com/gogo/protobuf/jsonpb" "go.uber.org/zap" - "pathwar.land/go/pkg/errcode" - "pathwar.land/go/pkg/pwapi" + "pathwar.land/go/v2/pkg/errcode" + "pathwar.land/go/v2/pkg/pwapi" ) func fetchAPIInstances(ctx context.Context, apiClient *http.Client, httpAPIAddr string, agentName string, logger *zap.Logger) (*pwapi.AgentListInstances_Output, error) { diff --git a/go/pkg/pwagent/daemon.go b/go/pkg/pwagent/daemon.go index 99cd508b3..e622ee593 100644 --- a/go/pkg/pwagent/daemon.go +++ b/go/pkg/pwagent/daemon.go @@ -7,8 +7,8 @@ import ( "github.com/docker/docker/client" "go.uber.org/zap" - "pathwar.land/go/pkg/errcode" - "pathwar.land/go/pkg/pwcompose" + "pathwar.land/go/v2/pkg/errcode" + "pathwar.land/go/v2/pkg/pwcompose" ) func Daemon(ctx context.Context, cli *client.Client, apiClient *http.Client, opts Opts) error { diff --git a/go/pkg/pwagent/doc.go b/go/pkg/pwagent/doc.go index f2404d37b..d30abe536 100644 --- a/go/pkg/pwagent/doc.go +++ b/go/pkg/pwagent/doc.go @@ -1 +1 @@ -package pwagent // import "pathwar.land/go/pkg/pwagent" +package pwagent // import "pathwar.land/go/v2/pkg/pwagent" diff --git a/go/pkg/pwagent/docker.go b/go/pkg/pwagent/docker.go index be6c88b08..3733d88d0 100644 --- 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/go/pkg/errcode" - "pathwar.land/go/pkg/pwapi" - "pathwar.land/go/pkg/pwcompose" - "pathwar.land/go/pkg/pwdb" - "pathwar.land/go/pkg/pwinit" + "pathwar.land/go/v2/pkg/errcode" + "pathwar.land/go/v2/pkg/pwapi" + "pathwar.land/go/v2/pkg/pwcompose" + "pathwar.land/go/v2/pkg/pwdb" + "pathwar.land/go/v2/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 index d8e1d692b..e3ba29830 100644 --- a/go/pkg/pwagent/nginx.go +++ b/go/pkg/pwagent/nginx.go @@ -21,10 +21,10 @@ import ( "go.uber.org/zap" "golang.org/x/crypto/sha3" "moul.io/godev" - "pathwar.land/go/pkg/errcode" - "pathwar.land/go/pkg/pwapi" - "pathwar.land/go/pkg/pwcompose" - "pathwar.land/go/pkg/pwdb" + "pathwar.land/go/v2/pkg/errcode" + "pathwar.land/go/v2/pkg/pwapi" + "pathwar.land/go/v2/pkg/pwcompose" + "pathwar.land/go/v2/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 index 3c300e12d..5c79f657d 100644 --- a/go/pkg/pwagent/types.go +++ b/go/pkg/pwagent/types.go @@ -4,7 +4,7 @@ import ( "time" "go.uber.org/zap" - "pathwar.land/go/internal/randstring" + "pathwar.land/go/v2/internal/randstring" ) type Opts struct { diff --git a/go/pkg/pwapi/api_agent-list-instances.go b/go/pkg/pwapi/api_agent-list-instances.go index 210a28e52..323206c8b 100644 --- a/go/pkg/pwapi/api_agent-list-instances.go +++ b/go/pkg/pwapi/api_agent-list-instances.go @@ -4,8 +4,8 @@ import ( "context" "go.uber.org/zap" - "pathwar.land/go/pkg/errcode" - "pathwar.land/go/pkg/pwdb" + "pathwar.land/go/v2/pkg/errcode" + "pathwar.land/go/v2/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 index a18631ca9..bd15badf6 100644 --- 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/go/internal/testutil" - "pathwar.land/go/pkg/errcode" + "pathwar.land/go/v2/internal/testutil" + "pathwar.land/go/v2/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 index 04dcf722f..3ed5bb123 100644 --- 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/go/pkg/errcode" + "pathwar.land/go/v2/pkg/errcode" ) func (svc *service) AgentList(context.Context, *AgentList_Input) (*AgentList_Output, error) { diff --git a/go/pkg/pwapi/api_agent-register.go b/go/pkg/pwapi/api_agent-register.go index 3f7c321e2..3375173d6 100644 --- 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/go/pkg/errcode" - "pathwar.land/go/pkg/pwdb" + "pathwar.land/go/v2/pkg/errcode" + "pathwar.land/go/v2/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 index a6c36ebf1..d0e184b61 100644 --- 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/go/internal/testutil" - "pathwar.land/go/pkg/errcode" + "pathwar.land/go/v2/internal/testutil" + "pathwar.land/go/v2/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 index 3505a69be..3f09699b9 100644 --- a/go/pkg/pwapi/api_agent-update-state.go +++ b/go/pkg/pwapi/api_agent-update-state.go @@ -3,7 +3,7 @@ package pwapi import ( "context" - "pathwar.land/go/pkg/errcode" + "pathwar.land/go/v2/pkg/errcode" ) func (svc *service) AgentUpdateState(context.Context, *AgentUpdateState_Input) (*AgentUpdateState_Output, error) { diff --git a/go/pkg/pwapi/api_challenge-get.go b/go/pkg/pwapi/api_challenge-get.go index 3c35acaeb..cb2d8d1ec 100644 --- 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/go/pkg/errcode" - "pathwar.land/go/pkg/pwdb" + "pathwar.land/go/v2/pkg/errcode" + "pathwar.land/go/v2/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 index a3e839543..2d38e5ade 100644 --- 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/go/internal/testutil" - "pathwar.land/go/pkg/errcode" + "pathwar.land/go/v2/internal/testutil" + "pathwar.land/go/v2/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 index 5c2ae8fcd..376be5085 100644 --- 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/go/pkg/errcode" + "pathwar.land/go/v2/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 index b345f202c..56b6e87fb 100644 --- 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/go/pkg/errcode" - "pathwar.land/go/pkg/pwdb" + "pathwar.land/go/v2/pkg/errcode" + "pathwar.land/go/v2/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 index b427cb0ad..ef4dcf820 100644 --- a/go/pkg/pwapi/api_challenge-subscription-close_test.go +++ b/go/pkg/pwapi/api_challenge-subscription-close_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "pathwar.land/go/internal/testutil" - "pathwar.land/go/pkg/errcode" - "pathwar.land/go/pkg/pwdb" + "pathwar.land/go/v2/internal/testutil" + "pathwar.land/go/v2/pkg/errcode" + "pathwar.land/go/v2/pkg/pwdb" ) 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 index 639cab40e..17f167e2e 100644 --- a/go/pkg/pwapi/api_challenge-subscription-validate.go +++ b/go/pkg/pwapi/api_challenge-subscription-validate.go @@ -3,8 +3,8 @@ package pwapi import ( "context" - "pathwar.land/go/pkg/errcode" - "pathwar.land/go/pkg/pwdb" + "pathwar.land/go/v2/pkg/errcode" + "pathwar.land/go/v2/pkg/pwdb" ) 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 index 47b4d61c8..2cab323c2 100644 --- 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/go/internal/testutil" - "pathwar.land/go/pkg/errcode" - "pathwar.land/go/pkg/pwdb" + "pathwar.land/go/v2/internal/testutil" + "pathwar.land/go/v2/pkg/errcode" + "pathwar.land/go/v2/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 index 82ce88a33..da7fef016 100644 --- a/go/pkg/pwapi/api_coupon-validate.go +++ b/go/pkg/pwapi/api_coupon-validate.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "pathwar.land/go/pkg/errcode" - "pathwar.land/go/pkg/pwdb" + "pathwar.land/go/v2/pkg/errcode" + "pathwar.land/go/v2/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 index ef1215f8c..4222f558d 100644 --- a/go/pkg/pwapi/api_coupon-validate_test.go +++ b/go/pkg/pwapi/api_coupon-validate_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "pathwar.land/go/internal/testutil" - "pathwar.land/go/pkg/errcode" + "pathwar.land/go/v2/internal/testutil" + "pathwar.land/go/v2/pkg/errcode" ) func TestEngine_CouponValidate(t *testing.T) { diff --git a/go/pkg/pwapi/api_organization-list.go b/go/pkg/pwapi/api_organization-list.go index 1d6ec97eb..160486fc7 100644 --- 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/go/pkg/errcode" - "pathwar.land/go/pkg/pwdb" + "pathwar.land/go/v2/pkg/errcode" + "pathwar.land/go/v2/pkg/pwdb" ) func (svc *service) OrganizationList(context.Context, *OrganizationList_Input) (*OrganizationList_Output, error) { diff --git a/go/pkg/pwapi/api_season-challenge-buy.go b/go/pkg/pwapi/api_season-challenge-buy.go index 7bfb500a3..781d743ef 100644 --- a/go/pkg/pwapi/api_season-challenge-buy.go +++ b/go/pkg/pwapi/api_season-challenge-buy.go @@ -3,8 +3,8 @@ package pwapi import ( "context" - "pathwar.land/go/pkg/errcode" - "pathwar.land/go/pkg/pwdb" + "pathwar.land/go/v2/pkg/errcode" + "pathwar.land/go/v2/pkg/pwdb" ) func (svc *service) SeasonChallengeBuy(ctx context.Context, in *SeasonChallengeBuy_Input) (*SeasonChallengeBuy_Output, error) { diff --git a/go/pkg/pwapi/api_season-challenge-buy_test.go b/go/pkg/pwapi/api_season-challenge-buy_test.go index edc789d08..1f7245596 100644 --- a/go/pkg/pwapi/api_season-challenge-buy_test.go +++ b/go/pkg/pwapi/api_season-challenge-buy_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "pathwar.land/go/internal/testutil" - "pathwar.land/go/pkg/errcode" + "pathwar.land/go/v2/internal/testutil" + "pathwar.land/go/v2/pkg/errcode" ) func TestSvc_ChallengeBuy(t *testing.T) { diff --git a/go/pkg/pwapi/api_season-challenge-get.go b/go/pkg/pwapi/api_season-challenge-get.go index 021e26efb..5b7c2ef7a 100644 --- a/go/pkg/pwapi/api_season-challenge-get.go +++ b/go/pkg/pwapi/api_season-challenge-get.go @@ -3,8 +3,8 @@ package pwapi import ( "context" - "pathwar.land/go/pkg/errcode" - "pathwar.land/go/pkg/pwdb" + "pathwar.land/go/v2/pkg/errcode" + "pathwar.land/go/v2/pkg/pwdb" ) func (svc *service) SeasonChallengeGet(ctx context.Context, in *SeasonChallengeGet_Input) (*SeasonChallengeGet_Output, error) { diff --git a/go/pkg/pwapi/api_season-challenge-get_test.go b/go/pkg/pwapi/api_season-challenge-get_test.go index 8f2f6e3f2..62579580d 100644 --- a/go/pkg/pwapi/api_season-challenge-get_test.go +++ b/go/pkg/pwapi/api_season-challenge-get_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "pathwar.land/go/internal/testutil" - "pathwar.land/go/pkg/errcode" + "pathwar.land/go/v2/internal/testutil" + "pathwar.land/go/v2/pkg/errcode" ) func TestSvc_SeasonChallengeGet(t *testing.T) { diff --git a/go/pkg/pwapi/api_season-challenge-list.go b/go/pkg/pwapi/api_season-challenge-list.go index e7a846008..4fb3d37a4 100644 --- a/go/pkg/pwapi/api_season-challenge-list.go +++ b/go/pkg/pwapi/api_season-challenge-list.go @@ -3,8 +3,8 @@ package pwapi import ( "context" - "pathwar.land/go/pkg/errcode" - "pathwar.land/go/pkg/pwdb" + "pathwar.land/go/v2/pkg/errcode" + "pathwar.land/go/v2/pkg/pwdb" ) func (svc *service) SeasonChallengeList(ctx context.Context, in *SeasonChallengeList_Input) (*SeasonChallengeList_Output, error) { diff --git a/go/pkg/pwapi/api_season-challenge-list_test.go b/go/pkg/pwapi/api_season-challenge-list_test.go index 70c8cd641..4d166c0eb 100644 --- a/go/pkg/pwapi/api_season-challenge-list_test.go +++ b/go/pkg/pwapi/api_season-challenge-list_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "pathwar.land/go/internal/testutil" - "pathwar.land/go/pkg/errcode" + "pathwar.land/go/v2/internal/testutil" + "pathwar.land/go/v2/pkg/errcode" ) func TestSvc_SeasonChallengeList(t *testing.T) { diff --git a/go/pkg/pwapi/api_team-accept-invite.go b/go/pkg/pwapi/api_team-accept-invite.go index 7ce66bd51..b684dc713 100644 --- a/go/pkg/pwapi/api_team-accept-invite.go +++ b/go/pkg/pwapi/api_team-accept-invite.go @@ -3,7 +3,7 @@ package pwapi import ( "context" - "pathwar.land/go/pkg/errcode" + "pathwar.land/go/v2/pkg/errcode" ) func (svc *service) TeamAcceptInvite(ctx context.Context, in *TeamAcceptInvite_Input) (*TeamAcceptInvite_Output, error) { diff --git a/go/pkg/pwapi/api_team-create.go b/go/pkg/pwapi/api_team-create.go index a442d499a..f5437cbd7 100644 --- a/go/pkg/pwapi/api_team-create.go +++ b/go/pkg/pwapi/api_team-create.go @@ -4,8 +4,8 @@ import ( "context" "strings" - "pathwar.land/go/pkg/errcode" - "pathwar.land/go/pkg/pwdb" + "pathwar.land/go/v2/pkg/errcode" + "pathwar.land/go/v2/pkg/pwdb" ) func (svc *service) TeamCreate(ctx context.Context, in *TeamCreate_Input) (*TeamCreate_Output, error) { diff --git a/go/pkg/pwapi/api_team-create_test.go b/go/pkg/pwapi/api_team-create_test.go index bd6799ccb..c5aa904fe 100644 --- a/go/pkg/pwapi/api_team-create_test.go +++ b/go/pkg/pwapi/api_team-create_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "pathwar.land/go/internal/testutil" - "pathwar.land/go/pkg/errcode" - "pathwar.land/go/pkg/pwdb" + "pathwar.land/go/v2/internal/testutil" + "pathwar.land/go/v2/pkg/errcode" + "pathwar.land/go/v2/pkg/pwdb" ) func TestSvc_TeamCreate(t *testing.T) { diff --git a/go/pkg/pwapi/api_team-get.go b/go/pkg/pwapi/api_team-get.go index 63a116349..2929427bd 100644 --- a/go/pkg/pwapi/api_team-get.go +++ b/go/pkg/pwapi/api_team-get.go @@ -4,8 +4,8 @@ import ( "context" "math/rand" - "pathwar.land/go/pkg/errcode" - "pathwar.land/go/pkg/pwdb" + "pathwar.land/go/v2/pkg/errcode" + "pathwar.land/go/v2/pkg/pwdb" ) func (svc *service) TeamGet(ctx context.Context, in *TeamGet_Input) (*TeamGet_Output, error) { diff --git a/go/pkg/pwapi/api_team-get_test.go b/go/pkg/pwapi/api_team-get_test.go index def52fe1f..188e67e78 100644 --- a/go/pkg/pwapi/api_team-get_test.go +++ b/go/pkg/pwapi/api_team-get_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "pathwar.land/go/internal/testutil" - "pathwar.land/go/pkg/errcode" + "pathwar.land/go/v2/internal/testutil" + "pathwar.land/go/v2/pkg/errcode" ) func TestSvc_TeamGet(t *testing.T) { diff --git a/go/pkg/pwapi/api_team-list.go b/go/pkg/pwapi/api_team-list.go index 74fb04b73..f49188d28 100644 --- a/go/pkg/pwapi/api_team-list.go +++ b/go/pkg/pwapi/api_team-list.go @@ -4,8 +4,8 @@ import ( "context" "math/rand" - "pathwar.land/go/pkg/errcode" - "pathwar.land/go/pkg/pwdb" + "pathwar.land/go/v2/pkg/errcode" + "pathwar.land/go/v2/pkg/pwdb" ) func (svc *service) TeamList(ctx context.Context, in *TeamList_Input) (*TeamList_Output, error) { diff --git a/go/pkg/pwapi/api_team-list_test.go b/go/pkg/pwapi/api_team-list_test.go index 6fa7d4d75..41d99a3a0 100644 --- a/go/pkg/pwapi/api_team-list_test.go +++ b/go/pkg/pwapi/api_team-list_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/stretchr/testify/assert" - "pathwar.land/go/internal/testutil" - "pathwar.land/go/pkg/errcode" + "pathwar.land/go/v2/internal/testutil" + "pathwar.land/go/v2/pkg/errcode" ) func TestSvc_TeamList(t *testing.T) { diff --git a/go/pkg/pwapi/api_team-send-invite.go b/go/pkg/pwapi/api_team-send-invite.go index af28c3e63..c87f47c4b 100644 --- a/go/pkg/pwapi/api_team-send-invite.go +++ b/go/pkg/pwapi/api_team-send-invite.go @@ -3,7 +3,7 @@ package pwapi import ( "context" - "pathwar.land/go/pkg/errcode" + "pathwar.land/go/v2/pkg/errcode" ) func (svc *service) TeamSendInvite(ctx context.Context, in *TeamSendInvite_Input) (*TeamSendInvite_Output, error) { diff --git a/go/pkg/pwapi/api_tool-dbdump.go b/go/pkg/pwapi/api_tool-dbdump.go index c3dba9297..664d12790 100644 --- a/go/pkg/pwapi/api_tool-dbdump.go +++ b/go/pkg/pwapi/api_tool-dbdump.go @@ -3,7 +3,7 @@ package pwapi import ( "context" - "pathwar.land/go/pkg/pwdb" + "pathwar.land/go/v2/pkg/pwdb" ) func (svc *service) ToolDBDump(context.Context, *Void) (*pwdb.Dump, error) { diff --git a/go/pkg/pwapi/api_tool-generate-fake-data.go b/go/pkg/pwapi/api_tool-generate-fake-data.go index a4bbba47e..ef3337d49 100644 --- a/go/pkg/pwapi/api_tool-generate-fake-data.go +++ b/go/pkg/pwapi/api_tool-generate-fake-data.go @@ -3,7 +3,7 @@ package pwapi import ( "context" - "pathwar.land/go/pkg/pwdb" + "pathwar.land/go/v2/pkg/pwdb" ) func (svc *service) ToolGenerateFakeData(context.Context, *Void) (*Void, error) { diff --git a/go/pkg/pwapi/api_tool-info.go b/go/pkg/pwapi/api_tool-info.go index bf28691f2..06a540248 100644 --- a/go/pkg/pwapi/api_tool-info.go +++ b/go/pkg/pwapi/api_tool-info.go @@ -4,7 +4,7 @@ import ( "context" "time" - "pathwar.land/go/pkg/pwversion" + "pathwar.land/go/v2/pkg/pwversion" ) func (svc *service) ToolInfo(context.Context, *GetInfo_Input) (*GetInfo_Output, error) { diff --git a/go/pkg/pwapi/api_tool-info_test.go b/go/pkg/pwapi/api_tool-info_test.go index b8956ab08..da47658c2 100644 --- a/go/pkg/pwapi/api_tool-info_test.go +++ b/go/pkg/pwapi/api_tool-info_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "pathwar.land/go/internal/testutil" + "pathwar.land/go/v2/internal/testutil" ) func TestEngine_ToolInfo(t *testing.T) { diff --git a/go/pkg/pwapi/api_tool-status_test.go b/go/pkg/pwapi/api_tool-status_test.go index 3cf14407d..8fb386e8e 100644 --- a/go/pkg/pwapi/api_tool-status_test.go +++ b/go/pkg/pwapi/api_tool-status_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "pathwar.land/go/internal/testutil" + "pathwar.land/go/v2/internal/testutil" ) func TestSvc_GetStatus(t *testing.T) { diff --git a/go/pkg/pwapi/api_user-delete-account.go b/go/pkg/pwapi/api_user-delete-account.go index 7dcf01ce7..242d9e25a 100644 --- a/go/pkg/pwapi/api_user-delete-account.go +++ b/go/pkg/pwapi/api_user-delete-account.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "pathwar.land/go/pkg/errcode" - "pathwar.land/go/pkg/pwdb" + "pathwar.land/go/v2/pkg/errcode" + "pathwar.land/go/v2/pkg/pwdb" ) func (svc *service) UserDeleteAccount(ctx context.Context, in *UserDeleteAccount_Input) (*UserDeleteAccount_Output, error) { diff --git a/go/pkg/pwapi/api_user-delete-account_test.go b/go/pkg/pwapi/api_user-delete-account_test.go index 624460881..980bae6a7 100644 --- a/go/pkg/pwapi/api_user-delete-account_test.go +++ b/go/pkg/pwapi/api_user-delete-account_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "pathwar.land/go/internal/testutil" + "pathwar.land/go/v2/internal/testutil" ) func TestSvc_UserDeleteAccount(t *testing.T) { diff --git a/go/pkg/pwapi/api_user-get-session.go b/go/pkg/pwapi/api_user-get-session.go index d9158e37b..67065b7da 100644 --- a/go/pkg/pwapi/api_user-get-session.go +++ b/go/pkg/pwapi/api_user-get-session.go @@ -7,9 +7,9 @@ import ( "math/rand" "go.uber.org/zap" - "pathwar.land/go/pkg/errcode" - "pathwar.land/go/pkg/pwdb" - "pathwar.land/go/pkg/pwsso" + "pathwar.land/go/v2/pkg/errcode" + "pathwar.land/go/v2/pkg/pwdb" + "pathwar.land/go/v2/pkg/pwsso" ) func (svc *service) UserGetSession(ctx context.Context, _ *UserGetSession_Input) (*UserGetSession_Output, error) { diff --git a/go/pkg/pwapi/api_user-get-session_test.go b/go/pkg/pwapi/api_user-get-session_test.go index 099e1117a..3bb44e599 100644 --- a/go/pkg/pwapi/api_user-get-session_test.go +++ b/go/pkg/pwapi/api_user-get-session_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "moul.io/godev" - "pathwar.land/go/internal/testutil" - "pathwar.land/go/pkg/pwsso" + "pathwar.land/go/v2/internal/testutil" + "pathwar.land/go/v2/pkg/pwsso" ) func TestSvc_UserGetSession(t *testing.T) { diff --git a/go/pkg/pwapi/api_user-set-preferences.go b/go/pkg/pwapi/api_user-set-preferences.go index 244b9e1c1..36867a14f 100644 --- a/go/pkg/pwapi/api_user-set-preferences.go +++ b/go/pkg/pwapi/api_user-set-preferences.go @@ -3,8 +3,8 @@ package pwapi import ( "context" - "pathwar.land/go/pkg/errcode" - "pathwar.land/go/pkg/pwdb" + "pathwar.land/go/v2/pkg/errcode" + "pathwar.land/go/v2/pkg/pwdb" ) func (svc *service) UserSetPreferences(ctx context.Context, in *UserSetPreferences_Input) (*UserSetPreferences_Output, error) { diff --git a/go/pkg/pwapi/api_user-set-preferences_test.go b/go/pkg/pwapi/api_user-set-preferences_test.go index b763a92c0..1b61e8fd4 100644 --- a/go/pkg/pwapi/api_user-set-preferences_test.go +++ b/go/pkg/pwapi/api_user-set-preferences_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "pathwar.land/go/internal/testutil" - "pathwar.land/go/pkg/errcode" + "pathwar.land/go/v2/internal/testutil" + "pathwar.land/go/v2/pkg/errcode" ) func TestSvc_UserSetPreferences(t *testing.T) { diff --git a/go/pkg/pwapi/auth.go b/go/pkg/pwapi/auth.go index ea0a1ba1d..4783b40d7 100644 --- a/go/pkg/pwapi/auth.go +++ b/go/pkg/pwapi/auth.go @@ -7,9 +7,9 @@ import ( "github.com/dgrijalva/jwt-go" "github.com/jinzhu/gorm" "google.golang.org/grpc/metadata" - "pathwar.land/go/pkg/errcode" - "pathwar.land/go/pkg/pwdb" - "pathwar.land/go/pkg/pwsso" + "pathwar.land/go/v2/pkg/errcode" + "pathwar.land/go/v2/pkg/pwdb" + "pathwar.land/go/v2/pkg/pwsso" ) type ctxKey string diff --git a/go/pkg/pwapi/doc.go b/go/pkg/pwapi/doc.go index e4ac25344..fb7b0423c 100644 --- a/go/pkg/pwapi/doc.go +++ b/go/pkg/pwapi/doc.go @@ -1 +1 @@ -package pwapi // import "pathwar.land/go/pkg/pwapi" +package pwapi // import "pathwar.land/go/v2/pkg/pwapi" diff --git a/go/pkg/pwapi/helpers.go b/go/pkg/pwapi/helpers.go index 54f1e8523..182b9ca4e 100644 --- a/go/pkg/pwapi/helpers.go +++ b/go/pkg/pwapi/helpers.go @@ -2,7 +2,7 @@ package pwapi import ( "github.com/jinzhu/gorm" - "pathwar.land/go/pkg/pwdb" + "pathwar.land/go/v2/pkg/pwdb" ) func userTeamForSeason(db *gorm.DB, userID, seasonID int64) (*pwdb.Team, error) { diff --git a/go/pkg/pwapi/pwapi.pb.go b/go/pkg/pwapi/pwapi.pb.go index 78391bb5d..9394062da 100644 --- a/go/pkg/pwapi/pwapi.pb.go +++ b/go/pkg/pwapi/pwapi.pb.go @@ -17,8 +17,8 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" - pwdb "pathwar.land/go/pkg/pwdb" - pwsso "pathwar.land/go/pkg/pwsso" + pwdb "pathwar.land/go/v2/pkg/pwdb" + pwsso "pathwar.land/go/v2/pkg/pwsso" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/go/pkg/pwapi/server.go b/go/pkg/pwapi/server.go index 0ad3c9c2d..cfc9806bd 100644 --- a/go/pkg/pwapi/server.go +++ b/go/pkg/pwapi/server.go @@ -23,7 +23,7 @@ import ( chilogger "github.com/treastech/logger" "go.uber.org/zap" "google.golang.org/grpc" - "pathwar.land/go/pkg/errcode" + "pathwar.land/go/v2/pkg/errcode" ) func NewServer(ctx context.Context, svc Service, opts ServerOpts) (*Server, error) { diff --git a/go/pkg/pwapi/server_test.go b/go/pkg/pwapi/server_test.go index a67a61e86..c5281c203 100644 --- a/go/pkg/pwapi/server_test.go +++ b/go/pkg/pwapi/server_test.go @@ -10,7 +10,7 @@ import ( _ "github.com/jinzhu/gorm/dialects/sqlite" "github.com/stretchr/testify/assert" "moul.io/godev" - "pathwar.land/go/internal/testutil" + "pathwar.land/go/v2/internal/testutil" ) func TestServer(t *testing.T) { diff --git a/go/pkg/pwapi/service.go b/go/pkg/pwapi/service.go index 3e3aa6fba..57910d56c 100644 --- a/go/pkg/pwapi/service.go +++ b/go/pkg/pwapi/service.go @@ -6,8 +6,8 @@ import ( "github.com/bwmarrin/snowflake" "github.com/jinzhu/gorm" "go.uber.org/zap" - "pathwar.land/go/pkg/errcode" - "pathwar.land/go/pkg/pwsso" + "pathwar.land/go/v2/pkg/errcode" + "pathwar.land/go/v2/pkg/pwsso" ) type Service interface { diff --git a/go/pkg/pwapi/testing.go b/go/pkg/pwapi/testing.go index 023a4a88b..23b88f42e 100644 --- a/go/pkg/pwapi/testing.go +++ b/go/pkg/pwapi/testing.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" "go.uber.org/zap" "google.golang.org/grpc" - "pathwar.land/go/pkg/pwdb" - "pathwar.land/go/pkg/pwsso" + "pathwar.land/go/v2/pkg/pwdb" + "pathwar.land/go/v2/pkg/pwsso" ) func TestingService(t *testing.T, opts ServiceOpts) (Service, func()) { diff --git a/go/pkg/pwapi/testing_test.go b/go/pkg/pwapi/testing_test.go index e29e5fc8b..f1821e168 100644 --- a/go/pkg/pwapi/testing_test.go +++ b/go/pkg/pwapi/testing_test.go @@ -6,9 +6,9 @@ import ( "github.com/jinzhu/gorm" "github.com/stretchr/testify/assert" - "pathwar.land/go/pkg/errcode" - "pathwar.land/go/pkg/pwdb" - "pathwar.land/go/pkg/pwsso" + "pathwar.land/go/v2/pkg/errcode" + "pathwar.land/go/v2/pkg/pwdb" + "pathwar.land/go/v2/pkg/pwsso" ) func testingSeasons(t *testing.T, svc Service) *pwdb.SeasonList { diff --git a/go/pkg/pwcompose/compose.go b/go/pkg/pwcompose/compose.go index 0dce665c9..febafc3c5 100644 --- a/go/pkg/pwcompose/compose.go +++ b/go/pkg/pwcompose/compose.go @@ -22,9 +22,9 @@ import ( "github.com/olekukonko/tablewriter" "go.uber.org/zap" "gopkg.in/yaml.v3" - "pathwar.land/go/internal/randstring" - "pathwar.land/go/pkg/errcode" - "pathwar.land/go/pkg/pwinit" + "pathwar.land/go/v2/internal/randstring" + "pathwar.land/go/v2/pkg/errcode" + "pathwar.land/go/v2/pkg/pwinit" ) const ( diff --git a/go/pkg/pwcompose/doc.go b/go/pkg/pwcompose/doc.go index c1b0988c3..8e0b1d56a 100644 --- a/go/pkg/pwcompose/doc.go +++ b/go/pkg/pwcompose/doc.go @@ -1 +1 @@ -package pwcompose // import "pathwar.land/go/pkg/pwcompose" +package pwcompose // import "pathwar.land/go/v2/pkg/pwcompose" diff --git a/go/pkg/pwdb/db.go b/go/pkg/pwdb/db.go index 067bbd1ab..f24e47221 100644 --- a/go/pkg/pwdb/db.go +++ b/go/pkg/pwdb/db.go @@ -5,7 +5,7 @@ import ( "github.com/jinzhu/gorm" "go.uber.org/zap" "moul.io/zapgorm" - "pathwar.land/go/pkg/errcode" + "pathwar.land/go/v2/pkg/errcode" ) type Opts struct { diff --git a/go/pkg/pwdb/doc.go b/go/pkg/pwdb/doc.go index fb3a2334f..1b5887f1f 100644 --- a/go/pkg/pwdb/doc.go +++ b/go/pkg/pwdb/doc.go @@ -1 +1 @@ -package pwdb // import "pathwar.land/go/pkg/pwdb" +package pwdb // import "pathwar.land/go/v2/pkg/pwdb" diff --git a/go/pkg/pwdb/errors.go b/go/pkg/pwdb/errors.go index 468d3eddb..9dd64ee60 100644 --- a/go/pkg/pwdb/errors.go +++ b/go/pkg/pwdb/errors.go @@ -4,7 +4,7 @@ import ( "errors" "github.com/jinzhu/gorm" - "pathwar.land/go/pkg/errcode" + "pathwar.land/go/v2/pkg/errcode" ) func IsRecordNotFoundError(err error) bool { diff --git a/go/pkg/pwdb/helpers.go b/go/pkg/pwdb/helpers.go index 6072d5e3b..c7159aad6 100644 --- a/go/pkg/pwdb/helpers.go +++ b/go/pkg/pwdb/helpers.go @@ -7,7 +7,7 @@ import ( "github.com/bwmarrin/snowflake" "github.com/jinzhu/gorm" "go.uber.org/zap" - "pathwar.land/go/internal/randstring" + "pathwar.land/go/v2/internal/randstring" ) func GetInfo(db *gorm.DB, logger *zap.Logger) (*Info, error) { diff --git a/go/pkg/pwdb/migrations.go b/go/pkg/pwdb/migrations.go index a7744a0a5..ae74ade2a 100644 --- a/go/pkg/pwdb/migrations.go +++ b/go/pkg/pwdb/migrations.go @@ -4,7 +4,7 @@ import ( "github.com/bwmarrin/snowflake" "github.com/jinzhu/gorm" "gopkg.in/gormigrate.v1" - "pathwar.land/go/pkg/errcode" + "pathwar.land/go/v2/pkg/errcode" ) func migrate(db *gorm.DB, sfn *snowflake.Node, opts Opts) error { diff --git a/go/pkg/pwinit/doc.go b/go/pkg/pwinit/doc.go index fbccc1b40..03d80f0bd 100644 --- a/go/pkg/pwinit/doc.go +++ b/go/pkg/pwinit/doc.go @@ -1 +1 @@ -package pwinit // import "pathwar.land/go/pkg/pwinit" +package pwinit // import "pathwar.land/go/v2/pkg/pwinit" diff --git a/go/pkg/pwsso/client.go b/go/pkg/pwsso/client.go index 250840bdb..4a8e056ad 100644 --- a/go/pkg/pwsso/client.go +++ b/go/pkg/pwsso/client.go @@ -7,7 +7,7 @@ import ( jwt "github.com/dgrijalva/jwt-go" "go.uber.org/zap" - "pathwar.land/go/pkg/errcode" + "pathwar.land/go/v2/pkg/errcode" ) type Opts struct { diff --git a/go/pkg/pwsso/doc.go b/go/pkg/pwsso/doc.go index 475fc9074..abceffc2d 100644 --- a/go/pkg/pwsso/doc.go +++ b/go/pkg/pwsso/doc.go @@ -1 +1 @@ -package pwsso // import "pathwar.land/go/pkg/pwsso" +package pwsso // import "pathwar.land/go/v2/pkg/pwsso" diff --git a/go/pkg/pwsso/keycloak.go b/go/pkg/pwsso/keycloak.go index 1e8bb56e8..b38def0c5 100644 --- a/go/pkg/pwsso/keycloak.go +++ b/go/pkg/pwsso/keycloak.go @@ -6,7 +6,7 @@ import ( "github.com/keycloak/kcinit/rest" "go.uber.org/zap" - "pathwar.land/go/pkg/errcode" + "pathwar.land/go/v2/pkg/errcode" ) const KeycloakBaseURL = "https://id.pathwar.land" diff --git a/go/pkg/pwsso/token.go b/go/pkg/pwsso/token.go index 36f641196..7ac2add89 100644 --- a/go/pkg/pwsso/token.go +++ b/go/pkg/pwsso/token.go @@ -5,7 +5,7 @@ import ( jwt "github.com/dgrijalva/jwt-go" "go.uber.org/zap" - "pathwar.land/go/pkg/errcode" + "pathwar.land/go/v2/pkg/errcode" ) func (c *client) TokenWithClaims(bearer string) (*jwt.Token, jwt.MapClaims, error) { diff --git a/go/pkg/pwversion/doc.go b/go/pkg/pwversion/doc.go index f05c67c93..0ca8480d5 100644 --- a/go/pkg/pwversion/doc.go +++ b/go/pkg/pwversion/doc.go @@ -1 +1 @@ -package pwversion // import "pathwar.land/go/pkg/pwversion" +package pwversion // import "pathwar.land/go/v2/pkg/pwversion" diff --git a/tool/screenshoter/go.mod b/tool/screenshoter/go.mod index 2d84c73e7..5f6639621 100644 --- a/tool/screenshoter/go.mod +++ b/tool/screenshoter/go.mod @@ -1,4 +1,4 @@ -module pathwar.land/tool/screenshoter +module pathwar.land/tool/screenshoter/v2 require ( github.com/chromedp/cdproto v0.0.0-20190926234355-1b4886c6fad6