awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-09-22 13:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: resolved migration failing

Browse Source
This commit is contained in:
=
2025-07-20 23:21:26 +05:30
parent 4cf66a8bfd
commit 272207c580
4 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
backend/src/db/migrations/20250718133527_project-unify-revert.ts
View File

@@ -13,9 +13,10 @@ const newProject = async (knex: Knex, projectId: string, projectType: ProjectTyp
await knex(TableName.Project).insert({
...project,
type: projectType,
defaultProduct: projectType,
// @ts-ignore id is required
id: newProjectId,
slug: slugify(`${project?.name}-${alphaNumericNanoId(4)}`)
slug: slugify(`${project?.name}-${alphaNumericNanoId(8)}`)
});
const customRoleMapping: Record<string, string> = {};
@@ -198,11 +199,15 @@ const newProject = async (knex: Knex, projectId: string, projectType: ProjectTyp
};
const kickOutSecretManagerProject = async (knex: Knex, oldProjectId: string) => {
const enviroments = await knex(TableName.Environment).where("projectId", oldProjectId).returning("id").first();
if (enviroments) {
const secret = await knex(TableName.Secret)
.join(TableName.SecretFolder, `${TableName.SecretFolder}.id`, `${TableName.Secret}.folderId`)
.join(TableName.Environment, `${TableName.Environment}.id`, `${TableName.SecretFolder}.envId`)
.where("projectId", oldProjectId)
.returning(`${TableName.Secret}.id`)
.first();
if (secret) {
const newProjectId = await newProject(knex, oldProjectId, ProjectType.SecretManager);
await knex(TableName.IntegrationAuth).where("projectId", oldProjectId).update("projectId", newProjectId);
await knex(TableName.ProjectBot).where("projectId", oldProjectId).update("projectId", newProjectId);
await knex(TableName.SecretBlindIndex).where("projectId", oldProjectId).update("projectId", newProjectId);
await knex(TableName.SecretSync).where("projectId", oldProjectId).update("projectId", newProjectId);
await knex(TableName.SecretTag).where("projectId", oldProjectId).update("projectId", newProjectId);
@@ -303,7 +308,7 @@ export async function up(knex: Knex): Promise<void> {
}
await knex(TableName.Project).whereIn("id", ids).update("defaultProduct", null);
}
} while (projectsToBeTyped.length > 0);
} while (projectsToBeSplit.length > 0);
}
}

2
backend/src/ee/services/project-template/project-template-fns.ts
View File

@@ -1,3 +1,4 @@
import { ProjectType } from "@app/db/schemas";
import {
InfisicalProjectTemplate,
TUnpackedPermission
@@ -5,7 +6,6 @@ import {
import { getPredefinedRoles } from "@app/services/project-role/project-role-fns";
import { ProjectTemplateDefaultEnvironments } from "./project-template-constants";
import { ProjectType } from "@app/db/schemas";
export const getDefaultProjectTemplate = (orgId: string, type: ProjectType) => ({
id: "b11b49a9-09a9-4443-916a-4246f9ff2c69", // random ID to appease zod

2
backend/src/services/project-role/project-role-service.ts
View File

@@ -2,7 +2,7 @@ import { ForbiddenError, MongoAbility, RawRuleOf } from "@casl/ability";
import { PackRule, packRules, unpackRules } from "@casl/ability/extra";
import { requestContext } from "@fastify/request-context";
import { ActionProjectType, ProjectMembershipRole, TableName, TProjects, ProjectType } from "@app/db/schemas";
import { ActionProjectType, ProjectMembershipRole, ProjectType, TableName, TProjects } from "@app/db/schemas";
import { TPermissionServiceFactory } from "@app/ee/services/permission/permission-service-types";
import {
ProjectPermissionActions,

2
backend/src/services/project-role/project-role-types.ts
View File

@@ -1,4 +1,4 @@
import { ProjectMembershipRole, TOrgRolesUpdate, TProjectRolesInsert, ProjectType } from "@app/db/schemas";
import { ProjectMembershipRole, ProjectType, TOrgRolesUpdate, TProjectRolesInsert } from "@app/db/schemas";
import { TProjectPermission } from "@app/lib/types";
export enum ProjectRoleServiceIdentifierType {