fix

pingcap · Aug 9, 2023 · cbda852 · cbda852
1 parent b0bb466
commit cbda852
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 37 deletions.
diff --git a/components/dm/spec/topology_dm.go b/components/dm/spec/topology_dm.go
@@ -205,11 +205,10 @@ func (s *MasterSpec) GetAdvertisePeerURL(enableTLS bool) string {
 
 // GetSource returns source to download the component
 func (s *MasterSpec) GetSource() string {
-	if s.Source != "" {
-		return s.Source
-	} else {
+	if s.Source == "" {
 		return ComponentDMMaster
 	}
+	return s.Source
 }
 
 // WorkerSpec represents the Master topology specification in topology.yaml
@@ -285,11 +284,10 @@ func (s *WorkerSpec) IgnoreMonitorAgent() bool {
 
 // GetSource returns source to download the component
 func (s *WorkerSpec) GetSource() string {
-	if s.Source != "" {
-		return s.Source
-	} else {
+	if s.Source == "" {
 		return ComponentDMWorker
 	}
+	return s.Source
 }
 
 // UnmarshalYAML sets default values when unmarshaling the topology file

diff --git a/pkg/cluster/spec/cdc.go b/pkg/cluster/spec/cdc.go
@@ -94,11 +94,10 @@ func (s *CDCSpec) IgnoreMonitorAgent() bool {
 
 // GetSource returns source to download the component
 func (s *CDCSpec) GetSource() string {
-	if s.Source != "" {
-		return s.Source
-	} else {
+	if s.Source == "" {
 		return ComponentCDC
 	}
+	return s.Source
 }
 
 // CDCComponent represents CDC component.

diff --git a/pkg/cluster/spec/dashboard.go b/pkg/cluster/spec/dashboard.go
@@ -97,11 +97,10 @@ func (s *DashboardSpec) IgnoreMonitorAgent() bool {
 
 // GetSource returns source to download the component
 func (s *DashboardSpec) GetSource() string {
-	if s.Source != "" {
-		return s.Source
-	} else {
+	if s.Source == "" {
 		return ComponentDashboard
 	}
+	return s.Source
 }
 
 // DashboardComponent represents Drainer component.

diff --git a/pkg/cluster/spec/drainer.go b/pkg/cluster/spec/drainer.go
@@ -115,11 +115,10 @@ func (s *DrainerSpec) IgnoreMonitorAgent() bool {
 
 // GetSource returns source to download the component
 func (s *DrainerSpec) GetSource() string {
-	if s.Source != "" {
-		return s.Source
-	} else {
+	if s.Source == "" {
 		return ComponentDrainer
 	}
+	return s.Source
 }
 
 // DrainerComponent represents Drainer component.

diff --git a/pkg/cluster/spec/instance.go b/pkg/cluster/spec/instance.go
@@ -306,11 +306,10 @@ func (i *BaseInstance) ComponentName() string {
 
 // ComponentSource implements Instance interface
 func (i *BaseInstance) ComponentSource() string {
-	if i.Source != "" {
-		return i.Source
-	} else {
+	if i.Source == "" {
 		return i.Name
 	}
+	return i.Source
 }
 
 // InstanceName implements Instance interface

diff --git a/pkg/cluster/spec/pd.go b/pkg/cluster/spec/pd.go
@@ -140,11 +140,10 @@ func (s *PDSpec) GetAdvertisePeerURL(enableTLS bool) string {
 
 // GetSource returns source to download the component
 func (s *PDSpec) GetSource() string {
-	if s.Source != "" {
-		return s.Source
-	} else {
+	if s.Source == "" {
 		return ComponentPD
 	}
+	return s.Source
 }
 
 // PDComponent represents PD component.

diff --git a/pkg/cluster/spec/pump.go b/pkg/cluster/spec/pump.go
@@ -114,11 +114,10 @@ func (s *PumpSpec) IgnoreMonitorAgent() bool {
 
 // GetSource returns source to download the component
 func (s *PumpSpec) GetSource() string {
-	if s.Source != "" {
-		return s.Source
-	} else {
-		return ComponentCDC
+	if s.Source == "" {
+		return ComponentPump
 	}
+	return s.Source
 }
 
 // PumpComponent represents Pump component.

diff --git a/pkg/cluster/spec/tidb.go b/pkg/cluster/spec/tidb.go
@@ -91,11 +91,10 @@ func (s *TiDBSpec) IgnoreMonitorAgent() bool {
 
 // GetSource returns source to download the component
 func (s *TiDBSpec) GetSource() string {
-	if s.Source != "" {
-		return s.Source
-	} else {
+	if s.Source == "" {
 		return ComponentTiDB
 	}
+	return s.Source
 }
 
 // TiDBComponent represents TiDB component.

diff --git a/pkg/cluster/spec/tiflash.go b/pkg/cluster/spec/tiflash.go
@@ -164,11 +164,10 @@ func (s *TiFlashSpec) IgnoreMonitorAgent() bool {
 
 // GetSource returns source to download the component
 func (s *TiFlashSpec) GetSource() string {
-	if s.Source != "" {
-		return s.Source
-	} else {
+	if s.Source == "" {
 		return ComponentTiFlash
 	}
+	return s.Source
 }
 
 // key names for storage config

diff --git a/pkg/cluster/spec/tikv.go b/pkg/cluster/spec/tikv.go
@@ -166,11 +166,10 @@ func (s *TiKVSpec) Labels() (map[string]string, error) {
 
 // GetSource returns source to download the component
 func (s *TiKVSpec) GetSource() string {
-	if s.Source != "" {
-		return s.Source
-	} else {
+	if s.Source == "" {
 		return ComponentTiKV
 	}
+	return s.Source
 }
 
 // TiKVComponent represents TiKV component.

diff --git a/pkg/cluster/spec/tikv_cdc.go b/pkg/cluster/spec/tikv_cdc.go
@@ -107,11 +107,10 @@ func (c *TiKVCDCComponent) Role() string {
 
 // GetSource returns source to download the component
 func (s *TiKVCDCSpec) GetSource() string {
-	if s.Source != "" {
-		return s.Source
-	} else {
+	if s.Source == "" {
 		return ComponentTiKVCDC
 	}
+	return s.Source
 }
 
 // Instances implements Component interface.