Merge branch 'main' into removing-sentry-logs

backend/src/ee/controllers/v1/secretSnapshotController.ts

@@ -13,13 +13,20 @@ import {
  */
 export const getSecretSnapshot = async (req: Request, res: Response) => {
   const { secretSnapshotId } = req.params;
+
   const secretSnapshot = await SecretSnapshot.findById(secretSnapshotId)
     .lean()
-    .populate<{ secretVersions: ISecretVersion[] }>("secretVersions")
+    .populate<{ secretVersions: ISecretVersion[] }>({
+      path: 'secretVersions',
+      populate: {
+        path: 'tags',
+        model: 'Tag'
+      }
+    })
     .populate<{ folderVersion: TFolderRootVersionSchema }>("folderVersion");
-
+  
   if (!secretSnapshot) throw new Error("Failed to find secret snapshot");
-
+  
   const folderId = secretSnapshot.folderId;
   // to show only the folder required secrets
   secretSnapshot.secretVersions = secretSnapshot.secretVersions.filter(

backend/src/ee/models/secretVersion.ts

@@ -27,6 +27,7 @@ export interface ISecretVersion {
   keyEncoding: "utf8" | "base64";
   createdAt: string;
   folder?: string;
+  tags?: string[];
 }
 
 const secretVersionSchema = new Schema<ISecretVersion>(
@@ -112,6 +113,11 @@ const secretVersionSchema = new Schema<ISecretVersion>(
       type: String,
       required: true,
     },
+    tags: {
+      ref: 'Tag',
+      type: [Schema.Types.ObjectId],
+      default: []
+    },
   },
   {
     timestamps: true,