scripts: upgrade protobuf dependencies (#5807)

Dockerfile.toast

@@ -13,7 +13,8 @@ RUN apk add --no-cache \
 # Newer versions of protoc-gen-go are stricter with the `go_package` argument, which is invalid in the K8s protobufs
 # so we're currently locked to an older version as there's no way to suppress the error
 # see https://github.com/golang/protobuf/issues/1316
-RUN go install 'github.com/golang/protobuf/[email protected]'
+RUN go install 'google.golang.org/protobuf/cmd/[email protected]'
+RUN go install 'google.golang.org/grpc/cmd/[email protected]'
 RUN go install 'github.com/google/wire/cmd/[email protected]'
 RUN go install 'golang.org/x/tools/cmd/goimports@latest'
 ARG GRPC_GATEWAY_VERSION="v1.16.0"

go.mod

@@ -19,7 +19,6 @@ require (
 	github.com/ghodss/yaml v1.0.0
 	github.com/go-logr/logr v1.2.3
 	github.com/gogo/protobuf v1.3.2
-	github.com/golang/protobuf v1.5.2
 	github.com/google/go-cmp v0.5.8
 	github.com/google/uuid v1.3.0
 	github.com/google/wire v0.5.0
@@ -144,6 +143,7 @@ require (
 	github.com/gogo/googleapis v1.4.0 // indirect
 	github.com/golang-jwt/jwt/v4 v4.0.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/btree v1.0.1 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
@@ -264,5 +264,5 @@ replace (
 	go.opentelemetry.io/otel/trace => go.opentelemetry.io/otel/trace v0.20.0
 	go.opentelemetry.io/proto/otlp => go.opentelemetry.io/proto/otlp v0.7.0
 
-	k8s.io/apimachinery => github.com/tilt-dev/apimachinery v0.23.6-tilt-20220503
+	k8s.io/apimachinery => github.com/tilt-dev/apimachinery v0.23.6-tilt-20220511
 )

go.sum

@@ -1546,8 +1546,8 @@ github.com/tetafro/godot v0.3.7/go.mod h1:/7NLHhv08H1+8DNj0MElpAACw1ajsCuf3TKNQx
 github.com/tetafro/godot v0.4.2/go.mod h1:/7NLHhv08H1+8DNj0MElpAACw1ajsCuf3TKNQxA5S+0=
 github.com/theupdateframework/notary v0.6.1 h1:7wshjstgS9x9F5LuB1L5mBI2xNMObWqjz+cjWoom6l0=
 github.com/theupdateframework/notary v0.6.1/go.mod h1:MOfgIfmox8s7/7fduvB2xyPPMJCrjRLRizA8OFwpnKY=
-github.com/tilt-dev/apimachinery v0.23.6-tilt-20220503 h1:Sz9yMKYXuCtngycEc+CAl0In28ng34SsPRbtS1MnDkQ=
-github.com/tilt-dev/apimachinery v0.23.6-tilt-20220503/go.mod h1:BEuFMMBaIbcOqVIJqNZJXGFTP4W6AycEpb5+m/97hrM=
+github.com/tilt-dev/apimachinery v0.23.6-tilt-20220511 h1:jnJqSPTJlKqiVlA4zy/fLgXlS1lTr88XCkeTIYC+9PU=
+github.com/tilt-dev/apimachinery v0.23.6-tilt-20220511/go.mod h1:BEuFMMBaIbcOqVIJqNZJXGFTP4W6AycEpb5+m/97hrM=
 github.com/tilt-dev/browser v0.0.1 h1:e+mFToX6A7pkMlGFrXW5VLvS7qS0HVbcXqmR0uPrWUA=
 github.com/tilt-dev/browser v0.0.1/go.mod h1:2DaMt8P8xEqDFzxaAbraOig5iUmQdd1wtO1Tb6tODHA=
 github.com/tilt-dev/buildkit v0.8.3-tilt-20220505 h1:a8aO6YvW5JQ7MW4ZI7qhFmSE+T7rUxNA2AbP53Qm+ZA=

internal/cloud/io_test.go

@@ -5,7 +5,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/golang/protobuf/ptypes"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/protobuf/types/known/timestamppb"
@@ -51,8 +50,7 @@ func TestWriteSnapshotTo(t *testing.T) {
 		}
 	}
 
-	startTime, err := ptypes.TimestampProto(now)
-	require.NoError(t, err)
+	startTime := timestamppb.New(now)
 	snapshot.View.TiltStartTime = startTime
 
 	err = WriteSnapshotTo(ctx, snapshot, buf)

internal/hud/server/logs_reader.go

@@ -26,7 +26,6 @@ import (
 
 type WebsocketReader struct {
 	conn         WebsocketConn
-	marshaller   jsonpb.Marshaler
 	unmarshaller jsonpb.Unmarshaler
 	persistent   bool // whether to keep listening on websocket, or close after first message
 	handler      ViewHandler
@@ -40,7 +39,6 @@ func newWebsocketReaderForLogs(conn WebsocketConn, persistent bool, resources []
 func newWebsocketReader(conn WebsocketConn, persistent bool, handler ViewHandler) *WebsocketReader {
 	return &WebsocketReader{
 		conn:         conn,
-		marshaller:   jsonpb.Marshaler{},
 		unmarshaller: jsonpb.Unmarshaler{},
 		persistent:   persistent,
 		handler:      handler,
@@ -137,8 +135,7 @@ func (wsr *WebsocketReader) Listen(ctx context.Context) error {
 			if messageType == websocket.TextMessage {
 				err = wsr.handleTextMessage(ctx, reader)
 				if err != nil {
-					// will I want this to be an Info sometimes??
-					logger.Get(ctx).Verbosef("Error handling websocket message: %v", err)
+					logger.Get(ctx).Errorf("Error streaming logs: %v", err)
 				}
 				if !wsr.persistent {
 					return
@@ -166,12 +163,12 @@ func (wsr *WebsocketReader) handleTextMessage(_ context.Context, reader io.Reade
 	v := &proto_webview.View{}
 	err := wsr.unmarshaller.Unmarshal(reader, v)
 	if err != nil {
-		return errors.Wrap(err, "Unmarshalling websocket message")
+		return errors.Wrap(err, "parsing")
 	}
 
 	err = wsr.handler.Handle(v)
 	if err != nil {
-		return errors.Wrap(err, "Handling Tilt state from websocket")
+		return errors.Wrap(err, "handling")
 	}
 
 	return nil

internal/hud/server/websocket.go

@@ -9,13 +9,13 @@ import (
 	"sync"
 	"time"
 
-	"github.com/grpc-ecosystem/grpc-gateway/runtime"
+	"google.golang.org/protobuf/types/known/timestamppb"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/util/workqueue"
 	ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/golang/protobuf/ptypes/timestamp"
+	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 
 	"github.com/tilt-dev/tilt/internal/hud/server/gorilla"
 	"github.com/tilt-dev/tilt/internal/hud/webview"
@@ -71,7 +71,7 @@ type WebsocketSubscriber struct {
 	dirtyUISession   *v1alpha1.UISession
 	dirtyClusters    map[string]*v1alpha1.Cluster
 
-	tiltStartTime    *timestamp.Timestamp
+	tiltStartTime    *timestamppb.Timestamp
 	clientCheckpoint logstore.Checkpoint
 }
 

internal/hud/server/websocket_reader_test.go

@@ -7,6 +7,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/golang/protobuf/jsonpb"
 	"github.com/stretchr/testify/assert"
 
 	"github.com/tilt-dev/tilt/internal/testutils/bufsync"
@@ -116,7 +117,7 @@ func (f *websocketReaderFixture) start() {
 
 func (f *websocketReaderFixture) sendView(v *proto_webview.View) {
 	buf := &bytes.Buffer{}
-	err := f.wsr.marshaller.Marshal(buf, v)
+	err := (&jsonpb.Marshaler{}).Marshal(buf, v)
 	assert.NoError(f.t, err)
 
 	f.conn.newMessageToRead(buf)

internal/hud/webview/convert.go

@@ -6,8 +6,8 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/golang/protobuf/ptypes"
 	"github.com/pkg/errors"
+	"google.golang.org/protobuf/types/known/timestamppb"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -89,10 +89,7 @@ func CompleteView(ctx context.Context, client ctrlclient.Client, st store.RStore
 
 	// We grandfather in TiltStartTime from the old protocol,
 	// because it tells the UI to reload.
-	start, err := ptypes.TimestampProto(s.TiltStartTime)
-	if err != nil {
-		return nil, err
-	}
+	start := timestamppb.New(s.TiltStartTime)
 	ret.TiltStartTime = start
 	ret.IsComplete = true
 
@@ -116,10 +113,7 @@ func LogUpdate(st store.RStore, checkpoint logstore.Checkpoint) (*proto_webview.
 
 	// We grandfather in TiltStartTime from the old protocol,
 	// because it tells the UI to reload.
-	start, err := ptypes.TimestampProto(s.TiltStartTime)
-	if err != nil {
-		return nil, err
-	}
+	start := timestamppb.New(s.TiltStartTime)
 	ret.TiltStartTime = start
 
 	return ret, nil