Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Regenerate expansion supergraphs #6201

Merged
merged 2 commits into from
Oct 29, 2024
Merged

Regenerate expansion supergraphs #6201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca946f6
Regenerate expansion supergraphs, add script for regeneration, remove…
dylan-apollo Oct 28, 2024
d838abb
Merge branch 'next' into dylan/regenerate-expansion-tests
dylan-apollo Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions apollo-federation/src/sources/connect/expand/tests/schemas/expand/carryover.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
schema
@link(url: "https://specs.apollo.dev/link/v1.0")
@link(url: "https://specs.apollo.dev/join/v0.5", for: EXECUTION)
@link(url: "https://specs.apollo.dev/tag/v0.3", import: ["@tag"])
@link(url: "https://specs.apollo.dev/inaccessible/v0.2", import: ["@inaccessible"], for: SECURITY)
@link(url: "https://specs.apollo.dev/authenticated/v0.1", import: ["@authenticated"], for: SECURITY)
@link(url: "https://specs.apollo.dev/requiresScopes/v0.1", import: ["@requiresScopes"], for: SECURITY)
@link(url: "https://specs.apollo.dev/policy/v0.1", import: ["@policy"], for: SECURITY)
@link(url: "https://specs.apollo.dev/tag/v0.3")
@link(url: "https://specs.apollo.dev/inaccessible/v0.2", for: SECURITY)
@link(url: "https://specs.apollo.dev/authenticated/v0.1", for: SECURITY)
@link(url: "https://specs.apollo.dev/requiresScopes/v0.1", for: SECURITY)
@link(url: "https://specs.apollo.dev/policy/v0.1", for: SECURITY)
@link(url: "http://specs.example.org/custom/v0.1", import: ["@custom"])
@link(url: "https://specs.apollo.dev/connect/v0.1", for: EXECUTION)
@join__directive(graphs: [ONE], name: "link", args: {url: "https://specs.apollo.dev/connect/v0.1", import: ["@connect", "@source"]})
Expand Down
2 changes: 0 additions & 2 deletions apollo-federation/src/sources/connect/expand/tests/schemas/expand/carryover.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# rover supergraph compose --config apollo-federation/src/sources/connect/expand/tests/schemas/carryover.yaml > apollo-federation/src/sources/connect/expand/tests/schemas/carryover.graphql
federation_version: =2.10.0-alpha.0
subgraphs:
one:
routing_url: none
Expand Down
68 changes: 0 additions & 68 deletions apollo-federation/src/sources/connect/expand/tests/schemas/expand/circular.graphql
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions apollo-federation/src/sources/connect/expand/tests/schemas/expand/circular.yaml
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions apollo-federation/src/sources/connect/expand/tests/schemas/expand/keys.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ type R

