feat: move go.mod on repo root

.circleci/config.yml

@@ -20,21 +20,21 @@ jobs:
   #        image: pathwar/pathwar
 
   go-build:
-    working_directory: /go/src/pathwar.land/go
+    working_directory: /go/src/pathwar.land
     docker:
       - image: circleci/golang:1.13
     steps:
       - checkout:
           path: /go/src/pathwar.land
       - moul/mod-download
       - gotools/mod-tidy-check
-      - run: make install
-      - run: SKIP_SLOW_TESTS=1 make unittest GO_TEST_OPTS="-test.timeout=60s -count=10"
-      - run: SKIP_SLOW_TESTS=0 make unittest GO_TEST_OPTS="-test.timeout=60s -count=2"
+      - run: cd go && make install
+      - run: cd go && SKIP_SLOW_TESTS=1 make unittest GO_TEST_OPTS="-test.timeout=60s -count=10"
+      - run: cd go && SKIP_SLOW_TESTS=0 make unittest GO_TEST_OPTS="-test.timeout=60s -count=2"
       - moul/install_golangci-lint
-      - run: PATH=$PATH:$(pwd)/bin make lint
+      - run: cd go && PATH=$PATH:$(pwd)/bin make lint
       - codecov/upload:
-          file: coverage.txt
+          file: go/coverage.txt
 
   go-generate:
     working_directory: /go/src/pathwar.land

.dockerignore

@@ -1,13 +1,16 @@
+.*~
+.#*
+*~
+*#
+.circleci/
+coverage.txt
+docker-compose.yml
+Dockerfile
+.dockerignore
+.gitignore
 node_modules
+out/
 package-lock.json
-yarn.lock
-.circleci/
 test/
-*~
-.#*
-.*~
-Dockerfile
 vendor/
-.gitignore
-.dockerignore
-docker-compose.yml
+yarn.lock

go/Dockerfile → Dockerfile

@@ -2,7 +2,7 @@
 FROM            golang:1.13-alpine as builder
 RUN             apk --no-cache --update add nodejs-npm make gcc g++ musl-dev openssl-dev git
 ENV             GO111MODULE=on GOPROXY=https://proxy.golang.org,direct
-COPY            go.mod go.sum /go/src/pathwar.land/go/
+COPY            go.mod go.sum /go/src/pathwar.land/
 WORKDIR         /go/src/pathwar.land/go
 RUN             go mod download
 COPY            . .

README.md

@@ -14,7 +14,7 @@
   <a href="https://www.codefactor.io/repository/github/pathwar/pathwar"><img src="https://www.codefactor.io/repository/github/pathwar/pathwar/badge" alt="Code Factor"></a>
   <a href="https://goreportcard.com/report/pathwar/pathwar"><img src="https://goreportcard.com/badge/pathwar/pathwar" alt="Go Report Card"></a>
   <a href="https://github.com/pathwar/pathwar/releases"><img src="https://badge.fury.io/gh/pathwar%2Fpathwar.svg" alt="GitHub version"></a>
-  <a href="https://pkg.go.dev/pathwar.land/go/v2"><img src="https://img.shields.io/static/v1?label=godoc&message=reference&color=blue" alt="GoDoc"></a>
+  <a href="https://pkg.go.dev/pathwar.land/v2/go"><img src="https://img.shields.io/static/v1?label=godoc&message=reference&color=blue" alt="GoDoc"></a>
   <a href="https://codecov.io/gh/pathwar/pathwar"><img src="https://codecov.io/gh/pathwar/pathwar/branch/master/graph/badge.svg" /></a>
 </p>
 

docs/Makefile

@@ -24,7 +24,7 @@ gen.sum: $(GEN_SRC)
 
 .PHONY: generate_local
 generate_local:
-	protoc -I ../go/vendor/github.com/grpc-ecosystem/grpc-gateway:../api:../go/vendor:/protobuf --swagger_out=logtostderr=true:. ../api/pwapi.proto
+	protoc -I ../vendor/github.com/grpc-ecosystem/grpc-gateway:../api:../vendor:/protobuf --swagger_out=logtostderr=true:. ../api/pwapi.proto
 	echo 'swagger: "2.0"' > swagger.yaml.tmp
 	cat ./pwapi.swagger.json | json2yaml | grep -v 'swagger: "2.0"' >> swagger.yaml.tmp
 	rm -f ./pwapi.swagger.json

