|
|
@@ -10,6 +10,7 @@ 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"
|
|
|
)
|
|
|
@@ -25,6 +26,7 @@ func NewGetPorterAppHandler(
|
|
|
) *GetPorterAppHandler {
|
|
|
return &GetPorterAppHandler{
|
|
|
PorterHandlerReadWriter: handlers.NewDefaultPorterHandler(config, nil, writer),
|
|
|
+ KubernetesAgentGetter: authz.NewOutOfClusterAgentGetter(config),
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -36,15 +38,37 @@ func (c *GetPorterAppHandler) ServeHTTP(w http.ResponseWriter, r *http.Request)
|
|
|
cluster, _ := ctx.Value(types.ClusterScope).(*models.Cluster)
|
|
|
appName, reqErr := requestutils.GetURLParamString(r, types.URLParamPorterAppName)
|
|
|
if reqErr != nil {
|
|
|
- c.HandleAPIError(w, r, apierrors.NewErrPassThroughToClient(reqErr, http.StatusBadRequest))
|
|
|
+ err := telemetry.Error(ctx, span, nil, "error parsing porter app name")
|
|
|
+ c.HandleAPIError(w, r, apierrors.NewErrPassThroughToClient(err, http.StatusBadRequest))
|
|
|
return
|
|
|
}
|
|
|
+ telemetry.WithAttributes(span, telemetry.AttributeKV{Key: "application-name", Value: appName})
|
|
|
|
|
|
app, err := c.Repo().PorterApp().ReadPorterAppByName(cluster.ID, appName)
|
|
|
if err != nil {
|
|
|
- c.HandleAPIError(w, r, apierrors.NewErrInternal(err))
|
|
|
+ err = telemetry.Error(ctx, span, err, "error reading porter app by name")
|
|
|
+ c.HandleAPIError(w, r, apierrors.NewErrPassThroughToClient(err, http.StatusInternalServerError))
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if app == nil || app.ID == 0 {
|
|
|
+ err = telemetry.Error(ctx, span, nil, "app with name does not exist in project")
|
|
|
+ c.HandleAPIError(w, r, apierrors.NewErrPassThroughToClient(err, http.StatusBadRequest))
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ namespace := utils.NamespaceFromPorterAppName(appName)
|
|
|
+ helmAgent, err := c.GetHelmAgent(ctx, r, cluster, namespace)
|
|
|
+ if err != nil {
|
|
|
+ err = telemetry.Error(ctx, span, err, "error getting helm agent")
|
|
|
+ c.HandleAPIError(w, r, apierrors.NewErrPassThroughToClient(err, http.StatusInternalServerError))
|
|
|
+ return
|
|
|
+ }
|
|
|
+ helmRelease, err := helmAgent.GetRelease(ctx, appName, 0, false)
|
|
|
+ if err != nil {
|
|
|
+ err = telemetry.Error(ctx, span, err, "error getting helm release for app")
|
|
|
+ c.HandleAPIError(w, r, apierrors.NewErrPassThroughToClient(err, http.StatusInternalServerError))
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- c.WriteResult(w, r, app.ToPorterAppType())
|
|
|
+ c.WriteResult(w, r, app.ToPorterAppTypeWithRevision(helmRelease.Version))
|
|
|
}
|