fix: proxy hasura's rest endpoints

nhost · Sep 20, 2023 · db11e2f · db11e2f
1 parent 47b1b0f
commit db11e2f
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 5 deletions.
diff --git a/dockercompose/graphql.go b/dockercompose/graphql.go
@@ -68,7 +68,7 @@ func graphql( //nolint:funlen
 			{
 				Name:    "hasura",
 				TLS:     useTLS,
-				Rule:    "( PathPrefix(`/v1`) || PathPrefix(`/v2`) || PathPrefix(`/console/assets`) ) && Host(`local.hasura.nhost.run`)", //nolint:lll
+				Rule:    "( PathPrefix(`/v1`) || PathPrefix(`/v2`) || PathPrefix(`/api`) || PathPrefix(`/console/assets`) ) && Host(`local.hasura.nhost.run`)", //nolint:lll
 				Port:    hasuraPort,
 				Rewrite: nil,
 			},

diff --git a/dockercompose/graphql_test.go b/dockercompose/graphql_test.go
@@ -82,7 +82,7 @@ func expectedGraphql() *Service {
 			"traefik.http.routers.graphql.service":                                  "graphql",
 			"traefik.http.routers.graphql.tls":                                      "false",
 			"traefik.http.routers.hasura.entrypoints":                               "web",
-			"traefik.http.routers.hasura.rule":                                      "( PathPrefix(`/v1`) || PathPrefix(`/v2`) || PathPrefix(`/console/assets`) ) && Host(`local.hasura.nhost.run`)",
+			"traefik.http.routers.hasura.rule":                                      "( PathPrefix(`/v1`) || PathPrefix(`/v2`) || PathPrefix(`/api`) || PathPrefix(`/console/assets`) ) && Host(`local.hasura.nhost.run`)",
 			"traefik.http.routers.hasura.service":                                   "hasura",
 			"traefik.http.routers.hasura.tls":                                       "false",
 			"traefik.http.services.graphql.loadbalancer.server.port":                "8080",

diff --git a/examples/myproject/nhost/metadata/allow_list.yaml b/examples/myproject/nhost/metadata/allow_list.yaml
@@ -1 +1,3 @@
-[]
+- collection: allowed-queries
+  scope:
+    global: true
diff --git a/examples/myproject/nhost/metadata/query_collections.yaml b/examples/myproject/nhost/metadata/query_collections.yaml
@@ -1 +1,10 @@
-[]
+- name: allowed-queries
+  definition:
+    queries:
+      - name: animals
+        query: |
+          query animals {
+            animals {
+              name
+            }
+          }
diff --git a/examples/myproject/nhost/metadata/rest_endpoints.yaml b/examples/myproject/nhost/metadata/rest_endpoints.yaml
@@ -1 +1,9 @@
-[]
+- comment: ""
+  definition:
+    query:
+      collection_name: allowed-queries
+      query_name: animals
+  methods:
+    - GET
+  name: animals
+  url: animals