From afb6df699841f6120e678871866aa134a6346afb Mon Sep 17 00:00:00 2001 From: Joakim Olsson Date: Mon, 28 Sep 2026 10:31:46 +0200 Subject: [PATCH] fix(sdlmerge): pass report pointer as error graphql-go-tools v2.25.0 moved operationreport.Report.Error to a pointer receiver, so only *Report implements error. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01WLmypV3dLndLLzCSpYJHMv --- sdlmerge/sdlmerge.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sdlmerge/sdlmerge.go b/sdlmerge/sdlmerge.go index ab8ee7b..2308e1d 100644 --- a/sdlmerge/sdlmerge.go +++ b/sdlmerge/sdlmerge.go @@ -50,12 +50,12 @@ func MergeSDLs(SDLs ...string) (string, error) { doc, report := astparser.ParseGraphqlDocumentString(strings.Join(rawDocs, "\n")) if report.HasErrors() { - return "", fmt.Errorf("parse graphql document string: %w", report) + return "", fmt.Errorf("parse graphql document string: %w", &report) } astnormalization.NormalizeSubgraphSDL(&doc, &report) if report.HasErrors() { - return "", fmt.Errorf("merge ast: %w", report) + return "", fmt.Errorf("merge ast: %w", &report) } if err := MergeAST(&doc); err != nil { @@ -81,11 +81,11 @@ func validateSubgraphs(subgraphs []string) error { return err } if report.HasErrors() { - return fmt.Errorf(parseDocumentError, report) + return fmt.Errorf(parseDocumentError, &report) } validator.Validate(&doc, &report) if report.HasErrors() { - return fmt.Errorf("validate schema: %w", report) + return fmt.Errorf("validate schema: %w", &report) } } return nil @@ -96,11 +96,11 @@ func normalizeSubgraphs(subgraphs []string) error { for i, subgraph := range subgraphs { doc, report := astparser.ParseGraphqlDocumentString(subgraph) if report.HasErrors() { - return fmt.Errorf(parseDocumentError, report) + return fmt.Errorf(parseDocumentError, &report) } subgraphNormalizer.NormalizeDefinition(&doc, &report) if report.HasErrors() { - return fmt.Errorf("normalize schema: %w", report) + return fmt.Errorf("normalize schema: %w", &report) } out, err := astprinter.PrintString(&doc) if err != nil { @@ -160,7 +160,7 @@ func (m *normalizer) normalize(operation *ast.Document) error { for _, walker := range m.walkers { walker.Walk(operation, nil, &report) if report.HasErrors() { - return fmt.Errorf("walk: %w", report) + return fmt.Errorf("walk: %w", &report) } }