Revert "feat: URI is not replacing the spec but merging instead (#1537)…

… (#1539) Revert "feat: [sc-103119] URI is not replacing the spec but merging instead (#1537)" This reverts commit c2f72ec.
replicatedhq · May 1, 2024 · aeaac7a · aeaac7a
1 parent 6b368f2
commit aeaac7a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/cmd/troubleshoot/cli/run.go b/cmd/troubleshoot/cli/run.go
@@ -273,8 +273,7 @@ func loadSupportBundleSpecsFromURIs(ctx context.Context, kinds *loader.Troublesh
 		return err
 	}
 
-	// uri spec replaces the original spec
-	*kinds = *moreKinds
+	kinds.Add(moreKinds)
 	return nil
 }
 

diff --git a/cmd/troubleshoot/cli/run_test.go b/cmd/troubleshoot/cli/run_test.go
@@ -57,9 +57,8 @@ spec:
 	err = loadSupportBundleSpecsFromURIs(ctx, kinds)
 	require.NoError(t, err)
 
-	// valid uri spec will replace the original spec
-	require.Len(t, kinds.SupportBundlesV1Beta2, 1)
-	assert.NotNil(t, kinds.SupportBundlesV1Beta2[0].Spec.Collectors[0].ClusterInfo)
+	require.Len(t, kinds.SupportBundlesV1Beta2, 2)
+	assert.NotNil(t, kinds.SupportBundlesV1Beta2[1].Spec.Collectors[0].ClusterInfo)
 }
 
 func Test_loadSupportBundleSpecsFromURIs_TimeoutError(t *testing.T) {