Merge branch 'dev' into bal-3478

.github/workflows/packer-build-ami.yml

@@ -0,0 +1,43 @@
+name: Packer build AWS AMI's 
+on: 
+  workflow_dispatch:
+    branches:
+      - prod
+
+jobs:
+  plan:
+    environment: Terraform
+    defaults:
+      run:
+        working-directory: /home/runner/work/ballerine/deploy/aws_ami
+    runs-on: ubuntu-latest
+    name: Packer build Artifacts
+    steps:
+      - name: Checkout to Git
+        uses: actions/checkout@v2
+
+    - name: Assume Role
+      uses: ./
+      env:
+        ROLE_ARN: ${{ secrets.AWS_PACKER_ROLE }}
+        ROLE_SESSION_NAME: packersession
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        DURATION_SECONDS: 900
+
+      - name: Setup `packer`
+        uses: hashicorp/setup-packer@main
+        id: setup
+        with:
+          version: 1.8.7
+
+      - name: Run `packer init`
+        id: init
+        run: "packer init template.json.pkr.hcl"
+
+      - name: Run `packer validate`
+        id: validate
+        run: "packer validate template.json.pkr.hcl"
+
+      - name: Build AWS AMIs
+        run: "packer build template.json.pkr.hcl"

apps/backoffice-v2/src/domains/business-reports/fetchers.ts

@@ -23,6 +23,7 @@ export const BusinessReportSchema = z
     reportType: z.enum([MERCHANT_REPORT_TYPES[0]!, ...MERCHANT_REPORT_TYPES.slice(1)]),
     createdAt: z.string().datetime(),
     updatedAt: z.string().datetime(),
+    displayDate: z.string().datetime(),
     riskScore: z.number().nullable(),
     status: z.enum([MERCHANT_REPORT_STATUSES[0]!, ...MERCHANT_REPORT_STATUSES.slice(1)]),
     parentCompanyName: z.string().nullable(),

apps/backoffice-v2/src/pages/MerchantMonitoring/components/MerchantMonitoringTable/columns.tsx

@@ -153,16 +153,12 @@ export const columns = [
     },
     header: 'Alert',
   }),
