Merge pull request #1194 from brave-intl/master

Prod Release: 03-20-2024

.github/workflows/ci.yml

@@ -39,35 +39,35 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@96f53100ba2a5449eb71d2e6604bbcd94b9449b5
+      - uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
 
       - name: Setup Node.js environment
-        uses: actions/setup-node@d82f92a0eb28e5699f87460c19fc2c674da76d01
+        uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1
         with:
           # Set always-auth in npmrc
           always-auth: true
           # Version Spec of the version to use.  Examples: 12.x, 10.15.1, >=10.15.0
-          node-version: 20.5.0
+          node-version: 20.7.0
           # Set this option if you want the action to check for the latest available version that satisfies the version spec
           check-latest: true
 
       - run: npm i --global [email protected]
       - run: npm --version
 
       - name: Docker Compose Install
-        uses: KengoTODA/actions-setup-docker-compose@cb7bd0f6c0c0ec9b2263d222e9adb72e35c6766b
+        uses: KengoTODA/actions-setup-docker-compose@818311a3c413a3a072378e424c020fafcbab9a49 # v1.1.0
         with:
           version: '1.25.4'
 
       - name: Cache node modules
-        uses: actions/cache@67b839edb68371cc5014f6cea11c9aa77238de78
+        uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84
         with:
           path: ~/.npm
           key: v1-npm-deps-${{ hashFiles('**/package-lock.json') }}
           restore-keys: v1-npm-deps-
 
       - run: docker-compose pull
-      - uses: satackey/action-docker-layer-caching@cc3f3828e75cbb45f0cf5139b95329c88480aa97
+      - uses: satackey/action-docker-layer-caching@46d2c640b1d8ef50d185452ad6fb324e6bd1d052 # v0.0.11
         # Ignore the failure of a step and avoid terminating the job.
         continue-on-error: true
         with:

.github/workflows/codeql-analysis.yml

@@ -35,11 +35,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@ddccb873888234080b77e9bc2d4764d5ccaaccf9 # v2.21.9
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -50,7 +50,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@ddccb873888234080b77e9bc2d4764d5ccaaccf9 # v2.21.9
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -64,4 +64,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@ddccb873888234080b77e9bc2d4764d5ccaaccf9 # v2.21.9

.github/workflows/generalized-deployments.yaml

@@ -10,14 +10,16 @@ jobs:
   push:
     name: Invoke General Docker Build Pipeline
     runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: read
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
     - name: Configure AWS Credentials
-      uses: aws-actions/configure-aws-credentials@v2
+      uses: aws-actions/configure-aws-credentials@010d0da01d0b5a38af31e9c3470dbfdabdecca3a # v4.0.1
       with:
-        aws-access-key-id: ${{ secrets.GDBP_AWS_ACCESS_KEY_ID }}
-        aws-secret-access-key: ${{ secrets.GDBP_AWS_SECRET_ACCESS_KEY }}
+        role-to-assume: ${{ secrets.GDBP_AWS_IAM_ROLE_ARN }}
         aws-region: us-west-2
     - name: Generalized Deployments
-      uses: brave-intl/[email protected]
+      uses: brave-intl/general-docker-build-pipeline-action@a5abec689bc65b6a985ed8527d741a130c1483af # v1.0.11

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:20.5.0
+FROM node:20.7.0
 
 RUN apt-get update && apt-get install -y postgresql-client
 

docker-compose.yml

@@ -58,7 +58,7 @@ services:
 
   eyeshade-postgres:
     container_name: eyeshade-postgres
-    image: postgres:15.3
+    image: postgres:16.2
     ports:
       - "3012:5432"
     environment:

eyeshade/consumer.js

@@ -3,7 +3,6 @@ import { Runtime } from 'bat-utils/boot-runtime.js'
 import config from '../config.js'
 import suggestionsConsumer from './workers/suggestions.js'
 import voteConsumer from './workers/acvote.js'
-import referralsConsumer from './workers/referrals.js'
 import settlementsConsumer from './workers/settlements.js'
 import { getCurrent } from './migrations/current.js'
 
@@ -29,7 +28,6 @@ const runtime = new Runtime(config)
 extras.utils.setupKafkaCert()
 suggestionsConsumer(runtime)
 voteConsumer(runtime)
-referralsConsumer(runtime)
 settlementsConsumer(runtime)
 runtime.kafka.consume().catch(console.error)
 export default runtime