make lint; make fmt

dannykopping · dannykopping · commit 634082b247db · 2025-05-07T23:05:17.000+02:00
Signed-off-by: Danny Kopping &lt;dannykopping@gmail.com&gt;
diff --git a/coderd/notifications/events.go b/coderd/notifications/events.go
@@ -39,7 +39,7 @@ var (
 	TemplateTemplateDeprecated = uuid.MustParse("f40fae84-55a2-42cd-99fa-b41c1ca64894")
 
 	TemplateWorkspaceBuildsFailedReport = uuid.MustParse("34a20db2-e9cc-4a93-b0e4-8569699d7a00")
-	TemplateWorkspaceResourceReplaced  = uuid.MustParse("89d9745a-816e-4695-a17f-3d0a229e2b8d")
+	TemplateWorkspaceResourceReplaced   = uuid.MustParse("89d9745a-816e-4695-a17f-3d0a229e2b8d")
 )
 
 // Notification-related events.
diff --git a/coderd/prebuilds/noop.go b/coderd/prebuilds/noop.go
@@ -13,7 +13,7 @@ type NoopReconciler struct{}
 
 func (NoopReconciler) Run(context.Context)         {}
 func (NoopReconciler) Stop(context.Context, error) {}
-func (NoopReconciler) TrackResourceReplacement(ctx context.Context, workspaceID, buildID, claimantID uuid.UUID, replacements []*sdkproto.ResourceReplacement) {
+func (NoopReconciler) TrackResourceReplacement(context.Context, uuid.UUID, uuid.UUID, uuid.UUID, []*sdkproto.ResourceReplacement) {
 }
 func (NoopReconciler) ReconcileAll(context.Context) error { return nil }
 func (NoopReconciler) SnapshotState(context.Context, database.Store) (*GlobalSnapshot, error) {
diff --git a/enterprise/coderd/prebuilds/reconcile.go b/enterprise/coderd/prebuilds/reconcile.go
@@ -632,6 +632,7 @@ func (c *StoreReconciler) provision(
 
 func (c *StoreReconciler) TrackResourceReplacement(ctx context.Context, workspaceID, buildID, claimantID uuid.UUID, replacements []*sdkproto.ResourceReplacement) {
 	// Set authorization context since this may be called in the background (i.e. with a bare context).
+	// nolint:gocritic // Necessary to query all the required data.
 	ctx = dbauthz.AsSystemRestricted(ctx)
 	// Since this may be called in a fire-and-forget fashion, we need to give up at some point.
 	trackCtx, trackCancel := context.WithTimeout(ctx, time.Minute)
@@ -642,6 +643,7 @@ func (c *StoreReconciler) TrackResourceReplacement(ctx context.Context, workspac
 	}
 }
 
+// nolint:revive // Shut up it's fine.
 func (c *StoreReconciler) trackResourceReplacement(ctx context.Context, workspaceID, buildID, claimantID uuid.UUID, replacements []*sdkproto.ResourceReplacement) error {
 	if err := ctx.Err(); err != nil {
 		return err
@@ -683,12 +685,12 @@ func (c *StoreReconciler) trackResourceReplacement(ctx context.Context, workspac
 	// Use the claiming build here (not prebuild) because both should be equivalent, and we might as well spot inconsistencies now.
 	templateVersion, err := c.store.GetTemplateVersionByID(ctx, build.TemplateVersionID)
 	if err != nil {
-		return xerrors.Errorf("fetch template version %q: %w", build.TemplateVersionID.String())
+		return xerrors.Errorf("fetch template version %q: %w", build.TemplateVersionID.String(), err)
 	}
 
 	org, err := c.store.GetOrganizationByID(ctx, workspace.OrganizationID)
 	if err != nil {
-		return xerrors.Errorf("fetch org %q: %w", workspace.OrganizationID.String())
+		return xerrors.Errorf("fetch org %q: %w", workspace.OrganizationID.String(), err)
 	}
 
 	// Track resource replacement in Prometheus metric.

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ var (`
`39`	`39`	`TemplateTemplateDeprecated = uuid.MustParse("f40fae84-55a2-42cd-99fa-b41c1ca64894")`
`40`	`40`
`41`	`41`	`TemplateWorkspaceBuildsFailedReport = uuid.MustParse("34a20db2-e9cc-4a93-b0e4-8569699d7a00")`
`42`		`- TemplateWorkspaceResourceReplaced = uuid.MustParse("89d9745a-816e-4695-a17f-3d0a229e2b8d")`
	`42`	`+ TemplateWorkspaceResourceReplaced = uuid.MustParse("89d9745a-816e-4695-a17f-3d0a229e2b8d")`
`43`	`43`	`)`
`44`	`44`
`45`	`45`	`// Notification-related events.`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ type NoopReconciler struct{}`
`13`	`13`
`14`	`14`	`func (NoopReconciler) Run(context.Context) {}`
`15`	`15`	`func (NoopReconciler) Stop(context.Context, error) {}`
`16`		`-func (NoopReconciler) TrackResourceReplacement(ctx context.Context, workspaceID, buildID, claimantID uuid.UUID, replacements []*sdkproto.ResourceReplacement) {`
	`16`	`+func (NoopReconciler) TrackResourceReplacement(context.Context, uuid.UUID, uuid.UUID, uuid.UUID, []*sdkproto.ResourceReplacement) {`
`17`	`17`	`}`
`18`	`18`	`func (NoopReconciler) ReconcileAll(context.Context) error { return nil }`
`19`	`19`	`func (NoopReconciler) SnapshotState(context.Context, database.Store) (*GlobalSnapshot, error) {`