Add validate function to crd resource and do validate before creation/update (#580)

mqtrigger/messageQueue/asq_test.go

@@ -104,7 +104,7 @@ func (m *azureHTTPClientMock) Do(req *http.Request) (*http.Response, error) {
 
 func TestNewStorageConnectionMissingAccountName(t *testing.T) {
 	connection, err := newAzureStorageConnection(DummyRouterURL, MessageQueueConfig{
-		MQType: ASQ,
+		MQType: fission.MessageQueueTypeASQ,
 		Url:    "",
 	})
 	require.Nil(t, connection)
@@ -114,7 +114,7 @@ func TestNewStorageConnectionMissingAccountName(t *testing.T) {
 func TestNewStorageConnectionMissingAccessKey(t *testing.T) {
 	_ = os.Setenv("AZURE_STORAGE_ACCOUNT_NAME", "accountname")
 	connection, err := newAzureStorageConnection(DummyRouterURL, MessageQueueConfig{
-		MQType: ASQ,
+		MQType: fission.MessageQueueTypeASQ,
 		Url:    "",
 	})
 	_ = os.Unsetenv("AZURE_STORAGE_ACCOUNT_NAME")
@@ -291,7 +291,7 @@ func TestAzureStorageQueuePoisonMessage(t *testing.T) {
 				Type: fission.FunctionReferenceTypeFunctionName,
 				Name: FunctionName,
 			},
-			MessageQueueType: ASQ,
+			MessageQueueType: fission.MessageQueueTypeASQ,
 			Topic:            QueueName,
 			ContentType:      ContentType,
 		},
@@ -434,7 +434,7 @@ func runAzureStorageQueueTest(t *testing.T, count int, output bool) {
 				Type: fission.FunctionReferenceTypeFunctionName,
 				Name: FunctionName,
 			},
-			MessageQueueType: ASQ,
+			MessageQueueType: fission.MessageQueueTypeASQ,
 			Topic:            QueueName,
 			ResponseTopic:    responseTopic,
 			ContentType:      ContentType,

mqtrigger/messageQueue/messageQueue.go

@@ -18,7 +18,6 @@ package messageQueue
 
 import (
 	"errors"
-	"regexp"
 	"time"
 
 	log "github.com/sirupsen/logrus"
@@ -28,21 +27,12 @@ import (
 	"github.com/fission/fission/crd"
 )
 
-const (
-	NATS string = "nats-streaming"
-	ASQ  string = "azure-storage-queue"
-)
-
 const (
 	ADD_TRIGGER requestType = iota
 	DELETE_TRIGGER
 	GET_ALL_TRIGGERS
 )
 
-var (
-	validAzureQueueName = regexp.MustCompile("^[a-z0-9][a-z0-9\\-]*[a-z0-9]$")
-)
-
 type (
 	messageQueueSubscription interface{}
 
@@ -92,9 +82,9 @@ func MakeMessageQueueTriggerManager(fissionClient *crd.FissionClient, routerUrl
 		fissionClient: fissionClient,
 	}
 	switch mqConfig.MQType {
-	case NATS:
+	case fission.MessageQueueTypeNats:
 		messageQueue, err = makeNatsMessageQueue(routerUrl, mqConfig)
-	case ASQ:
+	case fission.MessageQueueTypeASQ:
 		messageQueue, err = newAzureStorageConnection(routerUrl, mqConfig)
 	default:
 		err = errors.New("No matched message queue type found")
@@ -231,13 +221,3 @@ func (mqt *MessageQueueTriggerManager) syncTriggers() {
 		time.Sleep(3 * time.Second)
 	}
 }
-
-func IsTopicValid(mqType string, topic string) bool {
-	switch mqType {
-	case NATS:
-		return isTopicValidForNats(topic)
-	case ASQ:
-		return len(topic) >= 3 && len(topic) <= 63 && validAzureQueueName.MatchString(topic)
-	}
-	return false
-}