remove legacy test case

f0ssel · f0ssel · commit 1bf892471154 · 2024-05-28T18:15:35.000Z
diff --git a/coderd/apikey/apikey_test.go b/coderd/apikey/apikey_test.go
@@ -128,7 +128,7 @@ func TestGenerate(t *testing.T) {
 
 			// Assert that the hashed secret is correct.
 			hashed := sha256.Sum256([]byte(keytokens[1]))
-			assert.ElementsMatch(t, hashed, key.HashedSecret[:])
+			assert.ElementsMatch(t, hashed, key.HashedSecret)
 
 			assert.Equal(t, tc.params.UserID, key.UserID)
 			assert.WithinDuration(t, dbtime.Now(), key.CreatedAt, time.Second*5)
diff --git a/coderd/database/dbauthz/setup_test.go b/coderd/database/dbauthz/setup_test.go
@@ -264,7 +264,7 @@ func (s *MethodTestSuite) NotAuthorizedErrorTest(ctx context.Context, az *coderd
 		// any case where the error is nil and the response is an empty slice.
 		if err != nil || !hasEmptySliceResponse(resp) {
 			s.Errorf(err, "method should an error with cancellation")
-			s.ErrorIsf(err, context.Canceled, "error should match context.Cancelled")
+			s.ErrorIsf(err, context.Canceled, "error should match context.Canceled")
 		}
 	})
 }
diff --git a/coderd/workspaceagents_test.go b/coderd/workspaceagents_test.go
@@ -939,32 +939,6 @@ func TestWorkspaceAgentReportStats(t *testing.T) {
 		agentClient.SetSessionToken(r.AgentToken)
 
 		_, err := agentClient.PostStats(context.Background(), &agentsdk.Stats{
-			ConnectionsByProto: map[string]int64{"TCP": 1},
-			// Set connection count to 1 but all session counts to zero to
-			// assert we aren't updating last_used_at for a connections that may
-			// be spawned passively by the dashboard.
-			ConnectionCount:             1,
-			RxPackets:                   1,
-			RxBytes:                     1,
-			TxPackets:                   1,
-			TxBytes:                     1,
-			SessionCountVSCode:          0,
-			SessionCountJetBrains:       0,
-			SessionCountReconnectingPTY: 0,
-			SessionCountSSH:             0,
-			ConnectionMedianLatencyMS:   10,
-		})
-		require.NoError(t, err)
-
-		newWorkspace, err := client.Workspace(context.Background(), r.Workspace.ID)
-		require.NoError(t, err)
-
-		assert.True(t,
-			newWorkspace.LastUsedAt.Equal(r.Workspace.LastUsedAt),
-			"%s and %s should not differ", newWorkspace.LastUsedAt, r.Workspace.LastUsedAt,
-		)
-
-		_, err = agentClient.PostStats(context.Background(), &agentsdk.Stats{
 			ConnectionsByProto:          map[string]int64{"TCP": 1},
 			ConnectionCount:             1,
 			RxPackets:                   1,
@@ -979,7 +953,7 @@ func TestWorkspaceAgentReportStats(t *testing.T) {
 		})
 		require.NoError(t, err)
 
-		newWorkspace, err = client.Workspace(context.Background(), r.Workspace.ID)
+		newWorkspace, err := client.Workspace(context.Background(), r.Workspace.ID)
 		require.NoError(t, err)
 
 		assert.True(t,
diff --git a/coderd/workspaceapps/proxy.go b/coderd/workspaceapps/proxy.go
@@ -573,7 +573,7 @@ func (s *Server) proxyWorkspaceApp(rw http.ResponseWriter, r *http.Request, appT
 	}
 
 	// This strips the session token from a workspace app request.
-	cookieHeaders := r.Header.Values("Cookie")[:]
+	cookieHeaders := r.Header.Values("Cookie")
 	r.Header.Del("Cookie")
 	for _, cookieHeader := range cookieHeaders {
 		r.Header.Add("Cookie", httpapi.StripCoderCookies(cookieHeader))
diff --git a/coderd/workspacestats/reporter.go b/coderd/workspacestats/reporter.go
@@ -153,18 +153,16 @@ func (r *Reporter) ReportAgentStats(ctx context.Context, now time.Time, workspac
 		}
 		return nil
 	})
-	if sessionCount(stats) > 0 {
-		errGroup.Go(func() error {
-			err := r.opts.Database.UpdateWorkspaceLastUsedAt(ctx, database.UpdateWorkspaceLastUsedAtParams{
-				ID:         workspace.ID,
-				LastUsedAt: now,
-			})
-			if err != nil {
-				return xerrors.Errorf("update workspace LastUsedAt: %w", err)
-			}
-			return nil
+	errGroup.Go(func() error {
+		err := r.opts.Database.UpdateWorkspaceLastUsedAt(ctx, database.UpdateWorkspaceLastUsedAtParams{
+			ID:         workspace.ID,
+			LastUsedAt: now,
 		})
-	}
+		if err != nil {
+			return xerrors.Errorf("update workspace LastUsedAt: %w", err)
+		}
+		return nil
+	})
 	if r.opts.UpdateAgentMetricsFn != nil {
 		errGroup.Go(func() error {
 			user, err := r.opts.Database.GetUserByID(ctx, workspace.OwnerID)
@@ -194,7 +192,3 @@ func (r *Reporter) ReportAgentStats(ctx context.Context, now time.Time, workspac
 
 	return nil
 }
-
-func sessionCount(s *agentproto.Stats) int64 {
-	return s.SessionCountVscode + s.SessionCountJetbrains + s.SessionCountReconnectingPty + s.SessionCountSsh
-}

Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,7 @@ func (s MethodTestSuite) NotAuthorizedErrorTest(ctx context.Context, az coderd`
`264`	`264`	`// any case where the error is nil and the response is an empty slice.`
`265`	`265`	`if err != nil \|\| !hasEmptySliceResponse(resp) {`
`266`	`266`	`s.Errorf(err, "method should an error with cancellation")`
`267`		`- s.ErrorIsf(err, context.Canceled, "error should match context.Cancelled")`
	`267`	`+ s.ErrorIsf(err, context.Canceled, "error should match context.Canceled")`
`268`	`268`	`}`
`269`	`269`	`})`
`270`	`270`	`}`
Original file line number	Diff line number	Diff line change
`@@ -573,7 +573,7 @@ func (s Server) proxyWorkspaceApp(rw http.ResponseWriter, r http.Request, appT`
`573`	`573`	`}`
`574`	`574`
`575`	`575`	`// This strips the session token from a workspace app request.`
`576`		`- cookieHeaders := r.Header.Values("Cookie")[:]`
	`576`	`+ cookieHeaders := r.Header.Values("Cookie")`
`577`	`577`	`r.Header.Del("Cookie")`
`578`	`578`	`for _, cookieHeader := range cookieHeaders {`
`579`	`579`	`r.Header.Add("Cookie", httpapi.StripCoderCookies(cookieHeader))`