Migrate the new policies to use the new mediation context

wso2 · Dec 13, 2022 · c7c93bd · c7c93bd
1 parent 34bdbe3
commit c7c93bd
Show file tree

Hide file tree

Showing 25 changed files with 163 additions and 121 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 target/
 .DS_Store
+.idea/
diff --git a/build.py b/build.py
@@ -30,6 +30,7 @@
 
 def build():
     failed_projects = []
+    count = 1
 
     for pkg in packages:
         bal_toml = toml.load(os.path.join(pkg['name'], 'Ballerina.toml'))
@@ -40,8 +41,9 @@ def build():
             print(pkg['name'], 'is already in the latest version')
             continue
 
-        print(f'Building \'{pkg["name"]}\'')
-        exit_code = os.system(f'bal build {pkg["name"]}')
+        print(f'{count} Building \'{pkg["name"]}\'')
+        count += 1
+        exit_code = os.system(f'bal test {pkg["name"]}')
 
         if exit_code != 0:
             print(f'Failed to build {pkg["name"]}')

diff --git a/mediation-add-header/Dependencies.toml b/mediation-add-header/Dependencies.toml
@@ -235,7 +235,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "regex"
-version = "1.3.0"
+version = "1.3.2"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"},
 	{org = "ballerina", name = "lang.string"}

diff --git a/mediation-add-query-param/Ballerina.toml b/mediation-add-query-param/Ballerina.toml
@@ -1,7 +1,7 @@
 [package]
 org = "choreo"
 name = "mediation.add_query_param"
-version = "0.2.0"
+version = "0.3.0"
 distribution = "2201.2.3"
 keywords=["choreo-apim-mediation-policy", "choreo-apim-mediation-request-flow"]
 

diff --git a/mediation-add-query-param/Dependencies.toml b/mediation-add-query-param/Dependencies.toml
@@ -32,7 +32,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "constraint"
-version = "1.0.0"
+version = "1.0.1"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"}
 ]
@@ -62,7 +62,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "http"
-version = "2.4.3"
+version = "2.4.6"
 dependencies = [
 	{org = "ballerina", name = "auth"},
 	{org = "ballerina", name = "cache"},
@@ -93,7 +93,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "io"
-version = "1.3.0"
+version = "1.3.1"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"},
 	{org = "ballerina", name = "lang.value"}
@@ -218,7 +218,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "observe"
-version = "1.0.5"
+version = "1.0.6"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"}
 ]
@@ -235,7 +235,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "regex"
-version = "1.3.0"
+version = "1.3.2"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"},
 	{org = "ballerina", name = "lang.string"}
@@ -265,15 +265,15 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "time"
-version = "2.2.2"
+version = "2.2.3"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"}
 ]
 
 [[package]]
 org = "ballerina"
 name = "url"
-version = "2.2.2"
+version = "2.2.3"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"}
 ]
