ci: add ndc-test to validate generated schema (#109) (#110)

hasura · May 30, 2024 · 3887c3d · 3887c3d
1 parent cbcf3e2
commit 3887c3d
Show file tree

Hide file tree

Showing 7 changed files with 66 additions and 4 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -16,7 +16,7 @@ on:
 jobs:
   test-go:
     name: Run Go lint and unit tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     permissions:
       pull-requests: write
     steps:
@@ -34,7 +34,7 @@ jobs:
       - name: Vet
         run: go vet ./...
       - name: Lint
-        uses: golangci/golangci-lint-action@v4
+        uses: golangci/golangci-lint-action@v6
         with:
           version: latest
           only-new-issues: true
@@ -47,9 +47,14 @@ jobs:
           go test -v -coverpkg=./... -race -timeout 3m -coverprofile=coverage.out ./...
       - name: Run Go unit tests for the generation example
         run: |
+          make build-codegen
           pushd example/codegen
+          ../../_output/hasura-ndc-go generate
           go test -v -race -timeout 3m ./...
           popd
+      - name: Run ndc-test
+        run: |
+          ./example/codegen/test.sh
       - name: Go coverage format
         if: ${{ github.event_name == 'pull_request' }}
         run: |

diff --git a/cmd/hasura-ndc-go/schema.go b/cmd/hasura-ndc-go/schema.go
@@ -709,6 +709,9 @@ func (sp *SchemaParser) parseType(rawSchema *RawConnectorSchema, rootType *TypeI
 				TypeAST:    ty,
 			}
 		}
+		if _, ok := rawSchema.ScalarSchemas[string(scalarName)]; !ok {
+			rawSchema.ScalarSchemas[string(scalarName)] = defaultScalarTypes[scalarName]
+		}
 		rootType.TypeFragments = append(rootType.TypeFragments, inferredType.String())
 		rootType.Schema = schema.NewNamedType(string(scalarName))
 		rootType.IsScalar = true

diff --git a/cmd/hasura-ndc-go/templates/new/connector.go.tmpl b/cmd/hasura-ndc-go/templates/new/connector.go.tmpl
@@ -12,7 +12,8 @@ var connectorCapabilities = schema.CapabilitiesResponse{
 	Version: "0.1.3",
 	Capabilities: schema.Capabilities{
 		Query: schema.QueryCapabilities{
-			Variables: schema.LeafCapability{},
+			Variables:    schema.LeafCapability{},
+			NestedFields: schema.NestedFieldCapabilities{},
 		},
 		Mutation: schema.MutationCapabilities{},
 	},

diff --git a/cmd/hasura-ndc-go/testdata/basic/expected/schema.json b/cmd/hasura-ndc-go/testdata/basic/expected/schema.json
@@ -3126,6 +3126,13 @@
         "type": "int8"
       }
     },
+    "JSON": {
+      "aggregate_functions": {},
+      "comparison_operators": {},
+      "representation": {
+        "type": "json"
+      }
+    },
     "RawJSON": {
       "aggregate_functions": {},
       "comparison_operators": {},

diff --git a/example/codegen/connector.go b/example/codegen/connector.go
@@ -12,7 +12,8 @@ var connectorCapabilities = schema.CapabilitiesResponse{
 	Version: "0.1.3",
 	Capabilities: schema.Capabilities{
 		Query: schema.QueryCapabilities{
-			Variables: schema.LeafCapability{},
+			Variables:    schema.LeafCapability{},
+			NestedFields: schema.NestedFieldCapabilities{},
 		},
 		Mutation: schema.MutationCapabilities{},
 	},

diff --git a/example/codegen/schema.generated.json b/example/codegen/schema.generated.json
@@ -3154,6 +3154,13 @@
         "type": "int8"
       }
     },
+    "JSON": {
+      "aggregate_functions": {},
+      "comparison_operators": {},
+      "representation": {
+        "type": "json"
+      }
+    },
     "RawJSON": {
       "aggregate_functions": {},
       "comparison_operators": {},

diff --git a/example/codegen/test.sh b/example/codegen/test.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+set -eo pipefail
+
+trap 'printf "\nkilling process..." && kill $serverPID' EXIT
+
+cd "$(dirname "${BASH_SOURCE[0]}")"
+mkdir -p ./dist
+
+if [ ! -f ./dist/ndc-test ]; then
+  curl -L https://github.com/hasura/ndc-spec/releases/download/v0.1.3/ndc-test-x86_64-unknown-linux-gnu -o ./dist/ndc-test
+  chmod +x ./dist/ndc-test
+fi
+
+http_wait() {
+  printf "$1:\t "
+  for i in {1..120};
+  do
+    local code="$(curl -s -o /dev/null -m 2 -w '%{http_code}' $1)"
+    if [ "$code" != "200" ]; then
+      printf "."
+      sleep 1
+    else
+      printf "\r\033[K$1:\t ${GREEN}OK${NC}\n"
+      return 0
+    fi
+  done
+  printf "\n${RED}ERROR${NC}: cannot connect to $1.\n"
+  exit 1
+}
+
+go build -o ./dist/ndc-codegen-example .
+./dist/ndc-codegen-example serve > /dev/null 2>&1 &
+serverPID=$!
+
+http_wait http://localhost:8080/health
+
+./dist/ndc-test test --endpoint http://localhost:8080