BREAKING CHANGE: migrate berty.tech to berty.tech/berty (#1560)

BREAKING CHANGE: migrate berty.tech to berty.tech/berty

.buildkite/pipeline.yml

@@ -12,7 +12,7 @@ steps:
       - n0izn0iz/docker#v3.5.4:
           image: bertytech/protoc:22
           propagate-uid-gid: true
-          workdir: /go/src/berty.tech
+          workdir: /go/src/berty.tech/berty
           environment: ["GO111MODULE=on", "GOPATH=/go"]
           volumes: ["~/go/pkg/mod:/go/pkg/mod"]
     commands:
@@ -35,7 +35,7 @@ steps:
       - n0izn0iz/docker#v3.5.4:
           image: bertytech/githooks:v1
           propagate-uid-gid: true
-          workdir: /go/src/berty.tech
+          workdir: /go/src/berty.tech/berty
           environment: ["GO111MODULE=on", "GOPATH=/go"]
     commands:
       - set -x
@@ -49,7 +49,7 @@ steps:
       - n0izn0iz/docker#v3.5.4:
           image: bertytech/protoc:22
           propagate-uid-gid: true
-          workdir: /go/src/berty.tech
+          workdir: /go/src/berty.tech/berty
           environment:
             ["GO111MODULE=on", "GOPATH=/go", "HOME=/home/buildkite-agent"]
           volumes: ["~:/home/buildkite-agent", "~/go/pkg/mod:/go/pkg/mod"]
@@ -70,7 +70,7 @@ steps:
       - n0izn0iz/docker#v3.5.4:
           image: bertytech/protoc:22
           propagate-uid-gid: true
-          workdir: /go/src/berty.tech
+          workdir: /go/src/berty.tech/berty
           environment:
             ["GO111MODULE=on", "GOPATH=/go", "HOME=/home/buildkite-agent"]
           volumes: ["~:/home/buildkite-agent", "~/go/pkg/mod:/go/pkg/mod"]
@@ -86,7 +86,7 @@ steps:
       - n0izn0iz/docker#v3.5.4:
           image: bertytech/build-go:v2
           propagate-uid-gid: true
-          workdir: /go/src/berty.tech
+          workdir: /go/src/berty.tech/berty
           propagate-environment: true
           environment:
             [
@@ -125,7 +125,7 @@ steps:
       - n0izn0iz/docker#v3.5.4:
           image: bertytech/bazel:2.0.0-buster-r0
           propagate-uid-gid: true
-          workdir: /go/src/berty.tech
+          workdir: /go/src/berty.tech/berty
           environment:
             [
               "GO111MODULE=on",

.gitignore

@@ -1,14 +1,4 @@
 gen.sum.tmp
-# berty package
-/crew/
-/depviz/
-/go-ipfs-log/
-/go-libp2p-ble-transport/
-/go-orbit-db/
-/gomobile-ipfs/
-/gomobile-react-bridge/
-/protocol/
-/zero-push/
 
 # junk
 profile.out

README.md

@@ -14,7 +14,7 @@
   <a href="https://www.codefactor.io/repository/github/berty/berty"><img src="https://www.codefactor.io/repository/github/berty/berty/badge?s=bf5885a3b2782ead81d91cd423915f2e9ddc9196" alt="CodeFactor" /></a>
   <!--<a href="https://goreportcard.com/report/berty/berty"><img src="https://goreportcard.com/badge/berty/berty" alt="Go Report Card"></a>-->
   <a href="https://github.com/berty/berty/releases"><img src="https://badge.fury.io/gh/berty%2Fberty.svg" alt="GitHub version"></a>
-  <a href="https://godoc.org/berty.tech/go"><img src="https://godoc.org/berty.tech/go?status.svg" alt="GoDoc"></a>
+  <a href="https://godoc.org/berty.tech/berty/go"><img src="https://godoc.org/berty.tech/berty/go?status.svg" alt="GoDoc"></a>
   <a href="https://codecov.io/gh/berty/berty"><img src="https://codecov.io/gh/berty/berty/branch/master/graph/badge.svg?token=rBPpNHNNow" /></a>
 </p>
 

api/bertyprotocol.proto

@@ -4,7 +4,7 @@ package berty.protocol;
 
 import "github.com/gogo/protobuf/gogoproto/gogo.proto";
 
-option go_package = "berty.tech/go/pkg/bertyprotocol";
+option go_package = "berty.tech/berty/go/pkg/bertyprotocol";
 
 // ProtocolService is the top-level API to manage an instance of the Berty Protocol.
 // Each Berty Protocol Instance is considered as a Berty device and is associated with a Berty user.

api/errcode.proto

@@ -4,7 +4,7 @@ package berty.errcode;
 
 import "github.com/gogo/protobuf/gogoproto/gogo.proto";
 
-option go_package = "berty.tech/go/pkg/errcode";
+option go_package = "berty.tech/berty/go/pkg/errcode";
 
 option (gogoproto.goproto_enum_prefix_all) = false;
 

api/go-internal/handshake.proto

@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package handshake;
 
-option go_package = "berty.tech/go/internal/handshake";
+option go_package = "berty.tech/berty/go/internal/handshake";
 
 import "go-internal/sigchain.proto";
 import "github.com/gogo/protobuf/gogoproto/gogo.proto";

api/go-internal/protocolmodel.proto

@@ -5,7 +5,7 @@ package berty.protocolmodel;
 import "github.com/golang/protobuf/ptypes/timestamp/timestamp.proto";
 import "github.com/gogo/protobuf/gogoproto/gogo.proto";
 
-option go_package = "berty.tech/go/internal/protocoldb";
+option go_package = "berty.tech/berty/go/internal/protocoldb";
 
 option (gogoproto.goproto_unkeyed_all) = false;
 option (gogoproto.goproto_sizecache_all) = false;

api/go-internal/sigchain.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-option go_package = "berty.tech/go/internal/crypto";
+option go_package = "berty.tech/berty/go/internal/crypto";
 
 import "google/protobuf/timestamp.proto";
 import "github.com/gogo/protobuf/gogoproto/gogo.proto";

api/go-internal/store_entry.proto

@@ -4,7 +4,7 @@ package berty.group;
 
 import "github.com/gogo/protobuf/gogoproto/gogo.proto";
 
-option go_package = "berty.tech/go/internal/group";
+option go_package = "berty.tech/berty/go/internal/group";
 option (gogoproto.marshaler_all) = true;
 option (gogoproto.unmarshaler_all) = true;
 option (gogoproto.sizer_all) = true;

build/bazel/com_github_libp2p_go_openssl.BUILD.bzl

@@ -56,7 +56,7 @@ go_library(
         ],
         "//conditions:default": [],
     }),
-    importmap = "berty.tech/go/vendor/github.com/libp2p/go-openssl",
+    importmap = "berty.tech/berty/go/vendor/github.com/libp2p/go-openssl",
     importpath = "github.com/libp2p/go-openssl",
     visibility = ["//visibility:public"],
     deps = [

build/bazel/com_github_spacemonkeygo_openssl.BUILD.bazel

@@ -55,7 +55,7 @@ go_library(
         ],
         "//conditions:default": [],
     }),
