From b5a56e5239cc19f36be1d25e40d0c4d9b222128e Mon Sep 17 00:00:00 2001 From: Dan Jones Date: Wed, 7 Sep 2022 09:14:09 +0100 Subject: [PATCH] Remove redundant loops Signed-off-by: Dan Jones --- pkg/supportbundle/supportbundle.go | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/pkg/supportbundle/supportbundle.go b/pkg/supportbundle/supportbundle.go index 5bc95baa0..e7d691d0d 100644 --- a/pkg/supportbundle/supportbundle.go +++ b/pkg/supportbundle/supportbundle.go @@ -230,20 +230,10 @@ func AnalyzeSupportBundle(spec *troubleshootv1beta2.SupportBundleSpec, tmpDir st // 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) - } + newBundle.Spec.Collectors = append(target.Spec.Collectors, source.Spec.Collectors...) + newBundle.Spec.AfterCollection = append(target.Spec.AfterCollection, source.Spec.AfterCollection...) + newBundle.Spec.HostCollectors = append(target.Spec.HostCollectors, source.Spec.HostCollectors...) + newBundle.Spec.HostAnalyzers = append(target.Spec.HostAnalyzers, source.Spec.HostAnalyzers...) + newBundle.Spec.Analyzers = append(target.Spec.Analyzers, source.Spec.Analyzers...) return newBundle }