undo changes in internal/store/builder.go

Author: waltherlee

internal/store/builder.go

@@ -107,26 +107,18 @@ func (b *Builder) WithMetrics(r prometheus.Registerer) {
 
 // WithEnabledResources sets the enabledResources property of a Builder.
 func (b *Builder) WithEnabledResources(r []string) error {
-	enabledResources := map[string]bool{}
-	for _, er := range b.enabledResources {
-		enabledResources[er] = true
-	}
-	var newResources []string
 	for _, resource := range r {
-		// validate that the resource exists and skip those that are already enabled
 		if !resourceExists(resource) {
 			return fmt.Errorf("resource %s does not exist. Available resources: %s", resource, strings.Join(availableResources(), ","))
 		}
-		if _, ok := enabledResources[resource]; !ok {
-			newResources = append(newResources, resource)
-		}
-	}
-	if len(newResources) == 0 {
-		return nil
 	}
 
-	b.enabledResources = append(b.enabledResources, newResources...)
-	sort.Strings(b.enabledResources)
+	var sortedResources []string
+	sortedResources = append(sortedResources, r...)
+
+	sort.Strings(sortedResources)
+
+	b.enabledResources = append(b.enabledResources, sortedResources...)
 	return nil
 }
 

tests/e2e/discovery_test.go

@@ -259,7 +259,7 @@ func TestVariableVKsDiscoveryAndResolution(t *testing.T) {
 		// Note: we use count to make sure that only one metrics handler is running, and we also want to validate that the
 		// new metric is available and the old one was removed, otherwise, the response could come from the
 		// previous handler before its context was cancelled, or maybe because it failed to be cancelled.
-		if strings.Count(string(out), testUpdateCRDMetric) == 1 && !strings.Contains(string(out), testMetric) {
+		if strings.Contains(string(out), testUpdateCRDMetric) && !strings.Contains(string(out), testMetric) {
 			klog.InfoS("metrics available", "metric", string(out))
 			// Signal the process to exit, since we know the metrics are being generated as expected.
 			ch <- true