use new column to store migrated config, use new column

Author: dotansimha

packages/migrations/src/actions/2025.03.26T00-00-00.graphql-eslint.v4.ts

@@ -24,6 +24,13 @@ export default {
   name: '2025.03.26T00-00-00.graphql-eslint.v4.ts',
   noTransaction: true,
   run: async ({ sql, connection }) => {
+    console.log('Preparing policy config table with a new column (config_v4)...');
+    await connection.query(
+      sql`ALTER TABLE
+            schema_policy_config
+          ADD COLUMN IF NOT EXISTS "config_v4" jsonb`,
+    );
+
     console.log('Looking for existing schema_policy_config objects...');
 
     const existingV3Configs = await connection.query(
@@ -50,7 +57,7 @@ export default {
           const v4Config = migrateConfig(jsonConfig);
 
           await connection.query(
-            sql`UPDATE schema_policy_config SET config = ${sql.json(v4Config)} WHERE resource_type = ${resourceType} AND resource_id = ${resourceId}`,
+            sql`UPDATE schema_policy_config SET config_v4 = ${sql.json(v4Config)} WHERE resource_type = ${resourceType} AND resource_id = ${resourceId}`,
           );
           console.log(`Migrated config for ${resourceType}:${resourceId}`);
         } else {

packages/migrations/test/2025.03.26T00-00-00.policy-eslint-v4-upgrade.test.ts

@@ -246,10 +246,11 @@ await describe('migration: policy upgrade: graphql-eslint v3 -> v4', async () =>
         await runTo('2025.03.26T00-00-00.graphql-eslint.v4.ts');
 
         // assert scopes are still in place and identical
-        const newRecord = await db.oneFirst(sql`
-          SELECT config FROM schema_policy_config WHERE resource_id = ${organization.id}`);
+        const newRecord = await db.one(sql`
+          SELECT config, config_v4 FROM schema_policy_config WHERE resource_id = ${organization.id}`);
 
-        assert.deepStrictEqual(newRecord, testCase.out);
+        assert.deepStrictEqual(newRecord.config, testCase.in);
+        assert.deepStrictEqual(newRecord.config_v4, testCase.out);
 
         await complete();
       } finally {

packages/services/storage/src/db/types.ts

@@ -310,6 +310,7 @@ export interface schema_log {
 export interface schema_policy_config {
   allow_overriding: boolean;
   config: any;
+  config_v4: any | null;
   created_at: Date;
   resource_id: string;
   resource_type: schema_policy_resource;

packages/services/storage/src/index.ts

@@ -153,7 +153,7 @@ export async function createStorage(
   function transformSchemaPolicy(schema_policy: schema_policy_config): SchemaPolicy {
     return {
       id: `${schema_policy.resource_type}_${schema_policy.resource_id}`,
-      config: schema_policy.config,
+      config: schema_policy.config_v4,
       createdAt: schema_policy.created_at,
       updatedAt: schema_policy.updated_at,
       resource: schema_policy.resource_type,
@@ -3416,14 +3416,14 @@ export async function createStorage(
     async setSchemaPolicyForOrganization(input): Promise<SchemaPolicy> {
       const result = await pool.one<schema_policy_config>(sql`/* setSchemaPolicyForOrganization */
         INSERT INTO "schema_policy_config"
-        ("resource_type", "resource_id", "config", "allow_overriding")
+        ("resource_type", "resource_id", "config_v4", "allow_overriding")
           VALUES ('ORGANIZATION', ${input.organizationId}, ${sql.jsonb(input.policy)}, ${
             input.allowOverrides
           })
         ON CONFLICT
           (resource_type, resource_id)
         DO UPDATE
-          SET "config" = ${sql.jsonb(input.policy)},
+          SET "config_v4" = ${sql.jsonb(input.policy)},
               "allow_overriding" = ${input.allowOverrides},
               "updated_at" = now()
         RETURNING *;
@@ -3434,12 +3434,12 @@ export async function createStorage(
     async setSchemaPolicyForProject(input): Promise<SchemaPolicy> {
       const result = await pool.one<schema_policy_config>(sql`/* setSchemaPolicyForProject */
       INSERT INTO "schema_policy_config"
-      ("resource_type", "resource_id", "config")
+      ("resource_type", "resource_id", "config_v4")
         VALUES ('PROJECT', ${input.projectId}, ${sql.jsonb(input.policy)})
       ON CONFLICT
         (resource_type, resource_id)
       DO UPDATE
-        SET "config" = ${sql.jsonb(input.policy)},
+        SET "config_v4" = ${sql.jsonb(input.policy)},
             "updated_at" = now()
       RETURNING *;
     `);