cherry pick app update operation

devtron-labs · Sep 27, 2024 · 71be38d · 71be38d
1 parent 7f2c7b8
commit 71be38d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pkg/app/AppCrudOperationService.go b/pkg/app/AppCrudOperationService.go
@@ -483,9 +483,9 @@ func (impl AppCrudOperationServiceImpl) getAppAndProjectForAppIdentifier(appIden
 		//find app by display name if not found by unique identifier
 		app, err = impl.appRepository.FindAppAndProjectByAppName(appIdentifier.ReleaseName)
 		if err == pg.ErrMultiRows {
-			validApp, err := impl.dbMigration.FixMultipleAppsForInstalledApp(appNameUniqueIdentifier)
+			validApp, err := impl.dbMigration.FixMultipleAppsForInstalledApp(appIdentifier.ReleaseName)
 			if err != nil {
-				impl.logger.Errorw("error in fixing multiple installed app entries", "appName", appNameUniqueIdentifier, "err", err)
+				impl.logger.Errorw("error in fixing multiple installed app entries", "appName", appIdentifier.ReleaseName, "err", err)
 				return app, err
 			}
 			return validApp, err

diff --git a/util/rbac/EnforcerUtilHelm.go b/util/rbac/EnforcerUtilHelm.go
@@ -142,7 +142,7 @@ func (impl EnforcerUtilHelmImpl) getAppObject(clusterId int, namespace string, a
 	appNameIdentifier := appIdentifier.GetUniqueAppNameIdentifier()
 	appObj, err := impl.appRepository.FindAppAndProjectByAppName(appNameIdentifier)
 	if err == pg.ErrMultiRows {
-		appObj, err = impl.dbMigration.FixMultipleAppsForInstalledApp(appName)
+		appObj, err = impl.dbMigration.FixMultipleAppsForInstalledApp(appNameIdentifier)
 	}
 	if appObj == nil || err == pg.ErrNoRows {
 		impl.logger.Warnw("appObj not found, going to find app using display name ", "appIdentifier", appNameIdentifier, "appName", appName)