Merge pull request #3405 from Jayaprakash8887/release-5.0.0

Issue #SB-28316 feat: Dialcode reserve API code refactor.
project-sunbird · Jul 8, 2022 · 67d75b8 · 67d75b8
2 parents d7b1a56 + ef3d076
commit 67d75b8
Show file tree

Hide file tree

Showing 3 changed files with 108 additions and 1 deletion.
diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml
@@ -3944,6 +3944,48 @@ kong_apis:
     config.required: false
     config.enabled: false
 
+- name: linkDialcodeContentV1
+  uris: "{{ content_prefix }}/v1/dialcode/link"
+  upstream_url: "{{ content_service_url }}/content/v3/dialcode/link"
+  strip_uri: true
+  plugins:
+  - name: jwt
+  - name: cors
+  - "{{ statsd_pulgin }}"
+  - name: acl
+    config.whitelist:
+    - contentUpdate
+  - 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: opa-checks
+    config.required: false
+    config.enabled: false
+
+- name: reserveDialcodeContent
+  uris: "{{ content_prefix }}/v1/dialcode/reserve"
+  upstream_url: "{{ content_service_url }}/content/v3/dialcode/reserve"
+  strip_uri: true
+  plugins:
+  - name: jwt
+  - name: cors
+  - "{{ statsd_pulgin }}"
+  - name: acl
+    config.whitelist:
+    - contentUpdate
+  - 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: opa-checks
+    config.required: false
+    config.enabled: false
+
 - name: updateCourseHierarchy
   uris: "{{ course_service_prefix }}/v1/hierarchy/update"
   upstream_url: "{{ knowledge_mw_service_url }}/v1/course/hierarchy/update"
@@ -6029,7 +6071,7 @@ kong_apis:
   - "{{ statsd_pulgin }}"
   - name: acl
     config.whitelist:
-    - contentCreate
+    - contentUpdate
   - name: rate-limiting
     config.policy: local
     config.hour: "{{ medium_rate_limit_per_hour }}"
@@ -9314,6 +9356,48 @@ kong_apis:
     config.required: true
     config.enabled: true
 
+- name: linkDialcodeContentV2
+  uris: "{{ content_prefix }}/v2/dialcode/link"
+  upstream_url: "{{ content_service_url }}/content/v4/dialcode/link"
+  strip_uri: true
+  plugins:
+  - name: jwt
+  - name: cors
+  - "{{ statsd_pulgin }}"
+  - name: acl
+    config.whitelist:
+    - contentUpdate
+  - 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: opa-checks
+    config.required: false
+    config.enabled: false
+
+- name: reserveDialcodeContentV2
+  uris: "{{ content_prefix }}/v2/dialcode/reserve"
+  upstream_url: "{{ content_service_url }}/content/v4/dialcode/reserve"
+  strip_uri: true
+  plugins:
+  - name: jwt
+  - name: cors
+  - "{{ statsd_pulgin }}"
+  - name: acl
+    config.whitelist:
+    - contentUpdate
+  - 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: opa-checks
+    config.required: false
+    config.enabled: false
+
 - name: collectionReview
   uris: "{{ collection_prefix }}/v1/review"
   upstream_url: "{{ content_service_url }}/collection/v4/review"
@@ -9377,6 +9461,27 @@ kong_apis:
     config.required: false
     config.enabled: false
 
+- name: reserveDialcodeCollection
+  uris: "{{ collection_prefix }}/v1/dialcode/reserve"
+  upstream_url: "{{ content_service_url }}/collection/v4/dialcode/reserve"
+  strip_uri: true
+  plugins:
+  - name: jwt
+  - name: cors
+  - "{{ statsd_pulgin }}"
+  - name: acl
+    config.whitelist:
+    - contentUpdate
+  - 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: opa-checks
+    config.required: false
+    config.enabled: false
+
 - name: listNotificationTemplate
   uris: "{{ notification_service_prefix }}/v1/template/list"
   upstream_url: "{{ notification_service_url }}/v1/notification/template/list"

diff --git a/ansible/roles/stack-sunbird/templates/content-service_application.conf b/ansible/roles/stack-sunbird/templates/content-service_application.conf
@@ -501,6 +501,7 @@ dial_service {
     base_url : "http://dial-service.{{namespace}}.svc.cluster.local:9000"
     auth_key : "{{ sunbird_dial_repo_api_key }}"
     search   : "/dialcode/v3/search"
+    generate_url : "/dialcode/v3/generate"
   }
 }
 content.link_dialcode.validation=true

diff --git a/ansible/roles/stack-sunbird/templates/dial-service_application.conf b/ansible/roles/stack-sunbird/templates/dial-service_application.conf
@@ -188,5 +188,6 @@ jsonld {
     type = "sb"
     localPath = "/tmp"
     ttl = 300
+    sb_schema = ["https://sunbirdstagingpublic.blob.core.windows.net/sunbird-dial-staging/jsonld-schema/local/sb/schema.jsonld"]
 }