-  columnHelper.accessor('createdAt', {
+  columnHelper.accessor('displayDate', {
     cell: info => {
-      const createdAt = info.getValue();
-
-      if (!createdAt) {
-        return <TextWithNAFallback>{createdAt}</TextWithNAFallback>;
-      }
+      const displayDate = info.getValue();
 
       // Convert UTC time to local browser time
-      const localDateTime = dayjs.utc(createdAt).local();
+      const localDateTime = dayjs.utc(displayDate).local();
 
       const date = localDateTime.format('MMM DD, YYYY');
       const time = localDateTime.format('HH:mm');

apps/backoffice-v2/src/pages/MerchantMonitoringBusinessReport/MerchantMonitoringBusinessReport.page.tsx

@@ -272,8 +272,8 @@ export const MerchantMonitoringBusinessReport: FunctionComponent = () => {
               </div>
               <div className={`text-sm`}>
                 <span className={`me-2 leading-6 text-slate-400`}>Created at</span>
-                {businessReport?.createdAt &&
-                  dayjs(new Date(businessReport?.createdAt)).format('HH:mm MMM Do, YYYY')}
+                {businessReport?.displayDate &&
+                  dayjs(new Date(businessReport?.displayDate)).format('HH:mm MMM Do, YYYY')}
               </div>
               <div className={`flex items-center space-x-2 text-sm`}>
                 <span className={`text-slate-400`}>Monitoring Status</span>

apps/backoffice-v2/src/pages/MerchantMonitoringUploadMultiple/hooks/useMerchantMonitoringUploadMultiplePageLogic/batch-report-template.csv

@@ -1,4 +1,4 @@
 websiteUrl,countryCode,lineOfBusiness,parentCompanyName,merchantName,correlationId
 https://www.ballerine.com,,,,,
 https://www.google.com,US,Search Engine,Alphabet Inc.,Google,1
-https://www.bbc.com,UK,Journalism,BBC Inc.,BBC,2
+https://www.bbc.com,GB,Journalism,BBC Inc.,BBC,2

apps/kyb-app/src/components/layouts/AppShell/Logo.tsx

@@ -1,3 +1,4 @@
+import { useRefValue } from '@/hooks/useRefValue';
 import { useEffect } from 'react';
 
 interface Props {
@@ -16,14 +17,16 @@ const prefetchImage = (url: string) =>
 const fallback = (timeout: number) => new Promise(resolve => setTimeout(resolve, timeout));
 
 export const Logo = ({ logoSrc, appName, onLoad }: Props) => {
+  const onLoadRef = useRefValue(onLoad);
+
   useEffect(() => {
     if (!onLoad) {
       return;
     }
 
     // Using race here in case if image is corrupted or load takes to long we don't want to lock stepper breadcrumbs forever.
-    Promise.race([prefetchImage(logoSrc), fallback(3000)]).then(onLoad);
-  }, [logoSrc, onLoad]);
+    Promise.race([prefetchImage(logoSrc), fallback(3000)]).then(onLoadRef.current);
+  }, [logoSrc, onLoadRef]);
 
   return <img src={logoSrc} alt={appName} className="max-h-[80px] max-w-[200px] object-cover" />;
 };

deploy/ansible/ballerine_playbook/README.md

@@ -99,7 +99,7 @@ You can run the ansible playbook with the following command
 
 ```bash
 cd ballerine/deploy/ansible/ballerine_playbook
-ansible-playbook -i inventory.txt ballerine-playbook.yml
+ansible-playbook -i inventory.txt ballerine-playbook.yml --skip-tags packer
 ```
 
 The command above will use the host information from the `inventory` file.
@@ -110,4 +110,4 @@ When it's all done, provided all went well and no parameters were changed, you s
 
 ## Make entries to the DNS server
 
-Make sure the appropriate entries for the url in DNS are created
+Make sure the appropriate entries for the url in DNS are created

deploy/ansible/ballerine_playbook/roles/setup-ballerine/defaults/main.yml

@@ -3,6 +3,10 @@
 docker_edition: 'ce'
 docker_package: 'docker-{{ docker_edition }}'
 docker_package_state: present
+default_user: ubuntu
+
+cloud_user: ballerine
+cloud_group: ballerine
 
 # Service options.
 docker_service_state: started

deploy/ansible/ballerine_playbook/roles/setup-ballerine/tasks/cleanup-packer-build.yml

@@ -0,0 +1,12 @@
+---
+- name: Remove sensitive credential (1)
+  shell: find / -name "authorized_keys" -exec rm -f {} \;
+  become: true
+
+- name: Remove sensitive credential (2)
+  shell: find /root/ /home/*/ -name .cvspass -exec rm -f {} \;
+  become: true
+
+- name: Restart rsyslog
+  shell: service rsyslog restart
+  become: true

deploy/ansible/ballerine_playbook/roles/setup-ballerine/tasks/clone-ballerine.yml

@@ -0,0 +1,9 @@
+---
+- name: Clone Ballerine
+  git:
+    repo: https://github.com/ballerine-io/ballerine.git
+    dest: "{{ install_dir }}"
+    version: dev
+    clone: yes
+    update: yes
+  ignore_errors: yes

deploy/ansible/ballerine_playbook/roles/setup-ballerine/tasks/deploy-ballerine.yml

@@ -0,0 +1,11 @@
+- name: Deploy Ballerine with localhost
+  shell: sudo docker-compose -f docker-compose-build.yml up -d
+  args:
+    chdir: "{{ install_dir }}/deploy"
+  when: vite_api_url == ""
+
+- name: Deploy Ballerine with custom Domain
+  shell: sudo docker-compose -f docker-compose-build-https.yml up -d
+  args:
+    chdir: "{{ install_dir }}/deploy"
+  when: vite_api_url != ""

deploy/ansible/ballerine_playbook/roles/setup-ballerine/tasks/install-docker.yml

@@ -24,15 +24,13 @@
       - libnss3-tools
     state: latest
   become: true
-  tags:
-    - always
+
 
 - name: Upgrade dist to apply security fixes
   ansible.builtin.apt:
     upgrade: dist
   become: true
-  tags:
-    - always
+
 
 - name: Ensure old versions of Docker are not installed
   package:

deploy/ansible/ballerine_playbook/roles/setup-ballerine/tasks/main.yml

@@ -3,8 +3,25 @@
   package_facts:
     manager: auto
 
-- include_tasks: install-docker.yml
+- import_tasks: install-docker.yml
 
 - import_tasks: start-docker.yml
 
+- import_tasks: clone-ballerine.yml
+
+- import_tasks: setup-init-config.yml
+  tags: packer
+
 - import_tasks: setup-ballerine.yml
+
+- import_tasks: setup-ballerine-runtime.yml
+  tags: packer
+
+- import_tasks: deploy-ballerine.yml
+  tags: deploy
+
+- import_tasks: setup-user-data.yml
+  tags: packer
+
+- import_tasks: cleanup-packer-build.yml
+  tags: packer

deploy/ansible/ballerine_playbook/roles/setup-ballerine/tasks/setup-ballerine-runtime.yml

@@ -0,0 +1,39 @@
+- name: create runtime path folder
+  file:
+    dest: "{{ install_dir }}/scripts"
+    mode: 0755
+    recurse: yes
+    owner: "{{ cloud_user }}"
+    group: "{{ cloud_group }}"
+    state: directory
+
+- name: create boot script
+  template:
+    src: templates/boot.sh
+    dest: "{{ install_dir }}/scripts/boot.sh"
+    mode: 0755
+
+- name: create reboot entry job
+  cron:
+    name: "ballerine job"
+    special_time: reboot
+    user: "{{ cloud_user }}"
+    job: "{{ install_dir }}/scripts/boot.sh"
+
+- name: setup ssh key for ballerine user
+  copy:
+    src: templates/init-ssh.sh
+    dest: /var/lib/cloud/scripts/per-instance
+    mode: 0755
+    owner: "{{ cloud_user }}"
+    group: "{{ cloud_group }}"
+  become: true
+
+- name: setup ssh key for {{ default_user }} user
+  copy:
+    src: templates/init-ssh.sh
+    dest: /var/lib/cloud/scripts/per-instance
+    mode: 0755
+    owner: "{{ default_user }}"
+    group: "{{ cloud_group }}"
+  become: true

deploy/ansible/ballerine_playbook/roles/setup-ballerine/tasks/setup-ballerine.yml

@@ -1,4 +1,5 @@
 ---
+
 - name: Replace VITE URL for backoffice
   lineinfile:
     path: '~/ballerine/apps/backoffice-v2/.env.example'
@@ -33,16 +34,4 @@
   ansible.builtin.template:
     src: templates/Caddyfile.j2
     dest: "{{ install_dir }}/deploy/caddy/Caddyfile"
-  when: vite_api_url != ""
-
-- name: Deploy Ballerine up locally
-  shell: docker-compose -f docker-compose-build.yml up -d
-  args:
-    chdir: "{{ install_dir }}/deploy"
-  when: vite_api_url == ""
-
-- name: Deploy Ballerine up remote
-  shell: docker-compose -f docker-compose-build-https.yml up -d
-  args:
-    chdir: "{{ install_dir }}/deploy"
-  when: vite_api_url != ""
+  when: vite_api_url != ""

deploy/ansible/ballerine_playbook/roles/setup-ballerine/tasks/setup-init-config.yml

@@ -0,0 +1,25 @@
+---
+- name: deploy cloud init config file
+  template: src=templates/cloud-config.cfg dest=/etc/cloud/cloud.cfg.d/defaults.cfg
+  become: true
+
+- name: create group ballerine
+  group: name={{ cloud_user }} state=present
+  become: true
+
+- name: create user ballerine
+  user: name={{ cloud_user }} groups={{ cloud_group }}
+  become: true
+
+- name: create user {{ default_user }}
+  user: name={{ default_user }} groups={{ cloud_group }}
+  become: true
+
+- name: add sudoers group for user {{ cloud_user }}
+  copy:
+    content: 'ballerine ALL=(ALL) NOPASSWD: ALL'
+    dest: /etc/sudoers.d/ballerine
+    mode: 0440
+    owner: root
+    group: root
+  become: true

deploy/ansible/ballerine_playbook/roles/setup-ballerine/tasks/setup-user-data.yml

@@ -0,0 +1,9 @@
+---
+- name: setup runtime user data
+  copy:
+    src: ../templates/user-data.sh
+    dest: /var/lib/cloud/scripts/per-instance
+    mode: 0755
+    owner: "{{ cloud_user }}"
+    group: "{{ cloud_group }}"
+  become: true

deploy/ansible/ballerine_playbook/roles/setup-ballerine/templates/boot.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+cd /home/ballerine/ballerine
+
+git checkout dev ; git pull
+
+cd /home/ballerine/ballerine/deploy
+
+sudo docker-compose -f docker-compose-build.yml pull
+
+sudo docker-compose -f docker-compose-build.yml up -d

deploy/ansible/ballerine_playbook/roles/setup-ballerine/templates/cloud-config.cfg

@@ -0,0 +1,5 @@
+#cloud-config
+system_info:
+  default_user:
+    name: ballerine
+    lock_passwd: false

deploy/ansible/ballerine_playbook/roles/setup-ballerine/templates/init-ssh.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+authorized_keys_path=/home/ballerine/.ssh/authorized_keys
+if [[ ! -e "$authorized_keys_path" ]]; then
+		echo "Setting SSH key"
+		sudo cp ~/.ssh/authorized_keys "$authorized_keys_path"
+		sudo chown ballerine:ballerine "$authorized_keys_path"
+fi
+
+authorized_keys_ubuntu_path=/home/ubuntu/.ssh/authorized_keys
+if [[ ! -e "$authorized_keys_ubuntu_path" ]]; then
+		echo "Setting SSH key for ubuntu user"
+		sudo mkdir -p /home/ubuntu/.ssh/
+		sudo chmod -R 700 /home/ubuntu/.ssh/
+		sudo cp ~/.ssh/authorized_keys "$authorized_keys_ubuntu_path"
+		sudo chown -R ubuntu:ballerine /home/ubuntu/.ssh/
+fi

deploy/ansible/ballerine_playbook/roles/setup-ballerine/templates/user-data.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+default_user_name="[email protected]"
+default_user_password=admin
+
+echo "${default_user_name}:${default_user_password}" > /home/ballerine/ballerine/credential
+
+echo -e "\n***************************************************\n*     Default username : $default_user_name     *\n*     Default password : $default_user_password            *\n***************************************************\n" >/dev/console

deploy/aws_ami/defaults.cfg

@@ -0,0 +1,5 @@
+#cloud-config
+system_info:
+  default_user:
+    name: ballerine
+    lock_passwd: false