Merge branch 'nafees/preview-env-improvements' into dev

api/server/handlers/environment/update_environment_settings.go

@@ -27,8 +27,8 @@ func NewUpdateEnvironmentSettingsHandler(
 	config *config.Config,
 	decoderValidator shared.RequestDecoderValidator,
 	writer shared.ResultWriter,
-) *UpdateDeploymentStatusHandler {
-	return &UpdateDeploymentStatusHandler{
+) *UpdateEnvironmentSettingsHandler {
+	return &UpdateEnvironmentSettingsHandler{
 		PorterHandlerReadWriter: handlers.NewDefaultPorterHandler(config, decoderValidator, writer),
 		KubernetesAgentGetter:   authz.NewOutOfClusterAgentGetter(config),
 	}

workers/jobs/helm_revisions_count_tracker.go

@@ -247,8 +247,6 @@ func (t *helmRevisionsCountTracker) Run() error {
 						// sort revisions from newest to oldest
 						releaseutil.Reverse(revisions, releaseutil.SortByRevision)
 
-						time.Sleep(time.Minute * 15)
-
 						for i := 100; i < len(revisions); i += 1 {
 							rev := revisions[i]
 

workers/utils/retry_helm_agent.go

@@ -4,8 +4,8 @@ package utils
 
 import (
 	"fmt"
+	"log"
 	"os"
-	"strings"
 	"time"
 
 	"github.com/porter-dev/porter/api/types"
@@ -52,14 +52,14 @@ func (a *RetryHelmAgent) ListReleases(
 
 		if err == nil {
 			return releases, nil
-		} else if strings.Contains(err.Error(), "Unauthorized") {
+		} else {
+			log.Printf("recreating helm agent for retrying ListReleases. Error: %v", err)
+
 			a.agent, err = helm.GetAgentOutOfClusterConfig(a.form, a.l)
 
 			if err != nil {
 				return nil, fmt.Errorf("error recreating helm agent for retrying ListReleases: %w", err)
 			}
-		} else {
-			return nil, err
 		}
 
 		time.Sleep(a.retryInterval)
@@ -76,14 +76,14 @@ func (a *RetryHelmAgent) GetReleaseHistory(
 
 		if err == nil {
 			return releases, nil
-		} else if strings.Contains(err.Error(), "Unauthorized") {
+		} else {
+			log.Printf("recreating helm agent for retrying GetReleaseHistory. Error: %v", err)
+
 			a.agent, err = helm.GetAgentOutOfClusterConfig(a.form, a.l)
 
 			if err != nil {
 				return nil, fmt.Errorf("error recreating helm agent for retrying GetReleaseHistory: %w", err)
 			}
-		} else {
-			return nil, err
 		}
 
 		time.Sleep(a.retryInterval)
@@ -101,14 +101,14 @@ func (a *RetryHelmAgent) DeleteReleaseRevision(
 
 		if err == nil {
 			return nil
-		} else if strings.Contains(err.Error(), "Unauthorized") {
+		} else {
+			log.Printf("recreating helm agent for retrying DeleteReleaseRevision. Error: %v", err)
+
 			a.agent, err = helm.GetAgentOutOfClusterConfig(a.form, a.l)
 
 			if err != nil {
 				return fmt.Errorf("error recreating helm agent for retrying DeleteReleaseRevision: %w", err)
 			}
-		} else {
-			return err
 		}
 
 		time.Sleep(a.retryInterval)