add unit test

cmd/troubleshoot/cli/run_test.go

@@ -276,3 +276,28 @@ spec:
 		})
 	}
 }
+
+func Test_loadDuplicatedBundleSpecs(t *testing.T) {
+	spec := testutils.ServeFromFilePath(t, `
+apiVersion: troubleshoot.sh/v1beta2
+kind: SupportBundle
+metadata:
+  name: sb
+spec:
+  analyzers:
+  - clusterVersion: {}
+  hostCollectors:
+  - cpu: {}
+  hostAnalyzers:
+  - cpu: {}
+`)
+	args := []string{spec, spec}
+
+	ctx := context.Background()
+	client := testclient.NewSimpleClientset()
+	sb, _, err := loadSpecs(ctx, args, client)
+	require.NoError(t, err)
+	assert.Len(t, sb.Spec.Analyzers, 1)
+	assert.Len(t, sb.Spec.HostCollectors, 1)
+	assert.Len(t, sb.Spec.HostAnalyzers, 1)
+}

pkg/analyze/analyzer.go

@@ -279,23 +279,22 @@ func DedupAnalyzers(allAnalyzers []*troubleshootv1beta2.Analyze) []*troubleshoot
 }
 
 func DedupHostAnalyzers(allAnalyzers []*troubleshootv1beta2.HostAnalyze) []*troubleshootv1beta2.HostAnalyze {
-	uniqueAnalyzers := make(map[string]bool)
-	finalAnalyzers := []*troubleshootv1beta2.HostAnalyze{}
+	seen := make(map[string]bool)
+	out := []*troubleshootv1beta2.HostAnalyze{}
 
 	for _, analyzer := range allAnalyzers {
 		data, err := json.Marshal(analyzer)
 		if err != nil {
-			// return analyzer as is if for whatever reason it can't be marshalled into json
-			finalAnalyzers = append(finalAnalyzers, analyzer)
-		} else {
-			stringData := string(data)
-			if _, value := uniqueAnalyzers[stringData]; !value {
-				uniqueAnalyzers[stringData] = true
-				finalAnalyzers = append(finalAnalyzers, analyzer)
-			}
+			out = append(out, analyzer)
+			continue
+		}
+		key := string(data)
+		if _, ok := seen[key]; !ok {
+			out = append(out, analyzer)
+			seen[key] = true
 		}
 	}
-	return finalAnalyzers
+	return out
 }
 
 func stripRedactedLines(yaml []byte) []byte {

pkg/collect/collect.go

@@ -194,21 +194,20 @@ func CollectRemote(c *troubleshootv1beta2.RemoteCollector, additionalRedactors *
 }
 
 func DedupHostCollectors(allCollectors []*troubleshootv1beta2.HostCollect) []*troubleshootv1beta2.HostCollect {
-	uniqueCollectors := make(map[string]bool)
-	finalCollectors := []*troubleshootv1beta2.HostCollect{}
+	seen := make(map[string]bool)
+	out := []*troubleshootv1beta2.HostCollect{}
 
 	for _, collector := range allCollectors {
 		data, err := json.Marshal(collector)
 		if err != nil {
-			// return collector as is if for whatever reason it can't be marshalled into json
-			finalCollectors = append(finalCollectors, collector)
-		} else {
-			stringData := string(data)
-			if _, value := uniqueCollectors[stringData]; !value {
-				uniqueCollectors[stringData] = true
-				finalCollectors = append(finalCollectors, collector)
-			}
+			out = append(out, collector)
+			continue
+		}
+		key := string(data)
+		if _, ok := seen[key]; !ok {
+			out = append(out, collector)
+			seen[key] = true
 		}
 	}
-	return finalCollectors
+	return out
 }