feat: Flux app detail

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.21 AS build-env
+FROM golang:1.20  AS build-env
 
 RUN echo $GOPATH
 RUN apt update

Wire.go

@@ -41,6 +41,7 @@ import (
 	"github.com/devtron-labs/devtron/api/deployment"
 	"github.com/devtron-labs/devtron/api/devtronResource"
 	"github.com/devtron-labs/devtron/api/externalLink"
+	fluxApplication "github.com/devtron-labs/devtron/api/fluxApplication"
 	client "github.com/devtron-labs/devtron/api/helm-app"
 	"github.com/devtron-labs/devtron/api/infraConfig"
 	"github.com/devtron-labs/devtron/api/k8s"
@@ -191,7 +192,7 @@ func InitializeApp() (*App, error) {
 		build.BuildWireSet,
 		deployment2.DeploymentWireSet,
 		argoApplication.ArgoApplicationWireSet,
-
+		fluxApplication.FluxApplicationWireSet,
 		eventProcessor.EventProcessorWireSet,
 		workflow3.WorkflowWireSet,
 

api/auth/user/UserAuthHandler.go

@@ -237,7 +237,7 @@ func (handler UserAuthHandlerImpl) AddDefaultPolicyAndRoles(w http.ResponseWrite
 
 }
 func (handler UserAuthHandlerImpl) AuthVerification(w http.ResponseWriter, r *http.Request) {
-	verified, _, err := handler.userAuthService.AuthVerification(r)
+	verified, err := handler.userAuthService.AuthVerification(r)
 	if err != nil {
 		handler.logger.Errorw("service err, AuthVerification", "err", err)
 		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
@@ -253,14 +253,13 @@ func (handler UserAuthHandlerImpl) AuthVerificationV2(w http.ResponseWriter, r *
 		isSuperAdmin = true
 	}
 	response := make(map[string]interface{})
-	verified, emailId, err := handler.userAuthService.AuthVerification(r)
+	verified, err := handler.userAuthService.AuthVerification(r)
 	if err != nil {
 		handler.logger.Errorw("service err, AuthVerification", "err", err)
 		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
 		return
 	}
 	response["isSuperAdmin"] = isSuperAdmin
 	response["isVerified"] = verified
-	response["emailId"] = emailId
 	common.WriteJsonResp(w, nil, response, http.StatusOK)
 }

api/fluxApplication/FluxApplicationRestHandler.go

@@ -0,0 +1,60 @@
+package fluxApplication
+
+import (
+	"context"
+	"errors"
+	"github.com/devtron-labs/devtron/api/restHandler/common"
+	"github.com/devtron-labs/devtron/pkg/auth/authorisation/casbin"
+	clientErrors "github.com/devtron-labs/devtron/pkg/errors"
+	"github.com/devtron-labs/devtron/pkg/fluxApplication"
+	"github.com/gorilla/mux"
+	"go.uber.org/zap"
+	"net/http"
+)
+
+type FluxApplicationRestHandler interface {
+	GetApplicationDetail(w http.ResponseWriter, r *http.Request)
+}
+
+type FluxApplicationRestHandlerImpl struct {
+	fluxApplicationService fluxApplication.FluxApplicationService
+	logger                 *zap.SugaredLogger
+	enforcer               casbin.Enforcer
+}
+
+func NewFluxApplicationRestHandlerImpl(fluxApplicationService fluxApplication.FluxApplicationService,
+	logger *zap.SugaredLogger, enforcer casbin.Enforcer) *FluxApplicationRestHandlerImpl {
+	return &FluxApplicationRestHandlerImpl{
+		fluxApplicationService: fluxApplicationService,
+		logger:                 logger,
+		enforcer:               enforcer,
+	}
+
+}
+func (handler *FluxApplicationRestHandlerImpl) GetApplicationDetail(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	clusterIdString := vars["appId"]
+	appIdentifier, err := handler.fluxApplicationService.DecodeFluxAppId(clusterIdString)
+	if err != nil {
+		common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
+		return
+	}
+
+	// handle super-admin RBAC
+	token := r.Header.Get("token")
+	if ok := handler.enforcer.Enforce(token, casbin.ResourceGlobal, casbin.ActionGet, "*"); !ok {
+		common.WriteJsonResp(w, errors.New("unauthorized"), nil, http.StatusForbidden)
+		return
+	}
+
+	res, err := handler.fluxApplicationService.GetFluxAppDetail(context.Background(), appIdentifier)
+	if err != nil {
+		apiError := clientErrors.ConvertToApiError(err)
+		if apiError != nil {
+			err = apiError
+		}
+		common.WriteJsonResp(w, err, nil, http.StatusInternalServerError)
+		return
+	}
+	common.WriteJsonResp(w, err, res, http.StatusOK)
+}

api/fluxApplication/FluxApplicationRouter.go

@@ -0,0 +1,24 @@
+package fluxApplication
+
+import (
+	"github.com/gorilla/mux"
+)
+
+type FluxApplicationRouter interface {
+	InitFluxApplicationRouter(fluxApplicationRouter *mux.Router)
+}
+
+type FluxApplicationRouterImpl struct {
+	fluxApplicationRestHandler FluxApplicationRestHandler
+}
+
+func NewFluxApplicationRouterImpl(fluxApplicationRestHandler FluxApplicationRestHandler) *FluxApplicationRouterImpl {
+	return &FluxApplicationRouterImpl{
+		fluxApplicationRestHandler: fluxApplicationRestHandler,
+	}
+}
+
+func (impl *FluxApplicationRouterImpl) InitFluxApplicationRouter(fluxApplicationRouter *mux.Router) {
+	fluxApplicationRouter.Path("/app").Queries("appId", "{appId}").
+		HandlerFunc(impl.fluxApplicationRestHandler.GetApplicationDetail).Methods("GET")
+}

api/fluxApplication/wire_fluxApplication.go

@@ -0,0 +1,17 @@
+package fluxApplication
+
+import (
+	"github.com/devtron-labs/devtron/pkg/fluxApplication"
+	"github.com/google/wire"
+)
+
+var FluxApplicationWireSet = wire.NewSet(
+	fluxApplication.NewFluxApplicationServiceImpl,
+	wire.Bind(new(fluxApplication.FluxApplicationService), new(*fluxApplication.FluxApplicationServiceImpl)),
+
+	NewFluxApplicationRestHandlerImpl,
+	wire.Bind(new(FluxApplicationRestHandler), new(*FluxApplicationRestHandlerImpl)),
+
+	NewFluxApplicationRouterImpl,
+	wire.Bind(new(FluxApplicationRouter), new(*FluxApplicationRouterImpl)),
+)

api/helm-app/gRPC/applicationClient.go

@@ -48,6 +48,7 @@ type HelmAppClient interface {
 	InstallReleaseWithCustomChart(ctx context.Context, in *HelmInstallCustomRequest) (*HelmInstallCustomResponse, error)
 	GetNotes(ctx context.Context, request *InstallReleaseRequest) (*ChartNotesResponse, error)
 	ValidateOCIRegistry(ctx context.Context, OCIRegistryRequest *RegistryCredential) (*OCIRegistryResponse, error)
+	GetExternalFluxAppDetail(ctx context.Context, in *FluxAppDetailRequest) (*FluxAppDetail, error)
 }
 
 type HelmAppClientImpl struct {
@@ -359,3 +360,14 @@ func (impl *HelmAppClientImpl) ValidateOCIRegistry(ctx context.Context, in *Regi
 	}
 	return response, nil
 }
+func (impl *HelmAppClientImpl) GetExternalFluxAppDetail(ctx context.Context, in *FluxAppDetailRequest) (*FluxAppDetail, error) {
+	applicationClient, err := impl.getApplicationClient()
+	if err != nil {
+		return nil, err
+	}
+	detail, err := applicationClient.GetFluxAppDetail(ctx, in)
+	if err != nil {
+		return nil, err
+	}
+	return detail, nil
+}