feat: merge 4.0 to 4.1

ansible/inventory/env/group_vars/all.yml

@@ -481,11 +481,6 @@ sunbird_portal_offline_app_download_url: ""
 sunbird_portal_log_level: "debug"
 
 ### Release 2.2.0 ###
-sunbird_google_android_keycloak_client_id: ''
-sunbird_google_android_keycloak_secret: ''
-sunbird_trampoline_android_keycloak_client_id: ''
-sunbird_trampoline_android_keycloak_secret: ''
-sunbird_android_keycloak_client_id: ''
 sunbird_user_org_api_base_url: http://{{sunbird_swarm_manager_lb_ip}}:9000
 
 ### Release-2.3.0 ###
@@ -588,3 +583,11 @@ bootstrap_namespace: "{{ env }},flink-{{ env }},flink-kp-{{ env }}"
 graylog_open_to_public: false
 send_logs_to_graylog: false
 graylog_open_to_private: false
+
+# Keycloak related variables
+sunbird_google_android_keycloak_client_id: google-auth-android
+sunbird_android_keycloak_client_id: android
+sunbird_desktop_keycloak_client_id: desktop
+sunbird_google_desktop_keycloak_client_id: google-auth-desktop
+sunbird_trampoline_android_keycloak_client_id: trampoline-android
+sunbird_trampoline_desktop_keycloak_client_id: trampoline-desktop

ansible/roles/keycloak-deploy/templates/keycloak-realm.j2

@@ -661,7 +661,7 @@
       "surrogateAuthRequired": false,
       "enabled": true,
       "clientAuthenticatorType": "client-secret",
