From fc4aa084aee71dd6b7277a3f09ea6fb66c5d96db Mon Sep 17 00:00:00 2001 From: Ben Kraft Date: Fri, 27 Aug 2021 18:20:17 -0700 Subject: [PATCH] =?UTF-8?q?[=F0=9F=94=A5AUDIT=F0=9F=94=A5]=20Fix=20snapsho?= =?UTF-8?q?ts=20from=20changes=20to=20=5F=5Ftypename=20error=20(#72)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 🖍 _This is an audit!_ 🖍 ## Summary: These got broken by the merge. ## Test plan: make check Author: benjaminjkraft Auditors: aberkan, csilvers, dnerdy, MiguelCastillo Required Reviewers: Approved by: Checks: ⌛ Test (1.17), ⌛ Test (1.16), ⌛ Test (1.15), ⌛ Test (1.14), ⌛ Test (1.13), ⌛ Lint, ⌛ Test (1.17), ⌛ Test (1.16), ⌛ Test (1.15), ⌛ Test (1.14), ⌛ Test (1.13), ⌛ Lint Pull request URL: https://github.com/Khan/genqlient/pull/72 --- ....graphql-ComplexInlineFragments.graphql.go | 36 +++++++++++++++---- ...nt.graphql-SimpleInlineFragment.graphql.go | 6 +++- internal/integration/generated.go | 12 +++++-- 3 files changed, 45 insertions(+), 9 deletions(-) diff --git a/generate/testdata/snapshots/TestGenerate-ComplexInlineFragments.graphql-ComplexInlineFragments.graphql.go b/generate/testdata/snapshots/TestGenerate-ComplexInlineFragments.graphql-ComplexInlineFragments.graphql.go index b223929..d667050 100644 --- a/generate/testdata/snapshots/TestGenerate-ComplexInlineFragments.graphql-ComplexInlineFragments.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-ComplexInlineFragments.graphql-ComplexInlineFragments.graphql.go @@ -73,6 +73,9 @@ func __unmarshalComplexInlineFragmentsConflictingStuffContent(v *ComplexInlineFr case "Topic": *v = new(ComplexInlineFragmentsConflictingStuffTopic) return json.Unmarshal(m, *v) + case "": + return fmt.Errorf( + "Response was missing Content.__typename") default: return fmt.Errorf( `Unexpected concrete type for ComplexInlineFragmentsConflictingStuffContent: "%v"`, tn.TypeName) @@ -181,6 +184,9 @@ func __unmarshalComplexInlineFragmentsNestedStuffChildrenContent(v *ComplexInlin case "Topic": *v = new(ComplexInlineFragmentsNestedStuffChildrenTopic) return json.Unmarshal(m, *v) + case "": + return fmt.Errorf( + "Response was missing Content.__typename") default: return fmt.Errorf( `Unexpected concrete type for ComplexInlineFragmentsNestedStuffChildrenContent: "%v"`, tn.TypeName) @@ -224,7 +230,8 @@ func (v *ComplexInlineFragmentsNestedStuffChildrenParentTopicParentTopic) Unmars err = __unmarshalComplexInlineFragmentsNestedStuffChildrenParentTopicParentTopicChildrenContent( target, raw) if err != nil { - return err + return fmt.Errorf( + "Unable to unmarshal ComplexInlineFragmentsNestedStuffChildrenParentTopicParentTopic.Children: %w", err) } } } @@ -339,6 +346,9 @@ func __unmarshalComplexInlineFragmentsNestedStuffChildrenParentTopicParentTopicC case "Topic": *v = new(ComplexInlineFragmentsNestedStuffChildrenParentTopicParentTopicChildrenTopic) return json.Unmarshal(m, *v) + case "": + return fmt.Errorf( + "Response was missing Content.__typename") default: return fmt.Errorf( `Unexpected concrete type for ComplexInlineFragmentsNestedStuffChildrenParentTopicParentTopicChildrenContent: "%v"`, tn.TypeName) @@ -432,6 +442,9 @@ func __unmarshalComplexInlineFragmentsNestedStuffContent(v *ComplexInlineFragmen case "Topic": *v = new(ComplexInlineFragmentsNestedStuffTopic) return json.Unmarshal(m, *v) + case "": + return fmt.Errorf( + "Response was missing Content.__typename") default: return fmt.Errorf( `Unexpected concrete type for ComplexInlineFragmentsNestedStuffContent: "%v"`, tn.TypeName) @@ -470,7 +483,8 @@ func (v *ComplexInlineFragmentsNestedStuffTopic) UnmarshalJSON(b []byte) error { err = __unmarshalComplexInlineFragmentsNestedStuffChildrenContent( target, raw) if err != nil { - return err + return fmt.Errorf( + "Unable to unmarshal ComplexInlineFragmentsNestedStuffTopic.Children: %w", err) } } } @@ -573,6 +587,9 @@ func __unmarshalComplexInlineFragmentsRandomItemContent(v *ComplexInlineFragment case "Topic": *v = new(ComplexInlineFragmentsRandomItemTopic) return json.Unmarshal(m, *v) + case "": + return fmt.Errorf( + "Response was missing Content.__typename") default: return fmt.Errorf( `Unexpected concrete type for ComplexInlineFragmentsRandomItemContent: "%v"`, tn.TypeName) @@ -727,6 +744,9 @@ func __unmarshalComplexInlineFragmentsRepeatedStuffContent(v *ComplexInlineFragm case "Topic": *v = new(ComplexInlineFragmentsRepeatedStuffTopic) return json.Unmarshal(m, *v) + case "": + return fmt.Errorf( + "Response was missing Content.__typename") default: return fmt.Errorf( `Unexpected concrete type for ComplexInlineFragmentsRepeatedStuffContent: "%v"`, tn.TypeName) @@ -791,7 +811,8 @@ func (v *ComplexInlineFragmentsResponse) UnmarshalJSON(b []byte) error { err = __unmarshalComplexInlineFragmentsRandomItemContent( target, raw) if err != nil { - return err + return fmt.Errorf( + "Unable to unmarshal ComplexInlineFragmentsResponse.RandomItem: %w", err) } } { @@ -800,7 +821,8 @@ func (v *ComplexInlineFragmentsResponse) UnmarshalJSON(b []byte) error { err = __unmarshalComplexInlineFragmentsRepeatedStuffContent( target, raw) if err != nil { - return err + return fmt.Errorf( + "Unable to unmarshal ComplexInlineFragmentsResponse.RepeatedStuff: %w", err) } } { @@ -809,7 +831,8 @@ func (v *ComplexInlineFragmentsResponse) UnmarshalJSON(b []byte) error { err = __unmarshalComplexInlineFragmentsConflictingStuffContent( target, raw) if err != nil { - return err + return fmt.Errorf( + "Unable to unmarshal ComplexInlineFragmentsResponse.ConflictingStuff: %w", err) } } { @@ -818,7 +841,8 @@ func (v *ComplexInlineFragmentsResponse) UnmarshalJSON(b []byte) error { err = __unmarshalComplexInlineFragmentsNestedStuffContent( target, raw) if err != nil { - return err + return fmt.Errorf( + "Unable to unmarshal ComplexInlineFragmentsResponse.NestedStuff: %w", err) } } return nil diff --git a/generate/testdata/snapshots/TestGenerate-SimpleInlineFragment.graphql-SimpleInlineFragment.graphql.go b/generate/testdata/snapshots/TestGenerate-SimpleInlineFragment.graphql-SimpleInlineFragment.graphql.go index f3e2702..f9a9399 100644 --- a/generate/testdata/snapshots/TestGenerate-SimpleInlineFragment.graphql-SimpleInlineFragment.graphql.go +++ b/generate/testdata/snapshots/TestGenerate-SimpleInlineFragment.graphql-SimpleInlineFragment.graphql.go @@ -101,6 +101,9 @@ func __unmarshalSimpleInlineFragmentRandomItemContent(v *SimpleInlineFragmentRan case "Topic": *v = new(SimpleInlineFragmentRandomItemTopic) return json.Unmarshal(m, *v) + case "": + return fmt.Errorf( + "Response was missing Content.__typename") default: return fmt.Errorf( `Unexpected concrete type for SimpleInlineFragmentRandomItemContent: "%v"`, tn.TypeName) @@ -150,7 +153,8 @@ func (v *SimpleInlineFragmentResponse) UnmarshalJSON(b []byte) error { err = __unmarshalSimpleInlineFragmentRandomItemContent( target, raw) if err != nil { - return err + return fmt.Errorf( + "Unable to unmarshal SimpleInlineFragmentResponse.RandomItem: %w", err) } } return nil diff --git a/internal/integration/generated.go b/internal/integration/generated.go index c0fcb08..c89881e 100644 --- a/internal/integration/generated.go +++ b/internal/integration/generated.go @@ -48,7 +48,8 @@ func (v *queryWithFragmentsBeingsAnimal) UnmarshalJSON(b []byte) error { err = __unmarshalqueryWithFragmentsBeingsOwnerBeing( target, raw) if err != nil { - return err + return fmt.Errorf( + "Unable to unmarshal queryWithFragmentsBeingsAnimal.Owner: %w", err) } } return nil @@ -115,6 +116,9 @@ func __unmarshalqueryWithFragmentsBeingsBeing(v *queryWithFragmentsBeingsBeing, case "Animal": *v = new(queryWithFragmentsBeingsAnimal) return json.Unmarshal(m, *v) + case "": + return fmt.Errorf( + "Response was missing Being.__typename") default: return fmt.Errorf( `Unexpected concrete type for queryWithFragmentsBeingsBeing: "%v"`, tn.TypeName) @@ -196,6 +200,9 @@ func __unmarshalqueryWithFragmentsBeingsOwnerBeing(v *queryWithFragmentsBeingsOw case "Animal": *v = new(queryWithFragmentsBeingsOwnerAnimal) return json.Unmarshal(m, *v) + case "": + return fmt.Errorf( + "Response was missing Being.__typename") default: return fmt.Errorf( `Unexpected concrete type for queryWithFragmentsBeingsOwnerBeing: "%v"`, tn.TypeName) @@ -250,7 +257,8 @@ func (v *queryWithFragmentsResponse) UnmarshalJSON(b []byte) error { err = __unmarshalqueryWithFragmentsBeingsBeing( target, raw) if err != nil { - return err + return fmt.Errorf( + "Unable to unmarshal queryWithFragmentsResponse.Beings: %w", err) } } }