Mig release 8.0.0 rc1

.gitignore

@@ -1,4 +1,4 @@
 .DS_Store
 *.retry
 *.pyc
-.idea
+.idea

ansible/artifacts-download.yml

@@ -3,8 +3,53 @@
   become: yes
   vars_files:
     - "{{inventory_dir}}/secrets.yml"
-  environment:
-    AZURE_STORAGE_ACCOUNT: "{{ sunbird_artifact_storage_account_name }}"
-    AZURE_STORAGE_SAS_TOKEN: "{{ sunbird_artifact_storage_account_sas }}"
-  roles:
-    - artifacts-download-azure
+  tasks:
+    - name: download artifact from azure storage
+      include_role:
+        name: azure-cloud-storage
+        tasks_from: blob-download.yml
+      vars:
+        blob_container_name: "{{ cloud_storage_artifacts_bucketname }}"
+        blob_file_name: "{{ artifact }}"
+        local_file_or_folder_path: "{{ artifact_path }}"
+        storage_account_name: "{{ cloud_artifact_storage_accountname }}"
+        storage_account_key: "{{ cloud_artifact_storage_secret }}"
+      when: cloud_service_provider == "azure"
+
+    - name: download artifact from gcloud storage
+      include_role:
+        name: gcp-cloud-storage
+        tasks_from: download.yml
+      vars:
+        gcp_storage_service_account_name: "{{ cloud_artifact_storage_accountname }}"
+        gcp_storage_key_file: "{{ cloud_artifact_storage_secret }}"
+        gcp_bucket_name: "{{ cloud_storage_artifacts_bucketname }}"
+        gcp_path: "{{ artifact }}"
+        local_file_or_folder_path: "{{ artifact_path }}"
+      when: cloud_service_provider == "gcloud"
+
+    - name: download artifact from aws s3
+      include_role:
+        name: aws-cloud-storage
+        tasks_from: download.yml
+      vars:
+        local_file_or_folder_path: "{{ artifact_path }}"
+        s3_bucket_name: "{{ cloud_storage_artifacts_bucketname }}"
+        s3_path: "{{ artifact }}"
+        aws_default_region: "{{ cloud_public_storage_region }}"
+        aws_access_key_id: "{{ cloud_artifact_storage_accountname }}"
+        aws_secret_access_key: "{{ cloud_artifact_storage_secret }}"
+      when: cloud_service_provider == "aws"  
+
+    - name: download artifact from oci oss
+      include_role:
+        name: oci-cloud-storage
+        apply:
+          environment:
+           OCI_CLI_AUTH: "instance_principal"
+        tasks_from: download.yml
+      vars:
+        local_file_or_folder_path: "{{ artifact_path }}"
+        oss_bucket_name: "{{ cloud_storage_artifacts_bucketname }}"
+        oss_path: "{{ artifact }}"
+      when: cloud_service_provider == "oci" 

ansible/artifacts-upload.yml

@@ -3,8 +3,54 @@
   become: yes
   vars_files:
     - "{{inventory_dir}}/secrets.yml"
