All tests pass after rebase onto enable metadata writes

near · Apr 18, 2024 · d657e9d · d657e9d
1 parent c3f9303
commit d657e9d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 32 deletions.
diff --git a/runner/src/provisioner/provisioner.test.ts b/runner/src/provisioner/provisioner.test.ts
@@ -3,6 +3,7 @@ import pgFormat from 'pg-format';
 import Provisioner from './provisioner';
 import IndexerConfig from '../indexer-config/indexer-config';
 import { LogLevel } from '../indexer-meta/log-entry';
+import { type HasuraTableMetadata } from '../hasura-client';
 
 describe('Provisioner', () => {
   let adminPgClient: any;
@@ -236,19 +237,7 @@ describe('Provisioner', () => {
     });
 
     it('throws when scheduling cron jobs fails', async () => {
-      userPgClientQuery = jest.fn().mockReturnValueOnce({}).mockRejectedValueOnce(error); // Succeed setting provisioning status first
-
-      await expect(provisioner.provisionUserApi(indexerConfig)).rejects.toThrow('Failed to provision endpoint: Failed to setup partitioned logs table: Failed to schedule log partition jobs: some error');
-    });
-
-    it('throws when scheduling cron jobs fails', async () => {
-      userPgClientQuery = jest.fn().mockRejectedValueOnce(error);
-
-      await expect(provisioner.provisionUserApi(indexerConfig)).rejects.toThrow('Failed to provision endpoint: Failed to setup partitioned logs table: Failed to schedule log partition jobs: some error');
-    });
-
-    it('throws when scheduling cron jobs fails', async () => {
-      userPgClientQuery = jest.fn().mockRejectedValueOnce(error);
+      userPgClientQuery = jest.fn().mockResolvedValueOnce(null).mockRejectedValueOnce(error); // Succeed setting provisioning status first
 
       await expect(provisioner.provisionUserApi(indexerConfig)).rejects.toThrow('Failed to provision endpoint: Failed to setup partitioned logs table: Failed to schedule log partition jobs: some error');
     });
@@ -258,10 +247,10 @@ describe('Provisioner', () => {
       await provisioner.provisionLogsAndMetadataIfNeeded(indexerConfig);
       expect(hasuraClient.executeSqlOnSchema).toBeCalledTimes(2);
       expect(cronPgClient.query).toBeCalledTimes(2);
-      expect(userPgClientQuery).toBeCalledTimes(2);
+      expect(userPgClientQuery).toBeCalledTimes(3); // Set provisioning status, schedule today and tomorrow partitions
     });
 
-    it('tracks logs and metadata table once, adds permissions twice', async () => {
+    it('ensuring consistent state tracks logs and metadata table once, adds permissions twice', async () => {
       hasuraClient.getTrackedTablePermissions = jest.fn().mockReturnValueOnce([]).mockReturnValueOnce([
         {
           table: {
@@ -302,9 +291,7 @@ describe('Provisioner', () => {
 
       expect(hasuraClient.trackTables).not.toBeCalled();
       expect(hasuraClient.addPermissionsToTables).not.toBeCalled();
-      expect(userPgClientQuery.mock.calls).toEqual([
-        [setProvisioningStatusQuery],
-      ]);
+      expect(userPgClientQuery).not.toBeCalled();
     });
 
     it('get credentials for postgres', async () => {
@@ -365,23 +352,15 @@ describe('Provisioner', () => {
   });
 });
 
-function generateTableConfig (schemaName: string, tableName: string, role: string): any {
+function generateTableConfig (schemaName: string, tableName: string, role: string): HasuraTableMetadata {
   return {
     table: {
       name: tableName,
-      schema: schemaName
+      schema: schemaName,
     },
-    insert_permissions: [
-      { role }
-    ],
-    select_permissions: [
-      { role }
-    ],
-    update_permissions: [
-      { role }
-    ],
-    delete_permissions: [
-      { role }
-    ],
+    insert_permissions: [{ role, permission: {} }],
+    select_permissions: [{ role, permission: {} }],
+    update_permissions: [{ role, permission: {} }],
+    delete_permissions: [{ role, permission: {} }],
   };
 }
diff --git a/runner/src/provisioner/provisioner.ts b/runner/src/provisioner/provisioner.ts
@@ -8,6 +8,7 @@ import { logsTableDDL } from './schemas/logs-table';
 import { metadataTableDDL } from './schemas/metadata-table';
 import PgClientClass, { type PostgresConnectionParams } from '../pg-client';
 import type IndexerConfig from '../indexer-config/indexer-config';
+import { METADATA_TABLE_UPSERT, MetadataFields, IndexerStatus } from '../indexer-meta';
 
 const DEFAULT_PASSWORD_LENGTH = 16;