improvements: address requested changes

backend/src/db/migrations/20240924172713_add-kms-key-project-id.ts

@@ -1,5 +1,6 @@
 import { Knex } from "knex";
 
+import { dropConstraintIfExists } from "@app/db/migrations/utils/dropConstraintIfExists";
 import { TableName } from "@app/db/schemas";
 
 export async function up(knex: Knex): Promise<void> {
@@ -7,12 +8,14 @@ export async function up(knex: Knex): Promise<void> {
     const hasOrgId = await knex.schema.hasColumn(TableName.KmsKey, "orgId");
     const hasSlug = await knex.schema.hasColumn(TableName.KmsKey, "slug");
 
+    // drop constraint if exists (won't exist if rolled back, see below)
+    await dropConstraintIfExists(TableName.KmsKey, "kms_keys_orgid_slug_unique", knex);
+
     // projectId for CMEK functionality
     await knex.schema.alterTable(TableName.KmsKey, (table) => {
       table.string("projectId").nullable().references("id").inTable(TableName.Project).onDelete("CASCADE");
 
       if (hasOrgId) {
-        table.dropUnique(["orgId", "slug"]); // prevents using the same key name in different projects so swapping constraint
         table.unique(["orgId", "projectId", "slug"]);
       }
 
@@ -36,7 +39,6 @@ export async function down(knex: Knex): Promise<void> {
 
       if (hasOrgId) {
         table.dropUnique(["orgId", "projectId", "slug"]);
-        table.unique(["orgId", "slug"]);
       }
       table.dropColumn("projectId");
     });

backend/src/db/migrations/utils/dropConstraintIfExists.ts

@@ -0,0 +1,6 @@
+import { Knex } from "knex";
+
+import { TableName } from "@app/db/schemas";
+
+export const dropConstraintIfExists = (tableName: TableName, constraintName: string, knex: Knex) =>
+  knex.raw(`ALTER TABLE ${tableName} DROP CONSTRAINT IF EXISTS ${constraintName};`);