Merge branch 'dev-4.8.18' into cbrelease-4.8.17

MukeshLingutla · Sep 28, 2024 · 673a3a4 · 673a3a4
2 parents f9ed423 + 53b1ca8
commit 673a3a4
Show file tree

Hide file tree

Showing 16 changed files with 510 additions and 18 deletions.
diff --git a/ansible/inventory/env/group_vars/all.yml b/ansible/inventory/env/group_vars/all.yml
@@ -742,6 +742,7 @@ service_cb_integration_framework: cb-integration-framework
 service_ml_template_validation_portal_service: ml-template-validation-portal
 service_ml_template_validation_backend_service_service: ml-template-validation-backend-service
 service_cb_comment_service: cb-comment-service
+service_thumbnail_generation_service: thumbnail-generation-service
 
 # Ports
 service_bulk_upload_port: 3009
@@ -817,6 +818,7 @@ service_cb_integration_framework_port: 8091
 service_ml_template_validation_portal_port: 3111
 service_ml_template_validation_backend_service_port: 5000
 service_cb_comment_port: 8099
+service_thumbnail_generation_port: 8000
 
 # Network alias names, so that one service can talk to another
 network_alias_content_service: private-content-service
@@ -875,6 +877,7 @@ network_alias_cb_integration_framework: cb-integration-framework
 network_alias_ml_template_validation_portal_service: ml-template-validation-portal
 network_alias_ml_template_validation_backend_service_service: ml-template-validation-backend-service
 network_alias_cb_comment_service: cb-comment-service
+network_alias_thumbnail_generation_service: thumbnail-generation-service
 
 # Image names, this is used by the service alone, but since we want to have all the images in one place, we are oncfiguring the images here
 image_ui_static: ui-static
@@ -930,6 +933,7 @@ image_cb_service_registry_service: cb-service-registry
 image_ml_template_validation_portal_service: solution-upload-portal
 image_ml_template_validation_backend_service_service: ml-template-validation-backend-service
 image_cb_comment_service: cb-comment-service
+image_thumbnail_generation_service: thumbnail-generation-service
 
 #####################bulk-upload-spv#########
 host_bulk_upload: /mydata/bulk_upload
diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml
@@ -16681,7 +16681,7 @@ kong_apis:
 
   - name: hallOfFameUserLeaderBoard
     uris: "{{ halloffame_prefix }}/v1/userleaderboard"
-    upstream_url: "{{ sb_cb_ext_service_url }}/v1/halloffame/org/read"
+    upstream_url: "{{ sb_cb_ext_service_url }}/v1/halloffame/user/read"
     strip_uri: true
     plugins:
     - name: jwt
@@ -17705,9 +17705,9 @@ kong_apis:
       - name: request-size-limiting
         config.allowed_payload_size: "{{ medium_request_size_limit }}"        
 
-  - name: fileDownloadForCompetencyOrganisationMappingForOrg
-    uris: "{{ organisation_prefix }}/v1/getCompetencyDesignationMappingFile"
-    upstream_url: "{{ sb_cb_ext_service_url }}/organisation/v1/getCompetencyMappingFile"
+  - name: sampleFileDownloadForCompetencyOrganisationMappingForOrg
+    uris: "{{ organisation_prefix }}/v1/getCompetencyDesignationMappingFile/sample"
+    upstream_url: "{{ sb_cb_ext_service_url }}/organisation/v1/getCompetencyMappingFile/sample"
     strip_uri: true
     plugins:
       - name: jwt
@@ -17741,9 +17741,9 @@ kong_apis:
       - name: request-size-limiting
         config.allowed_payload_size: "{{ medium_request_size_limit }}"
 
