diff --git a/Dockerfile b/Dockerfile index 2774a09..87b5958 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,3 @@ -FROM ghcr.io/hasura/ndc-rest:v0.2.0 - -ENV HASURA_CONFIGURATION_DIRECTORY /etc/connector +FROM ghcr.io/hasura/ndc-rest:v0.2.1 COPY ./config /etc/connector diff --git a/Makefile b/Makefile index 82fa29b..207a1ec 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,11 @@ -NDC_REST_VERSION ?= v0.2.0 +NDC_REST_VERSION ?= v0.2.1 ORY_HYDRA_VERSION ?= v1.11.10 UID ?= $(shell id -u) GID ?= $(shell id -g) .PHONY: build-schema build-schema: - go install github.com/hasura/ndc-rest-schema@$(NDC_REST_VERSION) + go install github.com/hasura/ndc-rest-schema@latest ndc-rest-schema convert \ -c schema/public/config.yaml \ -o config/schema-public.json diff --git a/README.md b/README.md index 2c3014a..645f861 100644 --- a/README.md +++ b/README.md @@ -7,13 +7,15 @@ This connector is built upon the [NDC Rest](https://github.com/hasura/ndc-rest) > [!NOTE] > THe connector `v0.x` supports Hydra v1 API spec. Use `v1.x` or above if you want to use Hydra v2. +> [!NOTE] +> Support `client_secret_post` auth method for public APIs that require `client_credentials` credentials such as `/oauth2/*` only. The connector mainly supports admin API wrappers for Hasura Engine v3. + ## Environment Variables | Name | Description | Default Value | | ------------------------------ | ------------------------------------------------------------- | --------------------- | | HYDRA_PUBLIC_SERVER_URL | Public Hydra server URL | http://localhost:4444 | | HYDRA_ADMIN_SERVER_URL | Admin Hydra server URL | http://localhost:4445 | -| HYDRA_PUBLIC_BASIC_TOKEN | Basic token for public Hydra server | | | HYDRA_PUBLIC_TIMEOUT | Default request timeout for public APIs in seconds | 30 | | HYDRA_PUBLIC_RETRY_TIMES | Number of retry times for public APIs | 0 | | HYDRA_PUBLIC_RETRY_DELAY | Delay time between each retry in milliseconds for public APIs | 1000 | diff --git a/config/schema-public.json b/config/schema-public.json index 831c7ce..96a9380 100644 --- a/config/schema-public.json +++ b/config/schema-public.json @@ -1448,13 +1448,6 @@ "type": "int64" } }, - "JSON": { - "aggregate_functions": {}, - "comparison_operators": {}, - "representation": { - "type": "json" - } - }, "JSONRawMessage": { "aggregate_functions": {}, "comparison_operators": {}, diff --git a/docker-compose.yaml b/docker-compose.yaml index 25b5d8e..b44e685 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -4,8 +4,8 @@ services: context: . ports: - 8080:8080 - # volumes: - # - ./config:/etc/connector:ro + volumes: + - ./config:/etc/connector:ro environment: HYDRA_PUBLIC_SERVER_URL: http://hydra:4444 HYDRA_ADMIN_SERVER_URL: http://hydra:4445