Go modules is on by default since 1.16

Author: aledbf

components/content-service-api/generate.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-GO111MODULE=on go get github.com/golang/protobuf/[email protected]
+go get github.com/golang/protobuf/[email protected]
 protoc -I. --go_out=plugins=grpc:. *.proto
 mv github.com/gitpod-io/gitpod/content-service/api/* go && rm -rf github.com
 

components/image-builder-api/generate.sh

@@ -1,11 +1,11 @@
 #!/bin/bash
 
-GO111MODULE=on go get github.com/golang/protobuf/[email protected]
+go get github.com/golang/protobuf/[email protected]
 protoc -I. -I.. --go_out=plugins=grpc:. imgbuilder.proto
 mv github.com/gitpod-io/gitpod/image-builder/api/* go
 rm -rf github.com
 
-GO111MODULE=on go get github.com/golang/mock/mockgen@latest
+go get github.com/golang/mock/mockgen@latest
 cd go
 # source mode does not always work for gRPC: see https://github.com/golang/mock/pull/163
 mockgen -package mock github.com/gitpod-io/gitpod/image-builder/api ImageBuilderClient,ImageBuilder_BuildClient,ImageBuilder_LogsClient > mock/mock.go

components/registry-facade-api/generate.sh

@@ -2,6 +2,6 @@
 
 set -e
 
-GO111MODULE=on go get github.com/golang/protobuf/[email protected]
+go get github.com/golang/protobuf/[email protected]
 protoc -I. -I../../ --go_out=plugins=grpc:go imagespec.proto
 protoc -I. -I../../ --go_out=plugins=grpc:go provider.proto

components/supervisor-api/generate.sh

@@ -2,7 +2,7 @@
 
 PROTOC_INCLUDE="-I. -I $GOPATH/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis -I /usr/lib/protoc/include"
 
-GO111MODULE=on  go get github.com/golang/protobuf/protoc-gen-go
-GO111MODULE=off go get github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway
+go get github.com/golang/protobuf/protoc-gen-go
+go get github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway
 protoc $PROTOC_INCLUDE --go_out=plugins=grpc:go *.proto
 protoc $PROTOC_INCLUDE --grpc-gateway_out=logtostderr=true,paths=source_relative:go *.proto

components/supervisor-api/typescript-rest/build.sh

@@ -3,7 +3,7 @@
 # Licensed under the GNU Affero General Public License (AGPL).
 # See License-AGPL.txt in the project root for license information.
 
-GO111MODULES=off go get -v github.com/grpc-ecosystem/grpc-gateway/protoc-gen-openapiv2
+go get -v github.com/grpc-ecosystem/grpc-gateway/protoc-gen-openapiv2
 THIRD_PARTY_INCLUDES=${PROTOLOC:-..}
 if [ ! -d $THIRD_PARTY_INCLUDES/third_party/google/api ]; then
     echo "missing $THIRD_PARTY_INCLUDES/third_party/google/api"
@@ -16,6 +16,6 @@ export PROTO_INCLUDE="-I$THIRD_PARTY_INCLUDES/third_party -I /usr/lib/protoc/inc
 
 protoc $PROTO_INCLUDE --openapiv2_out=logtostderr=true:. -I${PROTOLOC:-..} ${PROTOLOC:-..}/*.proto && \
 mv *.swagger.json lib && \
-for f in $(ls lib/*.swagger.json); do 
+for f in $(ls lib/*.swagger.json); do
     yarn dtsgen -o ${f%.swagger.json}.dt.ts $f
 done

components/ws-daemon-api/generate.sh

@@ -1,10 +1,10 @@
 #!/bin/sh
 
-GO111MODULE=on go get github.com/golang/protobuf/[email protected]
+go get github.com/golang/protobuf/[email protected]
 protoc -I. -I.. --go_out=plugins=grpc:. *.proto
 mv github.com/gitpod-io/gitpod/ws-daemon/api/* go && rm -rf github.com
 
-GO111MODULE=on go get github.com/golang/mock/mockgen@latest
+go get github.com/golang/mock/mockgen@latest
 cd go
 mockgen -package mock -source=daemon.pb.go > mock/mock_wsdaemon.go
 

components/ws-manager-api/generate.sh

@@ -1,10 +1,10 @@
 #!/bin/sh
 
-GO111MODULE=on go get github.com/golang/protobuf/[email protected]
+go get github.com/golang/protobuf/[email protected]
 protoc -I. -I.. --go_out=plugins=grpc:. core.proto
 mv github.com/gitpod-io/gitpod/ws-manager/api/* go && rm -rf github.com
 
-GO111MODULE=on go get github.com/golang/mock/mockgen@latest
+go get github.com/golang/mock/mockgen@latest
 cd go
 # source mode does not always work for gRPC: see https://github.com/golang/mock/pull/163
 mockgen -package mock github.com/gitpod-io/gitpod/ws-manager/api WorkspaceManagerClient,WorkspaceManager_SubscribeClient > mock/mock.go