Merge pull request #4558 from Infisical/misc/add-secret-tags-to-audit-logs

misc: add secret tags to audit logs
This commit is contained in:
Sheen
2025-09-20 00:11:51 +08:00
committed by GitHub
5 changed files with 38 additions and 16 deletions

View File

@@ -603,6 +603,7 @@ interface CreateSecretEvent {
secretKey: string; secretKey: string;
secretVersion: number; secretVersion: number;
secretMetadata?: TSecretMetadata; secretMetadata?: TSecretMetadata;
secretTags?: string[];
}; };
} }
@@ -617,6 +618,7 @@ interface CreateSecretBatchEvent {
secretPath?: string; secretPath?: string;
secretVersion: number; secretVersion: number;
secretMetadata?: TSecretMetadata; secretMetadata?: TSecretMetadata;
secretTags?: string[];
}>; }>;
}; };
} }
@@ -630,6 +632,7 @@ interface UpdateSecretEvent {
secretKey: string; secretKey: string;
secretVersion: number; secretVersion: number;
secretMetadata?: TSecretMetadata; secretMetadata?: TSecretMetadata;
secretTags?: string[];
}; };
} }
@@ -644,6 +647,7 @@ interface UpdateSecretBatchEvent {
secretVersion: number; secretVersion: number;
secretMetadata?: TSecretMetadata; secretMetadata?: TSecretMetadata;
secretPath?: string; secretPath?: string;
secretTags?: string[];
}>; }>;
}; };
} }

View File

@@ -754,7 +754,8 @@ export const pitServiceFactory = ({
secrets: newSecrets.map((secret) => ({ secrets: newSecrets.map((secret) => ({
secretId: secret.id, secretId: secret.id,
secretKey: secret.secretKey, secretKey: secret.secretKey,
secretVersion: secret.version secretVersion: secret.version,
secretTags: secret.tags?.map((tag) => tag.name)
})) }))
} }
}); });
@@ -781,7 +782,8 @@ export const pitServiceFactory = ({
secrets: updatedSecrets.map((secret) => ({ secrets: updatedSecrets.map((secret) => ({
secretId: secret.id, secretId: secret.id,
secretKey: secret.secretKey, secretKey: secret.secretKey,
secretVersion: secret.version secretVersion: secret.version,
secretTags: secret.tags?.map((tag) => tag.name)
})) }))
} }
}); });

View File

@@ -1084,7 +1084,9 @@ export const secretApprovalRequestServiceFactory = ({
// @ts-expect-error not present on v1 secrets // @ts-expect-error not present on v1 secrets
secretKey: secret.key as string, secretKey: secret.key as string,
// @ts-expect-error not present on v1 secrets // @ts-expect-error not present on v1 secrets
secretMetadata: secret.secretMetadata as ResourceMetadataDTO secretMetadata: secret.secretMetadata as ResourceMetadataDTO,
// @ts-expect-error not present on v1 secrets
secretTags: (secret.tags as { name: string }[])?.map((tag) => tag.name)
})) }))
} }
}); });
@@ -1100,7 +1102,9 @@ export const secretApprovalRequestServiceFactory = ({
// @ts-expect-error not present on v1 secrets // @ts-expect-error not present on v1 secrets
secretKey: secret.key as string, secretKey: secret.key as string,
// @ts-expect-error not present on v1 secrets // @ts-expect-error not present on v1 secrets
secretMetadata: secret.secretMetadata as ResourceMetadataDTO secretMetadata: secret.secretMetadata as ResourceMetadataDTO,
// @ts-expect-error not present on v1 secrets
secretTags: (secret.tags as { name: string }[])?.map((tag) => tag.name)
} }
}); });
} }
@@ -1119,7 +1123,9 @@ export const secretApprovalRequestServiceFactory = ({
// @ts-expect-error not present on v1 secrets // @ts-expect-error not present on v1 secrets
secretKey: secret.key as string, secretKey: secret.key as string,
// @ts-expect-error not present on v1 secrets // @ts-expect-error not present on v1 secrets
secretMetadata: secret.secretMetadata as ResourceMetadataDTO secretMetadata: secret.secretMetadata as ResourceMetadataDTO,
// @ts-expect-error not present on v1 secrets
secretTags: (secret.tags as { name: string }[])?.map((tag) => tag.name)
})) }))
} }
}); });
@@ -1135,7 +1141,9 @@ export const secretApprovalRequestServiceFactory = ({
// @ts-expect-error not present on v1 secrets // @ts-expect-error not present on v1 secrets
secretKey: secret.key as string, secretKey: secret.key as string,
// @ts-expect-error not present on v1 secrets // @ts-expect-error not present on v1 secrets
secretMetadata: secret.secretMetadata as ResourceMetadataDTO secretMetadata: secret.secretMetadata as ResourceMetadataDTO,
// @ts-expect-error not present on v1 secrets
secretTags: (secret.tags as { name: string }[])?.map((tag) => tag.name)
} }
}); });
} }

