Address comments + attempt to fix protoc

coder · ammario · Sep 1, 2022 · Aug 29, 2022 · Aug 29, 2022 · Sep 1, 2022
commit 22b2028ad6193b222dfd39f5f47f289bb00b389c
diff --git a/.github/workflows/coder.yaml b/.github/workflows/coder.yaml
@@ -194,10 +194,13 @@ jobs:
         run: ./scripts/yarn_install.sh
 
       - name: Install Protoc
-        uses: arduino/setup-protoc@v1
-        with:
-          # This must be in lockstep with our dogfood Dockerfile
-          version: "3.21.5"
+        run: |
+          # protoc must be in lockstep with our dogfood Dockerfile
+          # or the version in the comments will differ.
+          cd dogfood
+          DOCKER_BUILDKIT=1 docker build . --target proto -t protoc
+          docker run --rm --entrypoint cat protoc  /tmp/bin/protoc > /usr/bin/protoc
+          chmod +x /usr/bin/protoc
       - uses: actions/setup-go@v3
         with:
           go-version: "~1.19"

diff --git a/agent/stats.go b/agent/stats.go
@@ -9,27 +9,27 @@ import (
 	"cdr.dev/slog"
 )
 
-// StatsConn wraps a net.Conn with statistics.
-type StatsConn struct {
+// statsConn wraps a net.Conn with statistics.
+type statsConn struct {
 	*Stats
 	net.Conn `json:"-"`
 }
 
-var _ net.Conn = new(StatsConn)
+var _ net.Conn = new(statsConn)
 
-func (c *StatsConn) Read(b []byte) (n int, err error) {
+func (c *statsConn) Read(b []byte) (n int, err error) {
 	n, err = c.Conn.Read(b)
 	atomic.AddInt64(&c.RxBytes, int64(n))
 	return n, err
 }
 
-func (c *StatsConn) Write(b []byte) (n int, err error) {
+func (c *statsConn) Write(b []byte) (n int, err error) {
 	n, err = c.Conn.Write(b)
 	atomic.AddInt64(&c.TxBytes, int64(n))
 	return n, err
 }
 
-var _ net.Conn = new(StatsConn)
+var _ net.Conn = new(statsConn)
 
 // Stats records the Agent's network connection statistics for use in
 // user-facing metrics and debugging.
@@ -51,7 +51,7 @@ func (s *Stats) Copy() *Stats {
 // wrapConn returns a new connection that records statistics.
 func (s *Stats) wrapConn(conn net.Conn) net.Conn {
 	atomic.AddInt64(&s.NumConns, 1)
-	cs := &StatsConn{
+	cs := &statsConn{
 		Stats: s,
 		Conn:  conn,
 	}

diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go
@@ -188,8 +188,8 @@ func (q *fakeQuerier) GetTemplateDAUs(_ context.Context, templateID uuid.UUID) (
 	var rs []database.GetTemplateDAUsRow
 	for _, key := range countKeys {
 		rs = append(rs, database.GetTemplateDAUsRow{
-			Date: key,
-			Daus: int64(len(counts[key])),
+			Date:   key,
+			Amount: int64(len(counts[key])),
 		})
 	}
 

diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/agentstats.sql b/coderd/database/queries/agentstats.sql
@@ -15,7 +15,7 @@ VALUES
 -- name: GetTemplateDAUs :many
 select
 	(created_at at TIME ZONE 'UTC')::date as date,
-	count(distinct(user_id)) as daus
+	count(distinct(user_id)) as amount
 from
 	agent_stats
 where template_id = $1

diff --git a/coderd/metricscache/metricscache.go b/coderd/metricscache/metricscache.go
@@ -67,7 +67,7 @@ func fillEmptyDays(rows []database.GetTemplateDAUsRow) []database.GetTemplateDAU
 				break
 			}
 			last.Date = last.Date.Add(day)
-			last.Daus = 0
+			last.Amount = 0
 			newRows = append(newRows, last)
 			diff -= day
 		}
@@ -101,8 +101,8 @@ func (c *Cache) refresh(ctx context.Context) error {
 		var resp codersdk.TemplateDAUsResponse
 		for _, ent := range fillEmptyDays(daus) {
 			resp.Entries = append(resp.Entries, codersdk.DAUEntry{
-				Date: ent.Date,
-				DAUs: int(ent.Daus),
+				Date:   ent.Date,
+				Amount: int(ent.Amount),
 			})
 		}
 		templateDAUs[template.ID.String()] = resp

diff --git a/coderd/metricscache/metricscache_test.go b/coderd/metricscache/metricscache_test.go
@@ -51,20 +51,20 @@ func TestCache(t *testing.T) {
 			},
 		}, []codersdk.DAUEntry{
 			{
-				Date: date(2022, 8, 27),
-				DAUs: 1,
+				Date:   date(2022, 8, 27),
+				Amount: 1,
 			},
 			{
-				Date: date(2022, 8, 28),
-				DAUs: 0,
+				Date:   date(2022, 8, 28),
+				Amount: 0,
 			},
 			{
-				Date: date(2022, 8, 29),
-				DAUs: 0,
+				Date:   date(2022, 8, 29),
+				Amount: 0,
 			},
 			{
-				Date: date(2022, 8, 30),
-				DAUs: 1,
+				Date:   date(2022, 8, 30),
+				Amount: 1,
 			},
 		}},
 		{"no holes", args{
@@ -84,16 +84,16 @@ func TestCache(t *testing.T) {
 			},
 		}, []codersdk.DAUEntry{
 			{
-				Date: date(2022, 8, 27),
-				DAUs: 1,
+				Date:   date(2022, 8, 27),
+				Amount: 1,
 			},
 			{
-				Date: date(2022, 8, 28),
-				DAUs: 1,
+				Date:   date(2022, 8, 28),
+				Amount: 1,
 			},
 			{
-				Date: date(2022, 8, 29),
-				DAUs: 1,
+				Date:   date(2022, 8, 29),
+				Amount: 1,
 			},
 		}},
 		{"holes", args{
@@ -121,32 +121,32 @@ func TestCache(t *testing.T) {
 			},
 		}, []codersdk.DAUEntry{
 			{
-				Date: date(2022, 1, 1),
-				DAUs: 2,
+				Date:   date(2022, 1, 1),
+				Amount: 2,
 			},
 			{
-				Date: date(2022, 1, 2),
-				DAUs: 0,
+				Date:   date(2022, 1, 2),
+				Amount: 0,
 			},
 			{
-				Date: date(2022, 1, 3),
-				DAUs: 0,
+				Date:   date(2022, 1, 3),
+				Amount: 0,
 			},
 			{
-				Date: date(2022, 1, 4),
-				DAUs: 1,
+				Date:   date(2022, 1, 4),
+				Amount: 1,
 			},
 			{
-				Date: date(2022, 1, 5),
-				DAUs: 0,
+				Date:   date(2022, 1, 5),
+				Amount: 0,
 			},
 			{
-				Date: date(2022, 1, 6),
-				DAUs: 0,
+				Date:   date(2022, 1, 6),
+				Amount: 0,
 			},
 			{
-				Date: date(2022, 1, 7),
-				DAUs: 2,
+				Date:   date(2022, 1, 7),
+				Amount: 2,
 			},
 		}},
 	}

diff --git a/coderd/templates_test.go b/coderd/templates_test.go
@@ -627,8 +627,8 @@ func TestTemplateDAUs(t *testing.T) {
 		Entries: []codersdk.DAUEntry{
 			{
 
-				Date: time.Now().UTC().Truncate(time.Hour * 24),
-				DAUs: 1,
+				Date:   time.Now().UTC().Truncate(time.Hour * 24),
+				Amount: 1,
 			},
 		},
 	}

diff --git a/codersdk/templates.go b/codersdk/templates.go
@@ -135,8 +135,8 @@ func (c *Client) TemplateVersionByName(ctx context.Context, template uuid.UUID,
 }
 
 type DAUEntry struct {
-	Date time.Time `json:"date"`
-	DAUs int       `json:"daus"`
+	Date   time.Time `json:"date"`
+	Amount int       `json:"amount"`
 }
 
 type TemplateDAUsResponse struct {
@@ -158,10 +158,9 @@ func (c *Client) TemplateDAUs(ctx context.Context, templateID uuid.UUID) (*Templ
 	return &resp, json.NewDecoder(res.Body).Decode(&resp)
 }
 
-// @typescript-ignore AgentStatsReportRequest
-
 // AgentStatsReportRequest is a WebSocket request by coderd
 // to the agent for stats.
+// @typescript-ignore AgentStatsReportRequest
 type AgentStatsReportRequest struct {
 }
 

diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
@@ -185,7 +185,7 @@ export interface CreateWorkspaceRequest {
 // From codersdk/templates.go
 export interface DAUEntry {
   readonly date: string
-  readonly daus: number
+  readonly amount: number
 }
 
 // From codersdk/workspaceresources.go

diff --git a/site/src/pages/TemplatePage/DAUChart.test.tsx b/site/src/pages/TemplatePage/DAUChart.test.tsx
@@ -25,7 +25,7 @@ describe("DAUChart", () => {
     render(
       <DAUChart
         templateDAUs={{
-          entries: [{ date: "2020-01-01", daus: 1 }],
+          entries: [{ date: "2020-01-01", amount: 1 }],
         }}
       />,
     )

diff --git a/site/src/pages/TemplatePage/DAUChart.tsx b/site/src/pages/TemplatePage/DAUChart.tsx
@@ -59,7 +59,7 @@ export const DAUChart: FC<DAUChartProps> = ({ templateDAUs: templateMetricsData
   })
 
   const data = templateMetricsData.entries.map((val) => {
-    return val.daus
+    return val.amount
   })
 
   defaults.font.family = theme.typography.fontFamily

diff --git a/site/src/testHelpers/coder.code-workspace b/site/src/testHelpers/coder.code-workspace
diff --git a/site/src/testHelpers/entities.ts b/site/src/testHelpers/entities.ts
@@ -4,9 +4,9 @@ import * as TypesGen from "../api/typesGenerated"
 
 export const MockTemplateDAUResponse: TypesGen.TemplateDAUsResponse = {
   entries: [
-    { date: "2022-08-27T00:00:00Z", daus: 1 },
-    { date: "2022-08-29T00:00:00Z", daus: 2 },
-    { date: "2022-08-30T00:00:00Z", daus: 1 },
+    { date: "2022-08-27T00:00:00Z", amount: 1 },
+    { date: "2022-08-29T00:00:00Z", amount: 2 },
+    { date: "2022-08-30T00:00:00Z", amount: 1 },
   ],
 }
 export const MockSessionToken: TypesGen.LoginWithPasswordResponse = {