From bc69adea64c5df73d755bca9c73da4a20e6daea1 Mon Sep 17 00:00:00 2001 From: dkttarento <138442957+dkttarento@users.noreply.github.com> Date: Thu, 9 May 2024 17:31:30 +0530 Subject: [PATCH 1/6] Update main.yml change in url for microsite --- 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 b060b8e902..b398a7314d 100644 --- a/ansible/roles/kong-api/defaults/main.yml +++ b/ansible/roles/kong-api/defaults/main.yml @@ -13004,8 +13004,8 @@ kong_apis: config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: microsite - uris: "/microsite/topFeatured/content/search" - upstream_url: "{{ sb_cb_ext_service_url }}/microsite/topFeatured/content/search" + uris: "/content/aggregation/search" + upstream_url: "{{ sb_cb_ext_service_url }}/content/aggregation/search" strip_uri: true plugins: - name: jwt From f6d8603e301eb1b5add53a91c20972350cf36d53 Mon Sep 17 00:00:00 2001 From: ravisaurav-tarento <142487505+ravisaurav-tarento@users.noreply.github.com> Date: Fri, 10 May 2024 11:33:08 +0530 Subject: [PATCH 2/6] Update main.yml --- ansible/roles/kong-api/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml index b060b8e902..5638074345 100644 --- a/ansible/roles/kong-api/defaults/main.yml +++ b/ansible/roles/kong-api/defaults/main.yml @@ -13022,7 +13022,7 @@ kong_apis: config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: workflowGetUserWFApplicationFieldsV2 - uris: "{{ workflow_handler_service_prefix }}/v2/getUserWFApplicationFields" + uris: "{{ workflow_handler_service_prefix }}/v2/userWFApplicationFieldsSearch" upstream_url: "{{ workflow_handler_service_url }}/v2/workflow/getUserWFApplicationFields" strip_uri: true plugins: From 32e177a4c55573d3c76fef565f0fb1fcb9a63f35 Mon Sep 17 00:00:00 2001 From: shankaragoudab <140387294+shankaragoudab@users.noreply.github.com> Date: Sun, 12 May 2024 19:45:58 +0530 Subject: [PATCH 3/6] added demand-create, read, delete and search api --- ansible/roles/kong-api/defaults/main.yml | 74 ++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml index cbb5b8acea..e33a2c0203 100644 --- a/ansible/roles/kong-api/defaults/main.yml +++ b/ansible/roles/kong-api/defaults/main.yml @@ -115,6 +115,7 @@ private_ml_survey_prefix: /private/mlsurvey open_program_prefix: /openprogram calendar_prefix: /calendar careers_prefix: /careers +demand_prefix: /demand # Service URLs knowledge_mw_service_url: "http://knowledge-mw-service:5000" @@ -153,6 +154,7 @@ ml_survey_service_url: "http://ml-survey-service:3000" ml_core_service_url: "http://ml-core-service:3000" ml_survey_private_url: "http://{{private_ingressgateway_ip}}/ml-survey" ml_core_private_url: "http://{{private_ingressgateway_ip}}/ml-core" +cb_pores_service_url : "http://cb-pores-service:7001" premium_consumer_rate_limits: - api: createContent @@ -13038,3 +13040,75 @@ kong_apis: config.limit_by: credential - name: request-size-limiting config.allowed_payload_size: "{{ small_request_size_limit }}" + + - name: demandCreate + uris: "{{ demand_prefix }}/create" + upstream_url: "{{ cb_pores_service_url }}/demand/create" + strip_uri: true + plugins: + - name: jwt + - name: cors + - "{{ statsd_pulgin }}" + - name: acl + config.whitelist: + - 'contentAccess' + - 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: demandRead + uris: "{{ demand_prefix }}/read" + upstream_url: "{{ cb_pores_service_url }}/demand/read" + strip_uri: true + plugins: + - name: jwt + - name: cors + - "{{ statsd_pulgin }}" + - name: acl + config.whitelist: + - 'contentAccess' + - 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: deleteDemand + uris: "{{ demand_prefix }}/delete" + upstream_url: "{{ cb_pores_service_url }}/demand/delete" + strip_uri: true + plugins: + - name: jwt + - name: cors + - "{{ statsd_pulgin }}" + - name: acl + config.whitelist: + - 'contentAccess' + - 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: searchDemand + uris: "{{ demand_prefix }}/filter" + upstream_url: "{{ cb_pores_service_url }}/demand/filter" + strip_uri: true + plugins: + - name: jwt + - name: cors + - "{{ statsd_pulgin }}" + - name: acl + config.whitelist: + - 'contentAccess' + - 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 e2bda61d1e324cf86b2668d45cfdee2a07c85b66 Mon Sep 17 00:00:00 2001 From: Sahil-tarento <140611066+Sahil-tarento@users.noreply.github.com> Date: Mon, 13 May 2024 12:46:06 +0530 Subject: [PATCH 4/6] Adding for orgResource Upload --- 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 e33a2c0203..3ba0ebc3c4 100644 --- a/ansible/roles/kong-api/defaults/main.yml +++ b/ansible/roles/kong-api/defaults/main.yml @@ -13112,3 +13112,21 @@ kong_apis: config.limit_by: credential - name: request-size-limiting config.allowed_payload_size: "{{ medium_request_size_limit }}" + + - name: orgAssetUpload + uris: "/storage/orgStoreUpload" + upstream_url: "{{ sb_cb_ext_service_url }}/storage/orgStoreUpload" + 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: "{{ x_large_request_size_limit }}" From 9d3423a4f98f90dd04420ccfa38245c35b9d605e Mon Sep 17 00:00:00 2001 From: dkttarento <138442957+dkttarento@users.noreply.github.com> Date: Mon, 13 May 2024 14:51:24 +0530 Subject: [PATCH 5/6] Update main.yml uris refactor for top courses msite. --- ansible/roles/kong-api/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml index 3ba0ebc3c4..f8a4416a10 100644 --- a/ansible/roles/kong-api/defaults/main.yml +++ b/ansible/roles/kong-api/defaults/main.yml @@ -13006,7 +13006,7 @@ kong_apis: config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: microsite - uris: "/content/aggregation/search" + uris: "/msite/content/aggregation/search" upstream_url: "{{ sb_cb_ext_service_url }}/content/aggregation/search" strip_uri: true plugins: From 100f6a7563b5ca05eb807087ea249588f182826f Mon Sep 17 00:00:00 2001 From: shankaragoudab <140387294+shankaragoudab@users.noreply.github.com> Date: Mon, 13 May 2024 18:13:41 +0530 Subject: [PATCH 6/6] updated the demand api's --- ansible/roles/kong-api/defaults/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml index f8a4416a10..ac8156fe7e 100644 --- a/ansible/roles/kong-api/defaults/main.yml +++ b/ansible/roles/kong-api/defaults/main.yml @@ -13042,7 +13042,7 @@ kong_apis: config.allowed_payload_size: "{{ small_request_size_limit }}" - name: demandCreate - uris: "{{ demand_prefix }}/create" + uris: "{{ demand_prefix }}/content/create" upstream_url: "{{ cb_pores_service_url }}/demand/create" strip_uri: true plugins: @@ -13060,7 +13060,7 @@ kong_apis: config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: demandRead - uris: "{{ demand_prefix }}/read" + uris: "{{ demand_prefix }}/content/read" upstream_url: "{{ cb_pores_service_url }}/demand/read" strip_uri: true plugins: @@ -13078,7 +13078,7 @@ kong_apis: config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: deleteDemand - uris: "{{ demand_prefix }}/delete" + uris: "{{ demand_prefix }}/content/delete" upstream_url: "{{ cb_pores_service_url }}/demand/delete" strip_uri: true plugins: @@ -13096,7 +13096,7 @@ kong_apis: config.allowed_payload_size: "{{ medium_request_size_limit }}" - name: searchDemand - uris: "{{ demand_prefix }}/filter" + uris: "{{ demand_prefix }}/content/search" upstream_url: "{{ cb_pores_service_url }}/demand/filter" strip_uri: true plugins: