Merge branch 'main' into org-switcher

aslilac · aslilac · commit 8d6b74d39b92 · 2024-05-14T16:50:43.000Z
diff --git a/coderd/agentapi/activitybump.go b/coderd/agentapi/activitybump.go
@@ -41,6 +41,7 @@ func ActivityBumpWorkspace(ctx context.Context, log slog.Logger, db database.Sto
 	// low priority operations fail first.
 	ctx, cancel := context.WithTimeout(ctx, time.Second*15)
 	defer cancel()
+	// nolint:gocritic // (#13146) Will be moved soon as part of refactor.
 	err := db.ActivityBumpWorkspace(ctx, database.ActivityBumpWorkspaceParams{
 		NextAutostart: nextAutostart.UTC(),
 		WorkspaceID:   workspaceID,
diff --git a/coderd/agentapi/stats.go b/coderd/agentapi/stats.go
@@ -102,6 +102,7 @@ func (a *StatsAPI) UpdateStats(ctx context.Context, req *agentproto.UpdateStatsR
 		return nil
 	})
 	errGroup.Go(func() error {
+		// nolint:gocritic // (#13146) Will be moved soon as part of refactor.
 		err := a.Database.UpdateWorkspaceLastUsedAt(ctx, database.UpdateWorkspaceLastUsedAtParams{
 			ID:         workspace.ID,
 			LastUsedAt: now,
diff --git a/coderd/batchstats/batcher.go b/coderd/batchstats/batcher.go
@@ -240,6 +240,7 @@ func (b *Batcher) flush(ctx context.Context, forced bool, reason string) {
 		b.buf.ConnectionsByProto = payload
 	}
 
+	// nolint:gocritic // (#13146) Will be moved soon as part of refactor.
 	err = b.store.InsertWorkspaceAgentStats(ctx, *b.buf)
 	elapsed := time.Since(start)
 	if err != nil {
diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go
@@ -1244,6 +1244,7 @@ func (api *API) workspaceAgentReportStats(rw http.ResponseWriter, r *http.Reques
 	})
 	if req.SessionCount() > 0 {
 		errGroup.Go(func() error {
+			// nolint:gocritic // (#13146) Will be moved soon as part of refactor.
 			err := api.Database.UpdateWorkspaceLastUsedAt(ctx, database.UpdateWorkspaceLastUsedAtParams{
 				ID:         workspace.ID,
 				LastUsedAt: now,
diff --git a/coderd/workspaceusage/tracker.go b/coderd/workspaceusage/tracker.go
@@ -130,6 +130,7 @@ func (tr *Tracker) flush(now time.Time) {
 	authCtx := dbauthz.AsSystemRestricted(ctx)
 	tr.flushLock.Lock()
 	defer tr.flushLock.Unlock()
+	// nolint:gocritic // (#13146) Will be moved soon as part of refactor.
 	if err := tr.s.BatchUpdateWorkspaceLastUsedAt(authCtx, database.BatchUpdateWorkspaceLastUsedAtParams{
 		LastUsedAt: now,
 		IDs:        ids,
diff --git a/enterprise/coderd/schedule/template.go b/enterprise/coderd/schedule/template.go
@@ -169,6 +169,7 @@ func (s *EnterpriseTemplateScheduleStore) Set(ctx context.Context, db database.S
 		}
 
 		if opts.UpdateWorkspaceLastUsedAt {
+			// nolint:gocritic // (#13146) Will be moved soon as part of refactor.
 			err = tx.UpdateTemplateWorkspacesLastUsedAt(ctx, database.UpdateTemplateWorkspacesLastUsedAtParams{
 				TemplateID: tpl.ID,
 				LastUsedAt: dbtime.Now(),
diff --git a/scripts/rules.go b/scripts/rules.go
@@ -467,3 +467,23 @@ func withTimezoneUTC(m dsl.Matcher) {
 	).Report(`Setting database timezone to UTC may mask timezone-related bugs.`).
 		At(m["tz"])
 }
+
+// workspaceActivity ensures that updating workspace activity is only done in the workspaceapps package.
+//
+//nolint:unused,deadcode,varnamelen
+func workspaceActivity(m dsl.Matcher) {
+	m.Import("github.com/coder/coder/v2/coderd/database")
+	m.Match(
+		`$_.ActivityBumpWorkspace($_, $_)`,
+		`$_.UpdateWorkspaceLastUsedAt($_, $_)`,
+		`$_.BatchUpdateWorkspaceLastUsedAt($_, $_)`,
+		`$_.UpdateTemplateWorkspacesLastUsedAt($_, $_)`,
+		`$_.InsertWorkspaceAgentStats($_, $_)`,
+		`$_.InsertWorkspaceAppStats($_, $_)`,
+	).Where(
+		!m.File().PkgPath.Matches(`workspaceapps`) &&
+			!m.File().PkgPath.Matches(`dbauthz$`) &&
+			!m.File().PkgPath.Matches(`dbgen$`) &&
+			!m.File().Name.Matches(`_test\.go$`),
+	).Report("Updating workspace activity should always be done in the workspaceapps package.")
+}

Original file line number	Diff line number	Diff line change
`@@ -240,6 +240,7 @@ func (b *Batcher) flush(ctx context.Context, forced bool, reason string) {`
`240`	`240`	`b.buf.ConnectionsByProto = payload`
`241`	`241`	`}`
`242`	`242`
	`243`	`+ // nolint:gocritic // (#13146) Will be moved soon as part of refactor.`
`243`	`244`	`err = b.store.InsertWorkspaceAgentStats(ctx, *b.buf)`
`244`	`245`	`elapsed := time.Since(start)`
`245`	`246`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -169,6 +169,7 @@ func (s *EnterpriseTemplateScheduleStore) Set(ctx context.Context, db database.S`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`if opts.UpdateWorkspaceLastUsedAt {`
	`172`	`+ // nolint:gocritic // (#13146) Will be moved soon as part of refactor.`
`172`	`173`	`err = tx.UpdateTemplateWorkspacesLastUsedAt(ctx, database.UpdateTemplateWorkspacesLastUsedAtParams{`
`173`	`174`	`TemplateID: tpl.ID,`
`174`	`175`	`LastUsedAt: dbtime.Now(),`