feat(deploy): update task defs for prod + staging

.aws/deploy/backend-task-definition.prod.json

@@ -241,6 +241,11 @@
           "value": "<DD_API_KEY>"
         }
       ],
+      "dockerLabels": {
+        "com.datadoghq.tags.env": "prod",
+        "com.datadoghq.tags.service": "isomer",
+        "com.datadoghq.tags.version": "7"
+      },
       "mountPoints": [],
       "volumesFrom": [],
       "secrets": [],

.aws/deploy/backend-task-definition.staging.json

@@ -223,7 +223,7 @@
         },
         {
           "name": "DD_ENV",
-          "value": "prod"
+          "value": "staging"
         },
         {
           "name": "DD_SERVICE",
@@ -250,6 +250,11 @@
           "value": "<DD_API_KEY>"
         }
       ],
+      "dockerLabels": {
+        "com.datadoghq.tags.env": "staging",
+        "com.datadoghq.tags.service": "isomer",
+        "com.datadoghq.tags.version": "7"
+      },
       "mountPoints": [],
       "volumesFrom": [],
       "secrets": [],

Dockerfile

@@ -20,6 +20,10 @@ RUN npm ci
 RUN rm -rf /var/cache/apk/*
 
 RUN git config --system --add safe.directory '*'
+RUN echo "[user]" > /root/.gitconfig 
+RUN echo "  name = Isomer Admin" >> /root/.gitconfig
+RUN echo "  email = [email protected]" >> /root/.gitconfig
+
 
 EXPOSE "8081"
 CMD ["bash", "-c", "chmod +x ./scripts/02_fetch_ssh_keys.sh && bash ./scripts/02_fetch_ssh_keys.sh & npm run start:ecs"] 

package.json

@@ -174,4 +174,4 @@
   "engines": {
     "node": ">=16.0.0"
   }
-}
+}

src/config/config.ts

@@ -2,7 +2,7 @@
 
 convict.addFormat({
   name: "required-string",
   validate: (val: any) => {
     if (!val) throw new Error("value cannot be empty, null or undefined")
     if (typeof val !== "string") throw new Error("value must be a string")
   },
@@ -10,14 +10,14 @@
 
 convict.addFormat({
   name: "required-positive-number",
   validate: (val: any) => {
     if (val === null || val === undefined || val === "")
       throw new Error("value cannot be empty, null or undefined")
     if (typeof val !== "number") throw new Error("value must be a number")
   },
   coerce: (val: string) => {
     const coercedVal = Number(val)
     if (isNaN(coercedVal)) {
       throw new Error(
         "value provided is not a positive number. please provide a valid positive number"
       )
@@ -31,7 +31,7 @@
 
 convict.addFormat({
   name: "required-boolean",
   validate: (val: any) => {
     if (val === null || val === undefined)
       throw new Error("value cannot be empty, null or undefined")
     if (typeof val !== "boolean") throw new Error("value must be a boolean")
@@ -258,7 +258,17 @@
   dataDog: {
     env: {
       doc: "The DataDog environment",
-      format: ["development", "local", "staging", "production"],
+      format: [
+        "development",
+        "local",
+        "staging",
+        "vapt",
+        "uat",
+        "production",
+        "prod",
+        "stg",
+        "dev",
+      ],
       env: "DD_ENV",
       default: "local",
     },

src/services/identity/SitesService.ts

@@ -442,6 +442,7 @@ class SitesService {
     createParams: Partial<Site> & {
       name: Site["name"]
       creator: Site["creator"]
+      creatorId: Site["creatorId"]
     }
   ) {
     return this.siteRepository.create(createParams)

src/services/identity/UsersService.ts

@@ -161,6 +161,7 @@ class UsersService {
         transaction,
       })
       user.lastLoggedIn = new Date()
+
       return user.save({ transaction })
     })
   }