Merge branch 'project-sunbird:release-6.0.0' into release-6.0.0

project-sunbird · May 6, 2024 · 966e885 · 966e885
2 parents f48b749 + 7e703a9
commit 966e885
Show file tree

Hide file tree

Showing 25 changed files with 982 additions and 291 deletions.
diff --git a/ansible/artifacts/sunbird/login/resources/js/telemetry_service.js b/ansible/artifacts/sunbird/login/resources/js/telemetry_service.js
@@ -3159,6 +3159,7 @@ var handleGoogleAuthEvent = () => {
         redirectToLib();
     }
 };
+
 var redirectToPortal = (redirectUrlPath) => { // redirectUrlPath for sso and self signUp
     const curUrlObj = window.location;
     var redirect_uri = getValueFromSession('redirect_uri');
@@ -3171,9 +3172,7 @@ var redirectToPortal = (redirectUrlPath) => { // redirectUrlPath for sso and sel
             const redirect_uriLocation = new URL(redirect_uri);
             if (client_id === 'android' || client_id === 'desktop') {
                 window.location.href = sessionUrlObj.protocol + '//' + sessionUrlObj.host + redirectUrlPath + updatedQuery;
-            } else if(client_id === 'portal' && 
-            redirectUrlPath === '/sign-in/sso/select-org' && 
-            (redirect_uri.includes('dock.sunbirded.org') || redirect_uri.includes('dockstaging.sunbirded.org'))) {
+            } else if(client_id === 'portal' && redirectUrlPath === '/sign-in/sso/select-org' && (sessionUrlObj.host !== redirect_uriLocation.host)) {
                 window.location.href = sessionUrlObj.protocol + '//' + sessionUrlObj.host + redirectUrlPath + updatedQuery;
             } else {
                 window.location.href = redirect_uriLocation.protocol + '//' + redirect_uriLocation.host +

diff --git a/ansible/roles/kong-api/defaults/main.yml b/ansible/roles/kong-api/defaults/main.yml
@@ -8237,6 +8237,27 @@ kong_apis:
     config.required: false
     config.enabled: false
 
+- name: uploadFileToCloud
+  uris: "{{ cloud_service_prefix }}/mlcore/v1/files/upload"
+  upstream_url: "{{ ml_core_service_url }}/v1/cloud-services/files/upload"
+  strip_uri: true
+  plugins:
+  - name: jwt
+  - name: cors
+  - "{{ statsd_pulgin }}"
+  - name: acl
+    config.whitelist:
+    - cloudUrlsCreate
+  - 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: listPlatformPrograms
   uris: "{{ user_extension_prefix }}/mlcore/v1/programsByPlatformRoles"
   upstream_url: "{{ ml_core_service_url }}/v1/user-extension/programsByPlatformRoles"

diff --git a/ansible/roles/ml-analytics-service/defaults/main.yml b/ansible/roles/ml-analytics-service/defaults/main.yml
@@ -138,3 +138,4 @@ ml_analytics_batch_cron_hour: "{{ ml_batch_cron_hour | default('18') }}"
 ml_analytics_nvsk_cron_minute: "{{ ml_nvsk_cron_minute | default('30') }}"
 ml_analytics_nvsk_cron_hour: "{{ ml_nvsk_cron_hour | default('7') }}"
 ml_analytics_nvsk_cron_weekday: "{{ ml_nvsk_cron_weekday | default('4') }}"
+ml_analytics_faust_applications_list: "'observations/py_observation_streaming observations/', 'observations/py_observation_evidence_streaming observations/', 'survey/py_survey_streaming survey/', 'survey/py_survey_evidence_streaming survey/'"
diff --git a/ansible/roles/ml-analytics-service/templates/config.j2 b/ansible/roles/ml-analytics-service/templates/config.j2
@@ -263,3 +263,8 @@ store = {{ ml_analytics_reports_store }}
 [ML_CORE_SERVICE_URL]
 
 url = {{ ml_analytics_core_service }}
+
+
+[SERVICES]
+
+faust_applications_list = {{ ml_analytics_faust_applications_list }}
diff --git a/ansible/roles/stack-sunbird/defaults/main.yml b/ansible/roles/stack-sunbird/defaults/main.yml
@@ -268,6 +268,7 @@ service_env:
   ml-reports-service: ../../../../ansible/roles/stack-sunbird/templates/ml-reports-service.env
   ml-core-service: ../../../../ansible/roles/stack-sunbird/templates/ml-core-service.env
   ml-projects-service: ../../../../ansible/roles/stack-sunbird/templates/ml-projects-service.env
+  ml-analytics-service: ../../../../ansible/roles/stack-sunbird/templates/ml-analytics-service.conf
   inbound: ../../../../ansible/roles/stack-sunbird/templates/inbound.env
   outbound:
     - ../../../../ansible/roles/stack-sunbird/templates/outbound.env

diff --git a/ansible/roles/stack-sunbird/templates/analytics_api_service.conf b/ansible/roles/stack-sunbird/templates/analytics_api_service.conf
@@ -201,10 +201,10 @@ public {
   }
 }
 cloud_storage_type="{{cloud_service_provider}}"
-storage.key.config="{{cloud_public_storage_accountname}}"
-storage.secret.config="{{cloud_public_storage_secret}}"
-public.storage.key.config="{{cloud_public_storage_accountname}}"
-public.storage.secret.config="{{cloud_public_storage_secret}}"
+storage.key.config="cloud_storage_key"
+storage.secret.config="cloud_storage_secret"
+public.storage.key.config="public_cloud_storage_key"
+public.storage.secret.config="public_cloud_storage_secret"
 cloud_storage_endpoint_with_protocol="{{cloud_storage_url}}"
 metrics.time.interval.min=30
 cache.refresh.time.interval.min=1440

diff --git a/ansible/roles/stack-sunbird/templates/ml-analytics-service.conf b/ansible/roles/stack-sunbird/templates/ml-analytics-service.conf
diff --git a/ansible/roles/stack-sunbird/templates/ml-core-service.env b/ansible/roles/stack-sunbird/templates/ml-core-service.env
@@ -69,4 +69,12 @@ KAFKA_GROUP_ID={{ml_core_kafka_group_id | default("ml-core-service")}}
 PROGRAM_USERS_JOINED_TOPIC={{ml_core_program_users_joined_topic | default (env_name+".programuser.info")}}
 
 #TimeOffset with respect to UTC
-TIMEZONE_DIFFRENECE_BETWEEN_LOCAL_TIME_AND_UTC={{ml_core_timezone_diffrenece_between_local_time_and_utc | default ("+05:30")}}
+TIMEZONE_DIFFRENECE_BETWEEN_LOCAL_TIME_AND_UTC={{ml_core_timezone_diffrenece_between_local_time_and_utc | default ("+05:30")}}
+
+
+#Validate Entities enable/Disable
+VALIDATE_ENTITIES={{ml_service_validate_entities | default ("ON")}}
+
+#Public base url of sunbird
+PUBLIC_BASE_URL={{ml_core_public_base_url | default("")}}
+
diff --git a/ansible/roles/stack-sunbird/templates/ml-survey-service.env b/ansible/roles/stack-sunbird/templates/ml-survey-service.env
@@ -65,3 +65,9 @@ KEYCLOAK_PUBLIC_KEY_PATH={{ml_survey_keycloak_public_key_path|default("keycloak-
 
 ## portal url of env
 APP_PORTAL_BASE_URL={{ proto }}://{{ domain_name }}
+
+#Program join enable/disable
+PROGRAM_JOIN_ON_OFF={{ml_program_join_on_off | default ("ON")}}
+
+#validate entities enable/disable
+VALIDATE_ENTITIES={{ml_service_validate_entities | default ("ON")}}
diff --git a/ansible/roles/stack-sunbird/templates/sunbird_report-service.env b/ansible/roles/stack-sunbird/templates/sunbird_report-service.env
@@ -29,3 +29,13 @@ sunbird_cache_ttl={{sunbird_cache_ttl}}
 sunbird_report_sas_expiry_in_minutes=3600
 sunbird_dataservice_url={{sunbird_dataservice_url}}
 
+# 6.0.0
+
+sunbird_cloud_storage_provider={{cloud_service_provider}}
+cloud_private_storage_accountname={{cloud_private_storage_accountname | default("")}}
+cloud_private_storage_secret={{cloud_private_storage_secret | default("")}}
+cloud_storage_privatereports_bucketname={{cloud_storage_privatereports_bucketname | default("reports")}}
+cloud_storage_resourceBundle_bucketname={{cloud_storage_label_bucketname | default("label")}}
+cloud_private_storage_region={{cloud_private_storage_region | default("ap-south-1")}}
+cloud_private_storage_project={{cloud_private_storage_project | default("")}}
+cloud_private_storage_endpoint={{cloud_private_storage_endpoint | default("")}}