feat(xinfra): include cluster and mysql version in register payload
This commit is contained in:
@@ -2385,18 +2385,20 @@ type cloudDMRegisterRequest struct {
|
||||
}
|
||||
|
||||
type cloudDMDataSource struct {
|
||||
InstanceName string `json:"instanceName"`
|
||||
InstanceDesc string `json:"instanceDesc"`
|
||||
DSType string `json:"dsType"`
|
||||
Host string `json:"host"`
|
||||
SecurityType string `json:"securityType"`
|
||||
UserName string `json:"userName"`
|
||||
Password string `json:"password"`
|
||||
DefaultSchema any `json:"defaultSchema"`
|
||||
ClientTimeZone string `json:"clientTimeZone"`
|
||||
ConnectTimeoutMs int `json:"connectTimeoutMs"`
|
||||
SocketTimeoutSecs int `json:"socketTimeoutSeconds"`
|
||||
ConnectionCharset string `json:"connectionCharset"`
|
||||
InstanceName string `json:"instanceName"`
|
||||
InstanceDesc string `json:"instanceDesc"`
|
||||
DSType string `json:"dsType"`
|
||||
Host string `json:"host"`
|
||||
ClusterID *uint64 `json:"cluster_id"`
|
||||
MySQLVersion string `json:"mysql_version"`
|
||||
SecurityType string `json:"securityType"`
|
||||
UserName string `json:"userName"`
|
||||
Password string `json:"password"`
|
||||
DefaultSchema any `json:"defaultSchema"`
|
||||
ClientTimeZone string `json:"clientTimeZone"`
|
||||
ConnectTimeoutMs int `json:"connectTimeoutMs"`
|
||||
SocketTimeoutSecs int `json:"socketTimeoutSeconds"`
|
||||
ConnectionCharset string `json:"connectionCharset"`
|
||||
}
|
||||
|
||||
func cloudDMExternalResourceID(instanceID uint64) string {
|
||||
@@ -2466,6 +2468,13 @@ func buildCloudDMRegisterRequest(instance model.DeploymentResult, payload delive
|
||||
if description == "" {
|
||||
description = instance.InstanceName
|
||||
}
|
||||
mysqlVersion := strings.TrimSpace(instance.Version)
|
||||
if mysqlVersion == "" {
|
||||
mysqlVersion = strings.TrimSpace(payload.MySQLVersion)
|
||||
}
|
||||
if mysqlVersion == "" {
|
||||
mysqlVersion = "8.0"
|
||||
}
|
||||
return cloudDMRegisterRequest{
|
||||
SourceSystem: "xinfra",
|
||||
ResourceType: "MYSQL_INSTANCE",
|
||||
@@ -2475,6 +2484,8 @@ func buildCloudDMRegisterRequest(instance model.DeploymentResult, payload delive
|
||||
InstanceDesc: description,
|
||||
DSType: "MySQL",
|
||||
Host: net.JoinHostPort(instance.Host, strconv.Itoa(instance.Port)),
|
||||
ClusterID: nil,
|
||||
MySQLVersion: mysqlVersion,
|
||||
SecurityType: "USER_PASSWD",
|
||||
UserName: "root",
|
||||
Password: password,
|
||||
|
||||
Reference in New Issue
Block a user