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.

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

federation 2.10.0 #3215

Merged
merged 15 commits into from
Feb 13, 2025
Merged

federation 2.10.0 #3215

merged 15 commits into from
Feb 13, 2025

Conversation

lennyburdette
Copy link
Contributor

Merging this should create a release PR that will actually cut the 2.10.0 packages.

sachindshinde and others added 14 commits August 30, 2024 09:21
Pull 2.8.5 and 2.9.0 release updates into next
Addresses #3123 / #3135 by skipping type resolution for `null`
references.
<!-- [CNN-217] -->

TODO:

- [x] Merge #3048 and rebase this 
- [x] Merge #3049 and rebase this
- [x] Merge #3050 and rebase this

Summary:

- Removes support for `@source*` directives
- Adds support for `@connect` and `@source`

[CNN-217]:
https://apollographql.atlassian.net/browse/CNN-217?atlOrigin=eyJpIjoiNWRkNTljNzYxNjVmNDY3MDlhMDU5Y2ZhYzA5YTRkZjUiLCJwIjoiZ2l0aHViLWNvbS1KU1cifQ

---------

Co-authored-by: Lenny Burdette <lenny@apollographql.com>
Co-authored-by: Ben Newman <ben@apollographql.com>
Co-authored-by: Taylor Jones <45475656+tayrrible@users.noreply.github.com>
Co-authored-by: Taylor Jones <taylor@apollographql.com>
Co-authored-by: Nicholas Cioli <nicholas.cioli@apollographql.com>
<!--
First, 🌠 thank you 🌠 for taking the time to consider a contribution to
Apollo!

Here are some important details to follow:

* ⏰ Your time is important
To save your precious time, if the contribution you are making will
take more than an hour, please make sure it has been discussed in an
        issue first. This is especially true for feature requests!

* 💡 Features
Feature requests can be created and discussed within a GitHub Issue.
Be sure to search for existing feature requests (and related issues!)
prior to opening a new request. If an existing issue covers the need,
please upvote that issue by using the 👍 emote, rather than opening a
        new issue.

* 🕷 Bug fixes
These can be created and discussed in this repository. When fixing a
bug,
please _try_ to add a test which verifies the fix. If you cannot, you
should
still submit the PR but we may still ask you (and help you!) to create a
test.

* Federation versions
Please make sure you're targeting the federation version you're opening
the PR for. Federation 2 (alpha) is currently located on the `main`
branch and prior versions of Federation live on the `version-0.x`
branch.

* 📖 Contribution guidelines
Follow
https://github.com/apollographql/federation/blob/HEAD/CONTRIBUTING.md
when submitting a pull request. Make sure existing tests still pass, and
add
        tests for all new behavior.

* ✏️ Explain your pull request
Describe the big picture of your changes here to communicate to what
        your pull request is meant to accomplish. Provide 🔗 links 🔗 to
        associated issues!

We hope you will find this to be a positive experience! Open source
contribution can be intimidating and we hope to alleviate that pain as
much
as possible. Without following these guidelines, you may be missing
context
that can help you succeed with your contribution, which is why we
encourage
discussion first. Ultimately, there is no guarantee that we will be able
to
merge your pull-request, but by following these guidelines we can try to
avoid disappointment.

