Merge pull request #1164 from isomerpages/release/0.67.1

Release/0.67.1

CHANGELOG.md

@@ -4,8 +4,14 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v0.67.1](https://github.com/isomerpages/isomercms-backend/compare/v0.67.0...v0.67.1)
+
+- Revert "Chore/lock repos when repairing (#1149)" [`a746288`](https://github.com/isomerpages/isomercms-backend/commit/a7462884ba9f1d072d1a1bac97e5d4c25d338adf)
+
 #### [v0.67.0](https://github.com/isomerpages/isomercms-backend/compare/v0.66.4...v0.67.0)
 
+> 22 February 2024
+
 - fix(start-commands): update commands to be different by env [`#1159`](https://github.com/isomerpages/isomercms-backend/pull/1159)
 - fix(dompurify): further limit src [`#1156`](https://github.com/isomerpages/isomercms-backend/pull/1156)
 - fix(file-ext): prevent users from bypassing checks on file extensions  [`#1157`](https://github.com/isomerpages/isomercms-backend/pull/1157)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "isomercms",
-  "version": "0.67.0",
+  "version": "0.67.1",
   "private": true,
   "scripts": {
     "build": "tsc -p tsconfig.build.json",

src/routes/formsg/formsgGGsRepair.ts

@@ -10,15 +10,12 @@ import { ResultAsync, errAsync, fromPromise, okAsync } from "neverthrow"
 
 import { config } from "@config/config"
 
-import { lock, unlock } from "@utils/mutex-utils"
-
 import {
   EFS_VOL_PATH_STAGING,
   EFS_VOL_PATH_STAGING_LITE,
 } from "@root/constants"
 import GitFileSystemError from "@root/errors/GitFileSystemError"
 import InitializationError from "@root/errors/InitializationError"
-import LockedError from "@root/errors/LockedError"
 import { consoleLogger } from "@root/logger/console.logger"
 import logger from "@root/logger/logger"
 import { attachFormSGHandler } from "@root/middleware"
@@ -117,20 +114,15 @@ export class FormsgGGsRepairRouter {
   }
 
   handleGGsFormSubmission = (repoNames: string[], requesterEmail: string) => {
-    const repairs: ResultAsync<string, GitFileSystemError | LockedError>[] = []
+    const repairs: ResultAsync<string, GitFileSystemError>[] = []
 
     const clonedStagingRepos: string[] = []
     const syncedStagingAndStagingLiteRepos: string[] = []
-    const LOCK_TIME_SECONDS = 15 * 60 // 15 minutes
     repoNames.forEach((repoName) => {
       const repoUrl = `[email protected]:isomerpages/${repoName}.git`
 
       repairs.push(
-        ResultAsync.fromPromise(
-          lock(repoName, LOCK_TIME_SECONDS),
-          (err) => new LockedError(`Unable to lock repo ${repoName}`)
-        )
-          .andThen(() => this.doesRepoNeedClone(repoName))
+        this.doesRepoNeedClone(repoName)
           .andThen(() => {
             const isStaging = true
             return (
@@ -174,15 +166,6 @@ export class FormsgGGsRepairRouter {
                 return okAsync(result)
               })
           )
-          .andThen((result) => {
-            // Failure to unlock is not blocking
-            ResultAsync.fromPromise(unlock(repoName), () => {
-              logger.error(
-                "Failed to unlock repo - repo will unlock after at most 15 min"
-              )
-            })
-            return okAsync(result)
-          })
       )
     })
 

src/utils/mutex-utils.js

@@ -35,18 +35,18 @@ const mockUnlock = (siteName) => {
   mockMutexObj[siteName] = false
 }
 
-const lock = async (siteName, lockLengthSeconds = 60) => {
+const lock = async (siteName) => {
   try {
-    const expiryTime =
-      Math.floor(new Date().valueOf() / 1000) + lockLengthSeconds
+    const ONE_MIN_FROM_CURR_DATE_IN_SECONDS_FROM_EPOCH_TIME =
+      Math.floor(new Date().valueOf() / 1000) + 60
 
     if (isE2eTestRepo(siteName)) return
     if (!IS_DEV) {
       const params = {
         TableName: MUTEX_TABLE_NAME,
         Item: {
           repo_id: siteName,
-          expdate: expiryTime,
+          expdate: ONE_MIN_FROM_CURR_DATE_IN_SECONDS_FROM_EPOCH_TIME,
         },
         ConditionExpression: "attribute_not_exists(repo_id)",
       }