INT - handle retries for spec and image content

client/pkg/apigee/apicalls.go

@@ -237,40 +237,48 @@ func (a *ApigeeClient) GetProduct(productName string) (*models.ApiProduct, error
 
 // GetImageWithURL - get the list of portals for the org
 func (a *ApigeeClient) GetImageWithURL(imageURL, portalURL string) (string, string) {
-	// Get the portal
-	response, err := a.newRequest(http.MethodGet, fmt.Sprintf("%s%s", portalURL, imageURL)).Execute()
-	if err != nil {
-		return "", ""
-	}
+	retries := 2
+	for i := 0; i <= retries; i++ {
+		// Get the portal
+		response, err := a.newRequest(http.MethodGet, fmt.Sprintf("%s%s", portalURL, imageURL)).Execute()
+		if err != nil {
+			return "", ""
+		}
 
-	contentType := ""
-	if contentTypeArray, ok := response.Headers["Content-Type"]; ok {
-		contentType = contentTypeArray[0]
-		// assuming an octet stream type is actually an image/png
-		if contentType == "application/octet-stream" {
-			contentType = "image/png"
+		contentType := ""
+		if contentTypeArray, ok := response.Headers["Content-Type"]; ok {
+			contentType = contentTypeArray[0]
+			// assuming an octet stream type is actually an image/png
+			if contentType == "application/octet-stream" {
+				contentType = "image/png"
+			}
 		}
-	}
 
-	if response.Code != 200 || string(response.Body) == "" || contentType == "" {
-		return "", ""
-	}
+		if response.Code != 200 || string(response.Body) == "" || contentType == "" {
+			continue
+		}
 
-	return base64.StdEncoding.EncodeToString(response.Body), contentType
+		return base64.StdEncoding.EncodeToString(response.Body), contentType
+	}
+	return "", ""
 }
 
 // GetSpecContent - get the spec content for an api product
 func (a *ApigeeClient) GetSpecContent(contentID string) []byte {
-	// Get the spec content file
-	response, err := a.newRequest(http.MethodGet, fmt.Sprintf(orgDataAPIURL+"/specs/doc/%s/content", a.cfg.Organization, contentID),
-		WithDefaultHeaders(),
-	).Execute()
+	retries := 2
+	for i := 0; i <= retries; i++ {
+		// Get the spec content file
+		response, err := a.newRequest(http.MethodGet, fmt.Sprintf(orgDataAPIURL+"/specs/doc/%s/content", a.cfg.Organization, contentID),
+			WithDefaultHeaders(),
+		).Execute()
+
+		if err != nil || response.Code != 200 {
+			continue
+		}
 
-	if err != nil || response.Code != 200 {
-		return []byte{}
+		return response.Body
 	}
-
-	return response.Body
+	return []byte{}
 }
 
 // GetRevisionSpec - gets the resource file of type openapi for the org, api, revision, and spec file specified

discovery/pkg/apigee/portalapihandlerjob.go

@@ -138,6 +138,9 @@ func (j *newPortalAPIHandler) buildServiceBody(newAPI *apigee.APIDocData, produc
 	imageContentType := ""
 	if newAPI.ImageURL != nil {
 		image, imageContentType = j.apigeeClient.GetImageWithURL(*newAPI.ImageURL, portal.CurrentURL)
+		if image == "" {
+			return nil, fmt.Errorf("could not retrive image, when it was set, for Product %s in Portal %s, skipping", newAPI.ProductName, newAPI.GetPortalTitle())
+		}
 	}
 
 	// create the service body to use for update or create