Merge branch 'nico/por-598-loading-on-preview-env-tab-not-showing' of github.com:porter-dev/porter into dev

api/server/handlers/environment/finalize_deployment.go

@@ -150,21 +150,21 @@ func (c *FinalizeDeploymentHandler) ServeHTTP(w http.ResponseWriter, r *http.Req
 		c.Config().ServerConf.ServerURL, depl.Namespace, depl.EnvironmentID, project.ID, url.QueryEscape(cluster.Name),
 	)
 
-	if len(request.SuccessfulResources) > 0 {
-		commentBody += "\n#### Successfully deployed resources\n"
-
-		for _, res := range request.SuccessfulResources {
-			if res.ReleaseType == "job" {
-				commentBody += fmt.Sprintf("- [`%s`](%s/jobs/%s/%s/%s?project_id=%d)\n",
-					res.ReleaseName, c.Config().ServerConf.ServerURL, cluster.Name, depl.Namespace,
-					res.ReleaseName, project.ID)
-			} else {
-				commentBody += fmt.Sprintf("- [`%s`](%s/applications/%s/%s/%s?project_id=%d)\n",
-					res.ReleaseName, c.Config().ServerConf.ServerURL, cluster.Name, depl.Namespace,
-					res.ReleaseName, project.ID)
-			}
-		}
-	}
+	// if len(request.SuccessfulResources) > 0 {
+	// 	commentBody += "\n#### Successfully deployed resources\n"
+
+	// 	for _, res := range request.SuccessfulResources {
+	// 		if res.ReleaseType == "job" {
+	// 			commentBody += fmt.Sprintf("- [`%s`](%s/jobs/%s/%s/%s?project_id=%d)\n",
+	// 				res.ReleaseName, c.Config().ServerConf.ServerURL, cluster.Name, depl.Namespace,
+	// 				res.ReleaseName, project.ID)
+	// 		} else {
+	// 			commentBody += fmt.Sprintf("- [`%s`](%s/applications/%s/%s/%s?project_id=%d)\n",
+	// 				res.ReleaseName, c.Config().ServerConf.ServerURL, cluster.Name, depl.Namespace,
+	// 				res.ReleaseName, project.ID)
+	// 		}
+	// 	}
+	// }
 
 	err = createOrUpdateComment(client, c.Repo(), env.NewCommentsDisabled, depl, github.String(commentBody))
 

cli/cmd/docker/agent.go

@@ -291,7 +291,8 @@ func (a *Agent) PullImage(image string) error {
 	out, err := a.ImagePull(a.ctx, image, opts)
 
 	if err != nil {
-		if client.IsErrNotFound(err) {
+		if client.IsErrNotFound(err) ||
+			(strings.Contains(image, "gcr.io") && strings.Contains(err.Error(), "or it may not exist")) {
 			return PullImageErrNotFound
 		} else if client.IsErrUnauthorized(err) {
 			return PullImageErrUnauthorized

dashboard/src/main/home/cluster-dashboard/preview-environments/deployments/DeploymentList.tsx

@@ -100,36 +100,31 @@ const DeploymentList = () => {
 
   useEffect(() => {
     let isSubscribed = true;
-    getPRDeploymentList()
-      .then(({ data }) => {
-        if (!isSubscribed) {
-          return;
-        }
+    setIsLoading(true);
+
+    Promise.allSettled([getPRDeploymentList(), getEnvironment()]).then(
+      ([getDeploymentsResponse, getEnvironmentResponse]) => {
+        const deploymentList =
+          getDeploymentsResponse.status === "fulfilled"
+            ? getDeploymentsResponse.value.data
+            : {};
+        const environmentList =
+          getEnvironmentResponse.status === "fulfilled"
+            ? getEnvironmentResponse.value.data
+            : {};
 
-        setDeploymentList(data.deployments || []);
-        setPullRequests(data.pull_requests || []);
-      })
-      .catch((err) => {
-        console.error(err);
-        if (isSubscribed) {
-          setHasError(true);
-        }
-      });
-    getEnvironment()
-      .then(({ data }) => {
         if (!isSubscribed) {
           return;
         }
 
-        setNewCommentsDisabled(data.new_comments_disabled || false);
-      })
-      .catch((err) => {
-        console.error(err);
-        if (isSubscribed) {
-          setHasError(true);
-        }
-      });
-    setIsLoading(false);
+        setDeploymentList(deploymentList.deployments || []);
+        setPullRequests(deploymentList.pull_requrests || []);
+
+        setNewCommentsDisabled(environmentList.new_comments_disabled || false);
+
+        setIsLoading(false);
+      }
+    );
 
     return () => {
       isSubscribed = false;

internal/registry/registry.go

@@ -707,7 +707,9 @@ func (r *Registry) GetECRPaginatedImages(
 	imageIDMap := make(map[string]bool)
 
 	for _, id := range resp.ImageIds {
-		imageIDMap[*id.ImageTag] = true
+		if id != nil && id.ImageTag != nil {
+			imageIDMap[*id.ImageTag] = true
+		}
 	}
 
 	var wg sync.WaitGroup