Change variable name

adapter/config/default_config.go

@@ -216,7 +216,7 @@ var defaultConfig = &Config{
 		},
 		MandateSubscriptionValidation: false,
 		MandateInternalKeyValidation:  false,
-		EnforcerDisabled:              false,
+		EnforcerEnabled:               true,
 	},
 	ManagementServer: managementServer{
 		Enabled:   false,

adapter/config/types.go

@@ -167,7 +167,7 @@ type enforcer struct {
 	MandateInternalKeyValidation  bool
 	Client                        httpClient
 	Cors                          cors `toml:"cors"`
-	EnforcerDisabled			  bool
+	EnforcerEnabled               bool
 }
 
 // Cors represents the configurations related to Cross-Origin Resource Sharing

adapter/internal/discovery/xds/marshaller.go

@@ -81,7 +81,7 @@ func MarshalConfig(config *config.Config) *enforcer.Config {
 	}
 	mandateSubscriptionValidation := config.Enforcer.MandateSubscriptionValidation
 	mandateInternalKeyValidation := config.Enforcer.MandateInternalKeyValidation
-	enforcerDisabled := config.Enforcer.EnforcerDisabled
+	enforcerEnabled := config.Enforcer.EnforcerEnabled
 	enableGatewayClassController := config.Adapter.EnableGatewayClassController
 
 	analytics := &enforcer.Analytics{
@@ -162,7 +162,7 @@ func MarshalConfig(config *config.Config) *enforcer.Config {
 		Soap:                          soap,
 		MandateSubscriptionValidation: mandateSubscriptionValidation,
 		MandateInternalKeyValidation:  mandateInternalKeyValidation,
-		EnforcerDisabled:              enforcerDisabled,
+		EnforcerEnabled:               enforcerEnabled,
 		EnableGatewayClassController:  enableGatewayClassController,
 		HttpClient:                    httpClient,
 	}

adapter/internal/discovery/xds/server.go

@@ -378,7 +378,7 @@ func GenerateEnvoyResoucesForGateway(gatewayName string) ([]types.Resource,
 				}
 				logger.LoggerAPKOperator.Debugf("JWT Requirements for API %+v is  %+v", envoyInternalAPI.adapterInternalAPI.UUID, jwtRequirements)
 				if len(jwtRequirements) > 0 {
-					if conf.Enforcer.EnforcerDisabled {
+					if !conf.Enforcer.EnforcerEnabled {
 						if len(jwtRequirements) == 1 {
 							jwtRequirementMap[envoyInternalAPI.adapterInternalAPI.UUID] = jwtRequirements[0]
 						} else {

adapter/internal/oasparser/envoyconf/http_filters.go

@@ -233,7 +233,7 @@ func getExtProcessHTTPFilter() *hcmv3.HttpFilter {
 	conf := config.ReadConfigs()
 	sendReqHeadersToEnforcer := ext_process.ProcessingMode_SEND
 	logger.LoggerOasparser.Info(fmt.Sprintf("Enforcer %+v", conf.Enforcer))
-	if conf.Enforcer.EnforcerDisabled {
+	if !conf.Enforcer.EnforcerEnabled {
 		logger.LoggerOasparser.Info("Enforcer is disabled, skipping request headers to enforcer")
 		sendReqHeadersToEnforcer = ext_process.ProcessingMode_SKIP
 	}
@@ -249,7 +249,7 @@ func getExtProcessHTTPFilter() *hcmv3.HttpFilter {
 		FailureModeAllow: true,
 		ProcessingMode: &ext_process.ProcessingMode{
 			// ResponseBodyMode:   ext_process.ProcessingMode_BUFFERED,
-			RequestHeaderMode: sendReqHeadersToEnforcer,
+			RequestHeaderMode:  sendReqHeadersToEnforcer,
 			ResponseHeaderMode: ext_process.ProcessingMode_SKIP,
 			// RequestHeaderMode:  ext_process.ProcessingMode_SKIP,
 			// ResponseHeaderMode: ext_process.ProcessingMode_SKIP,
@@ -266,7 +266,7 @@ func getExtProcessHTTPFilter() *hcmv3.HttpFilter {
 		RequestAttributes:  []string{"xds.route_metadata", "request.method", "request.id"},
 		ResponseAttributes: []string{"xds.route_metadata"},
 		MessageTimeout:     durationpb.New(conf.Envoy.EnforcerResponseTimeoutInSeconds * time.Second),
-		AllowModeOverride: true,
+		AllowModeOverride:  true,
 	}
 	ext, err2 := anypb.New(externalProcessor)
 	if err2 != nil {