From 59c9778a6ca48c923803bddeea089cf7c5f11d1b Mon Sep 17 00:00:00 2001
From: srinandan <13950006+srinandan@users.noreply.github.com>
Date: Wed, 17 May 2023 07:56:52 -0700
Subject: [PATCH] bug: fixes exit status during import  #206

---
 internal/client/developers/developers.go | 96 ++++++++++++------------
 test/developers.json                     | 22 ++++++
 2 files changed, 71 insertions(+), 47 deletions(-)
 create mode 100644 test/developers.json

diff --git a/internal/client/developers/developers.go b/internal/client/developers/developers.go
index 0c7a167ca..beddf354b 100644
--- a/internal/client/developers/developers.go
+++ b/internal/client/developers/developers.go
@@ -16,6 +16,7 @@ package developers
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"net/url"
@@ -167,9 +168,6 @@ func Export() (respBody []byte, err error) {
 
 // Import
 func Import(conn int, filePath string) error {
-	var pwg sync.WaitGroup
-	u, _ := url.Parse(apiclient.BaseURL)
-	u.Path = path.Join(u.Path, apiclient.GetApigeeOrg(), "developers")
 
 	entities, err := ReadDevelopersFile(filePath)
 	if err != nil {
@@ -181,62 +179,66 @@ func Import(conn int, filePath string) error {
 	clilog.Debug.Printf("Found %d developers in the file\n", numEntities)
 	clilog.Debug.Printf("Create developers with %d connections\n", conn)
 
-	numOfLoops, remaining := numEntities/conn, numEntities%conn
+	jobChan := make(chan Appdeveloper)
+	errChan := make(chan error)
+
+	fanOutWg := sync.WaitGroup{}
+	fanInWg := sync.WaitGroup{}
+
+	errs := []string{}
+	fanInWg.Add(1)
+	go func() {
+		defer fanInWg.Done()
+		for {
+			newErr, ok := <-errChan
+			if !ok {
+				return
+			}
+			errs = append(errs, newErr.Error())
+		}
+	}()
 
-	// ensure connections aren't greater than entities
-	if conn > numEntities {
-		conn = numEntities
+	for i := 0; i < conn; i++ {
+		fanOutWg.Add(1)
+		go createAsyncDeveloper(&fanOutWg, jobChan, errChan)
 	}
 
-	start := 0
-
-	for i, end := 0, 0; i < numOfLoops; i++ {
-		pwg.Add(1)
-		end = (i * conn) + conn
-		clilog.Debug.Printf("Creating batch %d of developers\n", (i + 1))
-		go batchImport(u.String(), entities.Developer[start:end], &pwg)
-		start = end
-		pwg.Wait()
+	for _, entity := range entities.Developer {
+		jobChan <- entity
 	}
+	close(jobChan)
+	fanOutWg.Wait()
+	close(errChan)
+	fanInWg.Wait()
 
-	if remaining > 0 {
-		pwg.Add(1)
-		clilog.Debug.Printf("Creating remaining %d developers\n", remaining)
-		go batchImport(u.String(), entities.Developer[start:numEntities], &pwg)
-		pwg.Wait()
+	if len(errs) > 0 {
+		return errors.New(strings.Join(errs, "\n"))
 	}
-
 	return nil
 }
 
-func createAsyncDeveloper(url string, dev Appdeveloper, wg *sync.WaitGroup) {
+func createAsyncDeveloper(wg *sync.WaitGroup, jobs <-chan Appdeveloper, errs chan<- error) {
 	defer wg.Done()
-	out, err := json.Marshal(dev)
-	if err != nil {
-		clilog.Error.Println(err)
-		return
-	}
-	_, err = apiclient.HttpClient(url, string(out))
-	if err != nil {
-		clilog.Error.Println(err)
-		return
-	}
-
-	clilog.Debug.Printf("Completed entity: %s", dev.EMail)
-}
-
-// batch creates a batch of developers to create
-func batchImport(url string, entities []Appdeveloper, pwg *sync.WaitGroup) {
-	defer pwg.Done()
-	// batch workgroup
-	var bwg sync.WaitGroup
-
-	bwg.Add(len(entities))
+	u, _ := url.Parse(apiclient.BaseURL)
+	u.Path = path.Join(u.Path, apiclient.GetApigeeOrg(), "developers")
 
-	for _, entity := range entities {
-		go createAsyncDeveloper(url, entity, &bwg)
+	for {
+		job, ok := <-jobs
+		if !ok {
+			return
+		}
+		dev, err := json.Marshal(job)
+		if err != nil {
+			errs <- err
+			continue
+		}
+		_, err = apiclient.HttpClient(u.String(), string(dev))
+		if err != nil {
+			errs <- err
+			continue
+		}
+		clilog.Debug.Printf("Completed entity: %s", job.EMail)
 	}
-	bwg.Wait()
 }
 
 // ReadDevelopersFile
diff --git a/test/developers.json b/test/developers.json
new file mode 100644
index 000000000..ab9321575
--- /dev/null
+++ b/test/developers.json
@@ -0,0 +1,22 @@
+{
+        "developer": [
+                {
+                        "email": "test1@user.com",
+                        "firstName": "Test1",
+                        "lastName": "User",
+                        "userName": "test1"
+                },
+                {
+                        "email": "test2@user.com",
+                        "firstName": "Test2",
+                        "lastName": "User",
+                        "userName": "test2"
+                },
+                {
+                        "email": "test3@user.com",
+                        "firstName": "Test3",
+                        "lastName": "User",
+                        "userName": "test3"
+                }
+        ]
+}