bug: fixes overwriting the bundles during export #309 (#310)

* bug: fixes overwriting the bundles during export #309 * bug: fixes overwriting the sf bundles during export #309
apigee · Oct 5, 2023 · 8e33e2f · 8e33e2f
1 parent a9e08e9
commit 8e33e2f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/internal/client/apis/apis.go b/internal/client/apis/apis.go
@@ -459,7 +459,7 @@ func ExportProxies(conn int, folder string, allRevisions bool) (err error) {
 
 	for i := 0; i < conn; i++ {
 		fanOutWg.Add(1)
-		go exportAPIProxies(&fanOutWg, jobChan, folder, errChan)
+		go exportAPIProxies(&fanOutWg, jobChan, folder, allRevisions, errChan)
 	}
 
 	for _, proxy := range prxs.Proxies {
@@ -483,14 +483,14 @@ func ExportProxies(conn int, folder string, allRevisions bool) (err error) {
 	return nil
 }
 
-func exportAPIProxies(wg *sync.WaitGroup, jobs <-chan revision, folder string, errs chan<- error) {
+func exportAPIProxies(wg *sync.WaitGroup, jobs <-chan revision, folder string, allRevisions bool, errs chan<- error) {
 	defer wg.Done()
 	for {
 		job, ok := <-jobs
 		if !ok {
 			return
 		}
-		err := apiclient.FetchBundle("apis", folder, job.name, job.rev, false)
+		err := apiclient.FetchBundle("apis", folder, job.name, job.rev, allRevisions)
 		if err != nil {
 			errs <- err
 		}

diff --git a/internal/client/sharedflows/sharedflows.go b/internal/client/sharedflows/sharedflows.go
@@ -333,7 +333,7 @@ func Export(conn int, folder string, allRevisions bool) (err error) {
 
 	for i := 0; i < conn; i++ {
 		fanOutWg.Add(1)
-		go exportSharedFlows(&fanOutWg, jobChan, folder, errChan)
+		go exportSharedFlows(&fanOutWg, jobChan, folder, allRevisions, errChan)
 	}
 
 	for _, proxy := range shrdflows.Flows {
@@ -357,14 +357,14 @@ func Export(conn int, folder string, allRevisions bool) (err error) {
 	return nil
 }
 
-func exportSharedFlows(wg *sync.WaitGroup, jobs <-chan revision, folder string, errs chan<- error) {
+func exportSharedFlows(wg *sync.WaitGroup, jobs <-chan revision, folder string, allRevisions bool, errs chan<- error) {
 	defer wg.Done()
 	for {
 		job, ok := <-jobs
 		if !ok {
 			return
 		}
-		err := apiclient.FetchBundle("sharedflows", folder, job.name, job.rev, false)
+		err := apiclient.FetchBundle("sharedflows", folder, job.name, job.rev, allRevisions)
 		if err != nil {
 			errs <- err
 		}