Stabilize protoc

coder · ammario · Sep 1, 2022 · Aug 29, 2022 · Aug 29, 2022 · Sep 1, 2022
commit 8da24c48ccce52ab5e2188c8b33aea52fc7c071f
diff --git a/.github/workflows/coder.yaml b/.github/workflows/coder.yaml
@@ -196,7 +196,8 @@ jobs:
       - name: Install Protoc
         uses: arduino/setup-protoc@v1
         with:
-          version: "3.20.0"
+          # This must be in lockstep with our dogfood Dockerfile
+          version: "3.21.5"
       - uses: actions/setup-go@v3
         with:
           go-version: "~1.19"

diff --git a/agent/agent_test.go b/agent/agent_test.go
@@ -100,15 +100,14 @@ func TestAgent(t *testing.T) {
 					_, err = ptyConn.Write(data)
 					require.NoError(t, err)
 
-					require.Eventually(t, func() bool {
-						s, ok := (<-stats)
-						return ok && s.NumConns > 0
+					var s *agent.Stats
+					require.Eventuallyf(t, func() bool {
+						var ok bool
+						s, ok = (<-stats)
+						return ok && s.NumConns > 0 && s.RxBytes > 0 && s.TxBytes > 0
 					}, testutil.WaitShort, testutil.IntervalFast,
-						"never saw conn",
+						"never saw stats: %+v", s,
 					)
-					assert.EqualValues(t, 1, (<-stats).NumConns)
-					assert.Greater(t, (<-stats).RxBytes, int64(0))
-					assert.Greater(t, (<-stats).TxBytes, int64(0))
 				})
 			})
 		}

diff --git a/dogfood/Dockerfile b/dogfood/Dockerfile
@@ -32,7 +32,7 @@ RUN mkdir --parents "$GOPATH" && \
     # goimports for updating imports
     go install golang.org/x/tools/cmd/goimports@v0.1.7 && \
     # protoc-gen-go is needed to build sysbox from source
-    go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.26 && \
+    go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.28 && \
     # drpc support for v2
     go install storj.io/drpc/cmd/protoc-gen-go-drpc@v0.0.26 && \
     # migrate for migration support for v2
@@ -70,6 +70,12 @@ RUN mkdir --parents "$GOPATH" && \
     # nfpm is used with `make build` to make release packages
     go install github.com/goreleaser/nfpm/v2/cmd/nfpm@v2.16.0
 
+FROM alpine:3.16 as proto
+WORKDIR /tmp
+RUN apk add curl unzip
+RUN curl -L -o protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v21.5/protoc-21.5-linux-x86_64.zip
+RUN unzip protoc.zip
+
 # Ubuntu 20.04 LTS (Focal Fossa)
 FROM ubuntu:focal
 
@@ -119,7 +125,6 @@ RUN apt-get update --quiet && apt-get install --yes \
       openssh-server \
       openssl \
       pkg-config \
-      protobuf-compiler \
       python3 \
       python3-pip \
       rsync \
@@ -156,6 +161,7 @@ RUN apt-get update --quiet && apt-get install --yes \
       skopeo \
       fish \
       gh \
+			unzip \
       zstd && \
     # Delete package cache to avoid consuming space in layer
     apt-get clean && \
@@ -300,6 +306,7 @@ RUN update-alternatives --install /usr/local/bin/gofmt gofmt /usr/local/go/bin/g
 
 COPY --from=go /tmp/bin /usr/local/bin
 COPY --from=rust-utils /tmp/bin /usr/local/bin
+COPY --from=proto /tmp/bin /usr/local/bin
 
 USER coder
 

diff --git a/peerbroker/proto/peerbroker.pb.go b/peerbroker/proto/peerbroker.pb.go
diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
@@ -29,7 +29,7 @@ export interface AgentGitSSHKey {
   readonly private_key: string
 }
 
-// From codersdk/metrics.go
+// From codersdk/templates.go
 export interface AgentStatsReportResponse {
   readonly num_comms: number
   readonly rx_bytes: number
@@ -182,7 +182,7 @@ export interface CreateWorkspaceRequest {
   readonly parameter_values?: CreateParameterRequest[]
 }
 
-// From codersdk/metrics.go
+// From codersdk/templates.go
 export interface DAUEntry {
   readonly date: string
   readonly daus: number
@@ -375,7 +375,7 @@ export interface Template {
   readonly created_by_name: string
 }
 
-// From codersdk/metrics.go
+// From codersdk/templates.go
 export interface TemplateDAUsResponse {
   readonly entries: DAUEntry[]
 }