-  - name: bulkUploadForCompetencyOrganisationMappingDetailsForOrg
-    uris: "{{ organisation_prefix }}/v1/competencyDesignationMappings/bulkUpload/details"
-    upstream_url: "{{ sb_cb_ext_service_url }}/organisation/v1/competencyDesignationMappings/details/bulkUpload"
+  - name: bulkUploadForCompetencyOrganisationMappingProgressDetailsForOrg
+    uris: "{{ organisation_prefix }}/v1/competencyDesignationMappings/bulkUpload/progress/details"
+    upstream_url: "{{ sb_cb_ext_service_url }}/organisation/v1/competencyDesignationMappings/progress/details/bulkUpload"
     strip_uri: true
     plugins:
       - name: jwt
@@ -17794,7 +17794,7 @@ kong_apis:
        config.limit_by: credential
      - name: request-size-limiting
        config.allowed_payload_size: "{{ medium_request_size_limit }}"
-
+       
   - name: publicAssessmentReadVersion1
     uris: "{{ public_assessment_prefix }}/v1/read"
     upstream_url: "{{ public_assessment_service_url }}/v1/public/assessment/read/do_11397690976124928011"
@@ -17864,3 +17864,165 @@ kong_apis:
         config.limit_by: credential
       - name: request-size-limiting
         config.allowed_payload_size: "{{ medium_request_size_limit }}"
+
+  - name: sampleFileDownloadForOrganisationDesignationMapping
+    uris: "{{ designation_prefix }}/v1/orgMapping/sample"
+    upstream_url: "{{ sb_cb_ext_service_url }}/designation/v1/orgMapping/sample"
+    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: "{{ medium_request_size_limit }}"
+
+  - name: bulkUploadForOrganisationDesignationMapping
+    uris: "{{ designation_prefix }}/v1/orgMapping/bulkUpload"
+    upstream_url: "{{ sb_cb_ext_service_url }}/designation/v1/orgMapping/bulkUpload"
+    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: "{{ medium_request_size_limit }}"
+
+  - name: bulkUploadForOrganisationDesignationMappingProgressDetails
+    uris: "{{ designation_prefix }}/v1/orgMapping/bulkUpload/progress/details"
+    upstream_url: "{{ sb_cb_ext_service_url }}/designation/v1/orgMapping/progress/details/bulkUpload"
+    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: "{{ medium_request_size_limit }}"
+
+  - name: bulkUploadFileDownloadFileForOrganisationDesignationMapping
+    uris: "{{ designation_prefix }}/v1/orgMapping/download"
+    upstream_url: "{{ sb_cb_ext_service_url }}/designation/v1/orgMapping/download"
+    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 }}"
+
+  - name: ciosReadContentByPartnercodeAndExternalid
+    uris: "{{ ciosIntegration_prefix }}/v1/read/content"
+    upstream_url: "{{ cios_content_service_url }}/ciosIntegration/v1/read/content"
+    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: ciosSearchContent
+    uris: "{{ ciosIntegration_prefix }}/v1/search/content"
+    upstream_url: "{{ cios_content_service_url }}/ciosIntegration/v1/search/content"
+    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: ciosUpdateContent
+    uris: "{{ ciosIntegration_prefix }}/v1/update/content"
+    upstream_url: "{{ cios_content_service_url }}/ciosIntegration/v1/update/content"
+    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: readbypartnercode
+    uris: "{{ contentpartner_prefix }}/v1/readbypartnercode"
+    upstream_url: "{{ cb_pores_service_url }}/contentpartner/v1/readbypartnercode"
+    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: "{{ medium_request_size_limit }}"
+
+  - name: initiateUserMigration
+    uris: "/user/migration/initiate"
+    upstream_url: "{{ sb_cb_ext_service_url }}/user/migration/initiate"
+    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: "{{ medium_request_size_limit }}"
diff --git a/kubernetes/helm_charts/core/nginx-public-ingress/values.j2 b/kubernetes/helm_charts/core/nginx-public-ingress/values.j2
@@ -655,6 +655,35 @@ proxyconfig: |-
      proxy_pass http://mentoring-portal:7601;
     }
 
