Remove deprecated mqtrigger with kind fission (#2875)

* Remove deprecated mqtrigger with kind fission
* Remove unused deps

---------

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>

cmd/fission-bundle/main.go

@@ -28,7 +28,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/manager/signals"
 	cnwebhook "sigs.k8s.io/controller-runtime/pkg/webhook"
 
-	"github.com/fission/fission/cmd/fission-bundle/mqtrigger"
 	"github.com/fission/fission/pkg/buildermgr"
 	"github.com/fission/fission/pkg/canaryconfigmgr"
 	"github.com/fission/fission/pkg/crd"
@@ -75,10 +74,6 @@ func runTimer(ctx context.Context, clientGen crd.ClientGeneratorInterface, logge
 	return timer.Start(ctx, clientGen, logger, mgr, routerUrl)
 }
 
-func runMessageQueueMgr(ctx context.Context, clientGen crd.ClientGeneratorInterface, logger *zap.Logger, mgr manager.Interface, routerUrl string) error {
-	return mqtrigger.Start(ctx, clientGen, logger, mgr, routerUrl)
-}
-
 // KEDA based MessageQueue Trigger Manager
 func runMQManager(ctx context.Context, clientGen crd.ClientGeneratorInterface, logger *zap.Logger, mgr manager.Interface, routerURL string) error {
 	return mqt.StartScalerManager(ctx, clientGen, logger, mgr, routerURL)
@@ -124,8 +119,6 @@ func getServiceName(arguments map[string]interface{}) string {
 		serviceName = "Fission-KubeWatcher"
 	} else if arguments["--timer"] == true {
 		serviceName = "Fission-Timer"
-	} else if arguments["--mqt"] == true {
-		serviceName = "Fission-MessageQueueTrigger"
 	} else if arguments["--builderMgr"] == true {
 		serviceName = "Fission-BuilderMgr"
 	} else if arguments["--storageServicePort"] != nil {
@@ -185,7 +178,6 @@ Usage:
   fission-bundle --storageServicePort=<port> --storageType=<storateType>
   fission-bundle --builderMgr [--storageSvcUrl=<url>] [--envbuilder-namespace=<namespace>]
   fission-bundle --timer [--routerUrl=<url>]
-  fission-bundle --mqt   [--routerUrl=<url>]
   fission-bundle --mqt_keda [--routerUrl=<url>]
   fission-bundle --webhookPort=<port>
   fission-bundle --logger
@@ -204,7 +196,6 @@ Options:
   --namespace=<namespace>         Kubernetes namespace in which to run function containers. Defaults to 'fission-function'.
   --kubewatcher                   Start Kubernetes events watcher.
   --timer                         Start Timer.
-  --mqt                           Start message queue trigger.
   --mqt_keda					  Start message queue trigger of kind KEDA
   --builderMgr                    Start builder manager.
   --version                       Print version information
@@ -285,14 +276,6 @@ Options:
 		}
 	}
 
-	if arguments["--mqt"] == true {
-		err = runMessageQueueMgr(ctx, clientGen, logger, mgr, routerUrl)
-		if err != nil {
-			logger.Error("message queue manager exited", zap.Error(err))
-			return
-		}
-	}
-
 	if arguments["--mqt_keda"] == true {
 		err = runMQManager(ctx, clientGen, logger, mgr, routerUrl)
 		if err != nil {

cmd/fission-bundle/mqtrigger/mqtrigger.go

@@ -1,115 +0,0 @@
-/*
-Copyright 2016 The Fission Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package mqtrigger
-
-import (
-	"context"
-	"fmt"
-	"os"
-	"path"
-	"strings"
-
-	"github.com/pkg/errors"
-	"go.uber.org/zap"
-
-	fv1 "github.com/fission/fission/pkg/apis/core/v1"
-	"github.com/fission/fission/pkg/crd"
-	"github.com/fission/fission/pkg/mqtrigger"
-	"github.com/fission/fission/pkg/mqtrigger/factory"
-	"github.com/fission/fission/pkg/mqtrigger/messageQueue"
-	_ "github.com/fission/fission/pkg/mqtrigger/messageQueue/kafka"
-	"github.com/fission/fission/pkg/utils/manager"
-)
-
-func Start(ctx context.Context, clientGen crd.ClientGeneratorInterface, logger *zap.Logger, mgr manager.Interface, routerUrl string) error {
-	fissionClient, err := clientGen.GetFissionClient()
-	if err != nil {
-		return errors.Wrap(err, "failed to get fission client")
-	}
-
-	err = crd.WaitForFunctionCRDs(ctx, logger, fissionClient)
-	if err != nil {
-		return errors.Wrap(err, "error waiting for CRDs")
-	}
-
-	mqType := (fv1.MessageQueueType)(os.Getenv("MESSAGE_QUEUE_TYPE"))
-	mqUrl := os.Getenv("MESSAGE_QUEUE_URL")
-
-	secretsPath := strings.TrimSpace(os.Getenv("MESSAGE_QUEUE_SECRETS"))
-
-	var secrets map[string][]byte
-	if len(secretsPath) > 0 {
-		// For authentication with message queue
-		secrets, err = readSecrets(logger, secretsPath)
-		if err != nil {
-			return err
-		}
-	}
-
-	mq, err := factory.Create(
-		logger,
-		mqType,
-		messageQueue.Config{
-			MQType:  (string)(mqType),
-			Url:     mqUrl,
-			Secrets: secrets,
-		},
-		routerUrl,
-	)
-	if err != nil {
-		logger.Fatal("failed to connect to remote message queue server", zap.Error(err))
-	}
-	mqtMgr := mqtrigger.MakeMessageQueueTriggerManager(logger, fissionClient, mqType, mq)
-	err = mqtMgr.Run(ctx, mgr)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func readSecrets(logger *zap.Logger, secretsPath string) (map[string][]byte, error) {
-	// return if no secrets exist
-	if _, err := os.Stat(secretsPath); os.IsNotExist(err) {
-		return nil, err
-	}
-
-	secretFiles, err := os.ReadDir(secretsPath)
-	if err != nil {
-		return nil, err
-	}
-
-	secrets := make(map[string][]byte)
-	for _, secretFile := range secretFiles {
-
-		fileName := secretFile.Name()
-		// /etc/secrets contain some hidden directories (like .data)
-		// ignore them
-		if !secretFile.IsDir() && !strings.HasPrefix(fileName, ".") {
-			logger.Info(fmt.Sprintf("Reading secret from %s", fileName))
-
-			filePath := path.Join(secretsPath, fileName)
-			secret, fileReadErr := os.ReadFile(filePath)
-			if fileReadErr != nil {
-				return nil, fileReadErr
-			}
-
-			secrets[fileName] = secret
-		}
-	}
-
-	return secrets, nil
-}

cmd/fission-cli/app/app.go

@@ -38,7 +38,6 @@ import (
 	"github.com/fission/fission/pkg/fission-cli/console"
 	"github.com/fission/fission/pkg/fission-cli/flag"
 	flagkey "github.com/fission/fission/pkg/fission-cli/flag/key"
-	_ "github.com/fission/fission/pkg/mqtrigger/messageQueue/kafka"
 )
 
 const (