Moved ConcatSpec to supportbundle package and clean up dead code

Signed-off-by: Dan Jones <[email protected]>

Author: danj-replicated

cmd/troubleshoot/cli/run.go

@@ -68,19 +68,6 @@ func runTroubleshoot(v *viper.Viper, arg []string) error {
 		})
 	}
 
-	// 	collectorContent, err := supportbundle.LoadSupportBundleSpec(arg)
-	// 	if err != nil {
-	// 		return errors.Wrap(err, "failed to load collector spec")
-	// 	}
-	//
-	// 	multidocs := strings.Split(string(collectorContent), "\n---\n")
-	//
-	// 	// we support both raw collector kinds and supportbundle kinds here
-	// supportBundle, err := supportbundle.ParseSupportBundleFromDoc([]byte(multidocs[0]))
-	// 	if err != nil {
-	// 		return errors.Wrap(err, "failed to parse collector")
-	// 	}
-
 	var mainBundle *troubleshootv1beta2.SupportBundle
 
 	troubleshootclientsetscheme.AddToScheme(scheme.Scheme)
@@ -101,7 +88,7 @@ func runTroubleshoot(v *viper.Viper, arg []string) error {
 		if i == 0 {
 			mainBundle = supportBundle
 		} else {
-			mainBundle.ConcatSpec(supportBundle)
+			mainBundle = supportbundle.ConcatSpec(mainBundle, supportBundle)
 		}
 
 		for i, additionalDoc := range multidocs {
@@ -135,25 +122,6 @@ func runTroubleshoot(v *viper.Viper, arg []string) error {
 		}
 	}
 
-	// 	for i, additionalDoc := range multidocs {
-	// 		if i == 0 {
-	// 			continue
-	// 		}
-	// 		additionalDoc, err := docrewrite.ConvertToV1Beta2([]byte(additionalDoc))
-	// 		if err != nil {
-	// 			return errors.Wrap(err, "failed to convert to v1beta2")
-	// 		}
-	// 		obj, _, err := decode(additionalDoc, nil, nil)
-	// 		if err != nil {
-	// 			return errors.Wrapf(err, "failed to parse additional doc %d", i)
-	// 		}
-	// 		multidocRedactors, ok := obj.(*troubleshootv1beta2.Redactor)
-	// 		if !ok {
-	// 			continue
-	// 		}
-	// 		additionalRedactors.Spec.Redactors = append(additionalRedactors.Spec.Redactors, multidocRedactors.Spec.Redactors...)
-	// 	}
-
 	var collectorCB func(chan interface{}, string)
 	progressChan := make(chan interface{}) // non-zero buffer can result in missed messages
 	finishedCh := make(chan bool, 1)

pkg/apis/troubleshoot/v1beta2/supportbundle_interfaces.go

@@ -226,3 +226,28 @@ func AnalyzeSupportBundle(spec *troubleshootv1beta2.SupportBundleSpec, tmpDir st
 	}
 	return analyzeResults, nil
 }
+
+
+// the intention with these appends is to swap them out at a later date with more specific handlers for merging the spec fields
+func ConcatSpec(target *troubleshootv1beta2.SupportBundle, source *troubleshootv1beta2.SupportBundle) *troubleshootv1beta2.SupportBundle{
+
+	newBundle := target.DeepCopy()
+
+	for _, v := range source.Spec.Collectors {
+		newBundle.Spec.Collectors = append(target.Spec.Collectors,v)
+	}
+
+	for _, v := range source.Spec.AfterCollection {
+		newBundle.Spec.AfterCollection = append(target.Spec.AfterCollection, v)
+	}
+	for _, v := range source.Spec.HostCollectors {
+		newBundle.Spec.HostCollectors = append(target.Spec.HostCollectors, v)
+	}
+	for _, v := range source.Spec.HostAnalyzers {
+		newBundle.Spec.HostAnalyzers = append(target.Spec.HostAnalyzers, v)
+	}
+	for _, v := range source.Spec.Analyzers {
+		newBundle.Spec.Analyzers = append(target.Spec.Analyzers, v)
+	}
+	return newBundle
+}