Removing port and schema override as these can be set from Aurora itself.

zk.go

@@ -36,13 +36,11 @@ type ServiceInstance struct {
 }
 
 type zkConfig struct {
-	endpoints            []string
-	path                 string
-	backoff              Backoff
-	timeout              time.Duration
-	logger               Logger
-	auroraSchemeOverride *string
-	auroraPortOverride   *int
+	endpoints []string
+	path      string
+	backoff   Backoff
+	timeout   time.Duration
+	logger    Logger
 }
 
 type ZKOpt func(z *zkConfig)
@@ -77,18 +75,6 @@ func ZKLogger(l Logger) ZKOpt {
 	}
 }
 
-func ZKAuroraSchemeOverride(scheme string) ZKOpt {
-	return func(z *zkConfig) {
-		z.auroraSchemeOverride = &scheme
-	}
-}
-
-func ZKAuroraPortOverride(port int) ZKOpt {
-	return func(z *zkConfig) {
-		z.auroraPortOverride = &port
-	}
-}
-
 // Retrieves current Aurora leader from ZK.
 func LeaderFromZK(cluster Cluster) (string, error) {
 	return LeaderFromZKOpts(ZKEndpoints(strings.Split(cluster.ZK, ",")...), ZKPath(cluster.SchedZKPath))
@@ -165,20 +151,9 @@ func LeaderFromZKOpts(options ...ZKOpt) (string, error) {
 
 				var scheme, host, port string
 				for k, v := range serviceInst.AdditionalEndpoints {
-
-					if config.auroraSchemeOverride == nil {
-						scheme = k
-					} else {
-						scheme = *config.auroraSchemeOverride
-					}
-
+					scheme = k
 					host = v.Host
-
-					if config.auroraPortOverride == nil {
-						port = strconv.Itoa(v.Port)
-					} else {
-						port = strconv.Itoa(*config.auroraPortOverride)
-					}
+					port = strconv.Itoa(v.Port)
 				}
 
 				leaderURL = scheme + "://" + host + ":" + port