+    location /validation/ {
+     proxy_set_header Host $host;
+     proxy_set_header X-Real-IP $remote_addr;
+     proxy_set_header X-Scheme $scheme;
+     proxy_connect_timeout 5;
+     proxy_send_timeout 60;
+     proxy_read_timeout 70;
+     proxy_set_header    X-Forwarded-Proto $scheme;
+     proxy_set_header Connection "";
+     proxy_http_version 1.1;
+     proxy_set_header X-Request-ID $sb_request_id;
+     rewrite ^/validation/(.*) /$1 break;
+     proxy_pass http://ml-template-validation-portal-service:3111;
+    }
+
+    location /imagegen/ {
+      proxy_cookie_path ~*^/.* /;
+      proxy_set_header X-Real-IP  $remote_addr;
+      proxy_set_header X-Forwarded-For $remote_addr;
+      proxy_set_header Host $host;
+      proxy_set_header X-Forwarded-Host $host;
+      proxy_set_header X-Forwarded-Server $host;
+      rewrite ^/imagegen/(.*) /$1 break;
+      proxy_pass http://thumbnail-generation-service:8000;
+      proxy_connect_timeout 10;
+      proxy_send_timeout 300;
+      proxy_read_timeout 300;
+    }
+
     location ~ /api/ratings/v1/read {
       # Enabling caching
       proxy_cache_key "$request_uri";
@@ -4008,6 +4037,21 @@ proxyconfig: |-
       proxy_set_header X-Request-ID $sb_request_id;
       proxy_pass http://ui-spv-igot;
     }
