From b6f8ac211e0fa410ebbfe621da77bd9446ec954b Mon Sep 17 00:00:00 2001 From: Dan Jones Date: Mon, 5 Sep 2022 15:54:54 +0100 Subject: [PATCH] Format Signed-off-by: Dan Jones --- pkg/supportbundle/supportbundle.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkg/supportbundle/supportbundle.go b/pkg/supportbundle/supportbundle.go index 5fb88f69..5bc95baa 100644 --- a/pkg/supportbundle/supportbundle.go +++ b/pkg/supportbundle/supportbundle.go @@ -227,16 +227,12 @@ 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{ - +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) + newBundle.Spec.Collectors = append(target.Spec.Collectors, v) } - for _, v := range source.Spec.AfterCollection { newBundle.Spec.AfterCollection = append(target.Spec.AfterCollection, v) }