Merge branch 'main' into script/CM-2073

Author: skwowet

.github/actions/build-docker-image/action.yaml

@@ -9,7 +9,7 @@ inputs:
 outputs:
   image:
     description: Image that was built
-    value: crowddotdev/${{ inputs.image }}:${{ steps.version-generator.outputs.IMAGE_VERSION }}
+    value: sjc.ocir.io/axbydjxa5zuh/${{ inputs.image }}:${{ steps.version-generator.outputs.IMAGE_VERSION }}
 
 runs:
   using: composite
@@ -26,7 +26,7 @@ runs:
 
     - name: Login to docker repository
       shell: bash
-      run: echo ${{ env.DOCKERHUB_PASSWORD }} | docker login -u ${{ env.DOCKERHUB_USERNAME }} --password-stdin
+      run: echo '${{ env.ORACLE_DOCKER_PASSWORD }}' | docker login sjc.ocir.io -u '${{ env.ORACLE_DOCKER_USERNAME }}' --password-stdin
 
     - name: Build and push docker image
       shell: bash

.github/actions/node/builder/index.js

@@ -21,16 +21,20 @@ const getBuildInputs = (): IBuildInput => {
 }
 
 const getPushInputs = (): IPushInput => {
-  const username = process.env.DOCKERHUB_USERNAME
+  const username = process.env.ORACLE_DOCKER_USERNAME
   if (!username) {
-    core.error('No DockerHub username found in DOCKERHUB_USERNAME environment variable!')
-    throw new Error('No DockerHub username found in DOCKERHUB_USERNAME environment variable!')
+    core.error('No Oracle Docker username found in ORACLE_DOCKER_USERNAME environment variable!')
+    throw new Error(
+      'No Oracle Docker username found in ORACLE_DOCKER_USERNAME environment variable!',
+    )
   }
 
-  const password = process.env.DOCKERHUB_PASSWORD
+  const password = process.env.ORACLE_DOCKER_PASSWORD
   if (!password) {
-    core.error('No DockerHub password found in DOCKERHUB_PASSWORD environment variable!')
-    throw new Error('No DockerHub password found in DOCKERHUB_PASSWORD environment variable!')
+    core.error('No Oracle Docker password found in ORACLE_DOCKER_PASSWORD environment variable!')
+    throw new Error(
+      'No Oracle Docker password found in ORACLE_DOCKER_PASSWORD environment variable!',
+    )
   }
 
   return {

.github/actions/node/src/inputs.ts

@@ -71,6 +71,7 @@ export const pushStep = async (): Promise<void> => {
   // do a docker login
   const exitCode = await exec.exec('docker', [
     'login',
+    'sjc.ocir.io',
     '--username',
     pushInput.dockerUsername,
     '--password',

.github/actions/node/src/steps.ts

@@ -9,8 +9,8 @@ on:
 
 env:
   CLOUD_ENV: lf-oracle-production
-  DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-  DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
+  ORACLE_DOCKER_USERNAME: ${{ secrets.ORACLE_DOCKER_USERNAME }}
+  ORACLE_DOCKER_PASSWORD: ${{ secrets.ORACLE_DOCKER_PASSWORD }}
   ORACLE_USER: ${{ secrets.ORACLE_USER }}
   ORACLE_TENANT: ${{ secrets.ORACLE_TENANT }}
   ORACLE_REGION: ${{ secrets.ORACLE_REGION }}
@@ -23,14 +23,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      
+
       - name: Install OCI
         run: |
           curl -L https://raw.githubusercontent.com/oracle/oci-cli/master/scripts/install/install.sh > install.sh
           chmod +x install.sh
           ./install.sh --accept-all-defaults
           echo "OCI_CLI_DIR=/home/runner/bin" >> $GITHUB_ENV
-      
+
       - name: Update PATH
         run: echo "${{ env.OCI_CLI_DIR }}" >> $GITHUB_PATH
 

.github/workflows/lf-oracle-production-deploy.yaml

@@ -9,8 +9,8 @@ on:
 
 env:
   CLOUD_ENV: lf-oracle-staging
-  DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
-  DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
+  ORACLE_DOCKER_USERNAME: ${{ secrets.ORACLE_DOCKER_USERNAME }}
+  ORACLE_DOCKER_PASSWORD: ${{ secrets.ORACLE_DOCKER_PASSWORD }}
   ORACLE_USER: ${{ secrets.ORACLE_USER }}
   ORACLE_TENANT: ${{ secrets.ORACLE_TENANT }}
   ORACLE_REGION: ${{ secrets.ORACLE_REGION }}

.github/workflows/lf-oracle-staging-deploy.yaml

@@ -3,10 +3,6 @@
 # frontend
 /frontend/                                                  @gaspergrom @Sameh16
 
-# backend and services
-/backend/                                                   @epipav @skwowet @themarolt @joanreyero @sausage-todd
-/services/                                                  @epipav @skwowet @themarolt @joanreyero @sausage-todd
-
 # infra
 /.github/                                                   @themarolt
 /.husky/                                                    @themarolt

CODEOWNERS

@@ -1,5 +1,6 @@
 import cronGenerator from 'cron-time-generator'
 
+import { DEFAULT_TENANT_ID } from '@crowd/common'
 import { DbStore, getDbConnection } from '@crowd/data-access-layer/src/database'
 import { IDbActivityCreateData } from '@crowd/data-access-layer/src/old/apps/data_sink_worker/repo/activity.data'
 import ActivityRepository from '@crowd/data-access-layer/src/old/apps/data_sink_worker/repo/activity.repo'
@@ -49,16 +50,21 @@ async function syncActivitiesBatch({
 
   for (const activity of activities) {
     const existingActivity = await activityRepo.existsWithId(activity.id)
+    const tenantId = DEFAULT_TENANT_ID
 
     try {
       if (existingActivity) {
         await activityRepo.rawUpdate(activity.id, {
           ...activity,
+          tenantId,
           platform: activity.platform as PlatformType,
         })
         result.updated++
       } else {
-        await activityRepo.rawInsert(activity)
+        await activityRepo.rawInsert({
+          ...activity,
+          tenantId,
+        })
         result.inserted++
       }
     } catch (error) {

backend/src/bin/jobs/syncActivities.ts

@@ -1,4 +1,4 @@
 DOCKERFILE="./services/docker/Dockerfile.activities_worker"
 CONTEXT="../"
-REPO="crowddotdev/activities-worker"
+REPO="sjc.ocir.io/axbydjxa5zuh/activities-worker"
 SERVICES="activities-worker"