@@ -293,15 +293,18 @@ modules = [
 [[package]]
 org = "choreo"
 name = "mediation"
-version = "0.6.1"
+version = "0.7.0"
+dependencies = [
+	{org = "ballerina", name = "regex"}
+]
 modules = [
 	{org = "choreo", packageName = "mediation", moduleName = "mediation"}
 ]
 
 [[package]]
 org = "choreo"
 name = "mediation.add_query_param"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
 	{org = "ballerina", name = "http"},
 	{org = "ballerina", name = "test"},

diff --git a/mediation-add-query-param/policy.bal b/mediation-add-query-param/policy.bal
@@ -20,14 +20,6 @@ import ballerina/http;
 @mediation:RequestFlow
 public function addQueryParam(mediation:Context ctx, http:Request req, string Parameter\ Name, string Parameter\ Value)
                                                                 returns http:Response|false|error|() {
-    map<string[]> qParams = <map<string[]>>ctx["queryParams"];
-
-    if qParams.hasKey(Parameter\ Name) {
-        qParams.get(Parameter\ Name).push(Parameter\ Value);
-    } else {
-        string[] vals = [Parameter\ Value];
-        qParams[Parameter\ Name] = vals;
-    }
-
+    ctx.addQueryParam(Parameter\ Name, Parameter\ Value);
     return ();
 }
diff --git a/mediation-add-query-param/tests/utest_policy.bal b/mediation-add-query-param/tests/utest_policy.bal
@@ -20,19 +20,19 @@ import ballerina/test;
 
 @test:Config {}
 public function testRequestFlowSingleInstance() {
-    mediation:Context ctx = {httpMethod: "get", resourcePath: "/greet", "queryParams": <map<string[]>>{}};
+    mediation:Context ctx = createContext("get", "/greet");
     http:Response|false|error|() result = addQueryParam(ctx, new, "x", "y");
-    assertResult(result, ctx["queryParams"], {x: ["y"]});
+    assertResult(result, ctx.queryParams(), {x: ["y"]});
 }
 
 @test:Config {}
 public function testRequestFlowMultipleInstance() {
-    mediation:Context ctx = {httpMethod: "get", resourcePath: "/greet", "queryParams": <map<string[]>>{}};
+    mediation:Context ctx = createContext("get", "/greet");
     http:Response|false|error|() result = addQueryParam(ctx, new, "arr", "1");
-    assertResult(result, ctx["queryParams"], {arr: ["1"]});
+    assertResult(result, ctx.queryParams(), {arr: ["1"]});
 
     result = addQueryParam(ctx, new, "arr", "2");
-    assertResult(result, ctx["queryParams"], {arr: ["1", "2"]});
+    assertResult(result, ctx.queryParams(), {arr: ["1", "2"]});
 }
 
 function assertResult(http:Response|false|error|() result, anydata qParamMap, map<string[]> expQParamMap) {
@@ -42,3 +42,11 @@ function assertResult(http:Response|false|error|() result, anydata qParamMap, ma
 
     test:assertEquals(qParamMap, expQParamMap);
 }
+
+function createContext(string httpMethod, string resPath) returns mediation:Context {
+    mediation:ResourcePath originalPath = checkpanic mediation:createImmutableResourcePath(resPath);
+    mediation:Context originalCtx =
+                mediation:createImmutableMediationContext(httpMethod, originalPath.pathSegments(), {}, {});
+    mediation:ResourcePath mutableResPath = checkpanic mediation:createMutableResourcePath(resPath);
+    return mediation:createMutableMediationContext(originalCtx, mutableResPath.pathSegments(), {}, {});
+}
diff --git a/mediation-json-to-xml/Dependencies.toml b/mediation-json-to-xml/Dependencies.toml
@@ -32,7 +32,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "constraint"
-version = "1.0.0"
+version = "1.0.1"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"}
 ]
@@ -62,7 +62,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "http"
-version = "2.4.3"
+version = "2.4.6"
 dependencies = [
 	{org = "ballerina", name = "auth"},
 	{org = "ballerina", name = "cache"},
@@ -93,7 +93,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "io"
-version = "1.3.0"
+version = "1.3.1"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"},
 	{org = "ballerina", name = "lang.value"}
@@ -221,7 +221,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "observe"
-version = "1.0.5"
+version = "1.0.6"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"}
 ]
@@ -238,7 +238,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "regex"
-version = "1.3.0"
+version = "1.3.2"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"},
 	{org = "ballerina", name = "lang.string"}
@@ -268,23 +268,23 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "time"
-version = "2.2.2"
+version = "2.2.3"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"}
 ]
 
 [[package]]
 org = "ballerina"
 name = "url"
-version = "2.2.2"
+version = "2.2.3"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"}
 ]
 
 [[package]]
 org = "ballerina"
 name = "xmldata"
-version = "2.3.0"
+version = "2.3.1"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"}
 ]

diff --git a/mediation-log-message/Ballerina.toml b/mediation-log-message/Ballerina.toml
@@ -1,7 +1,7 @@
 [package]
 org = "choreo"
 name = "mediation.log_message"
