From 9ece3b20e961f1740114d0b42bb732f4ce028156 Mon Sep 17 00:00:00 2001 From: Amit Kumar Yadav <36166686+amit-kumaryadav@users.noreply.github.com> Date: Wed, 7 Jul 2021 12:51:11 +0530 Subject: [PATCH 1/8] Update main.yml --- ansible/roles/kong-api/defaults/main.yml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml index 5f05e9a04..d136b9056 100644 --- a/ansible/roles/kong-api/defaults/main.yml +++ b/ansible/roles/kong-api/defaults/main.yml @@ -100,6 +100,7 @@ analytics_api_service_url: "http://analytics-service:9000" taxonomy_service_url: "http://taxonomy-service:9000" assessment_service_url: "http://assessment-service:9000" notification_service_url: "http://notification-service:9000" +sb_cb_ext_service_url: "http://sb-cb-ext-service:7001" premium_consumer_rate_limits: - api: createContent @@ -6039,3 +6040,21 @@ kong_apis: config.limit_by: credential - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" + + - name: getmandatoryContentStatus + uris: "/v1/check/mandatoryContentStatus" + upstream_url: "{{ sb_cb_ext_service_url }}/v1/check/mandatoryContentStatus" + strip_uri: true + plugins: + - name: jwt + - name: cors + - "{{ statsd_pulgin }}" + - name: acl + config.whitelist: + - 'mandatoryContentStatus' + - name: rate-limiting + config.policy: local + config.hour: "{{ medium_rate_limit_per_hour }}" + config.limit_by: credential + - name: request-size-limiting + config.allowed_payload_size: "{{ medium_request_size_limit }}" From 1dbe37bfa6e2fe4dd6726d49f5cb83fa72e78227 Mon Sep 17 00:00:00 2001 From: Amit Kumar Yadav <36166686+amit-kumaryadav@users.noreply.github.com> Date: Fri, 9 Jul 2021 10:42:24 +0530 Subject: [PATCH 2/8] Update main.yml --- ansible/roles/kong-api/defaults/main.yml | 277 +++++++++++++++++++++++ 1 file changed, 277 insertions(+) diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml index d136b9056..2422349ad 100644 --- a/ansible/roles/kong-api/defaults/main.yml +++ b/ansible/roles/kong-api/defaults/main.yml @@ -6058,3 +6058,280 @@ kong_apis: config.limit_by: credential - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" + + - name: assessmentSubmit + uris: "/v2/user/assessment/submit" + upstream_url: "{{ sb_cb_ext_service_url }}/v2/user/assessment/submit" + strip_uri: true + plugins: + - name: jwt + - name: cors + - "{{ statsd_pulgin }}" + - name: acl + config.whitelist: + - 'userAssessmentSubmit' + - name: rate-limiting + config.policy: local + config.hour: "{{ medium_rate_limit_per_hour }}" + config.limit_by: credential + - name: request-size-limiting + config.allowed_payload_size: "{{ medium_request_size_limit }}" + + + - name: getTopPerformersForCourse + uris: "/v2/resources/user/cohorts/top-performers" + upstream_url: "{{ sb_cb_ext_service_url }}/v2/resources/user/cohorts/top-performers" + strip_uri: true + plugins: + - name: jwt + - name: cors + - "{{ statsd_pulgin }}" + - name: acl + config.whitelist: + - 'topPerformersForCourse' + - name: rate-limiting + config.policy: local + config.hour: "{{ medium_rate_limit_per_hour }}" + config.limit_by: credential + - name: request-size-limiting + config.allowed_payload_size: "{{ medium_request_size_limit }}" + + - name: getActiveUsersForCourse + uris: "/v2/resources/user/cohorts/activeusers" + upstream_url: "{{ sb_cb_ext_service_url }}/v2/resources/user/cohorts/activeusers" + strip_uri: true + plugins: + - name: jwt + - name: cors + - "{{ statsd_pulgin }}" + - name: acl + config.whitelist: + - 'activeUsersForCourse' + - name: rate-limiting + config.policy: local + config.hour: "{{ medium_rate_limit_per_hour }}" + config.limit_by: credential + - name: request-size-limiting + config.allowed_payload_size: "{{ medium_request_size_limit }}" + + - name: courseAutoenrollment + uris: "/v1/autoenrollment" + upstream_url: "{{ sb_cb_ext_service_url }}/v1/autoenrollment" + strip_uri: true + plugins: + - name: jwt + - name: cors + - "{{ statsd_pulgin }}" + - name: acl + config.whitelist: + - 'courseAutoenrollment' + - name: rate-limiting + config.policy: local + config.hour: "{{ medium_rate_limit_per_hour }}" + config.limit_by: credential + - name: request-size-limiting + config.allowed_payload_size: "{{ medium_request_size_limit }}" + + - name: getCatalog + uris: "/v1/catalog/" + upstream_url: "{{ sb_cb_ext_service_url }}/v1/catalog/" + strip_uri: true + plugins: + - name: jwt + - name: cors + - "{{ statsd_pulgin }}" + - name: acl + config.whitelist: + - 'getCatalog' + - name: rate-limiting + config.policy: local + config.hour: "{{ medium_rate_limit_per_hour }}" + config.limit_by: credential + - name: request-size-limiting + config.allowed_payload_size: "{{ medium_request_size_limit }}" + + + - name: addWorkAllocation + uris: "/v2/workallocation/add" + upstream_url: "{{ sb_cb_ext_service_url }}/v2/workallocation/add" + strip_uri: true + plugins: + - name: jwt + - name: cors + - "{{ statsd_pulgin }}" + - name: acl + config.whitelist: + - 'addWorkAllocation' + - name: rate-limiting + config.policy: local + config.hour: "{{ medium_rate_limit_per_hour }}" + config.limit_by: credential + - name: request-size-limiting + config.allowed_payload_size: "{{ medium_request_size_limit }}" + + - name: updateWorkAllocation + uris: "/v2/workallocation/update" + upstream_url: "{{ sb_cb_ext_service_url }}/v2/workallocation/update" + strip_uri: true + plugins: + - name: jwt + - name: cors + - "{{ statsd_pulgin }}" + - name: acl + config.whitelist: + - 'updateWorkAllocation' + - name: rate-limiting + config.policy: local + config.hour: "{{ medium_rate_limit_per_hour }}" + config.limit_by: credential + - name: request-size-limiting + config.allowed_payload_size: "{{ medium_request_size_limit }}" + + + - name: addWorkOrder + uris: "/v2/workallocation/add/workorder" + upstream_url: "{{ sb_cb_ext_service_url }}/v2/workallocation/add/workorder" + strip_uri: true + plugins: + - name: jwt + - name: cors + - "{{ statsd_pulgin }}" + - name: acl + config.whitelist: + - 'addWorkOrder' + - name: rate-limiting + config.policy: local + config.hour: "{{ medium_rate_limit_per_hour }}" + config.limit_by: credential + - name: request-size-limiting + config.allowed_payload_size: "{{ medium_request_size_limit }}" + + + - name: updateWorkOrder + uris: "/v2/workallocation/update/workorder" + upstream_url: "{{ sb_cb_ext_service_url }}/v2/workallocation/update/workorder" + strip_uri: true + plugins: + - name: jwt + - name: cors + - "{{ statsd_pulgin }}" + - name: acl + config.whitelist: + - 'updateWorkOrder' + - name: rate-limiting + config.policy: local + config.hour: "{{ medium_rate_limit_per_hour }}" + config.limit_by: credential + - name: request-size-limiting + config.allowed_payload_size: "{{ medium_request_size_limit }}" + + + - name: getWorkOrders + uris: "/v2/workallocation/getWorkOrders" + upstream_url: "{{ sb_cb_ext_service_url }}/v2/workallocation/getWorkOrders" + strip_uri: true + plugins: + - name: jwt + - name: cors + - "{{ statsd_pulgin }}" + - name: acl + config.whitelist: + - 'getWorkOrders' + - name: rate-limiting + config.policy: local + config.hour: "{{ medium_rate_limit_per_hour }}" + config.limit_by: credential + - name: request-size-limiting + config.allowed_payload_size: "{{ small_request_size_limit }}" + + - name: getWorkOrderById + uris: "/v2/workallocation/getWorkOrderById" + upstream_url: "{{ sb_cb_ext_service_url }}/v2/workallocation/getWorkOrderById" + strip_uri: true + plugins: + - name: jwt + - name: cors + - "{{ statsd_pulgin }}" + - name: acl + config.whitelist: + - 'getWorkOrderById' + - name: rate-limiting + config.policy: local + config.hour: "{{ medium_rate_limit_per_hour }}" + config.limit_by: credential + - name: request-size-limiting + config.allowed_payload_size: "{{ small_request_size_limit }}" + + + - name: getWorkAllocationById + uris: "/v2/workallocation/getWorkAllocationById" + upstream_url: "{{ sb_cb_ext_service_url }}/v2/workallocation/getWorkAllocationById" + strip_uri: true + plugins: + - name: jwt + - name: cors + - "{{ statsd_pulgin }}" + - name: acl + config.whitelist: + - 'getWorkAllocationById' + - name: rate-limiting + config.policy: local + config.hour: "{{ medium_rate_limit_per_hour }}" + config.limit_by: credential + - name: request-size-limiting + config.allowed_payload_size: "{{ small_request_size_limit }}" + + - name: copyWorkOrder + uris: "/v2/workallocation/copy/workOrder" + upstream_url: "{{ sb_cb_ext_service_url }}/v2/workallocation/copy/workOrder" + strip_uri: true + plugins: + - name: jwt + - name: cors + - "{{ statsd_pulgin }}" + - name: acl + config.whitelist: + - 'copyWorkOrder' + - name: rate-limiting + config.policy: local + config.hour: "{{ medium_rate_limit_per_hour }}" + config.limit_by: credential + - name: request-size-limiting + config.allowed_payload_size: "{{ medium_request_size_limit }}" + + - name: getUserBasicDetails + uris: "/v2/workallocation/user/basicInfo" + upstream_url: "{{ sb_cb_ext_service_url }}/v2/workallocation/user/basicInfo" + strip_uri: true + plugins: + - name: jwt + - name: cors + - "{{ statsd_pulgin }}" + - name: acl + config.whitelist: + - 'getUserBasicDetails' + - name: rate-limiting + config.policy: local + config.hour: "{{ medium_rate_limit_per_hour }}" + config.limit_by: credential + - name: request-size-limiting + config.allowed_payload_size: "{{ small_request_size_limit }}" + + + - name: watAutoComplete + uris: "/v1/workallocation/users/autocomplete" + upstream_url: "{{ sb_cb_ext_service_url }}/v1/workallocation/users/autocomplete" + strip_uri: true + plugins: + - name: jwt + - name: cors + - "{{ statsd_pulgin }}" + - name: acl + config.whitelist: + - 'watAutoComplete' + - name: rate-limiting + config.policy: local + config.hour: "{{ medium_rate_limit_per_hour }}" + config.limit_by: credential + - name: request-size-limiting + config.allowed_payload_size: "{{ small_request_size_limit }}" From b8a6e891e61129743c22f94fa56beb8b91ef4b37 Mon Sep 17 00:00:00 2001 From: Amit Kumar Yadav <36166686+amit-kumaryadav@users.noreply.github.com> Date: Fri, 9 Jul 2021 13:23:41 +0530 Subject: [PATCH 3/8] Update main.yml --- ansible/roles/kong-api/defaults/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml index 2422349ad..5a3dbce1c 100644 --- a/ansible/roles/kong-api/defaults/main.yml +++ b/ansible/roles/kong-api/defaults/main.yml @@ -6051,7 +6051,7 @@ kong_apis: - "{{ statsd_pulgin }}" - name: acl config.whitelist: - - 'mandatoryContentStatus' + - 'dataAccess' - name: rate-limiting config.policy: local config.hour: "{{ medium_rate_limit_per_hour }}" @@ -6106,7 +6106,7 @@ kong_apis: - "{{ statsd_pulgin }}" - name: acl config.whitelist: - - 'activeUsersForCourse' + - 'dataAccess' - name: rate-limiting config.policy: local config.hour: "{{ medium_rate_limit_per_hour }}" @@ -6124,7 +6124,7 @@ kong_apis: - "{{ statsd_pulgin }}" - name: acl config.whitelist: - - 'courseAutoenrollment' + - 'courseSuperAdmin' - name: rate-limiting config.policy: local config.hour: "{{ medium_rate_limit_per_hour }}" From e948e0237a84cb34e3d0d928e64ef2737ba12157 Mon Sep 17 00:00:00 2001 From: Amit Kumar Yadav <36166686+amit-kumaryadav@users.noreply.github.com> Date: Fri, 9 Jul 2021 13:54:07 +0530 Subject: [PATCH 4/8] Update main.yml --- ansible/roles/kong-api/defaults/main.yml | 28 ++++++++++++------------ 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml index 5a3dbce1c..afddd4f08 100644 --- a/ansible/roles/kong-api/defaults/main.yml +++ b/ansible/roles/kong-api/defaults/main.yml @@ -6069,7 +6069,7 @@ kong_apis: - "{{ statsd_pulgin }}" - name: acl config.whitelist: - - 'userAssessmentSubmit' + - 'dataCreate' - name: rate-limiting config.policy: local config.hour: "{{ medium_rate_limit_per_hour }}" @@ -6088,7 +6088,7 @@ kong_apis: - "{{ statsd_pulgin }}" - name: acl config.whitelist: - - 'topPerformersForCourse' + - 'dataAccess' - name: rate-limiting config.policy: local config.hour: "{{ medium_rate_limit_per_hour }}" @@ -6124,7 +6124,7 @@ kong_apis: - "{{ statsd_pulgin }}" - name: acl config.whitelist: - - 'courseSuperAdmin' + - 'dataCreate' - name: rate-limiting config.policy: local config.hour: "{{ medium_rate_limit_per_hour }}" @@ -6142,7 +6142,7 @@ kong_apis: - "{{ statsd_pulgin }}" - name: acl config.whitelist: - - 'getCatalog' + - 'dataAccess' - name: rate-limiting config.policy: local config.hour: "{{ medium_rate_limit_per_hour }}" @@ -6161,7 +6161,7 @@ kong_apis: - "{{ statsd_pulgin }}" - name: acl config.whitelist: - - 'addWorkAllocation' + - 'dataCreate' - name: rate-limiting config.policy: local config.hour: "{{ medium_rate_limit_per_hour }}" @@ -6179,7 +6179,7 @@ kong_apis: - "{{ statsd_pulgin }}" - name: acl config.whitelist: - - 'updateWorkAllocation' + - 'dataUpdate' - name: rate-limiting config.policy: local config.hour: "{{ medium_rate_limit_per_hour }}" @@ -6198,7 +6198,7 @@ kong_apis: - "{{ statsd_pulgin }}" - name: acl config.whitelist: - - 'addWorkOrder' + - 'dataCreate' - name: rate-limiting config.policy: local config.hour: "{{ medium_rate_limit_per_hour }}" @@ -6217,7 +6217,7 @@ kong_apis: - "{{ statsd_pulgin }}" - name: acl config.whitelist: - - 'updateWorkOrder' + - 'dataUpdate' - name: rate-limiting config.policy: local config.hour: "{{ medium_rate_limit_per_hour }}" @@ -6236,7 +6236,7 @@ kong_apis: - "{{ statsd_pulgin }}" - name: acl config.whitelist: - - 'getWorkOrders' + - 'dataAccess' - name: rate-limiting config.policy: local config.hour: "{{ medium_rate_limit_per_hour }}" @@ -6254,7 +6254,7 @@ kong_apis: - "{{ statsd_pulgin }}" - name: acl config.whitelist: - - 'getWorkOrderById' + - 'dataAccess' - name: rate-limiting config.policy: local config.hour: "{{ medium_rate_limit_per_hour }}" @@ -6273,7 +6273,7 @@ kong_apis: - "{{ statsd_pulgin }}" - name: acl config.whitelist: - - 'getWorkAllocationById' + - 'dataAccess' - name: rate-limiting config.policy: local config.hour: "{{ medium_rate_limit_per_hour }}" @@ -6291,7 +6291,7 @@ kong_apis: - "{{ statsd_pulgin }}" - name: acl config.whitelist: - - 'copyWorkOrder' + - 'dataCreate' - name: rate-limiting config.policy: local config.hour: "{{ medium_rate_limit_per_hour }}" @@ -6309,7 +6309,7 @@ kong_apis: - "{{ statsd_pulgin }}" - name: acl config.whitelist: - - 'getUserBasicDetails' + - 'dataAccess' - name: rate-limiting config.policy: local config.hour: "{{ medium_rate_limit_per_hour }}" @@ -6328,7 +6328,7 @@ kong_apis: - "{{ statsd_pulgin }}" - name: acl config.whitelist: - - 'watAutoComplete' + - 'dataAccess' - name: rate-limiting config.policy: local config.hour: "{{ medium_rate_limit_per_hour }}" From 26e9e2242d93162a7de12708297fa6f6fe30445c Mon Sep 17 00:00:00 2001 From: Amit Kumar Yadav <36166686+amit-kumaryadav@users.noreply.github.com> Date: Fri, 9 Jul 2021 15:09:19 +0530 Subject: [PATCH 5/8] Update main.yml --- ansible/roles/kong-api/defaults/main.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml index afddd4f08..936b760ff 100644 --- a/ansible/roles/kong-api/defaults/main.yml +++ b/ansible/roles/kong-api/defaults/main.yml @@ -6335,3 +6335,21 @@ kong_apis: config.limit_by: credential - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" + + - name: getWOPdf + uris: "/getWOPdf" + upstream_url: "{{ sb_cb_ext_service_url }}/getWOPdf" + strip_uri: true + plugins: + - name: jwt + - name: cors + - "{{ statsd_pulgin }}" + - name: acl + config.whitelist: + - 'dataAccess' + - name: rate-limiting + config.policy: local + config.hour: "{{ medium_rate_limit_per_hour }}" + config.limit_by: credential + - name: request-size-limiting + config.allowed_payload_size: "{{ small_request_size_limit }}" From 2f5caf8972e1e9a6f336cc3608cc92ffa93ab3d9 Mon Sep 17 00:00:00 2001 From: Amit Kumar Yadav <36166686+amit-kumaryadav@users.noreply.github.com> Date: Fri, 9 Jul 2021 15:39:41 +0530 Subject: [PATCH 6/8] Update main.yml --- ansible/roles/kong-consumer/defaults/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/ansible/roles/kong-consumer/defaults/main.yml b/ansible/roles/kong-consumer/defaults/main.yml index 2ab952531..ddcee0dcf 100644 --- a/ansible/roles/kong-consumer/defaults/main.yml +++ b/ansible/roles/kong-consumer/defaults/main.yml @@ -85,6 +85,7 @@ kong_all_consumer_groups: - druidReportCreate - druidReportAdmin - dataCreate + - dataUpdate kong_consumers: - username: api-admin From 8d8496f57f798a396ee20662a001b97fbd99fc5e Mon Sep 17 00:00:00 2001 From: Amit Kumar Yadav <36166686+amit-kumaryadav@users.noreply.github.com> Date: Fri, 9 Jul 2021 15:56:30 +0530 Subject: [PATCH 7/8] Update main.yml --- ansible/roles/kong-consumer/defaults/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/ansible/roles/kong-consumer/defaults/main.yml b/ansible/roles/kong-consumer/defaults/main.yml index ddcee0dcf..2ab952531 100644 --- a/ansible/roles/kong-consumer/defaults/main.yml +++ b/ansible/roles/kong-consumer/defaults/main.yml @@ -85,7 +85,6 @@ kong_all_consumer_groups: - druidReportCreate - druidReportAdmin - dataCreate - - dataUpdate kong_consumers: - username: api-admin From d1fceadc608bd84120f97b5aeafdea45ecabbf19 Mon Sep 17 00:00:00 2001 From: Amit Kumar Yadav <36166686+amit-kumaryadav@users.noreply.github.com> Date: Fri, 9 Jul 2021 15:57:52 +0530 Subject: [PATCH 8/8] Update main.yml --- ansible/roles/kong-api/defaults/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml index 936b760ff..a7f6ff1ae 100644 --- a/ansible/roles/kong-api/defaults/main.yml +++ b/ansible/roles/kong-api/defaults/main.yml @@ -6179,7 +6179,7 @@ kong_apis: - "{{ statsd_pulgin }}" - name: acl config.whitelist: - - 'dataUpdate' + - 'dataCreate' - name: rate-limiting config.policy: local config.hour: "{{ medium_rate_limit_per_hour }}" @@ -6217,7 +6217,7 @@ kong_apis: - "{{ statsd_pulgin }}" - name: acl config.whitelist: - - 'dataUpdate' + - 'dataCreate' - name: rate-limiting config.policy: local config.hour: "{{ medium_rate_limit_per_hour }}"