addressed comments

Author: nddq

cns/configuration/configuration.go

@@ -13,17 +13,24 @@ import (
 	"github.com/pkg/errors"
 )
 
+type SWIFTV2Mode string
+
 const (
 	// EnvCNSConfig is the CNS_CONFIGURATION_PATH env var key
 	EnvCNSConfig      = "CNS_CONFIGURATION_PATH"
 	defaultConfigName = "cns_config.json"
+	// Service Fabric SWIFTV2 mode
+	SFSWIFTV2 SWIFTV2Mode = "SFSWIFTV2"
+	// K8s SWIFTV2 mode
+	K8sSWIFTV2 SWIFTV2Mode = "K8sSWIFTV2"
 )
 
 type CNSConfig struct {
 	ChannelMode                 string
 	EnablePprof                 bool
 	EnableSubnetScarcity        bool
 	EnableSwiftV2               bool
+	SWIFTV2Mode                 SWIFTV2Mode
 	InitializeFromCNI           bool
 	ManagedSettings             ManagedSettings
 	MetricsBindAddress          string

cns/middlewares/k8sSwiftV2.go

@@ -37,6 +37,8 @@ type K8sSWIFTv2Middleware struct {
 // Verify interface compliance at compile time
 var _ cns.IPConfigsHandlerMiddleware = (*K8sSWIFTv2Middleware)(nil)
 
+// IPConfigsRequestHandlerWrapper is the middleware function for handling SWIFT v2 IP configs requests for AKS-SWIFT. This function wrapped the default SWIFT request
+// and release IP configs handlers.
 func (m *K8sSWIFTv2Middleware) IPConfigsRequestHandlerWrapper(defaultHandler, failureHandler cns.IPConfigsHandlerFunc) cns.IPConfigsHandlerFunc {
 	return func(ctx context.Context, req cns.IPConfigsRequest) (*cns.IPConfigsResponse, error) {
 		podInfo, respCode, message := m.validateIPConfigsRequest(ctx, &req)
@@ -96,7 +98,7 @@ func (m *K8sSWIFTv2Middleware) IPConfigsRequestHandlerWrapper(defaultHandler, fa
 	}
 }
 
-// validateIPConfigsRequest validates if pod is multitenant by checking the pod labels, used in SWIFT V2 scenario.
+// validateIPConfigsRequest validates if pod is multitenant by checking the pod labels, used in SWIFT V2 AKS scenario.
 // nolint
 func (m *K8sSWIFTv2Middleware) validateIPConfigsRequest(ctx context.Context, req *cns.IPConfigsRequest) (podInfo cns.PodInfo, respCode types.ResponseCode, message string) {
 	// Retrieve the pod from the cluster

cns/service/main.go

@@ -1382,8 +1382,17 @@ func InitializeCRDState(ctx context.Context, httpRestService cns.HTTPService, cn
 		}
 		// if SWIFT v2 is enabled on CNS, attach multitenant middleware to rest service
 		// switch here for different type of swift v2 middleware (k8s or SF)
-		swiftV2Middleware := middlewares.K8sSWIFTv2Middleware{Cli: manager.GetClient()}
-		httpRestService.AttachIPConfigsHandlerMiddleware(&swiftV2Middleware)
+		var swiftV2Middleware cns.IPConfigsHandlerMiddleware
+		switch cnsconfig.SWIFTV2Mode {
+		case configuration.K8sSWIFTV2:
+			swiftV2Middleware = &middlewares.K8sSWIFTv2Middleware{Cli: manager.GetClient()}
+		case configuration.SFSWIFTV2:
+		default:
+			// default to K8s middleware for now, in a later changes we where start to pass in
+			// SWIFT v2 mode in CNS config, this should throw an error if the mode is not set.
+			swiftV2Middleware = &middlewares.K8sSWIFTv2Middleware{Cli: manager.GetClient()}
+		}
+		httpRestService.AttachIPConfigsHandlerMiddleware(swiftV2Middleware)
 	}
 
 	// start the pool Monitor before the Reconciler, since it needs to be ready to receive an