Add concatspec method

Signed-off-by: Dan Jones <danj@replicated.com>
replicatedhq · Aug 23, 2022 · 1a637f3 · 1a637f3
1 parent 3b3ae4e
commit 1a637f3
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/cmd/troubleshoot/cli/run.go b/cmd/troubleshoot/cli/run.go
@@ -101,7 +101,7 @@ func runTroubleshoot(v *viper.Viper, arg []string) error {
 		if i == 0 {
 			mainBundle = supportBundle
 		} else {
-			mainBundle.concatSpec(supportBundle)
+			mainBundle.ConcatSpec(supportBundle)
 		}
 
 		for i, additionalDoc := range multidocs {

diff --git a/pkg/apis/troubleshoot/v1beta2/supportbundle_interfaces.go b/pkg/apis/troubleshoot/v1beta2/supportbundle_interfaces.go
@@ -0,0 +1,19 @@
+package v1beta2
+
+func (s *SupportBundle) ConcatSpec(bundle *SupportBundle) {
+	for _, v := range bundle.Spec.Collectors {
+		s.Spec.Collectors = append(bundle.Spec.Collectors, v)
+	}
+	for _, v := range bundle.Spec.AfterCollection {
+		s.Spec.AfterCollection = append(bundle.Spec.AfterCollection, v)
+	}
+	for _, v := range bundle.Spec.HostCollectors {
+		s.Spec.HostCollectors = append(bundle.Spec.HostCollectors, v)
+	}
+	for _, v := range bundle.Spec.HostAnalyzers {
+		s.Spec.HostAnalyzers = append(bundle.Spec.HostAnalyzers, v)
+	}
+	for _, v := range bundle.Spec.Analyzers {
+		s.Spec.Analyzers = append(bundle.Spec.Analyzers, v)
+	}
+}