Skip to content

Commit b6f8ac2

Browse files
Format
Signed-off-by: Dan Jones <[email protected]>
1 parent 63510fc commit b6f8ac2

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

pkg/supportbundle/supportbundle.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -227,16 +227,12 @@ func AnalyzeSupportBundle(spec *troubleshootv1beta2.SupportBundleSpec, tmpDir st
227227
return analyzeResults, nil
228228
}
229229

230-
231230
// the intention with these appends is to swap them out at a later date with more specific handlers for merging the spec fields
232-
func ConcatSpec(target *troubleshootv1beta2.SupportBundle, source *troubleshootv1beta2.SupportBundle) *troubleshootv1beta2.SupportBundle{
233-
231+
func ConcatSpec(target *troubleshootv1beta2.SupportBundle, source *troubleshootv1beta2.SupportBundle) *troubleshootv1beta2.SupportBundle {
234232
newBundle := target.DeepCopy()
235-
236233
for _, v := range source.Spec.Collectors {
237-
newBundle.Spec.Collectors = append(target.Spec.Collectors,v)
234+
newBundle.Spec.Collectors = append(target.Spec.Collectors, v)
238235
}
239-
240236
for _, v := range source.Spec.AfterCollection {
241237
newBundle.Spec.AfterCollection = append(target.Spec.AfterCollection, v)
242238
}

0 commit comments

Comments
 (0)