-    importmap = "berty.tech/go/vendor/github.com/spacemonkeygo/openssl",
+    importmap = "berty.tech/berty/go/vendor/github.com/spacemonkeygo/openssl",
     importpath = "github.com/spacemonkeygo/openssl",
     visibility = ["//visibility:public"],
     deps = [

docs/Makefile

@@ -21,8 +21,8 @@ $(GEN_SUM): $(GEN_SRC)
 	  (set -e; cd ../go && GO111MODULE=on go mod vendor); \
 	  docker run \
 	    --user=`id -u` \
-	    --volume="$(PWD)/..:/go/src/berty.tech" \
-	    --workdir="/go/src/berty.tech/docs" \
+	    --volume="$(PWD)/..:/go/src/berty.tech/berty" \
+	    --workdir="/go/src/berty.tech/berty/docs" \
 	    --entrypoint="sh" \
 	    --rm \
 	    bertytech/protoc:22 \

go/BUILD.bazel

@@ -1,6 +1,6 @@
 load("@bazel_gazelle//:def.bzl", "gazelle")
 
-# gazelle:prefix berty.tech/go
+# gazelle:prefix berty.tech/berty/go
 # gazelle:proto disable_global
 gazelle(
     name = "gazelle",
@@ -17,5 +17,5 @@ golangcilint(
         "pkg/...",
         "internal/...",
     ],
-    prefix = "berty.tech/go",
+    prefix = "berty.tech/berty/go",
 )

go/Dockerfile

@@ -2,7 +2,7 @@
 FROM            golang:1.13.5-alpine as builder
 RUN             apk add --no-cache git gcc musl-dev make
 ENV             GO111MODULE=on
-WORKDIR         /go/src/berty.tech/go
+WORKDIR         /go/src/berty.tech/berty/go
 COPY            go.* ./
 RUN             go mod download
 COPY            . ./

go/Makefile

@@ -198,8 +198,8 @@ $(GEN_SUM): $(GEN_SRC)
 	  $(GO) mod vendor; \
 	  docker run \
 	    --user="$$uid" \
-	    --volume="$(PWD)/..:/go/src/berty.tech" \
-	    --workdir="/go/src/berty.tech/go" \
+	    --volume="$(PWD)/..:/go/src/berty.tech/berty" \
+	    --workdir="/go/src/berty.tech/berty/go" \
 	    --entrypoint="sh" \
 	    --rm \
 	    bertytech/protoc:22 \

go/cmd/berty/main.go

@@ -11,10 +11,10 @@ import (
 	"strings"
 	"time"
 
-	"berty.tech/go/internal/banner"
-	"berty.tech/go/internal/grpcutil"
-	"berty.tech/go/pkg/bertyprotocol"
-	"berty.tech/go/pkg/errcode"
+	"berty.tech/berty/go/internal/banner"
+	"berty.tech/berty/go/internal/grpcutil"
+	"berty.tech/berty/go/pkg/bertyprotocol"
+	"berty.tech/berty/go/pkg/errcode"
 	"github.com/jinzhu/gorm"
 	_ "github.com/jinzhu/gorm/dialects/sqlite" // required by gorm
 	ma "github.com/multiformats/go-multiaddr"

go/framework/bpbridge/bridge.go

@@ -11,9 +11,9 @@ import (
 	_ "github.com/jinzhu/gorm/dialects/sqlite" // required by gorm
 	"github.com/pkg/errors"
 
-	"berty.tech/go/internal/grpcutil"
-	"berty.tech/go/pkg/bertyprotocol"
-	"berty.tech/go/pkg/errcode"
+	"berty.tech/berty/go/internal/grpcutil"
+	"berty.tech/berty/go/pkg/bertyprotocol"
+	"berty.tech/berty/go/pkg/errcode"
 
 	"github.com/improbable-eng/grpc-web/go/grpcweb"
 	"github.com/jinzhu/gorm"

go/framework/bpbridge/bridge_test.go

@@ -13,9 +13,9 @@ import (
 	"net/textproto"
 	"testing"
 
-	"berty.tech/go/internal/ipfsutil"
-	"berty.tech/go/internal/testutil"
-	"berty.tech/go/pkg/bertyprotocol"
+	"berty.tech/berty/go/internal/ipfsutil"
+	"berty.tech/berty/go/internal/testutil"
+	"berty.tech/berty/go/pkg/bertyprotocol"
 	"github.com/gogo/protobuf/proto"
 	"go.uber.org/zap"
 	"golang.org/x/net/context"

go/framework/bpbridge/client.go

@@ -3,7 +3,7 @@ package bpbridge
 import (
 	"context"
 
-	"berty.tech/go/internal/grpcutil"
+	"berty.tech/berty/go/internal/grpcutil"
 	"google.golang.org/grpc"
 )
 

go/framework/bpbridge/doc.go

@@ -1 +1 @@
-package bpbridge // import "berty.tech/go/framework/bpbridge"
+package bpbridge // import "berty.tech/berty/go/framework/bpbridge"

go/internal/crypto/crypto.go

@@ -3,7 +3,7 @@ package crypto
 import (
 	"context"
 
-	"berty.tech/go/pkg/errcode"
+	"berty.tech/berty/go/pkg/errcode"
 	p2pcrypto "github.com/libp2p/go-libp2p-core/crypto"
 	"go.uber.org/zap"
 )

go/internal/crypto/crypto_module.go

@@ -8,7 +8,7 @@ import (
 	"encoding/binary"
 	"time"
 
-	"berty.tech/go/pkg/errcode"
+	"berty.tech/berty/go/pkg/errcode"
 	p2pcrypto "github.com/libp2p/go-libp2p-core/crypto"
 	"go.uber.org/zap"
 )

go/internal/crypto/crypto_sigchain.go

@@ -3,7 +3,7 @@ package crypto
 import (
 	"time"
 
-	"berty.tech/go/pkg/errcode"
+	"berty.tech/berty/go/pkg/errcode"
 	p2pcrypto "github.com/libp2p/go-libp2p-core/crypto"
 	"go.uber.org/zap"
 )

go/internal/crypto/crypto_sigchain_entry.go

@@ -1,7 +1,7 @@
 package crypto
 
 import (
-	"berty.tech/go/pkg/errcode"
+	"berty.tech/berty/go/pkg/errcode"
 	p2pcrypto "github.com/libp2p/go-libp2p-core/crypto"
 	mh "github.com/multiformats/go-multihash"
 )

go/internal/gormutil/doc.go

@@ -1 +1 @@
-package gormutil // import "berty.tech/go/internal/gormutil"
+package gormutil // import "berty.tech/berty/go/internal/gormutil"

go/internal/gormutil/utils.go

@@ -3,7 +3,7 @@ package gormutil
 import (
 	"github.com/jinzhu/gorm"
 	"go.uber.org/zap"
-	"gopkg.in/gormigrate.v1"
+	gormigrate "gopkg.in/gormigrate.v1"
 )
 
 // Init configures an active gorm connection