Merge pull request #536 from apigee/issue534

fix: adds proxy or sf name to the error #534
apigee · Sep 12, 2024 · 494e144 · 494e144
2 parents 5f6212d + 8e5ab1d
commit 494e144
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/internal/client/apis/apis.go b/internal/client/apis/apis.go
@@ -574,7 +574,8 @@ func importAPIProxies(wg *sync.WaitGroup, jobs <-chan string, errs chan<- error)
 
 		u, _ := url.Parse(apiclient.GetApigeeBaseURL())
 		q := u.Query()
-		q.Set("name", strings.TrimSuffix(filepath.Base(job), ".zip"))
+		n := strings.TrimSuffix(filepath.Base(job), ".zip")
+		q.Set("name", n)
 		q.Set("action", "import")
 		u.RawQuery = q.Encode()
 		u.Path = path.Join(u.Path, apiclient.GetApigeeOrg(), "apis")
@@ -622,7 +623,7 @@ func importAPIProxies(wg *sync.WaitGroup, jobs <-chan string, errs chan<- error)
 			b = []byte(err.Error())
 		}
 		if err != nil || resp.StatusCode < 200 || resp.StatusCode >= 300 {
-			errs <- fmt.Errorf("bundle not imported: (HTTP %v) %s", resp.StatusCode, b)
+			errs <- fmt.Errorf("bundle %s not imported: (HTTP %v) %s", n, resp.StatusCode, b)
 			continue
 		}
 

diff --git a/internal/client/sharedflows/sharedflows.go b/internal/client/sharedflows/sharedflows.go
@@ -441,7 +441,8 @@ func importSharedFlows(wg *sync.WaitGroup, jobs <-chan string, errs chan<- error
 
 		u, _ := url.Parse(apiclient.GetApigeeBaseURL())
 		q := u.Query()
-		q.Set("name", strings.TrimSuffix(filepath.Base(job), ".zip"))
+		n := strings.TrimSuffix(filepath.Base(job), ".zip")
+		q.Set("name", n)
 		q.Set("action", "import")
 		u.RawQuery = q.Encode()
 		u.Path = path.Join(u.Path, apiclient.GetApigeeOrg(), "sharedflows")
@@ -489,7 +490,7 @@ func importSharedFlows(wg *sync.WaitGroup, jobs <-chan string, errs chan<- error
 			b = []byte(err.Error())
 		}
 		if err != nil || resp.StatusCode < 200 || resp.StatusCode >= 300 {
-			errs <- fmt.Errorf("bundle not imported: (HTTP %v) %s", resp.StatusCode, b)
+			errs <- fmt.Errorf("bundle %s not imported: (HTTP %v) %s", n, resp.StatusCode, b)
 			continue
 		}