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

Merge pull request #1037 from scomans/main

Browse Source 
fix: renaming environments not updated in `secretimports` model
This commit is contained in:
Maidul Islam
2023-10-04 23:12:30 -04:00
committed by GitHub
parent 702d28faca 105c2e51ee
commit 5fce85ca41
1 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
backend/src/controllers/v2/environmentController.ts
View File

@@ -34,10 +34,10 @@ import { Webhook } from "../../models";
* @returns * @returns
*/ */
export const createWorkspaceEnvironment = async (req: Request, res: Response) => { export const createWorkspaceEnvironment = async (req: Request, res: Response) => {
/* /*
#swagger.summary = 'Create environment' #swagger.summary = 'Create environment'
#swagger.description = 'Create environment' #swagger.description = 'Create environment'
#swagger.security = [{ #swagger.security = [{
"apiKeyAuth": [] "apiKeyAuth": []
}] }]
@@ -46,12 +46,12 @@ export const createWorkspaceEnvironment = async (req: Request, res: Response) =>
"description": "ID of project", "description": "ID of project",
"required": true, "required": true,
"type": "string" "type": "string"
} }
/* /*
#swagger.summary = 'Create environment' #swagger.summary = 'Create environment'
#swagger.description = 'Create environment' #swagger.description = 'Create environment'
#swagger.security = [{ #swagger.security = [{
"apiKeyAuth": [] "apiKeyAuth": []
}] }]
@@ -60,7 +60,7 @@ export const createWorkspaceEnvironment = async (req: Request, res: Response) =>
"description": "ID of project", "description": "ID of project",
"required": true, "required": true,
"type": "string" "type": "string"
} }
#swagger.requestBody = { #swagger.requestBody = {
content: { content: {
@@ -88,7 +88,7 @@ export const createWorkspaceEnvironment = async (req: Request, res: Response) =>
#swagger.responses[200] = { #swagger.responses[200] = {
content: { content: {
"application/json": { "application/json": {
"schema": { "schema": {
"type": "object", "type": "object",
"properties": { "properties": {
"message": { "message": {
@@ -115,7 +115,7 @@ export const createWorkspaceEnvironment = async (req: Request, res: Response) =>
}, },
"description": "Response after creating a new environment" "description": "Response after creating a new environment"
} }
} }
} }
} }
*/ */
@@ -246,7 +246,7 @@ export const reorderWorkspaceEnvironments = async (req: Request, res: Response)
* @returns * @returns
*/ */
export const renameWorkspaceEnvironment = async (req: Request, res: Response) => { export const renameWorkspaceEnvironment = async (req: Request, res: Response) => {
/* /*
#swagger.summary = 'Rename workspace environment' #swagger.summary = 'Rename workspace environment'
#swagger.description = 'Rename a specific environment within a workspace' #swagger.description = 'Rename a specific environment within a workspace'
@@ -317,7 +317,7 @@ export const renameWorkspaceEnvironment = async (req: Request, res: Response) =>
} }
} }
} }
} }
*/ */
const { const {
params: { workspaceId }, params: { workspaceId },
@@ -394,6 +394,11 @@ export const renameWorkspaceEnvironment = async (req: Request, res: Response) =>
{ workspace: workspaceId, environment: oldEnvironmentSlug }, { workspace: workspaceId, environment: oldEnvironmentSlug },
{ environment: environmentSlug } { environment: environmentSlug }
); );
await SecretImport.updateMany(
{ workspace: workspaceId, 'imports.environment': oldEnvironmentSlug },
{ $set: { 'imports.$[element].environment': environmentSlug } },
{ arrayFilters: [{ 'element.environment': oldEnvironmentSlug }] },
);
await ServiceAccountWorkspacePermission.updateMany( await ServiceAccountWorkspacePermission.updateMany(
{ workspace: workspaceId, environment: oldEnvironmentSlug }, { workspace: workspaceId, environment: oldEnvironmentSlug },
@@ -447,10 +452,10 @@ export const renameWorkspaceEnvironment = async (req: Request, res: Response) =>
* @returns * @returns
*/ */
export const deleteWorkspaceEnvironment = async (req: Request, res: Response) => { export const deleteWorkspaceEnvironment = async (req: Request, res: Response) => {
/* /*
#swagger.summary = 'Delete workspace environment' #swagger.summary = 'Delete workspace environment'
#swagger.description = 'Delete a specific environment from a workspace' #swagger.description = 'Delete a specific environment from a workspace'
#swagger.security = [{ #swagger.security = [{
"apiKeyAuth": [] "apiKeyAuth": []
}] }]
@@ -483,7 +488,7 @@ export const deleteWorkspaceEnvironment = async (req: Request, res: Response) =>
#swagger.responses[200] = { #swagger.responses[200] = {
content: { content: {
"application/json": { "application/json": {
"schema": { "schema": {
"type": "object", "type": "object",
"properties": { "properties": {
"message": { "message": {
@@ -501,9 +506,9 @@ export const deleteWorkspaceEnvironment = async (req: Request, res: Response) =>
}, },
"description": "Response after deleting an environment from a workspace" "description": "Response after deleting an environment from a workspace"
} }
} }
} }
} }
*/ */
const { const {
params: { workspaceId }, params: { workspaceId },
@@ -590,10 +595,10 @@ export const deleteWorkspaceEnvironment = async (req: Request, res: Response) =>
// TODO(akhilmhdh) after rbac this can be completely removed // TODO(akhilmhdh) after rbac this can be completely removed
export const getAllAccessibleEnvironmentsOfWorkspace = async (req: Request, res: Response) => { export const getAllAccessibleEnvironmentsOfWorkspace = async (req: Request, res: Response) => {
/* /*
#swagger.summary = 'Get all accessible environments of a workspace' #swagger.summary = 'Get all accessible environments of a workspace'
#swagger.description = 'Fetch all environments that the user has access to in a specified workspace' #swagger.description = 'Fetch all environments that the user has access to in a specified workspace'
#swagger.security = [{ #swagger.security = [{
"apiKeyAuth": [] "apiKeyAuth": []
}] }]
@@ -640,7 +645,7 @@ export const getAllAccessibleEnvironmentsOfWorkspace = async (req: Request, res:
} }
} }
} }
} }
*/ */
const { const {
params: { workspaceId } params: { workspaceId }