-  environment:
-    AZURE_STORAGE_ACCOUNT: "{{ sunbird_artifact_storage_account_name }}"
-    AZURE_STORAGE_SAS_TOKEN: "{{ sunbird_artifact_storage_account_sas }}"
-  roles:
-    - artifacts-upload-azure
+  tasks:
+    - name: upload artifact to azure storage
+      include_role:
+        name: azure-cloud-storage
+        tasks_from: blob-upload.yml
+      vars:
+        blob_container_name: "{{ cloud_storage_artifacts_bucketname }}"
+        container_public_access: "off"
+        blob_file_name: "{{ artifact }}"
+        local_file_or_folder_path: "{{ artifact_path }}"
+        storage_account_name: "{{ cloud_artifact_storage_accountname }}"
+        storage_account_key: "{{ cloud_artifact_storage_secret }}"
+      when: cloud_service_provider == "azure"
+
+    - name: upload artifact to gcloud storage
+      include_role:
+        name: gcp-cloud-storage
+        tasks_from: upload.yml
+      vars:
+        gcp_storage_service_account_name: "{{ cloud_artifact_storage_accountname }}"
+        gcp_storage_key_file: "{{ cloud_artifact_storage_secret }}"
+        gcp_bucket_name: "{{ cloud_storage_artifacts_bucketname }}"
+        gcp_path: "{{ artifact }}"
+        local_file_or_folder_path: "{{ artifact_path }}"
+      when: cloud_service_provider == "gcloud"
+
+    - name: upload artifact to aws s3
+      include_role:
+        name: aws-cloud-storage
+        tasks_from: upload.yml
+      vars:
+        local_file_or_folder_path: "{{ artifact_path }}"
+        s3_bucket_name: "{{ cloud_storage_artifacts_bucketname }}"
+        s3_path: "{{ artifact }}"
+        aws_default_region: "{{ cloud_public_storage_region }}"
+        aws_access_key_id: "{{ cloud_artifact_storage_accountname }}"
+        aws_secret_access_key: "{{ cloud_artifact_storage_secret }}"
+      when: cloud_service_provider == "aws"
+
+    - name: upload artifact to oci oss
+      include_role:
+        name: oci-cloud-storage
+        apply:
+          environment:
+           OCI_CLI_AUTH: "instance_principal"
+        tasks_from: upload.yml
+      vars:
+        local_file_or_folder_path: "{{ artifact_path }}"
+        oss_bucket_name: "{{ cloud_storage_artifacts_bucketname }}"
+        oss_path: "{{ artifact }}"
+      when: cloud_service_provider == "oci"

ansible/artifacts/sunbird/login/login.ftl

@@ -9,7 +9,7 @@
     <div class="container-wrapper">
                 <div class="ui header centered mb-8">
                     <img onerror="" alt="">
-                    <h2 id="signIn" class="signInHead mt-8 mb-8">${msg("loginDiksha")}</h2>
+                    <h2 id="signIn" class="signInHead mt-8 mb-8">${msg("loginSunbird")}</h2>
                     <p class="subtitle">Login</p>
                 </div>
                 <p id="mergeAccountMessage" class="hide mb-0 textCenter">${msg("mergeAccountMessage")}</p>

ansible/artifacts/sunbird/login/messages/messages_en.properties

@@ -56,7 +56,7 @@ noAccount=Don''t have an account?
 username=Username or Mobile number
 goBack=<<Go Back
 mergeAccountMessage=Enter Mobile number / Email Address OR use Login with Google to identify the account from which you want to merge usage details
-migrateAccountMessage=Confirm the password for the DIKSHA account you want to merge of click Login with Google to sign in using your Gmail account
+migrateAccountMessage=Confirm the password for the SUNBIRD account you want to merge of click Login with Google to sign in using your Gmail account
 inCorrectPasswordError=The password entered is incorrect. Enter the password again.
 emailOrPhone=Email Address / Mobile Number
 placeholderForEmailOrPhone=Enter Email Address / Mobile Number
@@ -271,5 +271,5 @@ user_not_found=This Email Address/Mobile Number doesn''t belong to a valid user
 p3pPolicy=CP="This is not a P3P policy!"
 usernamePlaceholder = Enter your Registered Email address/Mobile number
 passwordPlaceholder = Enter your password
-loginDiksha = Welcome to SUNBIRD
+loginSunbird = 
 registerHere = Register here

ansible/artifacts/sunbird/login/resources/js/telemetry_service.js