-->
This PR was opened by the [Changesets
release](https://github.com/changesets/action) GitHub action. When
you're ready to do a release, you can merge this and the packages will
be published to npm automatically. If you're not ready to do a release
yet, that's fine, whenever you add more changesets to next, this PR will
be updated.

⚠️⚠️⚠️⚠️⚠️⚠️

`next` is currently in **pre mode** so this branch has prereleases
rather than normal releases. If you want to exit prereleases, run
`changeset pre exit` on `next`.

⚠️⚠️⚠️⚠️⚠️⚠️

# Releases
## @apollo/composition@2.10.0-alpha.3

### Patch Changes

- Updated dependencies
\[[`a0359b0c9a2d9890e1e200d5dc530a1ca4e1d647`](a0359b0)]:
    -   @apollo/federation-internals@2.10.0-alpha.3
    -   @apollo/query-graphs@2.10.0-alpha.3

## @apollo/gateway@2.10.0-alpha.3

### Patch Changes

- Updated dependencies
\[[`a0359b0c9a2d9890e1e200d5dc530a1ca4e1d647`](a0359b0)]:
    -   @apollo/federation-internals@2.10.0-alpha.3
    -   @apollo/composition@2.10.0-alpha.3
    -   @apollo/query-planner@2.10.0-alpha.3

## @apollo/federation-internals@2.10.0-alpha.3

### Patch Changes

- Incorporate changes from v2.9.3
([#3179](#3179))

## @apollo/query-graphs@2.10.0-alpha.3

### Patch Changes

- Updated dependencies
\[[`a0359b0c9a2d9890e1e200d5dc530a1ca4e1d647`](a0359b0)]:
    -   @apollo/federation-internals@2.10.0-alpha.3

## @apollo/query-planner@2.10.0-alpha.3

### Patch Changes

- Updated dependencies
\[[`a0359b0c9a2d9890e1e200d5dc530a1ca4e1d647`](a0359b0)]:
    -   @apollo/federation-internals@2.10.0-alpha.3
    -   @apollo/query-graphs@2.10.0-alpha.3

## @apollo/subgraph@2.10.0-alpha.3

### Patch Changes

- Updated dependencies
\[[`a0359b0c9a2d9890e1e200d5dc530a1ca4e1d647`](a0359b0)]:
    -   @apollo/federation-internals@2.10.0-alpha.3

## apollo-federation-integration-testsuite@2.10.0-alpha.3

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
<!--
First, 🌠 thank you 🌠 for taking the time to consider a contribution to
Apollo!

Here are some important details to follow:

* ⏰ Your time is important
To save your precious time, if the contribution you are making will
take more than an hour, please make sure it has been discussed in an
        issue first. This is especially true for feature requests!

* 💡 Features
Feature requests can be created and discussed within a GitHub Issue.
Be sure to search for existing feature requests (and related issues!)
prior to opening a new request. If an existing issue covers the need,
please upvote that issue by using the 👍 emote, rather than opening a
        new issue.

* 🕷 Bug fixes
These can be created and discussed in this repository. When fixing a
bug,
please _try_ to add a test which verifies the fix. If you cannot, you
should
still submit the PR but we may still ask you (and help you!) to create a
test.

* Federation versions
Please make sure you're targeting the federation version you're opening
the PR for. Federation 2 (alpha) is currently located on the `main`
branch and prior versions of Federation live on the `version-0.x`
branch.

* 📖 Contribution guidelines
Follow
https://github.com/apollographql/federation/blob/HEAD/CONTRIBUTING.md
when submitting a pull request. Make sure existing tests still pass, and
add
        tests for all new behavior.

* ✏️ Explain your pull request
Describe the big picture of your changes here to communicate to what
        your pull request is meant to accomplish. Provide 🔗 links 🔗 to
        associated issues!

We hope you will find this to be a positive experience! Open source
contribution can be intimidating and we hope to alleviate that pain as
much
as possible. Without following these guidelines, you may be missing
context
that can help you succeed with your contribution, which is why we
encourage
discussion first. Ultimately, there is no guarantee that we will be able
to
merge your pull-request, but by following these guidelines we can try to
avoid disappointment.

-->

---------

Co-authored-by: Maria Elisabeth Schreiber <maria.schreiber@apollographql.com>
Co-authored-by: Chris Lenfest <clenfest@apollographql.com>
Co-authored-by: Edward Huang <edward.huang@apollographql.com>
Co-authored-by: Matt Peake <7741049+peakematt@users.noreply.github.com>
Co-authored-by: kamila-brylewska-zendesk <kamila.brylewska@zendesk.com>
This PR was opened by the [Changesets
release](https://github.com/changesets/action) GitHub action. When
you're ready to do a release, you can merge this and the packages will
be published to npm automatically. If you're not ready to do a release
yet, that's fine, whenever you add more changesets to next, this PR will
be updated.

⚠️⚠️⚠️⚠️⚠️⚠️

`next` is currently in **pre mode** so this branch has prereleases
rather than normal releases. If you want to exit prereleases, run
`changeset pre exit` on `next`.

⚠️⚠️⚠️⚠️⚠️⚠️

# Releases
## @apollo/gateway@2.10.0-alpha.4

### Minor Changes

- Add request parameter to didEncounterError method
([#3199](#3199))

### Patch Changes

-   Updated dependencies \[]:
    -   @apollo/composition@2.10.0-alpha.4
    -   @apollo/federation-internals@2.10.0-alpha.4
    -   @apollo/query-planner@2.10.0-alpha.4

## @apollo/composition@2.10.0-alpha.4

### Patch Changes

-   Updated dependencies \[]:
    -   @apollo/federation-internals@2.10.0-alpha.4
    -   @apollo/query-graphs@2.10.0-alpha.4

## @apollo/query-graphs@2.10.0-alpha.4

### Patch Changes

-   Updated dependencies \[]:
    -   @apollo/federation-internals@2.10.0-alpha.4

## @apollo/query-planner@2.10.0-alpha.4

### Patch Changes

-   Updated dependencies \[]:
    -   @apollo/federation-internals@2.10.0-alpha.4
    -   @apollo/query-graphs@2.10.0-alpha.4

## @apollo/subgraph@2.10.0-alpha.4

### Patch Changes

-   Updated dependencies \[]:
    -   @apollo/federation-internals@2.10.0-alpha.4

## @apollo/federation-internals@2.10.0-alpha.4



## apollo-federation-integration-testsuite@2.10.0-alpha.4

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
<!--
First, 🌠 thank you 🌠 for taking the time to consider a contribution to
Apollo!

Here are some important details to follow:

* ⏰ Your time is important
To save your precious time, if the contribution you are making will
take more than an hour, please make sure it has been discussed in an
        issue first. This is especially true for feature requests!

* 💡 Features
Feature requests can be created and discussed within a GitHub Issue.
Be sure to search for existing feature requests (and related issues!)
prior to opening a new request. If an existing issue covers the need,
please upvote that issue by using the 👍 emote, rather than opening a
        new issue.

* 🕷 Bug fixes
These can be created and discussed in this repository. When fixing a
bug,
please _try_ to add a test which verifies the fix. If you cannot, you
should
still submit the PR but we may still ask you (and help you!) to create a
test.

* Federation versions
Please make sure you're targeting the federation version you're opening
the PR for. Federation 2 (alpha) is currently located on the `main`
branch and prior versions of Federation live on the `version-0.x`
branch.

* 📖 Contribution guidelines
Follow
https://github.com/apollographql/federation/blob/HEAD/CONTRIBUTING.md
when submitting a pull request. Make sure existing tests still pass, and
add
        tests for all new behavior.

* ✏️ Explain your pull request
Describe the big picture of your changes here to communicate to what
        your pull request is meant to accomplish. Provide 🔗 links 🔗 to
        associated issues!

We hope you will find this to be a positive experience! Open source
contribution can be intimidating and we hope to alleviate that pain as
much
as possible. Without following these guidelines, you may be missing
context
that can help you succeed with your contribution, which is why we
encourage
discussion first. Ultimately, there is no guarantee that we will be able
to
merge your pull-request, but by following these guidelines we can try to
avoid disappointment.

-->

---------

Co-authored-by: Maria Elisabeth Schreiber <maria.schreiber@apollographql.com>
Co-authored-by: Chris Lenfest <clenfest@apollographql.com>
Co-authored-by: Edward Huang <edward.huang@apollographql.com>
Co-authored-by: Matt Peake <7741049+peakematt@users.noreply.github.com>
Co-authored-by: kamila-brylewska-zendesk <kamila.brylewska@zendesk.com>
<!--
First, 🌠 thank you 🌠 for taking the time to consider a contribution to
Apollo!

Here are some important details to follow:

* ⏰ Your time is important
To save your precious time, if the contribution you are making will
take more than an hour, please make sure it has been discussed in an
        issue first. This is especially true for feature requests!

* 💡 Features
Feature requests can be created and discussed within a GitHub Issue.
Be sure to search for existing feature requests (and related issues!)
prior to opening a new request. If an existing issue covers the need,
please upvote that issue by using the 👍 emote, rather than opening a
        new issue.

* 🕷 Bug fixes
These can be created and discussed in this repository. When fixing a
bug,
please _try_ to add a test which verifies the fix. If you cannot, you
should
still submit the PR but we may still ask you (and help you!) to create a
test.

* Federation versions
Please make sure you're targeting the federation version you're opening
the PR for. Federation 2 (alpha) is currently located on the `main`
branch and prior versions of Federation live on the `version-0.x`
branch.

* 📖 Contribution guidelines
Follow
https://github.com/apollographql/federation/blob/HEAD/CONTRIBUTING.md
when submitting a pull request. Make sure existing tests still pass, and
add
        tests for all new behavior.

* ✏️ Explain your pull request
Describe the big picture of your changes here to communicate to what
        your pull request is meant to accomplish. Provide 🔗 links 🔗 to
        associated issues!

We hope you will find this to be a positive experience! Open source
contribution can be intimidating and we hope to alleviate that pain as
much
as possible. Without following these guidelines, you may be missing
context
that can help you succeed with your contribution, which is why we
encourage
discussion first. Ultimately, there is no guarantee that we will be able
to
merge your pull-request, but by following these guidelines we can try to
avoid disappointment.

-->

---------

Co-authored-by: Dylan Anthony <dylan@apollographql.com>
@lennyburdette lennyburdette requested a review from a team February 13, 2025 13:39
@lennyburdette lennyburdette requested review from a team as code owners February 13, 2025 13:39
Copy link

changeset-bot bot commented Feb 13, 2025

🦋 Changeset detected

Latest commit: b632655

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 7 packages
Name Type
apollo-federation-integration-testsuite Minor
@apollo/query-planner Minor
@apollo/query-graphs Minor
@apollo/composition Minor
@apollo/federation-internals Minor
@apollo/subgraph Minor
@apollo/gateway Minor

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@svc-apollo-docs
Copy link
Collaborator

svc-apollo-docs commented Feb 13, 2025

✅ Docs preview has no changes

The preview was not built because there were no changes.

Build ID: 45437e996eeef309dc7f2055

Copy link

codesandbox-ci bot commented Feb 13, 2025

This pull request is automatically built and testable in CodeSandbox.

To see build info of the built libraries, click here or the icon next to each commit SHA.

@@ -1,5 +1,21 @@
# CHANGELOG for `@apollo/composition`

## 2.10.0-alpha.4
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want to get rid of these?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah good call, i'll remove all these manually

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

requires a PR, this is a protected branch: #3216

Copy link
Member

@dylan-apollo dylan-apollo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM (pending the other PR merging into this one). I'm not positive that changeset will handle things correctly, but I don't see a way to test it either. So we'll just have to tweak if the generated PR doesn't look right.

Copy link
Contributor

@shorgi shorgi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

<!--
First, 🌠 thank you 🌠 for taking the time to consider a contribution to
Apollo!

Here are some important details to follow:

* ⏰ Your time is important
To save your precious time, if the contribution you are making will
take more than an hour, please make sure it has been discussed in an
        issue first. This is especially true for feature requests!

* 💡 Features
Feature requests can be created and discussed within a GitHub Issue.
Be sure to search for existing feature requests (and related issues!)
prior to opening a new request. If an existing issue covers the need,
please upvote that issue by using the 👍 emote, rather than opening a
        new issue.

* 🕷 Bug fixes
These can be created and discussed in this repository. When fixing a
bug,
please _try_ to add a test which verifies the fix. If you cannot, you
should
still submit the PR but we may still ask you (and help you!) to create a
test.

* Federation versions
Please make sure you're targeting the federation version you're opening
the PR for. Federation 2 (alpha) is currently located on the `main`
branch and prior versions of Federation live on the `version-0.x`
branch.

* 📖 Contribution guidelines
Follow
https://github.com/apollographql/federation/blob/HEAD/CONTRIBUTING.md
when submitting a pull request. Make sure existing tests still pass, and
add
        tests for all new behavior.

* ✏️ Explain your pull request
Describe the big picture of your changes here to communicate to what
        your pull request is meant to accomplish. Provide 🔗 links 🔗 to
        associated issues!

We hope you will find this to be a positive experience! Open source
contribution can be intimidating and we hope to alleviate that pain as
much
as possible. Without following these guidelines, you may be missing
context
that can help you succeed with your contribution, which is why we
encourage
discussion first. Ultimately, there is no guarantee that we will be able
to
merge your pull-request, but by following these guidelines we can try to
avoid disappointment.

-->
@lennyburdette lennyburdette merged commit 8927e31 into main Feb 13, 2025
16 checks passed
@github-actions github-actions bot mentioned this pull request Feb 3, 2025
lennyburdette added a commit that referenced this pull request Feb 13, 2025
This PR was opened by the [Changesets
release](https://github.com/changesets/action) GitHub action. When
you're ready to do a release, you can merge this and the packages will
be published to npm automatically. If you're not ready to do a release
yet, that's fine, whenever you add more changesets to main, this PR will
be updated.


# Releases
## @apollo/composition@2.10.0

### Minor Changes

- Adds the ability to compose and serialize directives for [Apollo
Connectors](https://go.apollo.dev/connectors). To use Apollo Connectors,
compose your supergraphs using
[GraphOS](https://www.apollographql.com/docs/graphos/platform/schema-management)
or [rover](https://www.apollographql.com/docs/rover/commands/dev), and
run your supergraph in [Apollo
Router](https://www.apollographql.com/docs/graphos/routing) 2.0.0 or
higher. ([#3215](#3215))

### Patch Changes

- Updated dependencies
\[[`8927e315ab0e865ef3ff12320f265ee95588b899`](8927e31),
[`8927e315ab0e865ef3ff12320f265ee95588b899`](8927e31)]:
    -   @apollo/query-graphs@2.10.0
    -   @apollo/federation-internals@2.10.0

## @apollo/gateway@2.10.0

### Minor Changes

- Adds the ability to compose and serialize directives for [Apollo
Connectors](https://go.apollo.dev/connectors). To use Apollo Connectors,
compose your supergraphs using
[GraphOS](https://www.apollographql.com/docs/graphos/platform/schema-management)
or [rover](https://www.apollographql.com/docs/rover/commands/dev), and
run your supergraph in [Apollo
Router](https://www.apollographql.com/docs/graphos/routing) 2.0.0 or
higher. ([#3215](#3215))

- Add request parameter to didEncounterError method
([#3194](#3194))

### Patch Changes

- Updated dependencies
\[[`8927e315ab0e865ef3ff12320f265ee95588b899`](8927e31),
[`8927e315ab0e865ef3ff12320f265ee95588b899`](8927e31)]:
    -   @apollo/query-planner@2.10.0
    -   @apollo/composition@2.10.0
    -   @apollo/federation-internals@2.10.0

## @apollo/federation-internals@2.10.0

### Minor Changes

- Adds the ability to compose and serialize directives for [Apollo
Connectors](https://go.apollo.dev/connectors). To use Apollo Connectors,
compose your supergraphs using
[GraphOS](https://www.apollographql.com/docs/graphos/platform/schema-management)
or [rover](https://www.apollographql.com/docs/rover/commands/dev), and
run your supergraph in [Apollo
Router](https://www.apollographql.com/docs/graphos/routing) 2.0.0 or
higher. ([#3215](#3215))

### Patch Changes

- Incorporate changes from v2.9.3
([#3215](#3215))

## @apollo/query-graphs@2.10.0

### Minor Changes

- Adds the ability to compose and serialize directives for [Apollo
Connectors](https://go.apollo.dev/connectors). To use Apollo Connectors,
compose your supergraphs using
[GraphOS](https://www.apollographql.com/docs/graphos/platform/schema-management)
or [rover](https://www.apollographql.com/docs/rover/commands/dev), and
run your supergraph in [Apollo
Router](https://www.apollographql.com/docs/graphos/routing) 2.0.0 or
higher. ([#3215](#3215))

### Patch Changes

- Updated dependencies
\[[`8927e315ab0e865ef3ff12320f265ee95588b899`](8927e31),
[`8927e315ab0e865ef3ff12320f265ee95588b899`](8927e31)]:
    -   @apollo/federation-internals@2.10.0

## @apollo/query-planner@2.10.0

### Minor Changes

- Adds the ability to compose and serialize directives for [Apollo
Connectors](https://go.apollo.dev/connectors). To use Apollo Connectors,
compose your supergraphs using
[GraphOS](https://www.apollographql.com/docs/graphos/platform/schema-management)
or [rover](https://www.apollographql.com/docs/rover/commands/dev), and
run your supergraph in [Apollo
Router](https://www.apollographql.com/docs/graphos/routing) 2.0.0 or
higher. ([#3215](#3215))

### Patch Changes

- Updated dependencies
\[[`8927e315ab0e865ef3ff12320f265ee95588b899`](8927e31),
[`8927e315ab0e865ef3ff12320f265ee95588b899`](8927e31)]:
    -   @apollo/query-graphs@2.10.0
    -   @apollo/federation-internals@2.10.0

## @apollo/subgraph@2.10.0

### Minor Changes

- Adds the ability to compose and serialize directives for [Apollo
Connectors](https://go.apollo.dev/connectors). To use Apollo Connectors,
compose your supergraphs using
[GraphOS](https://www.apollographql.com/docs/graphos/platform/schema-management)
or [rover](https://www.apollographql.com/docs/rover/commands/dev), and
run your supergraph in [Apollo
Router](https://www.apollographql.com/docs/graphos/routing) 2.0.0 or
higher. ([#3215](#3215))

### Patch Changes

- When resolving references, skip type resolution if the reference
resolves to null.
([#3215](#3215))

- Updated dependencies
\[[`8927e315ab0e865ef3ff12320f265ee95588b899`](8927e31),
[`8927e315ab0e865ef3ff12320f265ee95588b899`](8927e31)]:
    -   @apollo/federation-internals@2.10.0

## apollo-federation-integration-testsuite@2.10.0

### Minor Changes

- Adds the ability to compose and serialize directives for [Apollo
Connectors](https://go.apollo.dev/connectors). To use Apollo Connectors,
compose your supergraphs using
[GraphOS](https://www.apollographql.com/docs/graphos/platform/schema-management)
or [rover](https://www.apollographql.com/docs/rover/commands/dev), and
run your supergraph in [Apollo
Router](https://www.apollographql.com/docs/graphos/routing) 2.0.0 or
higher. ([#3215](#3215))

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Lenny Burdette <lenny@apollographql.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants