Improve git based database role

Author: Ndpnt

playbooks/deploy.yml

@@ -22,6 +22,11 @@
               (ota_apps_config['@opentermsarchive/engine'].recorder.snapshots.storage.type is defined and ota_apps_config['@opentermsarchive/engine'].recorder.snapshots.storage.type == 'mongo')
             ) | bool 
           }}"
+        snapshots_repository: "{{ ota_apps_config['@opentermsarchive/engine'].recorder.snapshots.storage.git.repository is defined and ota_apps_config['@opentermsarchive/engine'].recorder.snapshots.storage.git.repository }}"
+        snapshots_path: "{{ ota_apps_config['@opentermsarchive/engine'].recorder.snapshots.storage.git.path is defined and ota_apps_config['@opentermsarchive/engine'].recorder.snapshots.storage.git.path }}"
+        versions_repository: "{{ ota_apps_config['@opentermsarchive/engine'].recorder.versions.storage.git.repository is defined and ota_apps_config['@opentermsarchive/engine'].recorder.versions.storage.git.repository }}"
+        versions_path: "{{ ota_apps_config['@opentermsarchive/engine'].recorder.versions.storage.git.path is defined and ota_apps_config['@opentermsarchive/engine'].recorder.versions.storage.git.path }}"
+    
     - name: Install infrastructure
       become: true
       tags: [infrastructure]
@@ -57,9 +62,25 @@
       when:
         - mongo_required
 
-    - name: Setup Git-based databases
+    - name: Setup Git-based versions database
       ansible.builtin.include_role:
         name: ota/git-database
+      vars:
+        ota_git_database_repository: "{{ versions_repository }}"
+        ota_git_database_directory: "{{ versions_path }}"
+        ota_git_database_branch: main
+      when:
+        - versions_repository and versions_path
+
+    - name: Setup Git-based snapshots database
+      ansible.builtin.include_role:
+        name: ota/git-database
+      vars:
+        ota_git_database_repository: "{{ snapshots_repository }}"
+        ota_git_database_directory: "{{ snapshots_path }}"
+        ota_git_database_branch: main
+      when:
+        - snapshots_repository and snapshots_path
 
     - name: Setup OTA applications
       ansible.builtin.include_role:

roles/ota/git-database/defaults/main.yml

@@ -1,18 +1,41 @@
 ---
-- name: Setup snapshots git repository
-  ansible.builtin.include_tasks: database.yml
-  when: ota_apps_config['@opentermsarchive/engine'].recorder.snapshots.storage.git.repository is defined
-  vars:
-    engine_database_name: snapshots
-    engine_database_repository: "{{ ota_apps_config['@opentermsarchive/engine'].recorder.snapshots.storage.git.repository }}"
-    engine_database_branch: "{{ ota_database_snapshots_branch }}"
-    engine_database_directory: /home/{{ ansible_user }}/{{ ota_directory }}/{{ ota_apps_config['@opentermsarchive/engine'].recorder.snapshots.storage.git.path }}
+- name: Check if base data has already been obtained from {{ ota_git_database_repository }}
+  ansible.builtin.git:
+    repo: "{{ ota_git_database_repository }}"
+    version: "{{ ota_git_database_branch }}"
+    dest: "{{ ota_git_database_directory }}"
+    clone: false
+    update: false
+    key_file: /home/{{ ansible_user }}/.ssh/ota-github-bot-key
+  # the `before` property of the return value can tell us if the repository has been cloned already or not,
+  # see <https://docs.ansible.com/ansible/latest/collections/ansible/builtin/git_module.html#return-values>
+  register: existing_repository
 
-- name: Setup versions git repository
-  ansible.builtin.include_tasks: database.yml
-  when: ota_apps_config['@opentermsarchive/engine'].recorder.versions.storage.git.repository is defined
-  vars:
-    engine_database_name: versions
-    engine_database_repository: "{{ ota_apps_config['@opentermsarchive/engine'].recorder.versions.storage.git.repository }}"
-    engine_database_branch: "{{ ota_database_versions_branch }}"
-    engine_database_directory: /home/{{ ansible_user }}/{{ ota_directory }}/{{ ota_apps_config['@opentermsarchive/engine'].recorder.versions.storage.git.path }}
+- name: Obtain initial data from branch {{ ota_git_database_branch }} of {{ ota_git_database_repository }}
+  ansible.builtin.git:
+    repo: "{{ ota_git_database_repository }}"
+    version: "{{ ota_git_database_branch }}"
+    dest: "{{ ota_git_database_directory }}"
+    key_file: /home/{{ ansible_user }}/.ssh/ota-github-bot-key
+  when: existing_repository.before is defined and not existing_repository.before # if existing_repository.before is null, then the repository is new
+
+- name: Configure {{ ota_git_database_directory }} repository to use the GitHub Bot SSH Key
+  community.general.git_config:
+    name: core.sshCommand
+    value: ssh -i '/home/{{ ansible_user }}/.ssh/ota-github-bot-key'
+    scope: local
+    repo: "{{ ota_git_database_directory }}"
+
+- name: Remove existing locks in {{ ota_git_database_directory }}
+  ansible.builtin.file:
+    path: "{{ ota_git_database_directory }}/.git/index.lock"
+    state: absent
+
+- name: Get latest data from {{ ota_git_database_repository }}
+  ansible.builtin.git:
+    repo: "{{ ota_git_database_repository }}"
+    version: "{{ ota_git_database_branch }}"
+    dest: "{{ ota_git_database_directory }}"
+    update: true
+    force: true # discard any modified files
+    key_file: /home/{{ ansible_user }}/.ssh/ota-github-bot-key