-      "secret": "{{ core_vault_android_secret }}",
+      "secret": "{{ core_vault_android_keycloak_secret }}",
       "redirectUris": [
         "{{proto}}://{{proxy_server_name}}/oauth2callback",
         "{{ env }}.sunbird.app://mobile"
@@ -796,7 +796,7 @@
       "surrogateAuthRequired": false,
       "enabled": true,
       "clientAuthenticatorType": "client-secret",
-      "secret": "{{ core_vault_google_desktop_secret }}",
+      "secret": "{{ sunbird_google_desktop_keycloak_secret }}",
       "redirectUris": [
         "{{proto}}://{{proxy_server_name}}/*"
       ],
@@ -1683,7 +1683,7 @@
       "surrogateAuthRequired": false,
       "enabled": true,
       "clientAuthenticatorType": "client-secret",
-      "secret": "{{ core_vault_google_android_secret }}",
+      "secret": "{{ sunbird_google_android_keycloak_secret }}",
       "redirectUris": [
         "{{proto}}://{{proxy_server_name}}/*"
       ],
@@ -2039,7 +2039,7 @@
       "surrogateAuthRequired": false,
       "enabled": true,
       "clientAuthenticatorType": "client-secret",
-      "secret": "{{ core_vault_google_auth_secret }}",
+      "secret": "{{ core_vault_sunbird_google_keycloak_secret }}",
       "redirectUris": [
         "{{proto}}://{{proxy_server_name}}/*"
       ],
@@ -2427,7 +2427,7 @@
       "surrogateAuthRequired": false,
       "enabled": true,
       "clientAuthenticatorType": "client-secret",
-      "secret": "{{ core_vault_trampoline_desktop_secret }}",
+      "secret": "{{ sunbird_trampoline_desktop_keycloak_secret }}",
       "redirectUris": [
         "{{proto}}://{{proxy_server_name}}/*"
       ],
@@ -2562,7 +2562,7 @@
       "surrogateAuthRequired": false,
       "enabled": true,
       "clientAuthenticatorType": "client-secret",
-      "secret": "{{ core_vault_trampoline_android_secret }}",
+      "secret": "{{ sunbird_trampoline_android_keycloak_secret }}",
       "redirectUris": [
         "{{proto}}://{{proxy_server_name}}/*"
       ],

ansible/roles/postgres-migration/files/sunbird_programs/V4.0.0.sql

@@ -1,2 +1,2 @@
 UPDATE "public"."configuration" SET value='VidyaDaan: Your Content $contentName for the project $projectName has been approved by the project owner. Please login to $url for details.' WHERE key='smsContentAccept';
-UPDATE "public"."configuration" SET value='VidyaDaan: Your Content $contentName for the project $projectName has been approved by the project owner with few changes. Please login to $url for details.' WHERE key='smsContentRequestedChanges';
+UPDATE "public"."configuration" SET value='VidyaDaan: Your Content $contentName for the project $projectName has been approved by the project owner with few changes. Please login to $url for details.' WHERE key='smsContentAcceptWithChanges';

ansible/roles/stack-sunbird/templates/content-service_application.conf

@@ -568,11 +568,11 @@ objectcategorydefinition.keyspace="{{ lp_cassandra_keyspace_prefix }}_category_s
 channel {
   content{
     primarycategories=["Course Assessment", "eTextbook", "Explanation Content", "Learning Resource", "Practice Question Set", "Teacher Resource", "Exam Question"]
-    additionalcategories=["Classroom Teaching Video", "Concept Map", "Curiosity Question Set", "Experiential Resource", "Explanation Video", "Focus Spot", "Learning Outcome Definition", "Lesson Plan", "Marking Scheme Rubric", "Pedagogy Flow", "Previous Board Exam Papers", "TV Lesson", "Textbook"]
+    additionalcategories= {{ content_additional_categories | default('["Classroom Teaching Video", "Concept Map", "Curiosity Question Set", "Experiential Resource", "Explanation Video", "Focus Spot", "Learning Outcome Definition", "Lesson Plan", "Marking Scheme Rubric", "Pedagogy Flow", "Previous Board Exam Papers", "TV Lesson", "Textbook"]')}}
   }
   collection {
     primarycategories=["Content Playlist", "Course", "Digital Textbook", "Question paper"]
-    additionalcategories=["Textbook", "Lesson Plan"]
+    additionalcategories={{ collection_additional_categories | default('["Textbook", "Lesson Plan"]')}}
   }
   asset {
     primarycategories=["Asset", "CertAsset", "Certificate Template"]

ansible/roles/stack-sunbird/templates/taxonomy-service_application.conf

@@ -390,3 +390,6 @@ languageCode {
   telugu : "te"
 }
 objectcategorydefinition.keyspace="{{ lp_cassandra_keyspace_prefix }}_category_store"
+
+# Framework master category validation Supported values are Yes/No
+master.category.validation.enabled="{{ master_category_validation_enabled | default('Yes') }}"

deploy/jenkins/jobs/Build/jobs/KnowledgePlatform/jobs/Neo4j/config.xml

@@ -1,6 +1,6 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.38">
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="workflow-job@2.40">
   <actions>
-    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.21">
+    <org.jenkinsci.plugins.workflow.multibranch.JobPropertyTrackerAction plugin="workflow-multibranch@2.23">
       <jobPropertyDescriptors>
         <string>hudson.model.ParametersDefinitionProperty</string>
         <string>com.sonyericsson.rebuild.RebuildSettings</string>
@@ -19,7 +19,7 @@
       </strategy>
     </jenkins.model.BuildDiscarderProperty>
     <org.jenkinsci.plugins.workflow.job.properties.DisableConcurrentBuildsJobProperty/>
-    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.31">
+    <com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.32">
       <autoRebuild>false</autoRebuild>
       <rebuildDisabled>false</rebuildDisabled>
     </com.sonyericsson.rebuild.RebuildSettings>
@@ -38,7 +38,7 @@
         </hudson.model.StringParameterDefinition>
       </parameterDefinitions>
     </hudson.model.ParametersDefinitionProperty>
-    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.2">
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="[email protected]">
       <maxConcurrentPerNode>0</maxConcurrentPerNode>
       <maxConcurrentTotal>0</maxConcurrentTotal>
       <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
@@ -57,23 +57,26 @@
       </triggers>
     </org.jenkinsci.plugins.workflow.job.properties.PipelineTriggersJobProperty>
   </properties>
-  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.80">
-    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.2.2">
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="workflow-cps@2.90">
+    <scm class="hudson.plugins.git.GitSCM" plugin="git@4.7.1">
       <configVersion>2</configVersion>
       <userRemoteConfigs>
         <hudson.plugins.git.UserRemoteConfig>
-          <url>https://github.com/project-sunbird/sunbird-learning-platform.git</url>
+          <url>https://github.com/project-sunbird/knowledge-platform-db-extensions.git</url>
         </hudson.plugins.git.UserRemoteConfig>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
           <name>${github_release_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="empty-list"/>
+      <extensions/>
     </scm>
-    <scriptPath>pipelines/build/neo4j/Jenkinsfile</scriptPath>
+    <scriptPath>build/neo4j-extensions/Jenkinsfile</scriptPath>
     <lightweight>false</lightweight>
   </definition>
   <triggers/>
   <disabled>false</disabled>
-</flow-definition>
+</flow-definition>

deploy/jenkins/jobs/Deploy/jobs/dev/jobs/KnowledgePlatform/jobs/FlinkJobs/config.xml

@@ -97,18 +97,16 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
           <visibleItemCount>1</visibleItemCount>
           <script class="org.biouno.unochoice.model.GroovyScript">
             <secureScript plugin="[email protected]">
-              <script>return['activity-aggregate-updater',
-'relation-cache-updater',
-'post-publish-processor',
+              <script>return[
 'video-stream-generator',
 'questionset-publish',
-'collection-certificate-generator',
-'enrolment-reconciliation',
 'search-indexer',
+'asset-enrichment',
+'audit-event-generator',
 'audit-history-indexer',
-'auto-creator-v2',
 'collection-cert-pre-processor',
-'asset-enrichment']</script>
+'collection-certificate-generator',
+'auto-creator-v2']</script>
               <sandbox>true</sandbox>
             </secureScript>
             <secureFallbackScript plugin="[email protected]">
@@ -150,7 +148,7 @@ return """&lt;b&gt;This parameter is not used&lt;/b&gt;"""</script>
       </userRemoteConfigs>
       <branches>
         <hudson.plugins.git.BranchSpec>
-          <name>${branch_or_tag}></name>
+          <name>${branch_or_tag}</name>
         </hudson.plugins.git.BranchSpec>
       </branches>
       <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>

deploy/jenkins/jobs/OpsAdministration/jobs/dev/jobs/Core/jobs/PostInstallScript/config.xml

@@ -0,0 +1,107 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?><flow-definition plugin="[email protected]">
+  <actions/>
+  <description/>
+  <keepDependencies>false</keepDependencies>
+  <properties>
+    <com.sonyericsson.rebuild.RebuildSettings plugin="[email protected]">
+      <autoRebuild>false</autoRebuild>
+      <rebuildDisabled>false</rebuildDisabled>
+    </com.sonyericsson.rebuild.RebuildSettings>
+    <hudson.model.ParametersDefinitionProperty>
+      <parameterDefinitions>
+        <hudson.model.StringParameterDefinition>
+          <name>proto</name>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;Value of &lt;font style="color:DarkGreen;font-size:14px;"&gt;&lt;i&gt;proto&lt;/i&gt;&lt;/font&gt; from private repo Core/common.yml&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>domain_name</name>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;Value of &lt;font style="color:DarkGreen;font-size:14px;"&gt;&lt;i&gt;domain_name&lt;/i&gt;&lt;/font&gt; from private repo Core/common.yml&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>core_vault_sunbird_api_auth_token</name>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;Value of &lt;font style="color:DarkGreen;font-size:14px;"&gt;&lt;i&gt;core_vault_sunbird_api_auth_token&lt;/i&gt;&lt;/font&gt; from private repo Core/secrets.yml&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>private_ingressgateway_ip</name>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;Value of &lt;font style="color:DarkGreen;font-size:14px;"&gt;&lt;i&gt;private_ingressgateway_ip&lt;/i&gt;&lt;/font&gt; from private repo Core/common.yml&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>learningservice_ip</name>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;Value of &lt;font style="color:DarkGreen;font-size:14px;"&gt;&lt;i&gt;learningservice_ip&lt;/i&gt;&lt;/font&gt; from private repo Core/common.yml&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>core_vault_sunbird_sso_client_secret</name>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;Value of &lt;font style="color:DarkGreen;font-size:14px;"&gt;&lt;i&gt;core_vault_sunbird_sso_client_secret&lt;/i&gt;&lt;/font&gt; from private repo Core/secrets.yml&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>core_vault_sunbird_google_captcha_site_key_portal</name>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;Value of &lt;font style="color:DarkGreen;font-size:14px;"&gt;&lt;i&gt;core_vault_sunbird_google_captcha_site_key_portal&lt;/i&gt;&lt;/font&gt; from private repo Core/secrets.yml&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>sunbird_azure_public_storage_account_name</name>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;Value of &lt;font style="color:DarkGreen;font-size:14px;"&gt;&lt;i&gt;sunbird_azure_public_storage_account_name&lt;/i&gt;&lt;/font&gt; from private repo Core/common.yml&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>cassandra</name>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;Value of &lt;font style="color:DarkGreen;font-size:14px;"&gt;&lt;i&gt;cassandra-1&lt;/i&gt;&lt;/font&gt; IP private repo Core/hosts&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+        <hudson.model.StringParameterDefinition>
+          <name>knowledge_platform_tag</name>
+          <description>&lt;font style="color:dimgray;font-size:14px;"&gt;&lt;b&gt;Provide the value of &lt;font style="color:DarkGreen;font-size:14px;"&gt;&lt;a href=https://github.com/project-sunbird/knowledge-platform.git&gt;https://github.com/project-sunbird/knowledge-platform.git&lt;/a&gt;&lt;/font&gt; repo tag used&lt;/b&gt;&lt;/font&gt;</description>
+          <defaultValue/>
+          <trim>false</trim>
+        </hudson.model.StringParameterDefinition>
+      </parameterDefinitions>
+    </hudson.model.ParametersDefinitionProperty>
+    <hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="[email protected]">
+      <maxConcurrentPerNode>0</maxConcurrentPerNode>
+      <maxConcurrentTotal>0</maxConcurrentTotal>
+      <categories class="java.util.concurrent.CopyOnWriteArrayList"/>
+      <throttleEnabled>false</throttleEnabled>
+      <throttleOption>project</throttleOption>
+      <limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
+      <paramsToUseForLimit/>
+    </hudson.plugins.throttleconcurrents.ThrottleJobProperty>
+
+  </properties>
+  <definition class="org.jenkinsci.plugins.workflow.cps.CpsScmFlowDefinition" plugin="[email protected]">
+    <scm class="hudson.plugins.git.GitSCM" plugin="[email protected]">
+      <configVersion>2</configVersion>
+      <userRemoteConfigs>
+        <hudson.plugins.git.UserRemoteConfig>
+          <url>https://github.com/keshavprasadms/sunbird-devops.git</url>
+        </hudson.plugins.git.UserRemoteConfig>
+      </userRemoteConfigs>
+      <branches>
+        <hudson.plugins.git.BranchSpec>
+          <name>release-3.8.0</name>
+        </hudson.plugins.git.BranchSpec>
+      </branches>
+      <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
+      <submoduleCfg class="empty-list"/>
+      <extensions/>
+    </scm>
+    <scriptPath>pipelines/ops/post-install-script/Jenkinsfile</scriptPath>
+    <lightweight>false</lightweight>
+  </definition>
+  <triggers/>
+  <disabled>false</disabled>
+</flow-definition>