From c926637a1475216a862677f8d8957516ef208434 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 27 Nov 2023 13:35:49 -0800 Subject: [PATCH] Automated PR for router-bridge release 2.6.0 (#425) Automated changes by [create-pull-request](https://github.com/peter-evans/create-pull-request) GitHub action --------- Co-authored-by: apollo-bot2 Co-authored-by: Sachin D. Shinde Co-authored-by: Geoffroy Couprie --- federation-2/Cargo.lock | 2 +- federation-2/router-bridge/Cargo.toml | 2 +- .../js-src/supported_features.ts | 2 ++ federation-2/router-bridge/package-lock.json | 32 +++++++++---------- federation-2/router-bridge/package.json | 6 ++-- ...r_bridge__planner__tests__subgraphs-2.snap | 4 +++ ...r_bridge__planner__tests__subgraphs-3.snap | 4 +++ ...r_bridge__planner__tests__subgraphs-4.snap | 4 +++ ...r_bridge__planner__tests__subgraphs-5.snap | 4 +++ ...r_bridge__planner__tests__subgraphs-6.snap | 4 +++ ...ter_bridge__planner__tests__subgraphs.snap | 4 +++ 11 files changed, 47 insertions(+), 21 deletions(-) diff --git a/federation-2/Cargo.lock b/federation-2/Cargo.lock index 9a80b6d75..5d90bf88f 100644 --- a/federation-2/Cargo.lock +++ b/federation-2/Cargo.lock @@ -1811,7 +1811,7 @@ dependencies = [ [[package]] name = "router-bridge" -version = "0.5.8+v2.5.7" +version = "0.5.9+v2.6.0" dependencies = [ "anyhow", "async-channel", diff --git a/federation-2/router-bridge/Cargo.toml b/federation-2/router-bridge/Cargo.toml index f65ba80de..8fd7ae635 100644 --- a/federation-2/router-bridge/Cargo.toml +++ b/federation-2/router-bridge/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "router-bridge" -version = "0.5.8+v2.5.7" +version = "0.5.9+v2.6.0" authors = ["Apollo "] edition = "2018" description = "JavaScript bridge for the Apollo Router" diff --git a/federation-2/router-bridge/js-src/supported_features.ts b/federation-2/router-bridge/js-src/supported_features.ts index a74a89b4f..19dca0fbc 100644 --- a/federation-2/router-bridge/js-src/supported_features.ts +++ b/federation-2/router-bridge/js-src/supported_features.ts @@ -5,6 +5,7 @@ import { FeatureDefinitions, REQUIRES_SCOPES_VERSIONS, } from "@apollo/federation-internals"; +import { POLICY_VERSIONS } from "@apollo/federation-internals/dist/specs/policySpec"; export const ROUTER_SUPPORTED_SUPERGRAPH_FEATURES: Set = new Set( DEFAULT_SUPPORTED_SUPERGRAPH_FEATURES @@ -26,3 +27,4 @@ function addToRouterFeatures( addToRouterFeatures(AUTHENTICATED_VERSIONS); addToRouterFeatures(REQUIRES_SCOPES_VERSIONS); +addToRouterFeatures(POLICY_VERSIONS); diff --git a/federation-2/router-bridge/package-lock.json b/federation-2/router-bridge/package-lock.json index 8f12d4bf6..8ead4c669 100644 --- a/federation-2/router-bridge/package-lock.json +++ b/federation-2/router-bridge/package-lock.json @@ -1,17 +1,17 @@ { "name": "@apollo/router-bridge", - "version": "2.5.7", + "version": "2.6.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@apollo/router-bridge", - "version": "2.5.7", + "version": "2.6.0", "license": "Elastic-2.0", "dependencies": { "@apollo/core-schema": "^0.3.0", - "@apollo/federation-internals": "^2.5.7", - "@apollo/query-planner": "^2.5.7", + "@apollo/federation-internals": "^2.6.0", + "@apollo/query-planner": "^2.6.0", "@apollo/usage-reporting-protobuf": "^4.0.0", "@apollo/utils.usagereporting": "^3.0.0", "graphql": "16.6.0" @@ -47,9 +47,9 @@ } }, "node_modules/@apollo/federation-internals": { - "version": "2.5.7", - "resolved": "https://registry.npmjs.org/@apollo/federation-internals/-/federation-internals-2.5.7.tgz", - "integrity": "sha512-+c7m2c4FG4lMURZhtjFP59mm4/0zM49w6C/9uxryXriZKG3l3n5Ay12V/w9LNm7laoQkZjIBECBU39yT40mdBw==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@apollo/federation-internals/-/federation-internals-2.6.0.tgz", + "integrity": "sha512-59hmP4jlgrVIUSFQrCCxeOYahHH5q1schlJIzWWbTmYgBAbP8iZF/6MYIBJqpk1Hv+ZPI6P+tPAle8QYz4bE5Q==", "dependencies": { "@types/uuid": "^9.0.0", "chalk": "^4.1.0", @@ -88,11 +88,11 @@ } }, "node_modules/@apollo/query-graphs": { - "version": "2.5.7", - "resolved": "https://registry.npmjs.org/@apollo/query-graphs/-/query-graphs-2.5.7.tgz", - "integrity": "sha512-6kWJw4dYrk70jLEy/5fcfDaKB0vaFYe+NoLwDEZu7K3U4Y191xxNwUbjxkmQZSBwQ95beGrtOu7XWmJCnzKPlA==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@apollo/query-graphs/-/query-graphs-2.6.0.tgz", + "integrity": "sha512-IWm2g5zxqPgRPw1gs7EnYVnt/xOiyOZ1vVjM/pmrFQTZN39+hrkbLhg8E3kzx/QwqByAzowAJQ6qMqIdf1ZakQ==", "dependencies": { - "@apollo/federation-internals": "2.5.7", + "@apollo/federation-internals": "2.6.0", "deep-equal": "^2.0.5", "ts-graphviz": "^1.5.4", "uuid": "^9.0.0" @@ -105,12 +105,12 @@ } }, "node_modules/@apollo/query-planner": { - "version": "2.5.7", - "resolved": "https://registry.npmjs.org/@apollo/query-planner/-/query-planner-2.5.7.tgz", - "integrity": "sha512-WQ6UZNkd52M1OT+K1/OdfK/+8ktgj+KVr97QRm91eoydHldyG6oBuxC/1zdTKPY8wzL1ku6xNwRiAMUNe5cNZg==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@apollo/query-planner/-/query-planner-2.6.0.tgz", + "integrity": "sha512-HhVs5QTVDcx0G5TS32ej4SrnK8VGyrQ0KAVMuEzgTgG9sZ/dw22wrol4phd7a6n9u33XZymQmURQIfYU1Owh1w==", "dependencies": { - "@apollo/federation-internals": "2.5.7", - "@apollo/query-graphs": "2.5.7", + "@apollo/federation-internals": "2.6.0", + "@apollo/query-graphs": "2.6.0", "@apollo/utils.keyvaluecache": "^2.1.0", "chalk": "^4.1.0", "deep-equal": "^2.0.5", diff --git a/federation-2/router-bridge/package.json b/federation-2/router-bridge/package.json index 2f1970e17..b683d3c3a 100644 --- a/federation-2/router-bridge/package.json +++ b/federation-2/router-bridge/package.json @@ -1,7 +1,7 @@ { "name": "@apollo/router-bridge", "private": true, - "version": "2.5.7", + "version": "2.6.0", "description": "Apollo Router JS Bridge Entrypoint", "scripts": { "build": "make-dir bundled js-dist && rm -f tsconfig.tsbuildinfo && tsc --build --verbose && node esbuild/bundler.js && cp js-dist/runtime.js js-dist/do_api_schema.js js-dist/do_introspect.js js-dist/plan_worker.js js-dist/test_logger_worker.js js-dist/test_get_random_values.js bundled/", @@ -28,8 +28,8 @@ }, "dependencies": { "@apollo/core-schema": "^0.3.0", - "@apollo/federation-internals": "^2.5.7", - "@apollo/query-planner": "^2.5.7", + "@apollo/federation-internals": "^2.6.0", + "@apollo/query-planner": "^2.6.0", "@apollo/usage-reporting-protobuf": "^4.0.0", "@apollo/utils.usagereporting": "^3.0.0", "graphql": "16.6.0" diff --git a/federation-2/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-2.snap b/federation-2/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-2.snap index 61accf741..da68360f5 100644 --- a/federation-2/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-2.snap +++ b/federation-2/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-2.snap @@ -30,6 +30,8 @@ directive @federation__authenticated on FIELD_DEFINITION | OBJECT | INTERFACE | directive @federation__requiresScopes(scopes: [[federation__Scope!]!]!) on FIELD_DEFINITION | OBJECT | INTERFACE | SCALAR | ENUM +directive @federation__policy(policies: [[federation__Policy!]!]!) on FIELD_DEFINITION | OBJECT | INTERFACE | SCALAR | ENUM + directive @stream on FIELD directive @transform(from: String!) on FIELD @@ -52,6 +54,8 @@ scalar federation__FieldSet scalar federation__Scope +scalar federation__Policy + type Book implements Product { isbn: String! title: String diff --git a/federation-2/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-3.snap b/federation-2/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-3.snap index 1c02afbc2..d3612c4ea 100644 --- a/federation-2/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-3.snap +++ b/federation-2/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-3.snap @@ -30,6 +30,8 @@ directive @federation__authenticated on FIELD_DEFINITION | OBJECT | INTERFACE | directive @federation__requiresScopes(scopes: [[federation__Scope!]!]!) on FIELD_DEFINITION | OBJECT | INTERFACE | SCALAR | ENUM +directive @federation__policy(policies: [[federation__Policy!]!]!) on FIELD_DEFINITION | OBJECT | INTERFACE | SCALAR | ENUM + directive @stream on FIELD directive @transform(from: String!) on FIELD @@ -52,6 +54,8 @@ scalar federation__FieldSet scalar federation__Scope +scalar federation__Policy + union Body = Image | Text type Image implements NamedObject { diff --git a/federation-2/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-4.snap b/federation-2/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-4.snap index 169caf036..e1fa73c61 100644 --- a/federation-2/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-4.snap +++ b/federation-2/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-4.snap @@ -30,6 +30,8 @@ directive @federation__authenticated on FIELD_DEFINITION | OBJECT | INTERFACE | directive @federation__requiresScopes(scopes: [[federation__Scope!]!]!) on FIELD_DEFINITION | OBJECT | INTERFACE | SCALAR | ENUM +directive @federation__policy(policies: [[federation__Policy!]!]!) on FIELD_DEFINITION | OBJECT | INTERFACE | SCALAR | ENUM + directive @stream on FIELD directive @transform(from: String!) on FIELD @@ -52,6 +54,8 @@ scalar federation__FieldSet scalar federation__Scope +scalar federation__Policy + type Book implements Product { inStock: Boolean isCheckedOut: Boolean diff --git a/federation-2/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-5.snap b/federation-2/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-5.snap index fe627f9b9..704d9269d 100644 --- a/federation-2/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-5.snap +++ b/federation-2/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-5.snap @@ -30,6 +30,8 @@ directive @federation__authenticated on FIELD_DEFINITION | OBJECT | INTERFACE | directive @federation__requiresScopes(scopes: [[federation__Scope!]!]!) on FIELD_DEFINITION | OBJECT | INTERFACE | SCALAR | ENUM +directive @federation__policy(policies: [[federation__Policy!]!]!) on FIELD_DEFINITION | OBJECT | INTERFACE | SCALAR | ENUM + directive @stream on FIELD directive @transform(from: String!) on FIELD @@ -52,6 +54,8 @@ scalar federation__FieldSet scalar federation__Scope +scalar federation__Policy + type Amazon { referrer: String } diff --git a/federation-2/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-6.snap b/federation-2/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-6.snap index 99a561f00..2ac3c11bb 100644 --- a/federation-2/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-6.snap +++ b/federation-2/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs-6.snap @@ -30,6 +30,8 @@ directive @federation__authenticated on FIELD_DEFINITION | OBJECT | INTERFACE | directive @federation__requiresScopes(scopes: [[federation__Scope!]!]!) on FIELD_DEFINITION | OBJECT | INTERFACE | SCALAR | ENUM +directive @federation__policy(policies: [[federation__Policy!]!]!) on FIELD_DEFINITION | OBJECT | INTERFACE | SCALAR | ENUM + directive @stream on FIELD directive @transform(from: String!) on FIELD @@ -52,6 +54,8 @@ scalar federation__FieldSet scalar federation__Scope +scalar federation__Policy + type Book implements Product { reviews: [Review] relatedReviews: [Review!]! diff --git a/federation-2/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs.snap b/federation-2/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs.snap index ab6ac8a0c..8a20617e0 100644 --- a/federation-2/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs.snap +++ b/federation-2/router-bridge/src/snapshots/router_bridge__planner__tests__subgraphs.snap @@ -30,6 +30,8 @@ directive @federation__authenticated on FIELD_DEFINITION | OBJECT | INTERFACE | directive @federation__requiresScopes(scopes: [[federation__Scope!]!]!) on FIELD_DEFINITION | OBJECT | INTERFACE | SCALAR | ENUM +directive @federation__policy(policies: [[federation__Policy!]!]!) on FIELD_DEFINITION | OBJECT | INTERFACE | SCALAR | ENUM + directive @stream on FIELD directive @transform(from: String!) on FIELD @@ -52,6 +54,8 @@ scalar federation__FieldSet scalar federation__Scope +scalar federation__Policy + union AccountType = PasswordAccount | SMSAccount type Library {