Skip to content

merge main into next#3241

Merged
lennyburdette merged 29 commits intonextfrom
lb/merge-main
Apr 7, 2025
Merged

merge main into next#3241
lennyburdette merged 29 commits intonextfrom
lb/merge-main

Conversation

@lennyburdette
Copy link
Contributor

No description provided.

Meschreiber and others added 29 commits November 8, 2024 09:55
Removes unnecessary netlify.toml
For entity detection, make sure we're using the keyDirective as it
appears in the subgraph schema

fixes #3187
Clarify that no router redeploy is required to update percent label for
progressive override
This PR enhances didEncounterError method in
RemoteGraphQLDataSource class.

Co-authored-by: Chris Lenfest <clenfest@apollographql.com>
Updates the "IDE Support" page to describe options beyond JetBrains.
Updates:
- Include reference to new Vim/NeoVim doc
- Move page from reference to main federation docs for better visibility
Add deprecation `<Caution>` on v1.x versions in changelog
Clarify required `@link` directive for Fed 2
On [federation overview
page](https://www.apollographql.com/docs/deploy-preview/e4ba354a8ee685ee51a883f4/graphos/schema-design/federated-schemas/federation):
- Add benefit for connecting APIs declaratively
- Prioritize connectors quickstart
- Emphasize orchestration
- Link to Odyssey connectors course

---------

Co-authored-by: Maria Elisabeth Schreiber <maria.schreiber@apollographql.com>
Update Intro to Entities

---------

Co-authored-by: Maria Elisabeth Schreiber <maria.schreiber@apollographql.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 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>
Update diagrams for the federation conceptual page
Updates federation versions to include 2.10 and adds connectors
federation errors. Some reformatting included.
Fix legacy link
Moving federation reference out of the top-level reference section and
into the federation section.
To be merged with https://github.com/apollographql/docs-rewrite/pull/524
This new header option was added but only mentioned in release notes

---------

Co-authored-by: Renée <renee@kooi.me>
Fixes bug introduced in `2.10.0` where we could potentially throw in
`hintOnInconsistentEntity` if subgraphs use `@federation__key` rather
than `@key`.
Certain query patterns may cause resource exhaustion.

Corrects a set of denial-of-service (DOS) vulnerabilities that made it
possible for an attacker to render gateway inoperable with certain
simple query patterns due to uncontrolled resource consumption. All
prior-released versions and configurations are vulnerable.

See the associated GitHub Advisories
[GHSA-q2f9-x4p4-7xmh](GHSA-q2f9-x4p4-7xmh)
and
[GHSA-p2q6-pwh5-m6jr](GHSA-p2q6-pwh5-m6jr)
for more information.

---------

Co-authored-by: Chris Lenfest <clenfest@apollographql.com>
@lennyburdette lennyburdette requested a review from a team April 7, 2025 16:46
@lennyburdette lennyburdette requested a review from a team as a code owner April 7, 2025 16:46
@changeset-bot
Copy link

changeset-bot bot commented Apr 7, 2025

🦋 Changeset detected

Latest commit: 414740d

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

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

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 Apr 7, 2025

⚠️ Docs preview not attached to branch

The preview was not built because the PR's base branch next is not in the list of sources.

An Apollo team member can comment one of the following commands to dictate which branch to attach the preview to:

  • !docs set-base-branch version-0.x
  • !docs set-base-branch main

Build ID: feec20f4b52bdd76d138db0c

@codesandbox-ci
Copy link

codesandbox-ci bot commented Apr 7, 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.

@lennyburdette lennyburdette merged commit 0c74313 into next Apr 7, 2025
17 checks passed
@lennyburdette lennyburdette deleted the lb/merge-main branch April 7, 2025 17:46
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.