Fix endpoint scheme detection for TLS origination to PD (#977)

pingcap · Aug 11, 2021 · c375b81 · c375b81
1 parent f6c5059
commit c375b81
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/cmd/tidb-dashboard/main.go b/cmd/tidb-dashboard/main.go
@@ -98,9 +98,6 @@ func NewCLIConfig() *DashboardCLIConfig {
 	}
 
 	cfg.CoreConfig.NormalizePublicPathPrefix()
-	if err := cfg.CoreConfig.NormalizePDEndPoint(); err != nil {
-		log.Fatal("Invalid PD Endpoint", zap.Error(err))
-	}
 
 	// setup TLS config for TiDB components
 	if len(*clusterCaPath) != 0 && len(*clusterCertPath) != 0 && len(*clusterKeyPath) != 0 {
@@ -113,6 +110,10 @@ func NewCLIConfig() *DashboardCLIConfig {
 		cfg.CoreConfig.TiDBTLSConfig = buildTLSConfig(tidbCaPath, tidbKeyPath, tidbCertPath)
 	}
 
+	if err := cfg.CoreConfig.NormalizePDEndPoint(); err != nil {
+		log.Fatal("Invalid PD Endpoint", zap.Error(err))
+	}
+
 	// keyvisual check
 	startTime := cfg.KVFileStartTime
 	endTime := cfg.KVFileEndTime