go/go.mod → go.mod

@@ -1,4 +1,4 @@
-module pathwar.land/go/v2
+module pathwar.land/v2
 
 require (
 	github.com/Microsoft/go-winio v0.4.14 // indirect

go/Makefile

@@ -1,10 +1,12 @@
 ## moul/rules.mk
 GOPATH ?= $(HOME)/go
-GOPKG =		pathwar.land/go
-GOBINS =	./cmd/pathwar ./cmd/pwinit
-DOCKER_IMAGE =	pathwar/pathwar
+GOMOD_DIR = ..
+GOPKG =	pathwar.land
+GOBINS = ./cmd/pathwar ./cmd/pwinit
+DOCKER_IMAGE =pathwar/pathwar
+DOCKERFILE_PATH = ../Dockerfile
 
-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"
+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"
 PRE_INSTALL_STEPS += generate
 PRE_UNITTEST_STEPS += generate
 PRE_TEST_STEPS += generate
@@ -92,10 +94,10 @@ gen.sum: $(GEN_SRC)
 .PHONY: generate_local
 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" \
+	  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]/go/v2/pkg@ ./pkg/*/*.pb.go
+	sed -i [email protected]/go/[email protected]/v2/go/pkg@ ./pkg/*/*.pb.go
 	@### end of custom
 	goimports -w ./pkg ./cmd ./internal
 	shasum $(GEN_SRC) | sort > gen.sum.tmp

go/cmd/pathwar/main.go

@@ -25,14 +25,14 @@ import (
 	"go.uber.org/zap/zapcore"
 	"golang.org/x/oauth2"
 	"moul.io/srand"
-	"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"
+	"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"
 )
 
 const (

go/cmd/pwinit/main.go

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

go/doc.go

@@ -1 +1 @@
-package pathwar // import "pathwar.land/go/v2"
+package pathwar // import "pathwar.land/v2/go"

go/internal/randstring/randstring.go

@@ -1,4 +1,4 @@
-package randstring // import "pathwar.land/go/v2/internal/randstring"
+package randstring // import "pathwar.land/v2/go/internal/randstring"
 
 import "math/rand"
 

go/internal/testutil/doc.go

@@ -1 +1 @@
-package testutil // import "pathwar.land/go/v2/internal/testutil"
+package testutil // import "pathwar.land/v2/go/internal/testutil"

go/pkg/errcode/doc.go

@@ -1 +1 @@
-package errcode // import "pathwar.land/go/v2/pkg/errcode"
+package errcode // import "pathwar.land/v2/go/pkg/errcode"

go/pkg/pwagent/api.go

@@ -8,8 +8,8 @@ import (
 
 	"github.com/gogo/protobuf/jsonpb"
 	"go.uber.org/zap"
-	"pathwar.land/go/v2/pkg/errcode"
-	"pathwar.land/go/v2/pkg/pwapi"
+	"pathwar.land/v2/go/pkg/errcode"
+	"pathwar.land/v2/go/pkg/pwapi"
 )
 
 func fetchAPIInstances(ctx context.Context, apiClient *http.Client, httpAPIAddr string, agentName string, logger *zap.Logger) (*pwapi.AgentListInstances_Output, error) {

go/pkg/pwagent/daemon.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/docker/docker/client"
 	"go.uber.org/zap"
-	"pathwar.land/go/v2/pkg/errcode"
-	"pathwar.land/go/v2/pkg/pwcompose"
+	"pathwar.land/v2/go/pkg/errcode"
+	"pathwar.land/v2/go/pkg/pwcompose"
 )
 
 func Daemon(ctx context.Context, cli *client.Client, apiClient *http.Client, opts Opts) error {

go/pkg/pwagent/doc.go

@@ -1 +1 @@
-package pwagent // import "pathwar.land/go/v2/pkg/pwagent"
+package pwagent // import "pathwar.land/v2/go/pkg/pwagent"

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/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"
+	"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"
 )
 
 func applyDockerConfig(ctx context.Context, apiInstances *pwapi.AgentListInstances_Output, dockerClient *client.Client, opts Opts) error {

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/v2/pkg/errcode"
-	"pathwar.land/go/v2/pkg/pwapi"
-	"pathwar.land/go/v2/pkg/pwcompose"
-	"pathwar.land/go/v2/pkg/pwdb"
+	"pathwar.land/v2/go/pkg/errcode"
+	"pathwar.land/v2/go/pkg/pwapi"
+	"pathwar.land/v2/go/pkg/pwcompose"
+	"pathwar.land/v2/go/pkg/pwdb"
 )
 
 func applyNginxConfig(ctx context.Context, apiInstances *pwapi.AgentListInstances_Output, dockerClient *client.Client, opts Opts) error {

go/pkg/pwagent/types.go

@@ -4,7 +4,7 @@ import (
 	"time"
 
 	"go.uber.org/zap"
-	"pathwar.land/go/v2/internal/randstring"
+	"pathwar.land/v2/go/internal/randstring"
 )
 
 type Opts struct {

go/pkg/pwapi/api_agent-list-instances.go

@@ -4,8 +4,8 @@ import (
 	"context"
 
 	"go.uber.org/zap"
-	"pathwar.land/go/v2/pkg/errcode"
-	"pathwar.land/go/v2/pkg/pwdb"
+	"pathwar.land/v2/go/pkg/errcode"
+	"pathwar.land/v2/go/pkg/pwdb"
 )
 
 func (svc *service) AgentListInstances(ctx context.Context, in *AgentListInstances_Input) (*AgentListInstances_Output, error) {

go/pkg/pwapi/api_agent-list-instances_test.go

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

go/pkg/pwapi/api_agent-list.go

@@ -3,7 +3,7 @@ package pwapi
 import (
 	"context"
 
-	"pathwar.land/go/v2/pkg/errcode"
+	"pathwar.land/v2/go/pkg/errcode"
 )
 
 func (svc *service) AgentList(context.Context, *AgentList_Input) (*AgentList_Output, error) {

go/pkg/pwapi/api_agent-register.go

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

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/v2/internal/testutil"
-	"pathwar.land/go/v2/pkg/errcode"
+	"pathwar.land/v2/go/internal/testutil"
+	"pathwar.land/v2/go/pkg/errcode"
 )
 
 func TestService_AgentRegister(t *testing.T) {

go/pkg/pwapi/api_agent-update-state.go

@@ -3,7 +3,7 @@ package pwapi
 import (
 	"context"
 
-	"pathwar.land/go/v2/pkg/errcode"
+	"pathwar.land/v2/go/pkg/errcode"
 )
 
 func (svc *service) AgentUpdateState(context.Context, *AgentUpdateState_Input) (*AgentUpdateState_Output, error) {

go/pkg/pwapi/api_challenge-get.go

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

go/pkg/pwapi/api_challenge-get_test.go

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

go/pkg/pwapi/api_challenge-list.go

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

go/pkg/pwapi/api_challenge-subscription-close.go

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

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/v2/internal/testutil"
-	"pathwar.land/go/v2/pkg/errcode"
-	"pathwar.land/go/v2/pkg/pwdb"
+	"pathwar.land/v2/go/internal/testutil"
+	"pathwar.land/v2/go/pkg/errcode"
+	"pathwar.land/v2/go/pkg/pwdb"
 )
 
 func TestSvc_ChallengeSubscriptionClose(t *testing.T) {

go/pkg/pwapi/api_challenge-subscription-validate.go

@@ -3,8 +3,8 @@ package pwapi
 import (
 	"context"
 
-	"pathwar.land/go/v2/pkg/errcode"
-	"pathwar.land/go/v2/pkg/pwdb"
+	"pathwar.land/v2/go/pkg/errcode"
+	"pathwar.land/v2/go/pkg/pwdb"
 )
 
 func (svc *service) ChallengeSubscriptionValidate(ctx context.Context, in *ChallengeSubscriptionValidate_Input) (*ChallengeSubscriptionValidate_Output, error) {

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/v2/internal/testutil"
-	"pathwar.land/go/v2/pkg/errcode"
-	"pathwar.land/go/v2/pkg/pwdb"
+	"pathwar.land/v2/go/internal/testutil"
+	"pathwar.land/v2/go/pkg/errcode"
+	"pathwar.land/v2/go/pkg/pwdb"
 )
 
 func TestSvc_ChallengeSubscriptionValidate(t *testing.T) {