View File

@@ -627,7 +627,8 @@ export const registerDeprecatedSecretRouter = async (server: FastifyZodProvider)
secretId: secret.id, secretId: secret.id,
secretKey: req.params.secretName, secretKey: req.params.secretName,
secretVersion: secret.version, secretVersion: secret.version,
secretMetadata: req.body.secretMetadata secretMetadata: req.body.secretMetadata,
secretTags: secret.tags?.map((tag) => tag.name)
} }
} }
}); });
@@ -780,7 +781,8 @@ export const registerDeprecatedSecretRouter = async (server: FastifyZodProvider)
secretId: secret.id, secretId: secret.id,
secretKey: req.params.secretName, secretKey: req.params.secretName,
secretVersion: secret.version, secretVersion: secret.version,
secretMetadata: req.body.secretMetadata secretMetadata: req.body.secretMetadata,
secretTags: secret.tags?.map((tag) => tag.name)
} }
} }
}); });
@@ -2154,7 +2156,8 @@ export const registerDeprecatedSecretRouter = async (server: FastifyZodProvider)
secretId: secret.id, secretId: secret.id,
secretKey: secret.secretKey, secretKey: secret.secretKey,
secretVersion: secret.version, secretVersion: secret.version,
secretMetadata: secretMetadataMap.get(secret.secretKey) secretMetadata: secretMetadataMap.get(secret.secretKey),
secretTags: secret.tags?.map((tag) => tag.name)
})) }))
} }
} }
@@ -2288,7 +2291,6 @@ export const registerDeprecatedSecretRouter = async (server: FastifyZodProvider)
return { approval: secretOperation.approval }; return { approval: secretOperation.approval };
} }
const { secrets } = secretOperation; const { secrets } = secretOperation;
const secretMetadataMap = new Map( const secretMetadataMap = new Map(
inputSecrets.map(({ secretKey, secretMetadata }) => [secretKey, secretMetadata]) inputSecrets.map(({ secretKey, secretMetadata }) => [secretKey, secretMetadata])
); );
@@ -2308,7 +2310,8 @@ export const registerDeprecatedSecretRouter = async (server: FastifyZodProvider)
secretPath: secret.secretPath, secretPath: secret.secretPath,
secretKey: secret.secretKey, secretKey: secret.secretKey,
secretVersion: secret.version, secretVersion: secret.version,
secretMetadata: secretMetadataMap.get(secret.secretKey) secretMetadata: secretMetadataMap.get(secret.secretKey),
secretTags: secret.tags?.map((tag) => tag.name)
})) }))
} }
} }
@@ -2328,7 +2331,8 @@ export const registerDeprecatedSecretRouter = async (server: FastifyZodProvider)
secretPath: secret.secretPath, secretPath: secret.secretPath,
secretKey: secret.secretKey, secretKey: secret.secretKey,
secretVersion: secret.version, secretVersion: secret.version,
secretMetadata: secretMetadataMap.get(secret.secretKey) secretMetadata: secretMetadataMap.get(secret.secretKey),
secretTags: secret.tags?.map((tag) => tag.name)
})) }))
} }
} }

View File

@@ -478,7 +478,8 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => {
secretId: secret.id, secretId: secret.id,
secretKey: req.params.secretName, secretKey: req.params.secretName,
secretVersion: secret.version, secretVersion: secret.version,
secretMetadata: req.body.secretMetadata secretMetadata: req.body.secretMetadata,
secretTags: secret.tags?.map((tag) => tag.name)
} }
} }
}); });
@@ -621,7 +622,8 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => {
secretId: secret.id, secretId: secret.id,
secretKey: req.params.secretName, secretKey: req.params.secretName,
secretVersion: secret.version, secretVersion: secret.version,
secretMetadata: req.body.secretMetadata secretMetadata: req.body.secretMetadata,
secretTags: secret.tags?.map((tag) => tag.name)
} }
} }
}); });
@@ -911,7 +913,8 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => {
secretId: secret.id, secretId: secret.id,
secretKey: secret.secretKey, secretKey: secret.secretKey,
secretVersion: secret.version, secretVersion: secret.version,
secretMetadata: secretMetadataMap.get(secret.secretKey) secretMetadata: secretMetadataMap.get(secret.secretKey),
secretTags: secret.tags?.map((tag) => tag.name)
})) }))
} }
} }
@@ -1063,7 +1066,8 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => {
secretPath: secret.secretPath, secretPath: secret.secretPath,
secretKey: secret.secretKey, secretKey: secret.secretKey,
secretVersion: secret.version, secretVersion: secret.version,
secretMetadata: secretMetadataMap.get(secret.secretKey) secretMetadata: secretMetadataMap.get(secret.secretKey),
secretTags: secret.tags?.map((tag) => tag.name)
})) }))
} }
} }