From 1962ec07abbb3875c3ad14ba73f0abf871bb8e46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89mile=20R=C3=A9?= Date: Tue, 14 Apr 2026 18:53:17 +0400 Subject: [PATCH] Fix stale references to schema.graphql and v1_resolver.go MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update GNUmakefile targets to use wildcard graphql/*.graphql prerequisites instead of the deleted schema.graphql files, and remove v1_resolver.go from build prerequisites. Also update .gitattributes, package.json graphql.schema path, and AGENTS.md. Signed-off-by: Émile Ré --- .gitattributes | 6 +++--- AGENTS.md | 2 +- GNUmakefile | 12 +++--------- package.json | 2 +- 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/.gitattributes b/.gitattributes index 0f81d0f60..63a9981c0 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,5 +1,5 @@ -pkg/server/api/console/v1/v1_resolver.go -linguist-generated -pkg/server/api/connect/v1/v1_resolver.go -linguist-generated -pkg/server/api/trust/v1/v1_resolver.go -linguist-generated +pkg/server/api/console/v1/*_resolvers.go -linguist-generated +pkg/server/api/connect/v1/*_resolvers.go -linguist-generated +pkg/server/api/trust/v1/*_resolvers.go -linguist-generated pkg/server/api/mcp/v1/v1_resolver.go -linguist-generated pkg/server/api/mcp/v1/schema.resolvers.go -linguist-generated diff --git a/AGENTS.md b/AGENTS.md index 7d4aeecd3..845a0dac2 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -49,7 +49,7 @@ Detailed guides for specific subsystems live in `contrib/claude/`: Every feature must be exposed through **all three interfaces**: GraphQL, MCP, and CLI. When adding a new endpoint or editing an existing type, keep all three in sync: -- **GraphQL** — `pkg/server/api/console/v1/schema.graphql` (+ codegen) +- **GraphQL** — `pkg/server/api/console/v1/graphql/*.graphql` (+ codegen) - **MCP** — `pkg/server/api/mcp/v1/` (+ codegen) - **CLI** — `cmd/` diff --git a/GNUmakefile b/GNUmakefile index f554e4ea4..d1d592e96 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -194,13 +194,10 @@ docker-build: .PHONY: bin/probod bin/probod: pkg/server/api/connect/v1/schema/schema.go \ pkg/server/api/connect/v1/types/types.go \ - pkg/server/api/connect/v1/v1_resolver.go \ pkg/server/api/console/v1/schema/schema.go \ pkg/server/api/console/v1/types/types.go \ - pkg/server/api/console/v1/v1_resolver.go \ pkg/server/api/trust/v1/schema/schema.go \ pkg/server/api/trust/v1/types/types.go \ - pkg/server/api/trust/v1/v1_resolver.go \ pkg/server/api/mcp/v1/server/server.go \ pkg/server/api/mcp/v1/types/types.go \ apps/console/dist/index.html \ @@ -249,18 +246,15 @@ generate: pkg/server/api/connect/v1/schema/schema.go \ $(NPM) run relay pkg/server/api/connect/v1/schema/schema.go \ -pkg/server/api/connect/v1/types/types.go \ -pkg/server/api/connect/v1/v1_resolver.go: pkg/server/api/connect/v1/gqlgen.yaml pkg/server/api/connect/v1/schema.graphql +pkg/server/api/connect/v1/types/types.go: pkg/server/api/connect/v1/gqlgen.yaml $(wildcard pkg/server/api/connect/v1/graphql/*.graphql) $(GO_GENERATE) ./pkg/server/api/connect/v1 pkg/server/api/console/v1/schema/schema.go \ -pkg/server/api/console/v1/types/types.go \ -pkg/server/api/console/v1/v1_resolver.go: pkg/server/api/console/v1/gqlgen.yaml pkg/server/api/console/v1/schema.graphql +pkg/server/api/console/v1/types/types.go: pkg/server/api/console/v1/gqlgen.yaml $(wildcard pkg/server/api/console/v1/graphql/*.graphql) $(GO_GENERATE) ./pkg/server/api/console/v1 pkg/server/api/trust/v1/schema/schema.go \ -pkg/server/api/trust/v1/types/types.go \ -pkg/server/api/trust/v1/v1_resolver.go: pkg/server/api/trust/v1/gqlgen.yaml pkg/server/api/trust/v1/schema.graphql +pkg/server/api/trust/v1/types/types.go: pkg/server/api/trust/v1/gqlgen.yaml $(wildcard pkg/server/api/trust/v1/graphql/*.graphql) $(GO_GENERATE) ./pkg/server/api/trust/v1 pkg/server/api/mcp/v1/server/server.go \ diff --git a/package.json b/package.json index 27dbc1fe2..d469d46d8 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "turbo": "^2.5.3" }, "graphql": { - "schema": "./pkg/server/api/console/v1/schema.graphql" + "schema": "./pkg/server/api/console/v1/graphql/" }, "overrides": { "brace-expansion": "^5.0.5",