Merge pull request #2478 from AOT-Technologies/develop

Develop to release candidate 7.0.0

.github/pull_request_template.md

@@ -10,20 +10,14 @@ Give a high-level description of the changes.
 #Examples: Added a search feature, Renaming several fields, etc.
 -->
 
-# How has the change been tested?
-<!-- 
-Unit tests, Integration tests, Manual verification, etc.
--->
-
 # Screenshots (if applicable)
 <!-- 
 Add screenshots highlighting the changes.
 -->
 
-# Build Success screenshot (Till a CICD pipeline is set up)
-<!-- 
-Add a screenshot of the local execution of a successful build.
--->
-
 # Notes
 <!-- You can add any concerns highlighted during code review that cannot be addressed, any limitations in the changes, any subsequent actions to be taken, or anything noteworthy about the change that a reviewer would benefit from etc.-->
+
+# Checklist
+- [ ] Updated changelog
+- [ ] Added meaningful title for pull request

.github/workflows/forms-flow-api-ci.yml

@@ -2,11 +2,11 @@ name: Forms Flow API CI
 
 on:
   workflow_dispatch:
-  push:
-    branches:
-      - develop
-      - master
-      - release/**
+  # push:
+  #   branches:
+  #     - develop
+  #     - master
+  #     - release/**
   pull_request:
     branches:
       - develop
@@ -35,12 +35,12 @@ jobs:
 
     strategy:
       matrix:
-        python-version: [3.12.3]
+        python-version: [3.12.7]
 
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4 
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
@@ -85,6 +85,9 @@ jobs:
       USE_DOCKER_MOCK: "True"
 
     runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        python-version: [3.12.7]
 
     services:
       postgres:
@@ -101,9 +104,20 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
+      - name: Install Docker Compose
+        run: |
+          sudo curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+          sudo chmod +x /usr/local/bin/docker-compose
+          docker-compose --version
+      - name: Check for docker-compose.yml
+        run: |
+          if [ ! -f tests/docker/docker-compose.yml ]; then
+            echo "docker-compose.yml not found!"
+            exit 1
+          fi
       - name: Install dependencies
         run: |
           make build

.github/workflows/forms-flow-bpm-cd.yml

@@ -74,34 +74,35 @@ jobs:
           key: ${{ runner.os }}-buildx-${{ matrix.name }}-${{ github.sha }}
           restore-keys: |
             ${{ runner.os }}-buildx-${{ matrix.name }}
-      - name: Build and push Docker image - amd64
+      - name: Build and push Docker image
         if: ${{ github.ref != 'refs/heads/master' }}
         uses: docker/build-push-action@v4
         with:
           context: forms-flow-bpm
           push: true
           file: forms-flow-bpm/Dockerfile
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64/v8
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-      - name: Build and push Docker image - amd64
+      - name: Build and push Docker image
         if: ${{ github.ref == 'refs/heads/master' }}
         uses: docker/build-push-action@v2
         with:
           context: forms-flow-bpm
           push: true
+          platforms: linux/amd64,linux/arm64/v8
           file: forms-flow-bpm/Dockerfile
           tags: ${{ steps.meta.outputs.tags }}, formsflow/forms-flow-bpm:latest
           labels: ${{ steps.meta.outputs.labels }}
-      - name: Build and push Docker image - arm64
-        uses: docker/build-push-action@v4
-        with:
-          context: forms-flow-bpm
-          file: forms-flow-bpm/Dockerfile-ARM64
-          push: true
-          platforms: linux/arm64/v8
-          tags: ${{ steps.meta.outputs.tags }}-arm64
-          labels: ${{ steps.meta.outputs.labels }}
+      # - name: Build and push Docker image - arm64
+      #   uses: docker/build-push-action@v4
+      #   with:
+      #     context: forms-flow-bpm
+      #     file: forms-flow-bpm/Dockerfile-ARM64
+      #     push: true
+      #     platforms: linux/arm64/v8
+      #     tags: ${{ steps.meta.outputs.tags }}-arm64
+      #     labels: ${{ steps.meta.outputs.labels }}
       - name: Scan Docker image 🐳
         uses: snyk/actions/docker@master
         continue-on-error: true
@@ -136,17 +137,34 @@ jobs:
 
   zap_scan:
     runs-on: ubuntu-latest
-    name: Scan the webapplication
+    name: Scan the application
     steps:
       - name: Checkout
         uses: actions/checkout@v2
         with:
           ref: master
+
       - name: ZAP Scan
         uses: zaproxy/[email protected]
         with:
+          working-directory: zap-reports
           token: ${{ secrets.GITHUB_TOKEN }}
           docker_name: 'ghcr.io/zaproxy/zaproxy:stable'
           target: ${{ secrets.BPM_TARGET_URL }}
           rules_file_name: '.zap/rules.tsv'
-          cmd_options: '-a'
+
+      - name: Install AWS CLI
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y awscli
+          
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ secrets.REGION }}
+
+      - name: Upload ZAP Report to S3
+        run: |
+          aws s3 cp report_html.html s3://zap-report-formsflow/zap-reports/zap-report-$(date +%Y-%m-%d_%H-%M-%S).html

.github/workflows/forms-flow-bpm-ci.yml

@@ -1,11 +1,11 @@
 name: Forms Flow BPM CI
 on:
   workflow_dispatch:
-  push:
-    branches:
-      - develop
-      - master
-      - release/**
+  # push:
+  #   branches:
+  #     - develop
+  #     - master
+  #     - release/**
   pull_request:
     branches:
       - develop

.github/workflows/forms-flow-data-analysis-api-ci.yml

@@ -29,7 +29,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: [3.11.9]
+        python-version: [3.12.8]
 
     steps:
       - uses: actions/checkout@v2
@@ -44,7 +44,7 @@ jobs:
         id: pylint
         run: |
           pylint --rcfile=setup.cfg  src/api
-  
+
   Test:
     if: always()
     needs: setup-job
@@ -72,6 +72,10 @@ jobs:
 
     runs-on: ubuntu-20.04
 
+    strategy:
+      matrix:
+        python-version: [3.12.8]
+
     services:
       postgres:
         image: postgres:13
@@ -104,7 +108,11 @@ jobs:
   Build:
     if: always()
     runs-on: ubuntu-20.04
-    name: Build
+
+    strategy:
+      matrix:
+        python-version: [3.12.8]
+
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python ${{ matrix.python-version }}

.github/workflows/forms-flow-documents-ci.yml

@@ -2,11 +2,11 @@ name: Forms Flow Document CI
 
 on:
   workflow_dispatch:
-  push:
-    branches:
-      - develop
-      - master
-      - release/**
+  # push:
+  #   branches:
+  #     - develop
+  #     - master
+  #     - release/**
   pull_request:
     branches:
       - develop
@@ -34,12 +34,12 @@ jobs:
 
     strategy:
       matrix:
-        python-version: [3.12.3]
+        python-version: [3.12.7]
 
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies
@@ -77,6 +77,9 @@ jobs:
       USE_DOCKER_MOCK: "True"
 
     runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        python-version: [3.12.7]
 
     services:
       postgres:
@@ -93,9 +96,20 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
+      - name: Install Docker Compose
+        run: |
+          sudo curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+          sudo chmod +x /usr/local/bin/docker-compose
+          docker-compose --version
+      - name: Check for docker-compose.yml
+        run: |
+          if [ ! -f tests/docker/docker-compose.yml ]; then
+            echo "docker-compose.yml not found!"
+            exit 1
+          fi
       - name: Install dependencies
         run: |
           make build