From 0a59e76bf80de13bbeb98f2459f1fbf5793c2910 Mon Sep 17 00:00:00 2001 From: sgayangi Date: Tue, 11 Jun 2024 09:57:24 +0530 Subject: [PATCH 1/3] Update policies supported for APK --- .../specifications/ccAddHeader_v2.json | 35 +++++++++++++++++++ .../specifications/ccMirrorRequest_v1.json | 26 ++++++++++++++ .../specifications/ccRedirectRequest_v1.json | 34 ++++++++++++++++++ .../specifications/ccRemove_Header_v1.json | 27 ++++++++++++++ 4 files changed, 122 insertions(+) create mode 100644 modules/distribution/resources/operation_policies/specifications/ccAddHeader_v2.json create mode 100644 modules/distribution/resources/operation_policies/specifications/ccMirrorRequest_v1.json create mode 100644 modules/distribution/resources/operation_policies/specifications/ccRedirectRequest_v1.json create mode 100644 modules/distribution/resources/operation_policies/specifications/ccRemove_Header_v1.json diff --git a/modules/distribution/resources/operation_policies/specifications/ccAddHeader_v2.json b/modules/distribution/resources/operation_policies/specifications/ccAddHeader_v2.json new file mode 100644 index 0000000000..adedd5d020 --- /dev/null +++ b/modules/distribution/resources/operation_policies/specifications/ccAddHeader_v2.json @@ -0,0 +1,35 @@ +{ + "category": "Mediation", + "version": "v2", + "displayName": "Add Header", + "name": "ccAddHeader", + "description": "This policy allows you to add a new header to the request", + "policyAttributes": [ + { + "name": "headerName", + "displayName": "Header Name", + "description": "Name of the header to be added", + "validationRegex": "^([a-zA-Z_\\:][a-zA-Z\\d_\\-\\ ]*)$", + "type": "String", + "required": true + }, + { + "name": "headerValue", + "displayName": "Header Value", + "description": "Value of the header", + "validationRegex": "^.+$", + "type": "String", + "required": true + } + ], + "applicableFlows": [ + "request", + "response" + ], + "supportedGateways": [ + "ChoreoConnect" + ], + "supportedApiTypes": [ + "HTTP" + ] +} \ No newline at end of file diff --git a/modules/distribution/resources/operation_policies/specifications/ccMirrorRequest_v1.json b/modules/distribution/resources/operation_policies/specifications/ccMirrorRequest_v1.json new file mode 100644 index 0000000000..dc8464af41 --- /dev/null +++ b/modules/distribution/resources/operation_policies/specifications/ccMirrorRequest_v1.json @@ -0,0 +1,26 @@ +{ + "category": "Mediation", + "name": "ccMirrorRequest", + "version": "v1", + "displayName": "Mirror Request", + "description": "This policy allows you to mirror a request to various URLs", + "policyAttributes": [ + { + "name": "url", + "displayName": "URL", + "description": "URL to mirror the request to", + "validationRegex": "^(([\\w+]+\\:\\/\\/)?([\\w\\d-]+\\.)*[\\w-]+([\\.\\:]\\w+)*([\\/\\?\\=\\&\\#\\.]?[\\w-]+)*\\/?)$", + "type": "String", + "required": true + } + ], + "applicableFlows": [ + "request" + ], + "supportedGateways": [ + "ChoreoConnect" + ], + "supportedApiTypes": [ + "HTTP" + ] +} \ No newline at end of file diff --git a/modules/distribution/resources/operation_policies/specifications/ccRedirectRequest_v1.json b/modules/distribution/resources/operation_policies/specifications/ccRedirectRequest_v1.json new file mode 100644 index 0000000000..cb6227aab6 --- /dev/null +++ b/modules/distribution/resources/operation_policies/specifications/ccRedirectRequest_v1.json @@ -0,0 +1,34 @@ +{ + "category": "Mediation", + "name": "ccRedirectRequest", + "version": "v1", + "displayName": "Redirect Request", + "description": "This policy allows you to redirect a request", + "policyAttributes": [ + { + "name": "url", + "displayName": "URL", + "description": "URL to redirect the request to", + "validationRegex": "^(([\\w+]+\\:\\/\\/)?([\\w\\d-]+\\.)*[\\w-]+([\\.\\:]\\w+)*([\\/\\?\\=\\&\\#\\.]?[\\w-]+)*\\/?)$", + "type": "String", + "required": true + }, + { + "name": "statusCode", + "displayName": "Status Code", + "description": "Status code to display upon redirecting the request. Must be one of: 301, 302, 303, 307 or 308", + "validationRegex": "^(301|302|303|307|308)$", + "type": "String", + "required": true + } + ], + "applicableFlows": [ + "request" + ], + "supportedGateways": [ + "ChoreoConnect" + ], + "supportedApiTypes": [ + "HTTP" + ] +} \ No newline at end of file diff --git a/modules/distribution/resources/operation_policies/specifications/ccRemove_Header_v1.json b/modules/distribution/resources/operation_policies/specifications/ccRemove_Header_v1.json new file mode 100644 index 0000000000..8573aa5e93 --- /dev/null +++ b/modules/distribution/resources/operation_policies/specifications/ccRemove_Header_v1.json @@ -0,0 +1,27 @@ +{ + "category": "Mediation", + "name": "ccRemoveHeader", + "version": "v2", + "displayName": "Remove Header", + "description": "This policy allows you to remove a header from the request", + "policyAttributes": [ + { + "name": "headerName", + "displayName": "Header Name", + "description": "Name of the header to be removed", + "validationRegex": "^([a-zA-Z_\\:][a-zA-Z\\d_\\-\\ ]*)$", + "type": "String", + "required": true + } + ], + "applicableFlows": [ + "request", + "response" + ], + "supportedGateways": [ + "ChoreoConnect" + ], + "supportedApiTypes": [ + "HTTP" + ] +} \ No newline at end of file From 27e7f31f03879c4aadce7bb1965ec636c4869a6f Mon Sep 17 00:00:00 2001 From: sgayangi Date: Tue, 2 Jul 2024 09:42:45 +0530 Subject: [PATCH 2/3] Rename policies from cc to apk --- .../{ccAddHeader_v2.json => apkAddHeader_v2.json} | 2 +- ...torService_v1.json => apkCallInterceptorService_v1.json} | 2 +- .../{ccMirrorRequest_v1.json => apkMirrorRequest_v1.json} | 2 +- ...ccRedirectRequest_v1.json => apkRedirectRequest_v1.json} | 6 +++--- .../{ccRemove_Header_v1.json => apkRemove_Header_v1.json} | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) rename modules/distribution/resources/operation_policies/specifications/{ccAddHeader_v2.json => apkAddHeader_v2.json} (96%) rename modules/distribution/resources/operation_policies/specifications/{ccCallInterceptorService_v1.json => apkCallInterceptorService_v1.json} (96%) rename modules/distribution/resources/operation_policies/specifications/{ccMirrorRequest_v1.json => apkMirrorRequest_v1.json} (95%) rename modules/distribution/resources/operation_policies/specifications/{ccRedirectRequest_v1.json => apkRedirectRequest_v1.json} (85%) rename modules/distribution/resources/operation_policies/specifications/{ccRemove_Header_v1.json => apkRemove_Header_v1.json} (95%) diff --git a/modules/distribution/resources/operation_policies/specifications/ccAddHeader_v2.json b/modules/distribution/resources/operation_policies/specifications/apkAddHeader_v2.json similarity index 96% rename from modules/distribution/resources/operation_policies/specifications/ccAddHeader_v2.json rename to modules/distribution/resources/operation_policies/specifications/apkAddHeader_v2.json index adedd5d020..3ac81ed485 100644 --- a/modules/distribution/resources/operation_policies/specifications/ccAddHeader_v2.json +++ b/modules/distribution/resources/operation_policies/specifications/apkAddHeader_v2.json @@ -2,7 +2,7 @@ "category": "Mediation", "version": "v2", "displayName": "Add Header", - "name": "ccAddHeader", + "name": "apkAddHeader", "description": "This policy allows you to add a new header to the request", "policyAttributes": [ { diff --git a/modules/distribution/resources/operation_policies/specifications/ccCallInterceptorService_v1.json b/modules/distribution/resources/operation_policies/specifications/apkCallInterceptorService_v1.json similarity index 96% rename from modules/distribution/resources/operation_policies/specifications/ccCallInterceptorService_v1.json rename to modules/distribution/resources/operation_policies/specifications/apkCallInterceptorService_v1.json index fa72a75a6f..6ab62fe076 100644 --- a/modules/distribution/resources/operation_policies/specifications/ccCallInterceptorService_v1.json +++ b/modules/distribution/resources/operation_policies/specifications/apkCallInterceptorService_v1.json @@ -1,6 +1,6 @@ { "category": "Mediation", - "name": "ccCallInterceptorService", + "name": "apkCallInterceptorService", "version": "v1", "displayName": "Call Interceptor Service", "description": "This policy allows you to call an interceptor service for a request message", diff --git a/modules/distribution/resources/operation_policies/specifications/ccMirrorRequest_v1.json b/modules/distribution/resources/operation_policies/specifications/apkMirrorRequest_v1.json similarity index 95% rename from modules/distribution/resources/operation_policies/specifications/ccMirrorRequest_v1.json rename to modules/distribution/resources/operation_policies/specifications/apkMirrorRequest_v1.json index dc8464af41..cb3171b251 100644 --- a/modules/distribution/resources/operation_policies/specifications/ccMirrorRequest_v1.json +++ b/modules/distribution/resources/operation_policies/specifications/apkMirrorRequest_v1.json @@ -1,6 +1,6 @@ { "category": "Mediation", - "name": "ccMirrorRequest", + "name": "apkMirrorRequest", "version": "v1", "displayName": "Mirror Request", "description": "This policy allows you to mirror a request to various URLs", diff --git a/modules/distribution/resources/operation_policies/specifications/ccRedirectRequest_v1.json b/modules/distribution/resources/operation_policies/specifications/apkRedirectRequest_v1.json similarity index 85% rename from modules/distribution/resources/operation_policies/specifications/ccRedirectRequest_v1.json rename to modules/distribution/resources/operation_policies/specifications/apkRedirectRequest_v1.json index cb6227aab6..ecca51062d 100644 --- a/modules/distribution/resources/operation_policies/specifications/ccRedirectRequest_v1.json +++ b/modules/distribution/resources/operation_policies/specifications/apkRedirectRequest_v1.json @@ -1,6 +1,6 @@ { "category": "Mediation", - "name": "ccRedirectRequest", + "name": "apkRedirectRequest", "version": "v1", "displayName": "Redirect Request", "description": "This policy allows you to redirect a request", @@ -16,8 +16,8 @@ { "name": "statusCode", "displayName": "Status Code", - "description": "Status code to display upon redirecting the request. Must be one of: 301, 302, 303, 307 or 308", - "validationRegex": "^(301|302|303|307|308)$", + "description": "Status code to display upon redirecting the request. Must be either 301 or 302", + "validationRegex": "^(301|302)$", "type": "String", "required": true } diff --git a/modules/distribution/resources/operation_policies/specifications/ccRemove_Header_v1.json b/modules/distribution/resources/operation_policies/specifications/apkRemove_Header_v1.json similarity index 95% rename from modules/distribution/resources/operation_policies/specifications/ccRemove_Header_v1.json rename to modules/distribution/resources/operation_policies/specifications/apkRemove_Header_v1.json index 8573aa5e93..7f1bd8ef7a 100644 --- a/modules/distribution/resources/operation_policies/specifications/ccRemove_Header_v1.json +++ b/modules/distribution/resources/operation_policies/specifications/apkRemove_Header_v1.json @@ -1,6 +1,6 @@ { "category": "Mediation", - "name": "ccRemoveHeader", + "name": "apkRemoveHeader", "version": "v2", "displayName": "Remove Header", "description": "This policy allows you to remove a header from the request", From 5cab2f6091fd714f7428ecf0be8beef2192ec7d6 Mon Sep 17 00:00:00 2001 From: sgayangi Date: Tue, 23 Jul 2024 10:49:33 +0530 Subject: [PATCH 3/3] Add changes from code review --- .../{apkAddHeader_v2.json => apkAddHeader_v1.json} | 2 +- .../specifications/apkRedirectRequest_v1.json | 2 +- .../operation_policies/specifications/apkRemove_Header_v1.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename modules/distribution/resources/operation_policies/specifications/{apkAddHeader_v2.json => apkAddHeader_v1.json} (97%) diff --git a/modules/distribution/resources/operation_policies/specifications/apkAddHeader_v2.json b/modules/distribution/resources/operation_policies/specifications/apkAddHeader_v1.json similarity index 97% rename from modules/distribution/resources/operation_policies/specifications/apkAddHeader_v2.json rename to modules/distribution/resources/operation_policies/specifications/apkAddHeader_v1.json index 3ac81ed485..2312664d12 100644 --- a/modules/distribution/resources/operation_policies/specifications/apkAddHeader_v2.json +++ b/modules/distribution/resources/operation_policies/specifications/apkAddHeader_v1.json @@ -1,6 +1,6 @@ { "category": "Mediation", - "version": "v2", + "version": "v1", "displayName": "Add Header", "name": "apkAddHeader", "description": "This policy allows you to add a new header to the request", diff --git a/modules/distribution/resources/operation_policies/specifications/apkRedirectRequest_v1.json b/modules/distribution/resources/operation_policies/specifications/apkRedirectRequest_v1.json index ecca51062d..71cc1e991c 100644 --- a/modules/distribution/resources/operation_policies/specifications/apkRedirectRequest_v1.json +++ b/modules/distribution/resources/operation_policies/specifications/apkRedirectRequest_v1.json @@ -18,7 +18,7 @@ "displayName": "Status Code", "description": "Status code to display upon redirecting the request. Must be either 301 or 302", "validationRegex": "^(301|302)$", - "type": "String", + "type": "Integer", "required": true } ], diff --git a/modules/distribution/resources/operation_policies/specifications/apkRemove_Header_v1.json b/modules/distribution/resources/operation_policies/specifications/apkRemove_Header_v1.json index 7f1bd8ef7a..357ec8adba 100644 --- a/modules/distribution/resources/operation_policies/specifications/apkRemove_Header_v1.json +++ b/modules/distribution/resources/operation_policies/specifications/apkRemove_Header_v1.json @@ -1,7 +1,7 @@ { "category": "Mediation", "name": "apkRemoveHeader", - "version": "v2", + "version": "v1", "displayName": "Remove Header", "description": "This policy allows you to remove a header from the request", "policyAttributes": [