+
+    location /validation/ {
+      proxy_set_header Host $host;
+      proxy_set_header X-Real-IP $remote_addr;
+      proxy_set_header X-Scheme $scheme;
+      proxy_connect_timeout 5;
+      proxy_send_timeout 60;
+      proxy_read_timeout 70;
+      proxy_set_header    X-Forwarded-Proto $scheme;
+      proxy_set_header Connection "";
+      proxy_http_version 1.1;
+      proxy_set_header X-Request-ID $sb_request_id;
+      rewrite ^/validation/(.*) /$1 break;
+      proxy_pass http://ml-template-validation-portal-service:3111;
+    }
     location /v3/device/register {
       proxy_set_header X-Request-ID $sb_request_id;
       proxy_pass http://kong;

diff --git a/kubernetes/helm_charts/igot-deploy/cb-pores-service/files/cb-pores-service-env.j2 b/kubernetes/helm_charts/igot-deploy/cb-pores-service/files/cb-pores-service-env.j2
@@ -98,4 +98,10 @@ odcs.designation.term.read=v1/framework/term/read
 framework.copy=v1/framework/copy
 framework.publish=v1/framework/publish
 kafka.topic.framework.create={{env}}.framework.create
-kafka.topic.framework.create.group=framework.create.group
+kafka.topic.framework.create.group=framework.create.group
+
+cios.content.service.host=http://cios-content-service:7001
+cios.content.service.update.api=/ciosIntegration/v1/update/content
+cios.content.service.search.api=/ciosIntegration/v1/search/content
+cornell.partner.code=CORNELL
+upgrad.partner.code=UPGRAD
diff --git a/kubernetes/helm_charts/igot-deploy/cios-content-service/files/cios-content-service-env.j2 b/kubernetes/helm_charts/igot-deploy/cios-content-service/files/cios-content-service-env.j2
@@ -57,3 +57,12 @@ cios.read.api.base.url=http://cb-pores-service:7001
 cios.read.api.fixed.url=/cios/v1/content/readby/externalid/
 
 partner.read.path=/contentpartner/v1/readbypartnercode/
+
+elasticsearch.host={{ elasticsearch_host }}
+elasticsearch.port={{ elasticsearch_http_port }}
+elasticsearch.username={{ elasticsearch_username }}
+elasticsearch.password={{ elasticsearch_password }}
+elastic.required.field.cios.content.json.path=/EsFieldsMapping/esRequiredFieldsJsonFilePath.json
+search.result.redis.ttl=600
+cornell.partner.code=CORNELL
+upgrad.partner.code=UPGRAD
diff --git a/kubernetes/helm_charts/igot-deploy/ml-template-validation-portal/values.j2 b/kubernetes/helm_charts/igot-deploy/ml-template-validation-portal/values.j2
@@ -28,7 +28,7 @@ strategy:
 
 environmentjs: |-
   window["env"] = {
-      baseURL: 'http://ml-template-validation-backend-service:5000/template/api/v1/',
+      baseUrl: 'https://{{domain_name}}/apis/proxies/v8/',
       customAuth: true,
   };
 

diff --git a/kubernetes/helm_charts/igot-deploy/sb-cb-ext-service/files/sb-cb-ext-service-env.j2 b/kubernetes/helm_charts/igot-deploy/sb-cb-ext-service/files/sb-cb-ext-service-env.j2
@@ -435,6 +435,20 @@ designation.competency.bulk.upload.update.threshold.value=10
 
 competency.selected.version=competencies_v6
 competency.selected.version.facets.map={"competencies_v6":"competencies_v6.competencyAreaName,competencies_v6.competencyThemeName,competencies_v6.competencySubThemeName","competencies_v5":"competencies_v5.competencyArea,competencies_v5.competencyTheme,competencies_v5.competencySubTheme"}
-national.learning.insights.fields='{{national_learning_insights_fields}}'
-national.learning.insights.property.fields='{"valueColor": "#FFFFFF","labelColor": "#FFFFFF","linebreak":"false","background": "#1B4CA1","iconColor": "#FFFFFF"}'
-national.learning.insights.redis.key.mapping='{"Certificate Issued Yesterday":"dashboard_content_certificates_generated_yday_nlw_count","Total Certificate Issued So Far":"dashboard_content_certificates_generated_nlw_count","Events Published":"dashboard_events_published_nlw_count","Total Enrolments":"dashboard_content_enrolment_nlw_count"}'
+national.learning.insights.fields={{ national_learning_insights_fields }}
+national.learning.insights.property.fields={"valueColor": "#FFFFFF","labelColor": "#FFFFFF","linebreak":"false","background": "#1B4CA1","iconColor": "#FFFFFF"}
+national.learning.insights.redis.key.mapping={"Certificate Issued Yesterday":"dashboard_content_certificates_generated_yday_nlw_count","Total Certificate Issued So Far":"dashboard_content_certificates_generated_nlw_count","Events Published":"dashboard_events_published_nlw_count","Total Enrolments":"dashboard_content_enrolment_nlw_count"}
+
+#cbPoresService
+cb.pores.service.host=http://cb-pores-service:7001
+cb.pores.master.designation.endpoint=/designation/search
+sample.file.master.designation.workspace.name=Master
+Designationsample.bulk.upload.designation.file.name=bulkUploadDesignationMasterData.xlsx
+org.designation.bulk.upload.container.name=orgDesignation
+kafka.topics.org.designation.bulk.upload.event={{env}}.org.designation.bulk.upload
+kafka.topics.org.designation.bulk.upload.event.group=orgDesignationBulkUpload
+redis.master.data.read.timeout=3600
+
+
+kafka.topics.cqf.assessment.postpublish={{env}}.questionset.postpublish
+kafka.groupId.cqf.assessment.postpublish={{env}}-questionset-publish-group
diff --git a/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/Chart.yaml b/kubernetes/helm_charts/igot-deploy/thumbnail-generation-service/Chart.yaml
@@ -0,0 +1,6 @@
+apiVersion: v1
+appVersion: "1.0"
+description: A Helm chart for Kubernetes
+name: thumbnail-generation-service
+version: 0.1.0
+