awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-10 11:29:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Finish upgrade queue

Browse Source
This commit is contained in:
Daniel Hougaard
2024-02-22 05:00:25 +01:00
parent ec3cf0208c
commit 819a9b8d27
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/services/project/project-queue.ts
+18 -11
View File
@@ -15,7 +15,6 @@ import {
infisicalSymmetricDecrypt, infisicalSymmetricDecrypt,
infisicalSymmetricEncypt infisicalSymmetricEncypt
} from "@app/lib/crypto/encryption"; } from "@app/lib/crypto/encryption";
import { BadRequestError } from "@app/lib/errors";
import { logger } from "@app/lib/logger"; import { logger } from "@app/lib/logger";
import { createProjectKey, createWsMembers } from "@app/lib/project"; import { createProjectKey, createWsMembers } from "@app/lib/project";
import { decryptSecrets, SecretDocType, TPartialSecret } from "@app/lib/secret"; import { decryptSecrets, SecretDocType, TPartialSecret } from "@app/lib/secret";
@@ -83,21 +82,21 @@ export const projectQueueFactory = ({
try { try {
const [project] = await projectDAL.find({ const [project] = await projectDAL.find({
id: data.projectId, id: data.projectId,
version: ProjectVersion.V1, version: ProjectVersion.V1
$in: {
upgradeStatus: [ProjectUpgradeStatus.Failed, null]
}
}); });
const oldProjectKey = await projectKeyDAL.findLatestProjectKey(data.startedByUserId, data.projectId); const oldProjectKey = await projectKeyDAL.findLatestProjectKey(data.startedByUserId, data.projectId);
if (!project || !oldProjectKey) { if (!project || !oldProjectKey) {
throw new BadRequestError({ throw new Error("Project or project key not found");
message: "Project or project key not found"
});
} }
await projectDAL.setProjectUpgradeStatus(data.projectId, ProjectUpgradeStatus.InProgress); if (project.upgradeStatus !== ProjectUpgradeStatus.Failed && project.upgradeStatus !== null) {
throw new Error("Project upgrade status is not valid");
}
await projectDAL.setProjectUpgradeStatus(data.projectId, ProjectUpgradeStatus.InProgress); // Set the status to in progress. This is important to prevent multiple upgrades at the same time.
const userPrivateKey = infisicalSymmetricDecrypt({ const userPrivateKey = infisicalSymmetricDecrypt({
keyEncoding: data.encryptedPrivateKey.keyEncoding, keyEncoding: data.encryptedPrivateKey.keyEncoding,
ciphertext: data.encryptedPrivateKey.encryptedKey, ciphertext: data.encryptedPrivateKey.encryptedKey,
@@ -384,10 +383,18 @@ export const projectQueueFactory = ({
throw new Error("Failed to update some secret approvals"); throw new Error("Failed to update some secret approvals");
} }
throw new Error("Transaction was successful!"); await projectDAL.setProjectUpgradeStatus(data.projectId, null, tx);
// throw new Error("Transaction was successful!");
}); });
} catch (err) { } catch (err) {
const project = await projectDAL.findOne({ id: data.projectId, version: ProjectVersion.V1 }).catch(() => null); console.log(err);
const [project] = await projectDAL
.find({
id: data.projectId,
version: ProjectVersion.V1
})
.catch(() => [null]);
if (!project) { if (!project) {
logger.error("Failed to upgrade project, because no project was found", data); logger.error("Failed to upgrade project, because no project was found", data);