Resolve PR issues

backend/src/db/migrations/20240607032218_certificate-mgmt.ts

@@ -24,6 +24,7 @@ export async function up(knex: Knex): Promise<void> {
       t.foreign("projectId").references("id").inTable(TableName.Project).onDelete("CASCADE");
       t.string("type").notNullable(); // root / intermediate
       t.string("status").notNullable(); // active / pending-certificate
+      t.string("friendlyName").notNullable();
       t.string("organization").notNullable();
       t.string("ou").notNullable();
       t.string("country").notNullable();
@@ -31,7 +32,6 @@ export async function up(knex: Knex): Promise<void> {
       t.string("locality").notNullable();
       t.string("commonName").notNullable();
       t.string("dn").notNullable();
-      t.unique(["dn", "projectId"]);
       t.string("serialNumber").nullable().unique();
       t.integer("maxPathLength").nullable();
       t.string("keyAlgorithm").notNullable();
@@ -80,6 +80,7 @@ export async function up(knex: Knex): Promise<void> {
       t.foreign("caId").references("id").inTable(TableName.CertificateAuthority).onDelete("CASCADE");
       t.string("status").notNullable(); // active / pending-certificate
       t.string("serialNumber").notNullable().unique();
+      t.string("friendlyName").notNullable();
       t.string("commonName").notNullable();
       t.datetime("notBefore").notNullable();
       t.datetime("notAfter").notNullable();
@@ -88,8 +89,8 @@ export async function up(knex: Knex): Promise<void> {
     });
   }
 
-  if (!(await knex.schema.hasTable(TableName.CertificateCert))) {
-    await knex.schema.createTable(TableName.CertificateCert, (t) => {
+  if (!(await knex.schema.hasTable(TableName.CertificateBody))) {
+    await knex.schema.createTable(TableName.CertificateBody, (t) => {
       t.uuid("id", { primaryKey: true }).defaultTo(knex.fn.uuid());
       t.timestamps(true, true, true);
       t.uuid("certId").notNullable().unique();
@@ -102,7 +103,7 @@ export async function up(knex: Knex): Promise<void> {
   await createOnUpdateTrigger(knex, TableName.CertificateAuthorityCert);
   await createOnUpdateTrigger(knex, TableName.CertificateAuthoritySecret);
   await createOnUpdateTrigger(knex, TableName.Certificate);
-  await createOnUpdateTrigger(knex, TableName.CertificateCert);
+  await createOnUpdateTrigger(knex, TableName.CertificateBody);
 }
 
 export async function down(knex: Knex): Promise<void> {
@@ -115,8 +116,8 @@ export async function down(knex: Knex): Promise<void> {
   }
 
   // certificates
-  await knex.schema.dropTableIfExists(TableName.CertificateCert);
-  await dropOnUpdateTrigger(knex, TableName.CertificateCert);
+  await knex.schema.dropTableIfExists(TableName.CertificateBody);
+  await dropOnUpdateTrigger(knex, TableName.CertificateBody);
 
   await knex.schema.dropTableIfExists(TableName.Certificate);
   await dropOnUpdateTrigger(knex, TableName.Certificate);

backend/src/db/schemas/certificate-authorities.ts

@@ -15,6 +15,7 @@ export const CertificateAuthoritiesSchema = z.object({
   projectId: z.string(),
   type: z.string(),
   status: z.string(),
+  friendlyName: z.string(),
   organization: z.string(),
   ou: z.string(),
   country: z.string(),

backend/src/db/schemas/certificate-bodies.ts

@@ -9,7 +9,7 @@ import { zodBuffer } from "@app/lib/zod";
 
 import { TImmutableDBKeys } from "./models";
 
-export const CertificateCertsSchema = z.object({
+export const CertificateBodiesSchema = z.object({
   id: z.string().uuid(),
   createdAt: z.date(),
   updatedAt: z.date(),
@@ -17,6 +17,6 @@ export const CertificateCertsSchema = z.object({
   encryptedCertificate: zodBuffer
 });
 
-export type TCertificateCerts = z.infer<typeof CertificateCertsSchema>;
-export type TCertificateCertsInsert = Omit<z.input<typeof CertificateCertsSchema>, TImmutableDBKeys>;
-export type TCertificateCertsUpdate = Partial<Omit<z.input<typeof CertificateCertsSchema>, TImmutableDBKeys>>;
+export type TCertificateBodies = z.infer<typeof CertificateBodiesSchema>;
+export type TCertificateBodiesInsert = Omit<z.input<typeof CertificateBodiesSchema>, TImmutableDBKeys>;
+export type TCertificateBodiesUpdate = Partial<Omit<z.input<typeof CertificateBodiesSchema>, TImmutableDBKeys>>;

backend/src/db/schemas/certificates.ts

@@ -14,6 +14,7 @@ export const CertificatesSchema = z.object({
   caId: z.string().uuid(),
   status: z.string(),
   serialNumber: z.string(),
+  friendlyName: z.string(),
   commonName: z.string(),
   notBefore: z.date(),
   notAfter: z.date(),

backend/src/db/schemas/index.ts

@@ -12,7 +12,7 @@ export * from "./certificate-authorities";
 export * from "./certificate-authority-certs";
 export * from "./certificate-authority-crl";
 export * from "./certificate-authority-secret";
-export * from "./certificate-certs";
+export * from "./certificate-bodies";
 export * from "./certificate-secrets";
 export * from "./certificates";
 export * from "./dynamic-secret-leases";

backend/src/db/schemas/models.ts

@@ -7,7 +7,7 @@ export enum TableName {
   CertificateAuthoritySecret = "certificate_authority_secret",
   CertificateAuthorityCrl = "certificate_authority_crl",
   Certificate = "certificates",
-  CertificateCert = "certificate_certs",
+  CertificateBody = "certificate_bodies",
   CertificateSecret = "certificate_secrets",
   Groups = "groups",
   GroupProjectMembership = "group_project_memberships",