fix: recreating hasura3/ from scratch (#2409)

* Cleaned out all the old sqlmesh stuff and starting over

apps/hasura3/.gitignore

@@ -1,2 +1,3 @@
 engine/build
-.env*
+/.env
+/.env.*

apps/hasura3/.hasura/context.yaml

@@ -4,7 +4,7 @@ definition:
   current: default
   contexts:
     default:
-      project: dominant-snipe-4871
+      project: valid-robin-8499
       supergraph: ../supergraph.yaml
       subgraph: ../oso_subgraph/subgraph.yaml
       localEnvFile: ../.env

apps/hasura3/app/subgraph.yaml

@@ -5,4 +5,4 @@ definition:
   generator:
     rootPath: .
   includePaths:
-    - metadata
+    - metadata

apps/hasura3/compose.yaml

@@ -4,18 +4,16 @@ services:
   engine:
     build:
       context: engine
-      dockerfile_inline: |-
-        FROM ghcr.io/hasura/v3-engine
-        COPY ./build /md/
-    develop:
-      watch:
-        - action: sync+restart
-          path: engine/build
-          target: /md/
-    env_file:
-      - engine/.env.engine
+      dockerfile: Dockerfile.engine
+      pull: true
+    environment:
+      AUTHN_CONFIG_PATH: /md/auth_config.json
+      ENABLE_CORS: "true"
+      INTROSPECTION_METADATA_FILE: /md/metadata.json
+      METADATA_PATH: /md/open_dd.json
+      OTLP_ENDPOINT: http://local.hasura.dev:4317
     extra_hosts:
-      - local.hasura.dev=host-gateway
+      - local.hasura.dev:host-gateway
     ports:
       - mode: ingress
         protocol: tcp

apps/hasura3/engine/Dockerfile.engine

@@ -0,0 +1,2 @@
+FROM ghcr.io/hasura/v3-engine
+COPY ./build /md/

apps/hasura3/globals/auth-config.hml → apps/hasura3/globals/metadata/auth-config.hml

@@ -3,5 +3,5 @@ version: v2
 definition:
   mode:
     noAuth:
-      role: admin
+      role: anonymous
       sessionVariables: {}

apps/hasura3/globals/compatibility-config.hml → apps/hasura3/globals/metadata/compatibility-config.hml

@@ -1,2 +1,2 @@
 kind: CompatibilityConfig
-date: "2024-08-27"
+date: "2024-10-01"

apps/hasura3/globals/graphql-config.hml → apps/hasura3/globals/metadata/graphql-config.hml

@@ -1,4 +1,3 @@
----
 kind: GraphqlConfig
 version: v1
 definition:
@@ -33,6 +32,3 @@ definition:
       countDistinctFieldName: _count_distinct
   mutation:
     rootOperationTypeName: Mutation
-  apolloFederation:
-    enableRootFields: true
-

apps/hasura3/globals/subgraph.yaml

@@ -5,6 +5,4 @@ definition:
   generator:
     rootPath: .
   includePaths:
-    - auth-config.hml
-    - compatibility-config.hml
-    - graphql-config.hml
+    - metadata

apps/hasura3/oso_subgraph/connector/oso_clickhouse/.hasura-connector/Dockerfile.oso_clickhouse

@@ -0,0 +1,2 @@
+FROM ghcr.io/hasura/ndc-clickhouse:v1.0.5
+COPY ./ /etc/connector

apps/hasura3/oso_subgraph/connector/oso_clickhouse/.hasura-connector/connector-metadata.yaml

@@ -1,21 +1,29 @@
 packagingDefinition:
   type: PrebuiltDockerImage
-  dockerImage: "ghcr.io/hasura/ndc-clickhouse:v1.0.2"
+  dockerImage: "ghcr.io/hasura/ndc-clickhouse:v1.0.5"
 supportedEnvironmentVariables:
   - name: CLICKHOUSE_URL
     description: The ClickHouse connection URL
+    defaultValue: ""
+    required: true
   - name: CLICKHOUSE_USERNAME
     description: The ClickHouse connection username
+    defaultValue: ""
+    required: true
   - name: CLICKHOUSE_PASSWORD
     description: The ClickHouse connection password
+    defaultValue: ""
+    required: true
 commands:
   update: hasura-clickhouse update
+  printSchemaAndCapabilities: hasura-clickhouse print-schema-and-capabilities
 cliPlugin:
   name: clickhouse
-  version: "v1.0.2"
+  version: "v1.0.5"
 dockerComposeWatch:
   - path: ./
     target: /etc/connector
     action: sync+restart
+documentationPage: https://hasura.info/clickhouse-getting-started
 
 

apps/hasura3/oso_subgraph/connector/oso_clickhouse/compose.yaml

@@ -2,25 +2,18 @@ services:
   oso_subgraph_oso_clickhouse:
     build:
       context: .
-      dockerfile_inline: |-
-        FROM ghcr.io/hasura/ndc-clickhouse:v1.0.2
-        COPY ./ /etc/connector
-    develop:
-      watch:
-        - path: ./
-          action: sync+restart
-          target: /etc/connector
+      dockerfile: .hasura-connector/Dockerfile.oso_clickhouse
     environment:
       CLICKHOUSE_PASSWORD: $OSO_SUBGRAPH_OSO_CLICKHOUSE_CLICKHOUSE_PASSWORD
       CLICKHOUSE_URL: $OSO_SUBGRAPH_OSO_CLICKHOUSE_CLICKHOUSE_URL
       CLICKHOUSE_USERNAME: $OSO_SUBGRAPH_OSO_CLICKHOUSE_CLICKHOUSE_USERNAME
       HASURA_SERVICE_TOKEN_SECRET: $OSO_SUBGRAPH_OSO_CLICKHOUSE_HASURA_SERVICE_TOKEN_SECRET
-      OTEL_EXPORTER_OTLP_TRACES_ENDPOINT: $OSO_SUBGRAPH_OSO_CLICKHOUSE_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
+      OTEL_EXPORTER_OTLP_ENDPOINT: $OSO_SUBGRAPH_OSO_CLICKHOUSE_OTEL_EXPORTER_OTLP_ENDPOINT
       OTEL_SERVICE_NAME: $OSO_SUBGRAPH_OSO_CLICKHOUSE_OTEL_SERVICE_NAME
     extra_hosts:
-      - local.hasura.dev=host-gateway
+      - local.hasura.dev:host-gateway
     ports:
       - mode: ingress
-        target: 8080
-        published: "8139"
         protocol: tcp
+        published: "8763"
+        target: 8080