Add message queue service factory (#1537)

pkg/mqtrigger/mqtmanager.go

@@ -26,9 +26,6 @@ import (
 	fv1 "github.com/fission/fission/pkg/apis/core/v1"
 	"github.com/fission/fission/pkg/crd"
 	"github.com/fission/fission/pkg/mqtrigger/messageQueue"
-	"github.com/fission/fission/pkg/mqtrigger/messageQueue/azurequeuestorage"
-	"github.com/fission/fission/pkg/mqtrigger/messageQueue/kafka"
-	"github.com/fission/fission/pkg/mqtrigger/messageQueue/nats"
 	"github.com/fission/fission/pkg/utils"
 )
 
@@ -42,11 +39,12 @@ type (
 	requestType int
 
 	MessageQueueTriggerManager struct {
-		logger        *zap.Logger
-		reqChan       chan request
-		triggers      map[string]*triggerSubscription
-		fissionClient *crd.FissionClient
-		messageQueue  messageQueue.MessageQueue
+		logger           *zap.Logger
+		reqChan          chan request
+		triggers         map[string]*triggerSubscription
+		fissionClient    *crd.FissionClient
+		messageQueueType fv1.MessageQueueType
+		messageQueue     messageQueue.MessageQueue
 	}
 
 	triggerSubscription struct {
@@ -66,13 +64,14 @@ type (
 )
 
 func MakeMessageQueueTriggerManager(logger *zap.Logger,
-	fissionClient *crd.FissionClient, messageQueue messageQueue.MessageQueue) *MessageQueueTriggerManager {
+	fissionClient *crd.FissionClient, mqType fv1.MessageQueueType, messageQueue messageQueue.MessageQueue) *MessageQueueTriggerManager {
 	mqTriggerMgr := MessageQueueTriggerManager{
-		logger:        logger.Named("message_queue_trigger_manager"),
-		reqChan:       make(chan request),
-		triggers:      make(map[string]*triggerSubscription),
-		fissionClient: fissionClient,
-		messageQueue:  messageQueue,
+		logger:           logger.Named("message_queue_trigger_manager"),
+		reqChan:          make(chan request),
+		triggers:         make(map[string]*triggerSubscription),
+		fissionClient:    fissionClient,
+		messageQueueType: mqType,
+		messageQueue:     messageQueue,
 	}
 	return &mqTriggerMgr
 }
@@ -154,7 +153,9 @@ func (mqt *MessageQueueTriggerManager) syncTriggers() {
 		newTriggerMap := make(map[string]*fv1.MessageQueueTrigger)
 		for index := range newTriggers.Items {
 			newTrigger := &newTriggers.Items[index]
-			newTriggerMap[crd.CacheKey(&newTrigger.ObjectMeta)] = newTrigger
+			if newTrigger.Spec.MessageQueueType == mqt.messageQueueType {
+				newTriggerMap[crd.CacheKey(&newTrigger.ObjectMeta)] = newTrigger
+			}
 		}
 
 		// get current set of triggers
@@ -205,15 +206,3 @@ func (mqt *MessageQueueTriggerManager) syncTriggers() {
 		time.Sleep(3 * time.Second)
 	}
 }
-
-func IsTopicValid(mqType fv1.MessageQueueType, topic string) bool {
-	switch mqType {
-	case fv1.MessageQueueTypeNats:
-		return nats.IsTopicValid(topic)
-	case fv1.MessageQueueTypeASQ:
-		return azurequeuestorage.IsTopicValid(topic)
-	case fv1.MessageQueueTypeKafka:
-		return kafka.IsTopicValid(topic)
-	}
-	return false
-}