chore: Remove unnecessary custom Hasura config (#1020)

The existing Hasura config is used for setting up the shared logs/state tables. This is no longer needed and complicates the setup of QueryAPI, therefore I'm removing it.
near · Sep 3, 2024 · 274b011 · 274b011
1 parent 4b46f54
commit 274b011
Show file tree

Hide file tree

Showing 19 changed files with 6 additions and 157 deletions.
diff --git a/README.md b/README.md
@@ -39,27 +39,12 @@ Runner:
 - `AWS_ACCESS_KEY_ID`
 - `AWS_SECRET_ACCESS_KEY`
 
-Coordinator:
-- `LAKE_AWS_ACCESS_KEY`
-- `LAKE_AWS_SECRET_ACCESS_KEY`
-- `QUEUE_AWS_ACCESS_KEY`
-- `QUEUE_AWS_SECRET_ACCESS_KEY`
+Block Streamer:
+- `AWS_ACCESS_KEY_ID`
+- `AWS_SECRET_ACCESS_KEY`
 
 These should be populated with your credentials. In most cases, the same key pair can be used for all 3 sets of credentials. Just ensure the keys have permissions to access S3 for handling [Requestor Pays](https://docs.aws.amazon.com/AmazonS3/latest/userguide/RequesterPaysBuckets.html) in Near Lake. 
 
-### Hasura Configuration
-Hasura contains shared tables for e.g. logging and setting arbitrary state. These tables must be configured prior to running the entire QueryApi application. Configuration is stored in the `hasura/` directory and deployed through the Hasura CLI.
-
-To configure Hasura, first start it with:
-```sh
-docker compose up hasura-graphql --detach
-```
-
-And apply the configuration with:
-```sh
-cd ./hasura && hasura deploy
-```
-
 ### Running QueryApi
 With everything configured correctly, we can now start all components of QueryApi with:
 ```sh

diff --git a/hasura/Dockerfile b/hasura/Dockerfile
diff --git a/hasura/config.yaml b/hasura/config.yaml
diff --git a/hasura/metadata/actions.graphql b/hasura/metadata/actions.graphql
diff --git a/hasura/metadata/actions.yaml b/hasura/metadata/actions.yaml
diff --git a/hasura/metadata/allow_list.yaml b/hasura/metadata/allow_list.yaml
diff --git a/hasura/metadata/cron_triggers.yaml b/hasura/metadata/cron_triggers.yaml
diff --git a/hasura/metadata/databases/databases.yaml b/hasura/metadata/databases/databases.yaml
diff --git a/hasura/metadata/databases/default/tables/public_indexer_log_entries.yaml b/hasura/metadata/databases/default/tables/public_indexer_log_entries.yaml
diff --git a/hasura/metadata/databases/default/tables/public_indexer_state.yaml b/hasura/metadata/databases/default/tables/public_indexer_state.yaml
diff --git a/hasura/metadata/databases/default/tables/tables.yaml b/hasura/metadata/databases/default/tables/tables.yaml
diff --git a/hasura/metadata/query_collections.yaml b/hasura/metadata/query_collections.yaml
diff --git a/hasura/metadata/remote_schemas.yaml b/hasura/metadata/remote_schemas.yaml
diff --git a/hasura/metadata/rest_endpoints.yaml b/hasura/metadata/rest_endpoints.yaml
diff --git a/hasura/metadata/version.yaml b/hasura/metadata/version.yaml
diff --git a/hasura/migrations/default/1691364619300_init/down.sql b/hasura/migrations/default/1691364619300_init/down.sql
diff --git a/hasura/migrations/default/1691364619300_init/up.sql b/hasura/migrations/default/1691364619300_init/up.sql
diff --git a/runner/tests/integration.test.ts b/runner/tests/integration.test.ts
@@ -66,7 +66,7 @@ describe('Indexer integration', () => {
     postgresContainer = await (await PostgreSqlContainer.build())
       .withNetwork(network)
       .start();
-    hasuraContainer = await (await HasuraGraphQLContainer.build())
+    hasuraContainer = await new HasuraGraphQLContainer()
       .withNetwork(network)
       .withDatabaseUrl(postgresContainer.getConnectionUri(network.getName()))
       .start();

diff --git a/runner/tests/testcontainers/hasura.ts b/runner/tests/testcontainers/hasura.ts
@@ -9,19 +9,13 @@ export class HasuraGraphQLContainer {
 
   private readonly PORT = 8080;
 
-  private constructor (private readonly container: GenericContainer) {
+  constructor (private readonly container = new GenericContainer('hasura/graphql-engine:latest')) {
     container.withExposedPorts(this.PORT)
-      .withWaitStrategy(Wait.forLogMessage(/.*Starting API server.*/, 2))
+      .withWaitStrategy(Wait.forLogMessage(/.*Starting API server.*/i))
       .withLogConsumer(logConsumer)
       .withStartupTimeout(120_000);
   }
 
-  public static async build (): Promise<HasuraGraphQLContainer> {
-    const container = await GenericContainer.fromDockerfile('../hasura/').build();
-
-    return new HasuraGraphQLContainer(container);
-  }
-
   public withNetwork (network: StartedNetwork): this {
     this.container.withNetwork(network);
     return this;