diff --git a/.changeset/orange-yaks-double.md b/.changeset/orange-yaks-double.md deleted file mode 100644 index 04b911e4b..000000000 --- a/.changeset/orange-yaks-double.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@apollo/composition": patch ---- - -Fixed access control verification of transitive requirements (through `@requires` and/or `@fromContext`) to ensure it works with chains of transitive dependencies. diff --git a/.changeset/pre.json b/.changeset/pre.json deleted file mode 100644 index 5a5e5a71d..000000000 --- a/.changeset/pre.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "mode": "exit", - "tag": "preview", - "initialVersions": { - "@apollo/composition": "2.11.5", - "apollo-federation-integration-testsuite": "2.11.5", - "@apollo/gateway": "2.11.5", - "@apollo/federation-internals": "2.11.5", - "@apollo/query-graphs": "2.11.5", - "@apollo/query-planner": "2.11.5", - "@apollo/subgraph": "2.11.5" - }, - "changesets": [ - "orange-yaks-double", - "shaggy-adults-help", - "smart-crabs-jump" - ] -} diff --git a/.changeset/shaggy-adults-help.md b/.changeset/shaggy-adults-help.md deleted file mode 100644 index 5c92b4c36..000000000 --- a/.changeset/shaggy-adults-help.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -"@apollo/composition": patch -"@apollo/federation-internals": patch ---- -Allow interface object fields to specify access control - -Update composition logic to allow specifying access control directives (`@authenticated`, `@requiresScopes` and `@policy`) on `@interfaceObject` fields. While we disallow access control on interface types and fields, we decided to support it on `@interfaceObject` as it is a useful pattern to define a single resolver (that may need access controls) for common interface fields. Alternative would require our users to explicitly define resolvers for all implementations which defeats the purpose of `@interfaceObject`. - -This PR refactors in how we propagate access control by providing additional merge sources when merging directives on interfaces, interface fields and object fields. diff --git a/.changeset/smart-crabs-jump.md b/.changeset/smart-crabs-jump.md deleted file mode 100644 index 355706ec1..000000000 --- a/.changeset/smart-crabs-jump.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"@apollo/federation-internals": patch ---- - -Fixed demand control validations to unwrap non-nullable composite types and fields when performing validations. \ No newline at end of file diff --git a/composition-js/CHANGELOG.md b/composition-js/CHANGELOG.md index e4a14b2df..914e47a5b 100644 --- a/composition-js/CHANGELOG.md +++ b/composition-js/CHANGELOG.md @@ -1,14 +1,6 @@ # CHANGELOG for `@apollo/composition` -## 2.11.5-preview.1 - -### Patch Changes - -- Updated dependencies [[`3e2d1fd315db54a089fedf131cfaa27792bdd049`](https://github.com/apollographql/federation/commit/3e2d1fd315db54a089fedf131cfaa27792bdd049)]: - - @apollo/federation-internals@2.11.5-preview.1 - - @apollo/query-graphs@2.11.5-preview.1 - -## 2.11.5-preview.0 +## 2.11.5 ### Patch Changes @@ -20,9 +12,9 @@ This PR refactors in how we propagate access control by providing additional merge sources when merging directives on interfaces, interface fields and object fields. -- Updated dependencies [[`e1c58611c3c996b4fff98a54e49f00549ff2115d`](https://github.com/apollographql/federation/commit/e1c58611c3c996b4fff98a54e49f00549ff2115d)]: - - @apollo/federation-internals@2.11.5-preview.0 - - @apollo/query-graphs@2.11.5-preview.0 +- Updated dependencies [[`e1c58611c3c996b4fff98a54e49f00549ff2115d`](https://github.com/apollographql/federation/commit/e1c58611c3c996b4fff98a54e49f00549ff2115d), [`3e2d1fd315db54a089fedf131cfaa27792bdd049`](https://github.com/apollographql/federation/commit/3e2d1fd315db54a089fedf131cfaa27792bdd049)]: + - @apollo/federation-internals@2.11.5 + - @apollo/query-graphs@2.11.5 ## 2.11.4 diff --git a/composition-js/package.json b/composition-js/package.json index 56477ad63..e2ba4a8f0 100644 --- a/composition-js/package.json +++ b/composition-js/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/composition", - "version": "2.11.5-preview.1", + "version": "2.11.5", "description": "Apollo Federation composition utilities", "main": "dist/index.js", "types": "dist/index.d.ts", @@ -27,8 +27,8 @@ "access": "public" }, "dependencies": { - "@apollo/federation-internals": "2.11.5-preview.1", - "@apollo/query-graphs": "2.11.5-preview.1" + "@apollo/federation-internals": "2.11.5", + "@apollo/query-graphs": "2.11.5" }, "peerDependencies": { "graphql": "^16.5.0" diff --git a/federation-integration-testsuite-js/CHANGELOG.md b/federation-integration-testsuite-js/CHANGELOG.md index 25c91f3c7..8bbed99d4 100644 --- a/federation-integration-testsuite-js/CHANGELOG.md +++ b/federation-integration-testsuite-js/CHANGELOG.md @@ -1,8 +1,6 @@ # CHANGELOG for `federation-integration-testsuite-js` -## 2.11.5-preview.1 - -## 2.11.5-preview.0 +## 2.11.5 ## 2.11.4 diff --git a/federation-integration-testsuite-js/package.json b/federation-integration-testsuite-js/package.json index 38fe7e4ec..e2f09415d 100644 --- a/federation-integration-testsuite-js/package.json +++ b/federation-integration-testsuite-js/package.json @@ -1,7 +1,7 @@ { "name": "apollo-federation-integration-testsuite", "private": true, - "version": "2.11.5-preview.1", + "version": "2.11.5", "description": "Apollo Federation Integrations / Test Fixtures", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/gateway-js/CHANGELOG.md b/gateway-js/CHANGELOG.md index c85dfc168..4e5f9c6b7 100644 --- a/gateway-js/CHANGELOG.md +++ b/gateway-js/CHANGELOG.md @@ -1,22 +1,13 @@ # CHANGELOG for `@apollo/gateway` -## 2.11.5-preview.1 +## 2.11.5 ### Patch Changes -- Updated dependencies [[`3e2d1fd315db54a089fedf131cfaa27792bdd049`](https://github.com/apollographql/federation/commit/3e2d1fd315db54a089fedf131cfaa27792bdd049)]: - - @apollo/federation-internals@2.11.5-preview.1 - - @apollo/composition@2.11.5-preview.1 - - @apollo/query-planner@2.11.5-preview.1 - -## 2.11.5-preview.0 - -### Patch Changes - -- Updated dependencies [[`5ee4d966487e714ae6bc6445bf53d75ccbbaf6ae`](https://github.com/apollographql/federation/commit/5ee4d966487e714ae6bc6445bf53d75ccbbaf6ae), [`e1c58611c3c996b4fff98a54e49f00549ff2115d`](https://github.com/apollographql/federation/commit/e1c58611c3c996b4fff98a54e49f00549ff2115d)]: - - @apollo/composition@2.11.5-preview.0 - - @apollo/federation-internals@2.11.5-preview.0 - - @apollo/query-planner@2.11.5-preview.0 +- Updated dependencies [[`5ee4d966487e714ae6bc6445bf53d75ccbbaf6ae`](https://github.com/apollographql/federation/commit/5ee4d966487e714ae6bc6445bf53d75ccbbaf6ae), [`e1c58611c3c996b4fff98a54e49f00549ff2115d`](https://github.com/apollographql/federation/commit/e1c58611c3c996b4fff98a54e49f00549ff2115d), [`3e2d1fd315db54a089fedf131cfaa27792bdd049`](https://github.com/apollographql/federation/commit/3e2d1fd315db54a089fedf131cfaa27792bdd049)]: + - @apollo/composition@2.11.5 + - @apollo/federation-internals@2.11.5 + - @apollo/query-planner@2.11.5 ## 2.11.4 diff --git a/gateway-js/package.json b/gateway-js/package.json index e609ff507..5772b2ccf 100644 --- a/gateway-js/package.json +++ b/gateway-js/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/gateway", - "version": "2.11.5-preview.1", + "version": "2.11.5", "description": "Apollo Gateway", "author": "Apollo ", "main": "dist/index.js", @@ -25,9 +25,9 @@ "access": "public" }, "dependencies": { - "@apollo/composition": "2.11.5-preview.1", - "@apollo/federation-internals": "2.11.5-preview.1", - "@apollo/query-planner": "2.11.5-preview.1", + "@apollo/composition": "2.11.5", + "@apollo/federation-internals": "2.11.5", + "@apollo/query-planner": "2.11.5", "@apollo/server-gateway-interface": "^1.1.0", "@apollo/usage-reporting-protobuf": "^4.1.0", "@apollo/utils.createhash": "^2.0.0", diff --git a/internals-js/CHANGELOG.md b/internals-js/CHANGELOG.md index 4d0af5a65..1b1546a53 100644 --- a/internals-js/CHANGELOG.md +++ b/internals-js/CHANGELOG.md @@ -1,12 +1,6 @@ # CHANGELOG for `@apollo/federation-internals` -## 2.11.5-preview.1 - -### Patch Changes - -- Fixed demand control validations to unwrap non-nullable composite types and fields when performing validations. ([#3336](https://github.com/apollographql/federation/pull/3336)) - -## 2.11.5-preview.0 +## 2.11.5 ### Patch Changes @@ -16,6 +10,8 @@ This PR refactors in how we propagate access control by providing additional merge sources when merging directives on interfaces, interface fields and object fields. +- Fixed demand control validations to unwrap non-nullable composite types and fields when performing validations. ([#3336](https://github.com/apollographql/federation/pull/3336)) + ## 2.11.4 ### Patch Changes diff --git a/internals-js/package.json b/internals-js/package.json index 18be66095..7fec92510 100644 --- a/internals-js/package.json +++ b/internals-js/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/federation-internals", - "version": "2.11.5-preview.1", + "version": "2.11.5", "description": "Apollo Federation internal utilities", "main": "dist/index.js", "types": "dist/index.d.ts", diff --git a/package-lock.json b/package-lock.json index f84fd2e17..4e9d2efed 100644 --- a/package-lock.json +++ b/package-lock.json @@ -70,11 +70,11 @@ }, "composition-js": { "name": "@apollo/composition", - "version": "2.11.5-preview.1", + "version": "2.11.5", "license": "Elastic-2.0", "dependencies": { - "@apollo/federation-internals": "2.11.5-preview.1", - "@apollo/query-graphs": "2.11.5-preview.1" + "@apollo/federation-internals": "2.11.5", + "@apollo/query-graphs": "2.11.5" }, "engines": { "node": ">=14.15.0" @@ -85,7 +85,7 @@ }, "federation-integration-testsuite-js": { "name": "apollo-federation-integration-testsuite", - "version": "2.11.5-preview.1", + "version": "2.11.5", "license": "Elastic-2.0", "dependencies": { "graphql-tag": "^2.12.6", @@ -94,12 +94,12 @@ }, "gateway-js": { "name": "@apollo/gateway", - "version": "2.11.5-preview.1", + "version": "2.11.5", "license": "Elastic-2.0", "dependencies": { - "@apollo/composition": "2.11.5-preview.1", - "@apollo/federation-internals": "2.11.5-preview.1", - "@apollo/query-planner": "2.11.5-preview.1", + "@apollo/composition": "2.11.5", + "@apollo/federation-internals": "2.11.5", + "@apollo/query-planner": "2.11.5", "@apollo/server-gateway-interface": "^1.1.0", "@apollo/usage-reporting-protobuf": "^4.1.0", "@apollo/utils.createhash": "^2.0.0", @@ -125,7 +125,7 @@ }, "internals-js": { "name": "@apollo/federation-internals", - "version": "2.11.5-preview.1", + "version": "2.11.5", "license": "Elastic-2.0", "dependencies": { "@types/uuid": "^9.0.0", @@ -17947,10 +17947,10 @@ }, "query-graphs-js": { "name": "@apollo/query-graphs", - "version": "2.11.5-preview.1", + "version": "2.11.5", "license": "Elastic-2.0", "dependencies": { - "@apollo/federation-internals": "2.11.5-preview.1", + "@apollo/federation-internals": "2.11.5", "deep-equal": "^2.0.5", "ts-graphviz": "^1.5.4", "uuid": "^9.0.0" @@ -17964,11 +17964,11 @@ }, "query-planner-js": { "name": "@apollo/query-planner", - "version": "2.11.5-preview.1", + "version": "2.11.5", "license": "Elastic-2.0", "dependencies": { - "@apollo/federation-internals": "2.11.5-preview.1", - "@apollo/query-graphs": "2.11.5-preview.1", + "@apollo/federation-internals": "2.11.5", + "@apollo/query-graphs": "2.11.5", "@apollo/utils.keyvaluecache": "^2.1.0", "chalk": "^4.1.0", "deep-equal": "^2.0.5", @@ -17997,11 +17997,11 @@ }, "subgraph-js": { "name": "@apollo/subgraph", - "version": "2.11.5-preview.1", + "version": "2.11.5", "license": "MIT", "dependencies": { "@apollo/cache-control-types": "^1.0.2", - "@apollo/federation-internals": "2.11.5-preview.1" + "@apollo/federation-internals": "2.11.5" }, "engines": { "node": ">=14.15.0" diff --git a/query-graphs-js/CHANGELOG.md b/query-graphs-js/CHANGELOG.md index 23b0ab80d..a781f07b4 100644 --- a/query-graphs-js/CHANGELOG.md +++ b/query-graphs-js/CHANGELOG.md @@ -1,18 +1,11 @@ # CHANGELOG for `@apollo/query-graphs` -## 2.11.5-preview.1 +## 2.11.5 ### Patch Changes -- Updated dependencies [[`3e2d1fd315db54a089fedf131cfaa27792bdd049`](https://github.com/apollographql/federation/commit/3e2d1fd315db54a089fedf131cfaa27792bdd049)]: - - @apollo/federation-internals@2.11.5-preview.1 - -## 2.11.5-preview.0 - -### Patch Changes - -- Updated dependencies [[`e1c58611c3c996b4fff98a54e49f00549ff2115d`](https://github.com/apollographql/federation/commit/e1c58611c3c996b4fff98a54e49f00549ff2115d)]: - - @apollo/federation-internals@2.11.5-preview.0 +- Updated dependencies [[`e1c58611c3c996b4fff98a54e49f00549ff2115d`](https://github.com/apollographql/federation/commit/e1c58611c3c996b4fff98a54e49f00549ff2115d), [`3e2d1fd315db54a089fedf131cfaa27792bdd049`](https://github.com/apollographql/federation/commit/3e2d1fd315db54a089fedf131cfaa27792bdd049)]: + - @apollo/federation-internals@2.11.5 ## 2.11.4 diff --git a/query-graphs-js/package.json b/query-graphs-js/package.json index 23055c458..03a8e5d21 100644 --- a/query-graphs-js/package.json +++ b/query-graphs-js/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/query-graphs", - "version": "2.11.5-preview.1", + "version": "2.11.5", "description": "Apollo Federation library to work with 'query graphs'", "main": "dist/index.js", "types": "dist/index.d.ts", @@ -23,7 +23,7 @@ "node": ">=14.15.0" }, "dependencies": { - "@apollo/federation-internals": "2.11.5-preview.1", + "@apollo/federation-internals": "2.11.5", "deep-equal": "^2.0.5", "ts-graphviz": "^1.5.4", "uuid": "^9.0.0" diff --git a/query-planner-js/CHANGELOG.md b/query-planner-js/CHANGELOG.md index 96a7122cc..5fac2ef0c 100644 --- a/query-planner-js/CHANGELOG.md +++ b/query-planner-js/CHANGELOG.md @@ -1,20 +1,12 @@ # CHANGELOG for `@apollo/query-planner` -## 2.11.5-preview.1 +## 2.11.5 ### Patch Changes -- Updated dependencies [[`3e2d1fd315db54a089fedf131cfaa27792bdd049`](https://github.com/apollographql/federation/commit/3e2d1fd315db54a089fedf131cfaa27792bdd049)]: - - @apollo/federation-internals@2.11.5-preview.1 - - @apollo/query-graphs@2.11.5-preview.1 - -## 2.11.5-preview.0 - -### Patch Changes - -- Updated dependencies [[`e1c58611c3c996b4fff98a54e49f00549ff2115d`](https://github.com/apollographql/federation/commit/e1c58611c3c996b4fff98a54e49f00549ff2115d)]: - - @apollo/federation-internals@2.11.5-preview.0 - - @apollo/query-graphs@2.11.5-preview.0 +- Updated dependencies [[`e1c58611c3c996b4fff98a54e49f00549ff2115d`](https://github.com/apollographql/federation/commit/e1c58611c3c996b4fff98a54e49f00549ff2115d), [`3e2d1fd315db54a089fedf131cfaa27792bdd049`](https://github.com/apollographql/federation/commit/3e2d1fd315db54a089fedf131cfaa27792bdd049)]: + - @apollo/federation-internals@2.11.5 + - @apollo/query-graphs@2.11.5 ## 2.11.4 diff --git a/query-planner-js/package.json b/query-planner-js/package.json index fcdf313c8..84f30dd72 100644 --- a/query-planner-js/package.json +++ b/query-planner-js/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/query-planner", - "version": "2.11.5-preview.1", + "version": "2.11.5", "description": "Apollo Query Planner", "author": "Apollo ", "main": "dist/index.js", @@ -25,8 +25,8 @@ "access": "public" }, "dependencies": { - "@apollo/federation-internals": "2.11.5-preview.1", - "@apollo/query-graphs": "2.11.5-preview.1", + "@apollo/federation-internals": "2.11.5", + "@apollo/query-graphs": "2.11.5", "@apollo/utils.keyvaluecache": "^2.1.0", "chalk": "^4.1.0", "deep-equal": "^2.0.5", diff --git a/subgraph-js/CHANGELOG.md b/subgraph-js/CHANGELOG.md index 80f8e39f9..6f53c42f6 100644 --- a/subgraph-js/CHANGELOG.md +++ b/subgraph-js/CHANGELOG.md @@ -1,18 +1,11 @@ # CHANGELOG for `@apollo/subgraph` -## 2.11.5-preview.1 +## 2.11.5 ### Patch Changes -- Updated dependencies [[`3e2d1fd315db54a089fedf131cfaa27792bdd049`](https://github.com/apollographql/federation/commit/3e2d1fd315db54a089fedf131cfaa27792bdd049)]: - - @apollo/federation-internals@2.11.5-preview.1 - -## 2.11.5-preview.0 - -### Patch Changes - -- Updated dependencies [[`e1c58611c3c996b4fff98a54e49f00549ff2115d`](https://github.com/apollographql/federation/commit/e1c58611c3c996b4fff98a54e49f00549ff2115d)]: - - @apollo/federation-internals@2.11.5-preview.0 +- Updated dependencies [[`e1c58611c3c996b4fff98a54e49f00549ff2115d`](https://github.com/apollographql/federation/commit/e1c58611c3c996b4fff98a54e49f00549ff2115d), [`3e2d1fd315db54a089fedf131cfaa27792bdd049`](https://github.com/apollographql/federation/commit/3e2d1fd315db54a089fedf131cfaa27792bdd049)]: + - @apollo/federation-internals@2.11.5 ## 2.11.4 diff --git a/subgraph-js/package.json b/subgraph-js/package.json index 829bb9aa5..7fe29ada8 100644 --- a/subgraph-js/package.json +++ b/subgraph-js/package.json @@ -1,6 +1,6 @@ { "name": "@apollo/subgraph", - "version": "2.11.5-preview.1", + "version": "2.11.5", "description": "Apollo Subgraph Utilities", "main": "dist/index.js", "types": "dist/index.d.ts", @@ -25,7 +25,7 @@ }, "dependencies": { "@apollo/cache-control-types": "^1.0.2", - "@apollo/federation-internals": "2.11.5-preview.1" + "@apollo/federation-internals": "2.11.5" }, "peerDependencies": { "graphql": "^16.5.0"