Passing environment field to the interceptors

wso2 · Oct 18, 2023 · 8072497 · 8072497
1 parent 16c5a85
commit 8072497
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 1 deletion.
diff --git a/adapter/internal/interceptor/interceptor.go b/adapter/internal/interceptor/interceptor.go
@@ -71,6 +71,7 @@ type InvocationContext struct {
 	Vhost            string
 	ClusterName      string
 	APIProperties    string
+	Environment      string
 }
 
 var (
@@ -89,6 +90,7 @@ var (
 	 organizationId = "{{.Context.OrganizationID}}",
 	 basePath = "{{.Context.BasePath}}",
 	 supportedMethods = "{{.Context.SupportedMethods}}",
+	 environment = "{{.Context.Environment}}",
 	 apiName = "{{.Context.APIName}}",
 	 apiVersion = "{{.Context.APIVersion}}",
 	 pathTemplate = "{{.Context.PathTemplate}}",

diff --git a/adapter/internal/oasparser/envoyconf/routes_with_clusters.go b/adapter/internal/oasparser/envoyconf/routes_with_clusters.go
@@ -766,6 +766,7 @@ func createRoutes(params *routeCreateParams) (routes []*routev3.Route, err error
 			Vhost:            contextExtensions[vHostContextExtension],
 			ClusterName:      contextExtensions[clusterNameContextExtension],
 			APIProperties:    getAPIProperties(params.apiProperties),
+			Environment:      params.environment,
 		}
 		luaPerFilterConfig = lua.LuaPerRoute{
 			Override: &lua.LuaPerRoute_SourceCode{

diff --git a/adapter/internal/operator/synchronizer/gateway_synchronizer.go b/adapter/internal/operator/synchronizer/gateway_synchronizer.go
@@ -159,6 +159,7 @@ func getGlobalInterceptorScript(gatewayAPIPolicies map[string]dpv1alpha1.APIPoli
 		OrganizationID:   "",
 		BasePath:         "",
 		SupportedMethods: "",
+		Environment:      "",
 		APIName:          "",
 		APIVersion:       "",
 		PathTemplate:     "",

diff --git a/developer/resources/interceptor-service-open-api-v1.yaml b/developer/resources/interceptor-service-open-api-v1.yaml
@@ -230,6 +230,9 @@ components:
             keyType:
               type: string
               example: PRODUCTION
+        environment:
+          type: string
+          example: Development
     InterceptorContext:
       title: Interceptor Context
       type: object

diff --git a/...wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/constants/InterceptorConstants.java b/...wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/constants/InterceptorConstants.java
@@ -42,6 +42,7 @@ public static class APIMetadataFields {
         public static final String API_VERSION = "apiVersion";
         public static final String API_VHOST = "vhost";
         public static final String API_ORGANIZATION_ID = "organizationId";
+        public static final String ENVIRONMENT = "environment";
 
     }
 }
diff --git a/...forcer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/security/AuthFilter.java b/...forcer/org.wso2.apk.enforcer/src/main/java/org/wso2/apk/enforcer/security/AuthFilter.java
@@ -248,6 +248,8 @@ private void setInterceptorAPIMetadata(RequestContext requestContext) {
                 Objects.toString(requestContext.getMatchedAPI().getVhost(), ""));
         requestContext.addMetadataToMap(InterceptorConstants.APIMetadataFields.API_ORGANIZATION_ID,
                 Objects.toString(requestContext.getMatchedAPI().getOrganizationId(), ""));
+        requestContext.addMetadataToMap(InterceptorConstants.APIMetadataFields.ENVIRONMENT,
+                Objects.toString(requestContext.getMatchedAPI().getEnvironment(), ""));
     }
 
     private void populateRemoveAndProtectedAuthHeaders(RequestContext requestContext) {

diff --git a/gateway/router/resources/interceptor/lib/consts.lua b/gateway/router/resources/interceptor/lib/consts.lua
@@ -52,7 +52,8 @@ INV_CONTEXT = {
     VHOST = "vhost",
     API_NAME = "apiName",
     API_VERSION = "apiVersion",
-    AUTH_CTX = "authenticationContext"
+    AUTH_CTX = "authenticationContext",
+    ENVIRONMENT = "environment"
 }
 
 -- keys of the payload to the auth context

diff --git a/test/interceptor-backend/ballerina/types.bal b/test/interceptor-backend/ballerina/types.bal
@@ -142,6 +142,7 @@ public type InvocationContext record {
     string prodClusterName?;
     string sandClusterName?;
     string apiProperties?;
+    string environment?;
     InvocationContext_authenticationContext authenticationContext?;
 };