From 5c675f76607f958830e8546840c580c09d93fbcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Harun=20K=C3=BC=C3=A7=C3=BCk?= <harun.kucuk@messagebird.com>
Date: Wed, 25 Aug 2021 12:55:20 +0300
Subject: [PATCH 1/3] makes DiscoveryIgnoreHostnameFilters alias aware

---
 go/logic/orchestrator.go | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/go/logic/orchestrator.go b/go/logic/orchestrator.go
index f3c1fc407..2b25695b4 100644
--- a/go/logic/orchestrator.go
+++ b/go/logic/orchestrator.go
@@ -18,6 +18,7 @@ package logic
 
 import (
 	"fmt"
+	orcraft "github.com/openark/orchestrator/go/raft"
 	"math/rand"
 	"os"
 	"os/signal"
@@ -274,6 +275,23 @@ func DiscoverInstance(instanceKey inst.InstanceKey) {
 		return
 	}
 
+	if instance.InstanceAlias !="" &&
+		inst.FiltersMatchInstanceKey(&inst.InstanceKey{Hostname: instance.InstanceAlias, Port: instanceKey.Port}, config.Config.DiscoveryIgnoreHostnameFilters) {
+
+		log.Debugf("discoverInstance: skipping discovery of %+v (alias) because it matches DiscoveryIgnoreHostnameFilters", instance.InstanceAlias)
+
+		var ignoreInstanceKey = &inst.InstanceKey{Hostname: instanceKey.Hostname, Port: instanceKey.Port}
+
+		if !inst.InstanceIsForgotten(ignoreInstanceKey) {
+			err := inst.ForgetInstance(ignoreInstanceKey)
+			if err != nil {
+				log.Fatale(err)
+			}
+		}
+		return
+	}
+
+
 	// Investigate replicas:
 	for _, replicaKey := range instance.SlaveHosts.GetInstanceKeys() {
 		replicaKey := replicaKey // not needed? no concurrency here?

From 8d761e845f7a628f43906f04d88b6075ed148627 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Harun=20K=C3=BC=C3=A7=C3=BCk?= <harun.kucuk@messagebird.com>
Date: Wed, 25 Aug 2021 13:24:21 +0300
Subject: [PATCH 2/3] formatted file with gofmt

---
 go/logic/orchestrator.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/go/logic/orchestrator.go b/go/logic/orchestrator.go
index 2b25695b4..0bce05b29 100644
--- a/go/logic/orchestrator.go
+++ b/go/logic/orchestrator.go
@@ -275,7 +275,7 @@ func DiscoverInstance(instanceKey inst.InstanceKey) {
 		return
 	}
 
-	if instance.InstanceAlias !="" &&
+	if instance.InstanceAlias != "" &&
 		inst.FiltersMatchInstanceKey(&inst.InstanceKey{Hostname: instance.InstanceAlias, Port: instanceKey.Port}, config.Config.DiscoveryIgnoreHostnameFilters) {
 
 		log.Debugf("discoverInstance: skipping discovery of %+v (alias) because it matches DiscoveryIgnoreHostnameFilters", instance.InstanceAlias)
@@ -291,7 +291,6 @@ func DiscoverInstance(instanceKey inst.InstanceKey) {
 		return
 	}
 
-
 	// Investigate replicas:
 	for _, replicaKey := range instance.SlaveHosts.GetInstanceKeys() {
 		replicaKey := replicaKey // not needed? no concurrency here?

From b8723997907ace2557d816e86685de9c22065aad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Harun=20K=C3=BC=C3=A7=C3=BCk?= <harun.kucuk@messagebird.com>
Date: Thu, 2 Sep 2021 18:59:29 +0300
Subject: [PATCH 3/3] removed redundant import

---
 go/logic/orchestrator.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/go/logic/orchestrator.go b/go/logic/orchestrator.go
index 0bce05b29..d33a85db1 100644
--- a/go/logic/orchestrator.go
+++ b/go/logic/orchestrator.go
@@ -18,7 +18,6 @@ package logic
 
 import (
 	"fmt"
-	orcraft "github.com/openark/orchestrator/go/raft"
 	"math/rand"
 	"os"
 	"os/signal"