main sync

Author: Shivam-nagar23

CHANGELOG/release-notes-v1.4.0.md

@@ -0,0 +1,20 @@
+## v1.4.0
+
+## Enhancements
+- feat: Made ng labels env driven (#6438)
+- feat: Link helm release (#6454)
+- feat: access manager (#6377)
+- feat: migrate external argo cd application (#6303)
+- feat: Dark Mode v1 (#2348)
+- feat: Dark Mode v2 (#2367)
+- feat: Dark Mode v3 (#2484)
+## Bugs
+- fix: cluster update issue (#6465)
+- fix: in CreateGrafanaDataSource (#6463)
+- fix: onboard acd app (#6457)
+- fix: prom client in chart-sync (#6442)
+- fix: incorrect gitops metrics (#6444)
+- fix: envId check in EventBuilder.go (#6436)
+- fix: createDockerRepoIfNeeded error handling (#6433)
+
+

api/bean/ConfigMapAndSecret.go

@@ -80,6 +80,9 @@ func GetTransformedDataForSecretRootJsonData(data string, mode util.SecretTransf
 	}
 
 	for _, configData := range secretsJson.ConfigSecretJson.Secrets {
+		if configData.Data == nil || configData.External {
+			continue
+		}
 		configData.Data, err = util.GetDecodedAndEncodedData(configData.Data, mode)
 		if err != nil {
 			return "", err

api/helm-app/HelmAppRestHandler.go

@@ -62,6 +62,7 @@ type HelmAppRestHandler interface {
 	UpdateApplication(w http.ResponseWriter, r *http.Request)
 	TemplateChart(w http.ResponseWriter, r *http.Request)
 	SaveHelmAppDetailsViewedTelemetryData(w http.ResponseWriter, r *http.Request)
+	ListHelmApplicationsForEnvironment(w http.ResponseWriter, r *http.Request)
 }
 
 const HELM_APP_ACCESS_COUNTER = "HelmAppAccessCounter"
@@ -588,3 +589,46 @@ func (handler *HelmAppRestHandlerImpl) SaveHelmAppDetailsViewedTelemetryData(w h
 	common.WriteJsonResp(w, err, nil, http.StatusOK)
 
 }
+
+func (handler *HelmAppRestHandlerImpl) ListHelmApplicationsForEnvironment(w http.ResponseWriter, r *http.Request) {
+
+	query := r.URL.Query()
+
+	clusterIdString := query.Get("clusterId")
+	var (
+		clusterId int
+		envId     int
+		err       error
+	)
+
+	if len(clusterIdString) != 0 {
+		clusterId, err = strconv.Atoi(clusterIdString)
+		if err != nil {
+			common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
+			return
+		}
+	}
+
+	envIdString := query.Get("envId")
+	if len(envIdString) != 0 {
+		envId, err = strconv.Atoi(envIdString)
+		if err != nil {
+			common.WriteJsonResp(w, err, nil, http.StatusBadRequest)
+			return
+		}
+	}
+
+	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
+	}
+	releaseList, err := handler.helmAppService.ListHelmApplicationsForClusterOrEnv(r.Context(), clusterId, envId)
+	if err != nil {
+		handler.logger.Errorw("error in fetching helm release for given env", "err", err)
+		common.WriteJsonResp(w, err, "error in fetching helm release", http.StatusInternalServerError)
+		return
+	}
+	common.WriteJsonResp(w, nil, releaseList, http.StatusOK)
+	return
+}

api/helm-app/HelmAppRouter.go

@@ -45,6 +45,10 @@ func (impl *HelmAppRouterImpl) InitAppListRouter(helmRouter *mux.Router) {
 	helmRouter.Path("/hibernate").Queries("appType", "{appType}").HandlerFunc(impl.helmAppRestHandler.Hibernate).Methods("POST")
 	helmRouter.Path("/unhibernate").Queries("appType", "{appType}").HandlerFunc(impl.helmAppRestHandler.UnHibernate).Methods("POST")
 
+	helmRouter.Path("/external-helm-release").
+		HandlerFunc(impl.helmAppRestHandler.ListHelmApplicationsForEnvironment).
+		Methods("GET")
+
 	// GetReleaseInfo used only for external apps
 	helmRouter.Path("/release-info").Queries("appId", "{appId}").
 		HandlerFunc(impl.helmAppRestHandler.GetReleaseInfo).Methods("GET")

api/helm-app/bean/bean.go

@@ -26,6 +26,7 @@ const (
 	SOURCE_DEVTRON_APP       SourceAppType = "devtron-app"
 	SOURCE_HELM_APP          SourceAppType = "helm-app"
 	SOURCE_EXTERNAL_HELM_APP SourceAppType = "external-helm-app"
+	SOURCE_LINKED_HELM_APP   SourceAppType = "linked-helm-app"
 	SOURCE_UNKNOWN           SourceAppType = "unknown"
 	ErrReleaseNotFound       string        = "release: not found"
 )

api/helm-app/gRPC/applicationClient.go

@@ -52,6 +52,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)
+	GetReleaseDetails(ctx context.Context, in *ReleaseIdentifier) (*DeployedAppDetail, error)
 	GetExternalFluxAppDetail(ctx context.Context, in *FluxAppDetailRequest) (*FluxAppDetail, error)
 }
 
@@ -395,6 +396,19 @@ func (impl *HelmAppClientImpl) ListFluxApplication(ctx context.Context, req *App
 	}
 	return stream, nil
 }
+
+func (impl *HelmAppClientImpl) GetReleaseDetails(ctx context.Context, in *ReleaseIdentifier) (*DeployedAppDetail, error) {
+	applicationClient, err := impl.getApplicationClient()
+	if err != nil {
+		return nil, err
+	}
+	response, err := applicationClient.GetReleaseDetails(ctx, in)
+	if err != nil {
+		return nil, err
+	}
+	return response, nil
+}
+
 func (impl *HelmAppClientImpl) GetExternalFluxAppDetail(ctx context.Context, in *FluxAppDetailRequest) (*FluxAppDetail, error) {
 	applicationClient, err := impl.getApplicationClient()
 	if err != nil {