-version = "0.2.0"
+version = "0.3.0"
 distribution = "2201.2.3"
 keywords=["choreo-apim-mediation-policy", "choreo-apim-mediation-request-flow", "choreo-apim-mediation-response-flow", "choreo-apim-mediation-fault-flow"]
 

diff --git a/mediation-log-message/Dependencies.toml b/mediation-log-message/Dependencies.toml
@@ -32,7 +32,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "constraint"
-version = "1.0.0"
+version = "1.0.1"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"}
 ]
@@ -62,7 +62,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "http"
-version = "2.4.3"
+version = "2.4.6"
 dependencies = [
 	{org = "ballerina", name = "auth"},
 	{org = "ballerina", name = "cache"},
@@ -93,7 +93,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "io"
-version = "1.3.0"
+version = "1.3.1"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"},
 	{org = "ballerina", name = "lang.value"}
@@ -221,7 +221,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "observe"
-version = "1.0.5"
+version = "1.0.6"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"}
 ]
@@ -238,7 +238,7 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "regex"
-version = "1.3.0"
+version = "1.3.2"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"},
 	{org = "ballerina", name = "lang.string"}
@@ -259,15 +259,15 @@ dependencies = [
 [[package]]
 org = "ballerina"
 name = "time"
-version = "2.2.2"
+version = "2.2.3"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"}
 ]
 
 [[package]]
 org = "ballerina"
 name = "url"
-version = "2.2.2"
+version = "2.2.3"
 dependencies = [
 	{org = "ballerina", name = "jballerina.java"}
 ]
@@ -287,15 +287,18 @@ modules = [
 [[package]]
 org = "choreo"
 name = "mediation"
-version = "0.6.1"
+version = "0.7.0"
+dependencies = [
+	{org = "ballerina", name = "regex"}
+]
 modules = [
 	{org = "choreo", packageName = "mediation", moduleName = "mediation"}
 ]
 
 [[package]]
 org = "choreo"
 name = "mediation.log_message"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
 	{org = "ballerina", name = "http"},
 	{org = "ballerina", name = "log"},

diff --git a/mediation-log-message/policy.bal b/mediation-log-message/policy.bal
@@ -30,7 +30,7 @@ public function logRequestMessage(mediation:Context ctx, http:Request req, boole
         mediation\-flow: REQUEST,
         request\-id: "",
         http\-method: req.method,
-        resource\-path: ctx.resourcePath
+        resource\-path: ctx.originalContext().resourcePath().toString()
     };
 
     if req.hasHeader(HEADER_X_REQUEST_ID) {
@@ -65,7 +65,7 @@ public function logResponseMessage(mediation:Context ctx, http:Request req, http
         mediation\-flow: RESPONSE,
         request\-id: "",
         http\-method: req.method,
-        resource\-path: ctx.resourcePath
+        resource\-path: ctx.originalContext().resourcePath().toString()
     };
 
     if res.hasHeader(HEADER_X_REQUEST_ID) {
@@ -101,7 +101,7 @@ public function logFaultMessage(mediation:Context ctx, http:Request req, http:Re
         mediation\-flow: FAULT,
         request\-id: "",
         http\-method: req.method,
-        resource\-path: ctx.resourcePath
+        resource\-path: ctx.originalContext().resourcePath().toString()
     };
 
     // Since the fault flow may be triggered by both the request flow and the response flow, we take the x-request-id

diff --git a/mediation-remove-header/Ballerina.toml b/mediation-remove-header/Ballerina.toml
@@ -1,7 +1,7 @@
 [package]
 org = "choreo"
 name = "mediation.remove_header"
-version = "0.2.0"
+version = "0.3.0"
 distribution = "2201.2.3"
 keywords=["choreo-apim-mediation-policy", "choreo-apim-mediation-request-flow", "choreo-apim-mediation-response-flow", "choreo-apim-mediation-fault-flow"]