refactor: CR's fixes

evgeniy-scherbina · evgeniy-scherbina · commit 80c89fea87f1 · 2025-05-26T12:39:58.000Z
diff --git a/enterprise/coderd/prebuilds/metricscollector.go b/enterprise/coderd/prebuilds/metricscollector.go
@@ -286,5 +286,9 @@ func (mc *MetricsCollector) trackHardLimitedStatus(orgName, templateName, preset
 
 	key := hardLimitedPresetKey{orgName: orgName, templateName: templateName, presetName: presetName}
 
-	mc.isPresetHardLimited[key] = isHardLimited
+	if isHardLimited {
+		mc.isPresetHardLimited[key] = true
+	} else {
+		delete(mc.isPresetHardLimited, key)
+	}
 }
diff --git a/enterprise/coderd/prebuilds/reconcile_test.go b/enterprise/coderd/prebuilds/reconcile_test.go
@@ -1036,17 +1036,15 @@ func TestHardLimitedPresetShouldNotBlockDeletion(t *testing.T) {
 			require.Equal(t, database.WorkspaceTransitionDelete, workspaceBuilds[0].Transition)
 			require.Equal(t, database.WorkspaceTransitionStart, workspaceBuilds[1].Transition)
 
-			// Metric is reset to zero after preset became outdated.
+			// Metric is deleted after preset became outdated.
 			mf, err = registry.Gather()
 			require.NoError(t, err)
 			metric = findMetric(mf, prebuilds.MetricPresetHardLimitedGauge, map[string]string{
 				"template_name": template.Name,
 				"preset_name":   preset.Name,
 				"org_name":      org.Name,
 			})
-			require.NotNil(t, metric)
-			require.NotNil(t, metric.GetGauge())
-			require.EqualValues(t, 0, metric.GetGauge().GetValue())
+			require.Nil(t, metric)
 		})
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -286,5 +286,9 @@ func (mc *MetricsCollector) trackHardLimitedStatus(orgName, templateName, preset`
`286`	`286`
`287`	`287`	`key := hardLimitedPresetKey{orgName: orgName, templateName: templateName, presetName: presetName}`
`288`	`288`
`289`		`- mc.isPresetHardLimited[key] = isHardLimited`
	`289`	`+ if isHardLimited {`
	`290`	`+ mc.isPresetHardLimited[key] = true`
	`291`	`+ } else {`
	`292`	`+ delete(mc.isPresetHardLimited, key)`
	`293`	`+ }`
`290`	`294`	`}`