type T
@join__type(graph: ONE, key: "id")
@join__type(graph: ONE, key: "id id2")
{
id: ID!
id2: ID!
Expand Down
4 changes: 1 addition & 3 deletions apollo-federation/src/sources/connect/expand/tests/schemas/expand/keys.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# rover supergraph compose --config apollo-federation/src/sources/connect/expand/tests/schemas/expand/keys.yaml > apollo-federation/src/sources/connect/expand/tests/schemas/expand/keys.graphql
federation_version: =2.10.0-alpha.3
subgraphs:
one:
routing_url: none
Expand All @@ -22,7 +20,7 @@ subgraphs:
entity: true
)
}
type T @key(fields: "id") {
type T @key(fields: "id") @key(fields: "id id2") {
id: ID!
id2: ID!
r1: R @connect(http: { GET: "http://localhost/rs/{$$this.id}" }, selection: "id id2") # expect `key: "id"``
Expand Down
14 changes: 12 additions & 2 deletions apollo-federation/src/sources/connect/expand/tests/schemas/expand/nested_inputs.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
schema
@link(url: "https://specs.apollo.dev/link/v1.0")
@link(url: "https://specs.apollo.dev/join/v0.4", for: EXECUTION)
@link(url: "https://specs.apollo.dev/join/v0.5", for: EXECUTION)
@link(url: "https://specs.apollo.dev/connect/v0.1", for: EXECUTION)
@join__directive(graphs: [CONNECTORS], name: "link", args: {url: "https://specs.apollo.dev/connect/v0.1", import: ["@connect", "@source"]})
@join__directive(graphs: [CONNECTORS], name: "source", args: {name: "example", http: {baseURL: "http://example"}})
{
Expand All @@ -11,7 +12,7 @@ directive @join__directive(graphs: [join__Graph!], name: String!, args: join__Di

directive @join__enumValue(graph: join__Graph!) repeatable on ENUM_VALUE

directive @join__field(graph: join__Graph, requires: join__FieldSet, provides: join__FieldSet, type: String, external: Boolean, override: String, usedOverridden: Boolean, overrideLabel: String) repeatable on FIELD_DEFINITION | INPUT_FIELD_DEFINITION
directive @join__field(graph: join__Graph, requires: join__FieldSet, provides: join__FieldSet, type: String, external: Boolean, override: String, usedOverridden: Boolean, overrideLabel: String, contextArguments: [join__ContextArgument!]) repeatable on FIELD_DEFINITION | INPUT_FIELD_DEFINITION

directive @join__graph(name: String!, url: String!) on ENUM_VALUE

Expand All @@ -30,10 +31,19 @@ input BazInput
quux: QuuxInput
}

input join__ContextArgument {
name: String!
type: String!
context: String!
selection: join__FieldValue!
}

scalar join__DirectiveArguments

scalar join__FieldSet

scalar join__FieldValue

enum join__Graph {
CONNECTORS @join__graph(name: "connectors", url: "none")
}
Expand Down
1 change: 0 additions & 1 deletion apollo-federation/src/sources/connect/expand/tests/schemas/expand/nested_inputs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
federation_version: =2.9.0-connectors.0
subgraphs:
connectors:
routing_url: none
Expand Down
56 changes: 33 additions & 23 deletions apollo-federation/src/sources/connect/expand/tests/schemas/expand/normalize_names.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
schema
@link(url: "https://specs.apollo.dev/link/v1.0")
@link(url: "https://specs.apollo.dev/join/v0.4", for: EXECUTION)
@join__directive(graphs: [CONNECTORS_SUBGRAPH], name: "link", args: {url: "https://specs.apollo.dev/connect/v0.1", import: ["@connect", "@source"]})
@join__directive(graphs: [CONNECTORS_SUBGRAPH], name: "source", args: {name: "example", http: {baseURL: "http://example"}})
@link(url: "https://specs.apollo.dev/link/v1.0")
@link(url: "https://specs.apollo.dev/join/v0.5", for: EXECUTION)
@link(url: "https://specs.apollo.dev/connect/v0.1", for: EXECUTION)
@join__directive(graphs: [CONNECTORS_SUBGRAPH], name: "link", args: {url: "https://specs.apollo.dev/connect/v0.1", import: ["@connect", "@source"]})
@join__directive(graphs: [CONNECTORS_SUBGRAPH], name: "source", args: {name: "example", http: {baseURL: "http://example"}})
{
query: Query
query: Query
}

directive @join__directive(graphs: [join__Graph!], name: String!, args: join__DirectiveArguments) repeatable on SCHEMA | OBJECT | INTERFACE | FIELD_DEFINITION

directive @join__enumValue(graph: join__Graph!) repeatable on ENUM_VALUE

directive @join__field(graph: join__Graph, requires: join__FieldSet, provides: join__FieldSet, type: String, external: Boolean, override: String, usedOverridden: Boolean, overrideLabel: String) repeatable on FIELD_DEFINITION | INPUT_FIELD_DEFINITION
directive @join__field(graph: join__Graph, requires: join__FieldSet, provides: join__FieldSet, type: String, external: Boolean, override: String, usedOverridden: Boolean, overrideLabel: String, contextArguments: [join__ContextArgument!]) repeatable on FIELD_DEFINITION | INPUT_FIELD_DEFINITION

directive @join__graph(name: String!, url: String!) on ENUM_VALUE

Expand All @@ -23,39 +24,48 @@ directive @join__unionMember(graph: join__Graph!, member: String!) repeatable on

directive @link(url: String, as: String, for: link__Purpose, import: [link__Import]) repeatable on SCHEMA

input join__ContextArgument {
name: String!
type: String!
context: String!
selection: join__FieldValue!
}

scalar join__DirectiveArguments

scalar join__FieldSet

scalar join__FieldValue

enum join__Graph {
CONNECTORS_SUBGRAPH @join__graph(name: "connectors-subgraph", url: "none")
CONNECTORS_SUBGRAPH @join__graph(name: "connectors-subgraph", url: "none")
}

scalar link__Import

enum link__Purpose {
"""
`SECURITY` features provide metadata necessary to securely resolve fields.
"""
SECURITY

"""
`EXECUTION` features provide metadata necessary for operation execution.
"""
EXECUTION
"""
`SECURITY` features provide metadata necessary to securely resolve fields.
"""
SECURITY

"""
`EXECUTION` features provide metadata necessary for operation execution.
"""
EXECUTION
}

type Query
@join__type(graph: CONNECTORS_SUBGRAPH)
@join__type(graph: CONNECTORS_SUBGRAPH)
{
users: [User] @join__field(graph: CONNECTORS_SUBGRAPH) @join__directive(graphs: [CONNECTORS_SUBGRAPH], name: "connect", args: {source: "example", http: {GET: "/"}, selection: "id a"})
user(id: ID!): User @join__field(graph: CONNECTORS_SUBGRAPH) @join__directive(graphs: [CONNECTORS_SUBGRAPH], name: "connect", args: {source: "example", http: {GET: "/{$args.id}"}, selection: "id a b", entity: true})
users: [User] @join__directive(graphs: [CONNECTORS_SUBGRAPH], name: "connect", args: {source: "example", http: {GET: "/"}, selection: "id a"})
user(id: ID!): User @join__directive(graphs: [CONNECTORS_SUBGRAPH], name: "connect", args: {source: "example", http: {GET: "/{$args.id}"}, selection: "id a b", entity: true})
}

type User
@join__type(graph: CONNECTORS_SUBGRAPH, key: "id")
@join__type(graph: CONNECTORS_SUBGRAPH, key: "id")
{
id: ID!
a: String @join__field(graph: CONNECTORS_SUBGRAPH)
b: String @join__field(graph: CONNECTORS_SUBGRAPH)
id: ID!
a: String
b: String
}
1 change: 0 additions & 1 deletion apollo-federation/src/sources/connect/expand/tests/schemas/expand/normalize_names.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
federation_version: =2.9.0-connectors.12
subgraphs:
connectors-subgraph:
routing_url: none
Expand Down
5 changes: 2 additions & 3 deletions apollo-federation/src/sources/connect/expand/tests/schemas/expand/realistic.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ input CreateUserInput
{
name: String!
username: String!
email: EmailAddress
status: Status
email: EmailAddress!
status: Status!
address: AddressInput
}

Expand Down Expand Up @@ -151,5 +151,4 @@ type User
phone: String
website: String
company: CompanyInfo
status: Status
}
10 changes: 3 additions & 7 deletions apollo-federation/src/sources/connect/expand/tests/schemas/expand/realistic.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
# rover supergraph compose --config apollo-federation/src/sources/connect/expand/tests/schemas/realistic.yaml > apollo-federation/src/sources/connect/expand/tests/schemas/realistic.graphql
# this is currently manually edited to add Status enum and EmailAddress scalars to the input type
federation_version: =2.10.0-alpha.0
subgraphs:
connectors:
routing_url: none
Expand Down Expand Up @@ -66,7 +63,6 @@ subgraphs:
phone: String
website: String
company: CompanyInfo
status: String # Status
}

type Address {
Expand All @@ -86,7 +82,7 @@ subgraphs:
name: String
catchPhrase: String
bs: String
email: String # EmailAddress
email: EmailAddress
}

input CompanyInput {
Expand All @@ -109,8 +105,8 @@ subgraphs:
input CreateUserInput {
name: String!
username: String!
email: String # EmailAddress!
status: String # Status!
email: EmailAddress!
status: Status!
address: AddressInput
}

Expand Down
14 changes: 12 additions & 2 deletions apollo-federation/src/sources/connect/expand/tests/schemas/expand/simple.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
schema
@link(url: "https://specs.apollo.dev/link/v1.0")
@link(url: "https://specs.apollo.dev/join/v0.4", for: EXECUTION)
@link(url: "https://specs.apollo.dev/join/v0.5", for: EXECUTION)
@link(url: "https://specs.apollo.dev/connect/v0.1", for: EXECUTION)
@join__directive(graphs: [CONNECTORS], name: "link", args: {url: "https://specs.apollo.dev/connect/v0.1", import: ["@connect", "@source"]})
@join__directive(graphs: [CONNECTORS], name: "source", args: {name: "example", http: {baseURL: "http://example"}})
{
Expand All @@ -11,7 +12,7 @@ directive @join__directive(graphs: [join__Graph!], name: String!, args: join__Di

directive @join__enumValue(graph: join__Graph!) repeatable on ENUM_VALUE

directive @join__field(graph: join__Graph, requires: join__FieldSet, provides: join__FieldSet, type: String, external: Boolean, override: String, usedOverridden: Boolean, overrideLabel: String) repeatable on FIELD_DEFINITION | INPUT_FIELD_DEFINITION
directive @join__field(graph: join__Graph, requires: join__FieldSet, provides: join__FieldSet, type: String, external: Boolean, override: String, usedOverridden: Boolean, overrideLabel: String, contextArguments: [join__ContextArgument!]) repeatable on FIELD_DEFINITION | INPUT_FIELD_DEFINITION

directive @join__graph(name: String!, url: String!) on ENUM_VALUE

Expand All @@ -23,10 +24,19 @@ directive @join__unionMember(graph: join__Graph!, member: String!) repeatable on

directive @link(url: String, as: String, for: link__Purpose, import: [link__Import]) repeatable on SCHEMA

input join__ContextArgument {
name: String!
type: String!
context: String!
selection: join__FieldValue!
}

scalar join__DirectiveArguments

scalar join__FieldSet

scalar join__FieldValue

enum join__Graph {
CONNECTORS @join__graph(name: "connectors", url: "none")
GRAPHQL @join__graph(name: "graphql", url: "https://graphql")
Expand Down
1 change: 0 additions & 1 deletion apollo-federation/src/sources/connect/expand/tests/schemas/expand/simple.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
federation_version: =2.9.0-connectors.0
subgraphs:
connectors:
routing_url: none
Expand Down
7 changes: 0 additions & 7 deletions apollo-federation/src/sources/connect/expand/tests/schemas/expand/steelthread.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,6 @@ directive @join__unionMember(graph: join__Graph!, member: String!) repeatable on

directive @link(url: String, as: String, for: link__Purpose, import: [link__Import]) repeatable on SCHEMA

type Contact
@join__type(graph: CONNECTORS)
{
phone: String
email: String
}

input join__ContextArgument {
name: String!
type: String!
Expand Down
Loading