fix(cd-service): make sure environment applications list gets updated…

… during custom migrations (#2003) Ref: SRX-GJNPF1
freiheit-com · Oct 2, 2024 · 2d7a508 · 2d7a508
1 parent 0ddd272
commit 2d7a508
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/pkg/db/db.go b/pkg/db/db.go
@@ -1635,10 +1635,6 @@ func (h *DBHandler) RunCustomMigrations(
 	if err != nil {
 		return err // better wrap the error in a descriptive message?
 	}
-	err = h.RunCustomMigrationEnvironmentApplications(ctx)
-	if err != nil {
-		return err
-	}
 	return nil
 }
 

diff --git a/services/cd-service/pkg/cmd/server.go b/services/cd-service/pkg/cmd/server.go
@@ -378,6 +378,11 @@ func RunServer() {
 				logger.FromContext(ctx).Fatal("Error running custom database migrations", zap.Error(err))
 			}
 			logger.FromContext(ctx).Sugar().Warnf("Skipping custom migrations, because all tables contain data.")
+			err = dbHandler.RunCustomMigrationEnvironmentApplications(ctx)
+			if err != nil {
+				return err
+			}
+			logger.FromContext(ctx).Sugar().Warnf("Applied custom migrations for environment applications")
 		} else {
 			logger.FromContext(ctx).Sugar().Warnf("Skipping custom migrations, because KUBERPULT_DB_WRITE_ESL_TABLE_ONLY=false")
 		}