From e44dc10d9df17d3aef16467a9451a0a358b1a7ab Mon Sep 17 00:00:00 2001
From: Sanyam Singhal <ssinghal@yugabyte.com>
Date: Fri, 17 Jan 2025 16:09:18 +0530
Subject: [PATCH 1/2] [DB-14827] Bug Fix: Migration Complexity Explanation
 empty in case of Oracle (#2171)

- updated html template to check for empty value before adding Migration Complexity Explanation heading.
---
 yb-voyager/cmd/assessMigrationCommand.go                      | 2 +-
 yb-voyager/cmd/templates/migration_assessment_report.template | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/yb-voyager/cmd/assessMigrationCommand.go b/yb-voyager/cmd/assessMigrationCommand.go
index 905bac4fd4..556ddb577b 100644
--- a/yb-voyager/cmd/assessMigrationCommand.go
+++ b/yb-voyager/cmd/assessMigrationCommand.go
@@ -1607,7 +1607,7 @@ func generateAssessmentReportJson(reportDir string) error {
 	if err != nil {
 		return fmt.Errorf("unable to build migration complexity explanation for json report: %w", err)
 	}
-	log.Info(assessmentReport.MigrationComplexityExplanation)
+	log.Infof("migration complexity explanation: %q", assessmentReport.MigrationComplexityExplanation)
 
 	strReport, err := json.MarshalIndent(assessmentReport, "", "\t")
 	if err != nil {
diff --git a/yb-voyager/cmd/templates/migration_assessment_report.template b/yb-voyager/cmd/templates/migration_assessment_report.template
index 9f4f4a97a2..894ba5121e 100644
--- a/yb-voyager/cmd/templates/migration_assessment_report.template
+++ b/yb-voyager/cmd/templates/migration_assessment_report.template
@@ -272,7 +272,7 @@
             {{ end }}
         {{end}}
 
-        {{if ne .MigrationComplexity "NOT AVAILABLE"}}
+        {{if and (ne .MigrationComplexity "NOT AVAILABLE") (ne (len .MigrationComplexityExplanation) 0)}}
             <h2>Migration Complexity Explanation</h2>
             <p>{{ .MigrationComplexityExplanation }}</p>
         {{end}}

From db06a1db1fa82811df03158510bc0fe026a805e9 Mon Sep 17 00:00:00 2001
From: Priyanshi Gupta <pgupta@yugabyte.com>
Date: Mon, 20 Jan 2025 12:39:39 +0530
Subject: [PATCH 2/2] Add 2.25 YB version to supported preview versions list
 (#2207)

---
 yb-voyager/src/ybversion/constants.go  | 1 +
 yb-voyager/src/ybversion/yb_version.go | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/yb-voyager/src/ybversion/constants.go b/yb-voyager/src/ybversion/constants.go
index 94bbfffa94..afa2c125f8 100644
--- a/yb-voyager/src/ybversion/constants.go
+++ b/yb-voyager/src/ybversion/constants.go
@@ -23,6 +23,7 @@ const (
 	SERIES_2024_2 = "2024.2"
 	SERIES_2_21   = "2.21"
 	SERIES_2_23   = "2.23"
+	SERIES_2_25   = "2.25"
 )
 
 var LatestStable *YBVersion
diff --git a/yb-voyager/src/ybversion/yb_version.go b/yb-voyager/src/ybversion/yb_version.go
index fad15e0863..087de2d730 100644
--- a/yb-voyager/src/ybversion/yb_version.go
+++ b/yb-voyager/src/ybversion/yb_version.go
@@ -29,7 +29,7 @@ import (
 // Reference - https://docs.yugabyte.com/preview/releases/ybdb-releases/
 var supportedYBVersionStableSeriesOld = []string{SERIES_2_14, SERIES_2_18, SERIES_2_20}
 var supportedYBVersionStableSeries = []string{SERIES_2024_1, SERIES_2024_2}
-var supportedYBVersionPreviewSeries = []string{SERIES_2_21, SERIES_2_23}
+var supportedYBVersionPreviewSeries = []string{SERIES_2_21, SERIES_2_23, SERIES_2_25}
 
 var allSupportedYBVersionSeries = lo.Flatten([][]string{supportedYBVersionStableSeries, supportedYBVersionPreviewSeries, supportedYBVersionStableSeriesOld})
 var ErrUnsupportedSeries = fmt.Errorf("unsupported YB version series. Supported YB version series = %v", allSupportedYBVersionSeries)