Merge pull request #85 from D4ryl00/fix/api-build

Fix: API build with buf

Makefile

@@ -154,7 +154,7 @@ $(gen_sum): $(gen_src)
 		--workdir="/go/src/berty.tech/weshnet" \
 		--entrypoint="sh" \
 		--rm \
-		bertytech/buf:1 \
+		bertytech/buf:2 \
 		-xec 'make generate_local'; \
 	  $(MAKE) tidy \
 	)

account_export_test.go

@@ -7,10 +7,10 @@ import (
 	"os"
 	"testing"
 
+	mocknet "github.com/berty/go-libp2p-mock"
 	"github.com/ipfs/go-cid"
 	ds "github.com/ipfs/go-datastore"
 	dsync "github.com/ipfs/go-datastore/sync"
-	mocknet "github.com/berty/go-libp2p-mock"
 	"github.com/stretchr/testify/require"
 
 	orbitdb "berty.tech/go-orbit-db"

deactivate_test.go

@@ -5,9 +5,9 @@ import (
 	"testing"
 	"time"
 
+	libp2p_mocknet "github.com/berty/go-libp2p-mock"
 	ds "github.com/ipfs/go-datastore"
 	dsync "github.com/ipfs/go-datastore/sync"
-	libp2p_mocknet "github.com/berty/go-libp2p-mock"
 	"github.com/stretchr/testify/require"
 
 	"berty.tech/weshnet"

docs/Makefile

@@ -22,7 +22,7 @@ $(gen_sum): $(gen_src)
 	    --workdir="/go/src/berty.tech/berty/docs" \
 	    --entrypoint="sh" \
 	    --rm \
-	    bertytech/buf:1 \
+	    bertytech/buf:2 \
 	    -xec 'make generate_local' \
 	)
 .PHONY: generate

internal/handshake/handshake_util_test.go

@@ -7,11 +7,11 @@ import (
 	"testing"
 	"time"
 
+	p2pmocknet "github.com/berty/go-libp2p-mock"
 	ggio "github.com/gogo/protobuf/io"
 	p2pcrypto "github.com/libp2p/go-libp2p/core/crypto"
 	p2pnetwork "github.com/libp2p/go-libp2p/core/network"
 	p2ppeer "github.com/libp2p/go-libp2p/core/peer"
-	p2pmocknet "github.com/berty/go-libp2p-mock"
 	"github.com/stretchr/testify/require"
 
 	"berty.tech/weshnet/pkg/ipfsutil"

orbitdb_test.go

@@ -8,9 +8,9 @@ import (
 	"testing"
 	"time"
 
+	mocknet "github.com/berty/go-libp2p-mock"
 	datastore "github.com/ipfs/go-datastore"
 	sync_ds "github.com/ipfs/go-datastore/sync"
-	mocknet "github.com/berty/go-libp2p-mock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap"

pkg/rendezvous/emitterio_sync_test.go

@@ -8,11 +8,11 @@ import (
 	"testing"
 	"time"
 
+	mocknet "github.com/berty/go-libp2p-mock"
 	rendezvous "github.com/berty/go-libp2p-rendezvous"
 	db "github.com/berty/go-libp2p-rendezvous/db/sqlcipher"
 	"github.com/berty/go-libp2p-rendezvous/test_utils"
 	"github.com/libp2p/go-libp2p/core/host"
-	mocknet "github.com/berty/go-libp2p-mock"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap"
 

pkg/tinder/driver_mock_test.go

@@ -5,8 +5,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/libp2p/go-libp2p/core/peer"
 	mocknet "github.com/berty/go-libp2p-mock"
+	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

pkg/tinder/driver_service_test.go

@@ -7,11 +7,11 @@ import (
 	"testing"
 	"time"
 
+	mocknet "github.com/berty/go-libp2p-mock"
 	rendezvous "github.com/berty/go-libp2p-rendezvous"
 	dht "github.com/libp2p/go-libp2p-kad-dht"
 	"github.com/libp2p/go-libp2p/core/host"
 	"github.com/libp2p/go-libp2p/core/peer"
-	mocknet "github.com/berty/go-libp2p-mock"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap"
 

pkg/tinder/service_mocked_test.go

@@ -6,9 +6,9 @@ import (
 	"testing"
 	"time"
 
+	mocknet "github.com/berty/go-libp2p-mock"
 	"github.com/libp2p/go-libp2p/core/host"
 	"github.com/libp2p/go-libp2p/core/peer"
-	mocknet "github.com/berty/go-libp2p-mock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap"

pkg/tinder/testing_test.go

@@ -6,12 +6,12 @@ import (
 	"testing"
 	"time"
 
+	mocknet "github.com/berty/go-libp2p-mock"
 	rendezvous "github.com/berty/go-libp2p-rendezvous"
 	dbrdvp "github.com/berty/go-libp2p-rendezvous/db/sqlite"
 	p2putil "github.com/libp2p/go-libp2p-testing/netutil"
 	"github.com/libp2p/go-libp2p/core/host"
 	"github.com/libp2p/go-libp2p/core/peer"
-	mocknet "github.com/berty/go-libp2p-mock"
 	ma "github.com/multiformats/go-multiaddr"
 	"github.com/stretchr/testify/require"
 )

testing.go

@@ -12,14 +12,14 @@ import (
 	"testing"
 	"time"
 
+	libp2p_mocknet "github.com/berty/go-libp2p-mock"
 	grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
 	grpc_zap "github.com/grpc-ecosystem/go-grpc-middleware/logging/zap"
 	grpc_ctxtags "github.com/grpc-ecosystem/go-grpc-middleware/tags"
 	datastore "github.com/ipfs/go-datastore"
 	ds_sync "github.com/ipfs/go-datastore/sync"
 	"github.com/libp2p/go-libp2p/core/crypto"
 	"github.com/libp2p/go-libp2p/core/peer"
-	libp2p_mocknet "github.com/berty/go-libp2p-mock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap"

tool/docker-protoc/Dockerfile

@@ -1,24 +1,32 @@
 FROM    moul/protoc-gen-gotemplate:latest as pgg
 
 # build image
-FROM    golang:1.18-alpine as builder
+FROM    golang:1.19-alpine as builder
 # install deps
-RUN     apk --no-cache add make git go rsync libc-dev openssh docker npm
+RUN     apk --no-cache add make git go rsync libc-dev openssh docker npm bash curl
+# ensure we use bash for all RUN commands
+SHELL ["/bin/bash", "-c"]
+RUN     git clone https://github.com/asdf-vm/asdf.git ~/.asdf --branch v0.12.0 && \
+        echo -e '\n. $HOME/.asdf/asdf.sh' >> ~/.bashrc
 # install compilers
 WORKDIR $GOPATH/src/berty.tech/weshnet
-COPY    go.mod go.sum ./
+COPY    go.mod go.sum .tool-versions ./
+# ensure modifications to bashrc are properly sourced
+ENV     BASH_ENV=~/.bashrc
+# @TODO(gfanton): use asdf version
 RUN     go install -mod=readonly \
-          github.com/bufbuild/buf/cmd/buf \ # @TODO(gfanton): use asdf version
           google.golang.org/protobuf/cmd/protoc-gen-go \
           github.com/gogo/protobuf/protoc-gen-gogo \
           google.golang.org/grpc/cmd/protoc-gen-go-grpc \
           github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway \
           github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger \
           github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc \
           golang.org/x/tools/cmd/goimports
+RUN     asdf plugin add buf && asdf install buf && \
+        cp $(asdf which buf) /go/bin/buf
 
 # runtime
-FROM    golang:1.18-alpine
+FROM    golang:1.19-alpine
 RUN     apk --no-cache add git openssh make protobuf gcc libc-dev nodejs npm yarn sudo perl-utils tar sed grep \
  &&     mkdir -p /.cache/go-build \
  &&     chmod -R 777 /.cache \

tool/docker-protoc/Makefile

@@ -1,5 +1,5 @@
 IMAGE ?=	bertytech/buf
-VERSION ?=	1
+VERSION ?=	2
 
 build:
 	cd ../../ && docker build -f ./tool/docker-protoc/Dockerfile -t $(IMAGE):$(VERSION) -t $(IMAGE):latest .