helm revision number (#4534)

Author: d-g-town

api/server/handlers/porter_app/create.go

@@ -7,11 +7,10 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
+	"strconv"
 	"strings"
 	"time"
 
-	"github.com/porter-dev/api-contracts/generated/go/porter/v1/porterv1connect"
-
 	"connectrpc.com/connect"
 
 	porterv1 "github.com/porter-dev/api-contracts/generated/go/porter/v1"
@@ -119,10 +118,21 @@ func (c *CreatePorterAppHandler) ServeHTTP(w http.ResponseWriter, r *http.Reques
 			return
 		}
 
+		namespace := fmt.Sprintf("app-%s", appName)
+		telemetry.WithAttributes(span, telemetry.AttributeKV{Key: "application-name", Value: appName})
+
+		k8sAgent, err := c.GetAgent(r, cluster, namespace)
+		if err != nil {
+			err = telemetry.Error(ctx, span, err, "error getting k8s agent")
+			c.HandleAPIError(w, r, apierrors.NewErrPassThroughToClient(err, http.StatusInternalServerError))
+			return
+		}
+
 		revisionNumber, err := pollForRevisionNumber(ctx, pollForRevisionNumberInput{
 			ProjectID:  project.ID,
 			RevisionID: appImageResp.Msg.RevisionId,
-			CCPClient:  c.Config().ClusterControlPlaneClient,
+			Namespace:  namespace,
+			K8sAgent:   k8sAgent,
 		})
 		if err != nil {
 			err := telemetry.Error(ctx, span, err, "error polling for revision number")
@@ -583,7 +593,8 @@ func (c *CreatePorterAppHandler) ServeHTTP(w http.ResponseWriter, r *http.Reques
 type pollForRevisionNumberInput struct {
 	ProjectID  uint
 	RevisionID string
-	CCPClient  porterv1connect.ClusterControlPlaneServiceClient
+	Namespace  string
+	K8sAgent   *kubernetes.Agent
 }
 
 func pollForRevisionNumber(ctx context.Context, input pollForRevisionNumberInput) (int, error) {
@@ -597,20 +608,28 @@ func pollForRevisionNumber(ctx context.Context, input pollForRevisionNumberInput
 			return 0, telemetry.Error(ctx, span, nil, "timed out waiting for revision number")
 		}
 
-		appRevisionResp, err := input.CCPClient.GetAppRevision(ctx, connect.NewRequest(&porterv1.GetAppRevisionRequest{
-			ProjectId:     int64(input.ProjectID),
-			AppRevisionId: input.RevisionID,
-		}))
+		deploymentList, err := input.K8sAgent.GetDeploymentsBySelector(ctx, input.Namespace, fmt.Sprintf("porter.run/app-revision-id=%s", input.RevisionID))
 		if err != nil {
 			return 0, telemetry.Error(ctx, span, err, "error getting app revision")
 		}
 
-		if appRevisionResp == nil || appRevisionResp.Msg == nil || appRevisionResp.Msg.AppRevision == nil {
-			return 0, telemetry.Error(ctx, span, err, "app revision resp is nil")
+		if deploymentList == nil {
+			return 0, telemetry.Error(ctx, span, nil, "deployment list is nil")
 		}
 
-		if appRevisionResp.Msg.AppRevision.RevisionNumber != 0 {
-			return int(appRevisionResp.Msg.AppRevision.RevisionNumber), nil
+		if len(deploymentList.Items) > 0 {
+			firstDeployment := deploymentList.Items[0]
+
+			if len(firstDeployment.Spec.Template.Annotations) > 0 && firstDeployment.Spec.Template.Annotations["helm.sh/revision"] != "" {
+				helmRevisionNumberString := firstDeployment.Spec.Template.Annotations["helm.sh/revision"]
+				helmRevisionNumber, err := strconv.Atoi(helmRevisionNumberString)
+				if err != nil {
+					err = telemetry.Error(ctx, span, err, "error converting helm revision number to int")
+					return 0, err
+				}
+
+				return helmRevisionNumber, nil
+			}
 		}
 
 		time.Sleep(2 * time.Second)

api/server/handlers/porter_app/get.go

@@ -1,6 +1,7 @@
 package porter_app
 
 import (
+	"fmt"
 	"net/http"
 
 	"github.com/porter-dev/porter/api/server/authz"
@@ -10,7 +11,6 @@ import (
 	"github.com/porter-dev/porter/api/server/shared/config"
 	"github.com/porter-dev/porter/api/server/shared/requestutils"
 	"github.com/porter-dev/porter/api/types"
-	utils "github.com/porter-dev/porter/api/utils/porter_app"
 	"github.com/porter-dev/porter/internal/models"
 	"github.com/porter-dev/porter/internal/telemetry"
 )
@@ -30,13 +30,15 @@ func NewGetPorterAppHandler(
 	}
 }
 
+// ServeHTTP handles the get porter app API endpoint
+//
+// NOTE: This endpoint is still in use as of 2024-04-15.
 func (c *GetPorterAppHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
 	ctx, span := telemetry.NewSpan(ctx, "serve-get-porter-app")
 	defer span.End()
 
 	cluster, _ := ctx.Value(types.ClusterScope).(*models.Cluster)
-	project, _ := ctx.Value(types.ProjectScope).(*models.Project)
 
 	appName, reqErr := requestutils.GetURLParamString(r, types.URLParamPorterAppName)
 	if reqErr != nil {
@@ -58,14 +60,7 @@ func (c *GetPorterAppHandler) ServeHTTP(w http.ResponseWriter, r *http.Request)
 		return
 	}
 
-	// this is a temporary fix until we figure out how to reconcile the new revisions table
-	// with dependencies on helm releases throuhg the api
-	if project.GetFeatureFlag(models.ValidateApplyV2, c.Config().LaunchDarklyClient) {
-		c.WriteResult(w, r, app.ToPorterAppType())
-		return
-	}
-
-	namespace := utils.NamespaceFromPorterAppName(appName)
+	namespace := fmt.Sprintf("app-%s", app.Name)
 	helmAgent, err := c.GetHelmAgent(ctx, r, cluster, namespace)
 	if err != nil {
 		err = telemetry.Error(ctx, span, err, "error getting helm agent")