fix: added missing clusterConfig in releaseIdentifier request (#4359)

* added missing clusterConfig in releaseIdentifier request * remove duplicate logic
devtron-labs · Dec 6, 2023 · b886994 · b886994
1 parent 3dd2630
commit b886994
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/api/helm-app/HelmAppService.go b/api/helm-app/HelmAppService.go
@@ -846,16 +846,7 @@ func (impl *HelmAppServiceImpl) TemplateChart(ctx context.Context, templateChart
 	return response, nil
 }
 func (impl *HelmAppServiceImpl) GetNotes(ctx context.Context, request *InstallReleaseRequest) (string, error) {
-	clusterId := int(request.ReleaseIdentifier.ClusterConfig.ClusterId)
-	config, err := impl.GetClusterConf(clusterId)
 	var notesTxt string
-	if err != nil {
-		impl.logger.Errorw("error in fetching cluster detail", "clusterId", clusterId, "err", err)
-		return notesTxt, err
-	}
-
-	request.ReleaseIdentifier.ClusterConfig = config
-
 	response, err := impl.helmAppClient.GetNotes(ctx, request)
 	if err != nil {
 		impl.logger.Errorw("error in fetching chart", "err", err)

diff --git a/pkg/appStore/deployment/service/InstalledAppService.go b/pkg/appStore/deployment/service/InstalledAppService.go
@@ -965,6 +965,14 @@ func (impl *InstalledAppServiceImpl) FindNotesForArgoApplication(installedAppId,
 			},
 		}
 
+		clusterId := installedAppVerison.InstalledApp.Environment.ClusterId
+		config, err := impl.helmAppService.GetClusterConf(clusterId)
+		if err != nil {
+			impl.logger.Errorw("error in fetching cluster detail", "clusterId", clusterId, "err", err)
+			return "", appName, err
+		}
+		installReleaseRequest.ReleaseIdentifier.ClusterConfig = config
+
 		notes, err = impl.helmAppService.GetNotes(context.Background(), installReleaseRequest)
 		if err != nil {
 			impl.logger.Errorw("error in fetching notes", "err", err)