change from string to *ybversion.YBVersion

yugabyte · Dec 9, 2024 · e17b81d · e17b81d
1 parent ea6f6e5
commit e17b81d
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 20 deletions.
diff --git a/yb-voyager/cmd/analyzeSchema.go b/yb-voyager/cmd/analyzeSchema.go
@@ -1218,7 +1218,7 @@ func packAndSendAnalyzeSchemaPayload(status string) {
 	}
 
 	analyzePayload := callhome.AnalyzePhasePayload{
-		TargetDbVersion: schemaAnalysisReport.TargetDBVersion.String(),
+		TargetDbVersion: schemaAnalysisReport.TargetDBVersion,
 		Issues:          callhome.MarshalledJsonString(callhomeIssues),
 		DatabaseObjects: callhome.MarshalledJsonString(lo.Map(schemaAnalysisReport.SchemaSummary.DBObjects, func(dbObject utils.DBObject, _ int) utils.DBObject {
 			dbObject.ObjectNames = ""

diff --git a/yb-voyager/cmd/assessMigrationCommand.go b/yb-voyager/cmd/assessMigrationCommand.go
@@ -163,7 +163,7 @@ func packAndSendAssessMigrationPayload(status string, errMsg string) {
 	})
 
 	assessPayload := callhome.AssessMigrationPhasePayload{
-		TargetDbVersion:     assessmentReport.TargetDBVersion.String(),
+		TargetDbVersion:     assessmentReport.TargetDBVersion,
 		MigrationComplexity: assessmentReport.MigrationComplexity,
 		UnsupportedFeatures: callhome.MarshalledJsonString(lo.Map(assessmentReport.UnsupportedFeatures, func(feature UnsupportedFeature, _ int) callhome.UnsupportedFeature {
 			var objects []string
@@ -474,7 +474,7 @@ func createMigrationAssessmentCompletedEvent() *cp.MigrationAssessmentCompletedE
 	payload := AssessMigrationPayload{
 		PayloadVersion:      ASSESS_MIGRATION_PAYLOAD_VERSION,
 		VoyagerVersion:      assessmentReport.VoyagerVersion,
-		TargetDbVersion:     assessmentReport.TargetDBVersion.String(),
+		TargetDbVersion:     assessmentReport.TargetDBVersion,
 		MigrationComplexity: assessmentReport.MigrationComplexity,
 		SchemaSummary:       assessmentReport.SchemaSummary,
 		AssessmentIssues:    assessmentIssues,

diff --git a/yb-voyager/cmd/common.go b/yb-voyager/cmd/common.go
@@ -1224,7 +1224,7 @@ type AssessMigrationDBConfig struct {
 type AssessMigrationPayload struct {
 	PayloadVersion        string
 	VoyagerVersion        string
-	TargetDbVersion       string
+	TargetDbVersion       *ybversion.YBVersion
 	MigrationComplexity   string
 	SchemaSummary         utils.SchemaSummary
 	AssessmentIssues      []AssessmentIssuePayload

diff --git a/yb-voyager/src/callhome/diagnostics.go b/yb-voyager/src/callhome/diagnostics.go
@@ -30,6 +30,7 @@ import (
 	log "github.com/sirupsen/logrus"
 
 	"github.com/yugabyte/yb-voyager/yb-voyager/src/utils"
+	"github.com/yugabyte/yb-voyager/yb-voyager/src/ybversion"
 )
 
 // call-home json formats
@@ -103,19 +104,19 @@ type UnsupportedFeature struct {
 }
 
 type AssessMigrationPhasePayload struct {
-	TargetDbVersion            string `json:"target_db_version"`
-	MigrationComplexity        string `json:"migration_complexity"`
-	UnsupportedFeatures        string `json:"unsupported_features"`
-	UnsupportedDatatypes       string `json:"unsupported_datatypes"`
-	UnsupportedQueryConstructs string `json:"unsupported_query_constructs"`
-	MigrationCaveats           string `json:"migration_caveats"`
-	UnsupportedPlPgSqlObjects  string `json:"unsupported_plpgsql_objects"`
-	Error                      string `json:"error,omitempty"` // Removed it for now, TODO
-	TableSizingStats           string `json:"table_sizing_stats"`
-	IndexSizingStats           string `json:"index_sizing_stats"`
-	SchemaSummary              string `json:"schema_summary"`
-	SourceConnectivity         bool   `json:"source_connectivity"`
-	IopsInterval               int64  `json:"iops_interval"`
+	TargetDbVersion            *ybversion.YBVersion `json:"target_db_version"`
+	MigrationComplexity        string               `json:"migration_complexity"`
+	UnsupportedFeatures        string               `json:"unsupported_features"`
+	UnsupportedDatatypes       string               `json:"unsupported_datatypes"`
+	UnsupportedQueryConstructs string               `json:"unsupported_query_constructs"`
+	MigrationCaveats           string               `json:"migration_caveats"`
+	UnsupportedPlPgSqlObjects  string               `json:"unsupported_plpgsql_objects"`
+	Error                      string               `json:"error,omitempty"` // Removed it for now, TODO
+	TableSizingStats           string               `json:"table_sizing_stats"`
+	IndexSizingStats           string               `json:"index_sizing_stats"`
+	SchemaSummary              string               `json:"schema_summary"`
+	SourceConnectivity         bool                 `json:"source_connectivity"`
+	IopsInterval               int64                `json:"iops_interval"`
 }
 
 type AssessMigrationBulkPhasePayload struct {
@@ -140,9 +141,9 @@ type ExportSchemaPhasePayload struct {
 // SHOULD NOT REMOVE THESE TWO (issues, database_objects) FIELDS of AnalyzePhasePayload as parsing these specifically here
 // https://github.com/yugabyte/yugabyte-growth/blob/ad5df306c50c05136df77cd6548a1091ae577046/diagnostics_v2/main.py#L563
 type AnalyzePhasePayload struct {
-	TargetDbVersion string `json:"target_db_version"`
-	Issues          string `json:"issues"`
-	DatabaseObjects string `json:"database_objects"`
+	TargetDbVersion *ybversion.YBVersion `json:"target_db_version"`
+	Issues          string               `json:"issues"`
+	DatabaseObjects string               `json:"database_objects"`
 }
 type ExportDataPhasePayload struct {
 	ParallelJobs            int64  `json:"parallel_jobs"`