Regenerate expansion supergraphs (#6201)

apollo-federation/src/sources/connect/expand/tests/schemas/expand/carryover.graphql

@@ -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"]})

apollo-federation/src/sources/connect/expand/tests/schemas/expand/carryover.yaml

@@ -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

apollo-federation/src/sources/connect/expand/tests/schemas/expand/keys.graphql

@@ -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!

apollo-federation/src/sources/connect/expand/tests/schemas/expand/keys.yaml

@@ -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
@@ -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"``

apollo-federation/src/sources/connect/expand/tests/schemas/expand/nested_inputs.graphql

@@ -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"}})
 {
@@ -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
 
@@ -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")
 }

apollo-federation/src/sources/connect/expand/tests/schemas/expand/nested_inputs.yaml

@@ -1,4 +1,3 @@
-federation_version: =2.9.0-connectors.0
 subgraphs:
   connectors:
     routing_url: none

apollo-federation/src/sources/connect/expand/tests/schemas/expand/normalize_names.graphql

@@ -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
 
@@ -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
 }

apollo-federation/src/sources/connect/expand/tests/schemas/expand/normalize_names.yaml

@@ -1,4 +1,3 @@
-federation_version: =2.9.0-connectors.12
 subgraphs:
   connectors-subgraph:
     routing_url: none

apollo-federation/src/sources/connect/expand/tests/schemas/expand/realistic.graphql

@@ -80,8 +80,8 @@ input CreateUserInput
 {
   name: String!
   username: String!
-  email: EmailAddress
-  status: Status
+  email: EmailAddress!
+  status: Status!
   address: AddressInput
 }
 
@@ -151,5 +151,4 @@ type User
   phone: String
   website: String
   company: CompanyInfo
-  status: Status
 }

apollo-federation/src/sources/connect/expand/tests/schemas/expand/realistic.yaml

@@ -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
@@ -66,7 +63,6 @@ subgraphs:
           phone: String
           website: String
           company: CompanyInfo
-          status: String # Status
         }
 
         type Address {
@@ -86,7 +82,7 @@ subgraphs:
           name: String
           catchPhrase: String
           bs: String
-          email: String # EmailAddress
+          email: EmailAddress
         }
 
         input CompanyInput {
@@ -109,8 +105,8 @@ subgraphs:
         input CreateUserInput {
           name: String!
           username: String!
-          email: String # EmailAddress!
-          status: String # Status!
+          email: EmailAddress!
+          status: Status!
           address: AddressInput
         }
 

apollo-federation/src/sources/connect/expand/tests/schemas/expand/simple.graphql

@@ -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"}})
 {
@@ -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
 
@@ -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")

apollo-federation/src/sources/connect/expand/tests/schemas/expand/simple.yaml

@@ -1,4 +1,3 @@
-federation_version: =2.9.0-connectors.0
 subgraphs:
   connectors:
     routing_url: none

apollo-federation/src/sources/connect/expand/tests/schemas/expand/steelthread.graphql

@@ -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!