@@ -2477,17 +2477,14 @@ if (typeof module != 'undefined') {
 
 let pdataId = "";
 let tenantSlug;
-if (window.location.origin.indexOf("diksha.gov.in") >= 0) {
-  pdataId = "prod.diksha.portal";
-} else if (window.location.origin.indexOf("staging.ntp.net.in") >= 0) {
-  pdataId = "staging.diksha.portal";
-} else if (window.location.origin.indexOf("staging.sunbirded.org") >= 0) {
+if (window.location.origin.indexOf("staging.sunbirded.org") >= 0) {
   pdataId = "staging.diksha.portal";
 } else if (window.location.origin.indexOf("dev.sunbirded.org") >= 0) {
   pdataId = "dev.sunbird.portal";
   tenantSlug = "sunbird";
 } else {
-  pdataId = "preprod.diksha.portal";
+  tenantSlug = "sunbird";
+  pdataId = "dev.sunbird.portal";
 }
 
 let curUrlObj = window.location;
@@ -2506,7 +2503,7 @@ if(client_id.toLowerCase() === 'android'){
     "telemetry": {
       "pdata": {
         "id": pdataId,
-        "ver": "5.0.0",
+        "ver": "6.0.0",
         "pid": "sunbird-portal"
       }
     }
@@ -2533,7 +2530,7 @@ if(client_id.toLowerCase() === 'android'){
         request: {
           filters: {
             isTenant: true,
-            slug: id || 'ntp'
+            slug: id || 'sunbird'
           }
         }
       }),
@@ -2687,7 +2684,6 @@ if(client_id.toLowerCase() === 'android'){
   function stringToHTML(str) {
     let parser = new DOMParser();
     let doc = parser.parseFromString(str, 'text/html');
-    console.log('Doc parse => ', doc); // TODO: log!
     return doc?.body?.innerText || document.createElement('body');
   }
 

ansible/assets-upload.yml

@@ -1,8 +1,105 @@
 ---
 - hosts: localhost
-  vars:
-    ansible_connection: local
   vars_files:
     - ['{{inventory_dir}}/secrets.yml', 'secrets/{{env}}.yml']
-  roles:
-    - assets-upload-azure
+  # Azure
+  tasks:
+  - name: this block consists of tasks related to azure storage
+    block:
+    - name: set common azure variables
+      set_fact:
+        blob_container_name: "{{ cloud_storage_playercdn_bucketname }}"
+        container_public_access: "container"
+        blob_container_folder_path: ""
+        storage_account_name: "{{ cloud_public_storage_accountname }}"
+        storage_account_key: "{{ cloud_public_storage_secret }}"
+
+    - name: delete files and folders from azure storage using azcopy
+      include_role:
+        name: azure-cloud-storage
+        tasks_from: delete-using-azcopy.yml
+
+    - name: upload batch of files to azure storage
+      include_role:
+        name: azure-cloud-storage
+        tasks_from: blob-upload-batch.yml
+      vars:
+        local_file_or_folder_path: "{{ assets }}"
+    when: cloud_service_provider == "azure"
+
+##### AWS
+  - name: this block consists of tasks related to aws storage
+    block:
+    - name: set common aws variables
+      set_fact:
+        s3_bucket_name: "{{ cloud_storage_playercdn_bucketname }}"
+        s3_path: ""
+        aws_default_region: "{{ cloud_public_storage_region }}"
+        aws_access_key_id: "{{ cloud_public_storage_accountname }}"
+        aws_secret_access_key: "{{ cloud_public_storage_secret }}"
+
+    - name: delete files and folders from s3
+      include_role:
+        name: aws-cloud-storage
+        tasks_from: delete-folder.yml
+
+    - name: upload batch of files to s3
+      include_role:
+        name: aws-cloud-storage
+        tasks_from: upload-folder.yml
+      vars:
+        local_file_or_folder_path: "{{ assets }}"
+    when: cloud_service_provider == "aws"  
+
+  #GCP
+  - name: this block consists of tasks related to azure storage
+    block:
+    - name: set common gcloud variables
+      set_fact:
+        gcp_storage_service_account_name: "{{ cloud_public_storage_accountname }}"
+        gcp_storage_key_file: "{{ cloud_public_storage_secret }}"
+        gcp_bucket_name: "{{ cloud_storage_playercdn_bucketname }}"
+        gcp_path: ""
+        file_delete_pattern: ""
+
+
+    - name: delete files and folders from gcloud storage
+      include_role:
+        name: gcp-cloud-storage
+        tasks_from: delete-batch.yml
+
+    - name: upload batch of files to gcloud storage
+      include_role:
+        name: gcp-cloud-storage
+        tasks_from: upload-batch.yml
+      vars:
+        local_file_or_folder_path: "{{ assets }}/*"
+    when: cloud_service_provider == "gcloud"
+
+##### OCI
+  - name: this block consists of tasks related to oci oss
+    block:
+    - name: set common oci variables
+      set_fact:
+        oss_bucket_name: "{{ cloud_storage_playercdn_bucketname }}"
+        oss_path: ""
+        oss_namespace: "{{oci_namespace}}"
+
+    - name: delete files and folders from oci oss
+      include_role:
+        name: oci-cloud-storage
+        apply:
+          environment:
+           OCI_CLI_AUTH: "instance_principal"
+        tasks_from: delete-folder.yml
+
+    - name: upload batch of files to oci oss
+      include_role:
+        name: oci-cloud-storage
+        apply:
+          environment:
+           OCI_CLI_AUTH: "instance_principal"
+        tasks_from: upload-folder.yml
+      vars:
+        local_file_or_folder_path: "{{ assets }}"
+    when: cloud_service_provider == "oci"  

ansible/bootstrap.yml

@@ -8,7 +8,7 @@
     - name: Installing other packages
       apt:
         state: present
-        name: ['python-pkg-resources', 'python2-pip']
+        name: ['python-pkg-resources', 'python-pip']
       when: ansible_distribution_version | float < 18
     - name: Installing other packages
       apt:
@@ -19,10 +19,8 @@
     - bootstrap_any
   tags:
     - bootstrap_any
-    - all
 
-- hosts: "{{hosts}}"
-  gather_facts: no
+- hosts: "{{ hosts }}"
   become: yes
   ignore_unreachable: yes
   vars_files:
@@ -32,6 +30,36 @@
   tags:
     - azure_cli
 
+- hosts: "{{ hosts }}"
+  become: yes
+  ignore_unreachable: yes
+  vars_files:
+    - "{{inventory_dir}}/secrets.yml"
+  roles:
+    - role: gcloud-cli
+  tags:
+    - gcloud_cli
+
+- hosts: "{{ hosts }}"
+  become: yes
+  ignore_unreachable: yes
+  vars_files:
+    - "{{inventory_dir}}/secrets.yml"
+  roles:
+    - role: aws-cli
+  tags:
+    - aws_cli
+
+- hosts: "{{ hosts }}"
+  become: yes
+  ignore_unreachable: yes
+  vars_files:
+    - "{{inventory_dir}}/secrets.yml"
+  roles:
+    - role: oci-cli
+  tags:
+    - oci_cli
+
 - hosts: "{{ hosts| default('all') }}"
   become: yes
   gather_facts: no
@@ -42,4 +70,3 @@
     - vm-agents-nodeexporter
   tags:
     - node_exporter
-    - all

ansible/cassandra-deploy.yml

@@ -3,7 +3,8 @@
   environment:
     sunbird_cassandra_host: "{{ groups['cassandra'][0] }}"
     sunbird_cassandra_port: 9042
-    sunbird_cassandra_keyspace: sunbird
+    sunbird_cassandra_keyspace: "{{cassandra_keyspace_to_migrate}}"
+    sunbird_cassandra_migration_location: "filesystem:migration-script/{{cassandra_keyspace_to_migrate}}"
   vars_files:
     - ['{{inventory_dir}}/secrets.yml', 'secrets/{{env}}.yml']
   roles: