From c43d982311eb8c716e83fdc193a8f0ab5a8bdd3c Mon Sep 17 00:00:00 2001 From: Coenen Benjamin Date: Mon, 13 May 2024 18:11:32 +0200 Subject: [PATCH 01/12] add a warning in router version for 1.45.0 (#5155) --- docs/source/federation-version-support.mdx | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/docs/source/federation-version-support.mdx b/docs/source/federation-version-support.mdx index 44a7c65a72..7205400590 100644 --- a/docs/source/federation-version-support.mdx +++ b/docs/source/federation-version-support.mdx @@ -43,7 +43,15 @@ The table below shows which version of federation each router release is compile - v1.45.0 + v1.45.1 + + + 2.7.2 + + + + + ⚠️ v1.45.0 2.7.2 From 145ff4101630f564eab375cfb1df4701057479e1 Mon Sep 17 00:00:00 2001 From: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com> Date: Thu, 16 May 2024 10:15:43 +0200 Subject: [PATCH 02/12] prep release: v1.47.0-rc.0 --- Cargo.lock | 6 +- apollo-router-benchmarks/Cargo.toml | 2 +- apollo-router-scaffold/Cargo.toml | 2 +- .../templates/base/Cargo.toml | 2 +- .../templates/base/xtask/Cargo.toml | 2 +- apollo-router/Cargo.toml | 2 +- .../tracing/docker-compose.datadog.yml | 2 +- dockerfiles/tracing/docker-compose.jaeger.yml | 2 +- dockerfiles/tracing/docker-compose.zipkin.yml | 2 +- helm/chart/router/Chart.yaml | 4 +- helm/chart/router/README.md | 8 +- licenses.html | 640 +++--------------- scripts/install.sh | 2 +- 13 files changed, 112 insertions(+), 564 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b8826e21ce..5cf7afc3a3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -262,7 +262,7 @@ dependencies = [ [[package]] name = "apollo-router" -version = "1.46.0" +version = "1.47.0-rc.0" dependencies = [ "access-json", "anyhow", @@ -424,7 +424,7 @@ dependencies = [ [[package]] name = "apollo-router-benchmarks" -version = "1.46.0" +version = "1.47.0-rc.0" dependencies = [ "apollo-parser", "apollo-router", @@ -440,7 +440,7 @@ dependencies = [ [[package]] name = "apollo-router-scaffold" -version = "1.46.0" +version = "1.47.0-rc.0" dependencies = [ "anyhow", "cargo-scaffold", diff --git a/apollo-router-benchmarks/Cargo.toml b/apollo-router-benchmarks/Cargo.toml index 91086440e3..d4c3d4b960 100644 --- a/apollo-router-benchmarks/Cargo.toml +++ b/apollo-router-benchmarks/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "apollo-router-benchmarks" -version = "1.46.0" +version = "1.47.0-rc.0" authors = ["Apollo Graph, Inc. "] edition = "2021" license = "Elastic-2.0" diff --git a/apollo-router-scaffold/Cargo.toml b/apollo-router-scaffold/Cargo.toml index 52b903aea1..dcec91f271 100644 --- a/apollo-router-scaffold/Cargo.toml +++ b/apollo-router-scaffold/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "apollo-router-scaffold" -version = "1.46.0" +version = "1.47.0-rc.0" authors = ["Apollo Graph, Inc. "] edition = "2021" license = "Elastic-2.0" diff --git a/apollo-router-scaffold/templates/base/Cargo.toml b/apollo-router-scaffold/templates/base/Cargo.toml index f91e353964..7481f12b09 100644 --- a/apollo-router-scaffold/templates/base/Cargo.toml +++ b/apollo-router-scaffold/templates/base/Cargo.toml @@ -22,7 +22,7 @@ apollo-router = { path ="{{integration_test}}apollo-router" } apollo-router = { git="https://github.com/apollographql/router.git", branch="{{branch}}" } {{else}} # Note if you update these dependencies then also update xtask/Cargo.toml -apollo-router = "1.46.0" +apollo-router = "1.47.0-rc.0" {{/if}} {{/if}} async-trait = "0.1.52" diff --git a/apollo-router-scaffold/templates/base/xtask/Cargo.toml b/apollo-router-scaffold/templates/base/xtask/Cargo.toml index 4b855db8a5..9372321512 100644 --- a/apollo-router-scaffold/templates/base/xtask/Cargo.toml +++ b/apollo-router-scaffold/templates/base/xtask/Cargo.toml @@ -13,7 +13,7 @@ apollo-router-scaffold = { path ="{{integration_test}}apollo-router-scaffold" } {{#if branch}} apollo-router-scaffold = { git="https://github.com/apollographql/router.git", branch="{{branch}}" } {{else}} -apollo-router-scaffold = { git = "https://github.com/apollographql/router.git", tag = "v1.46.0" } +apollo-router-scaffold = { git = "https://github.com/apollographql/router.git", tag = "v1.47.0-rc.0" } {{/if}} {{/if}} anyhow = "1.0.58" diff --git a/apollo-router/Cargo.toml b/apollo-router/Cargo.toml index 7a5c4590f9..b729e4c117 100644 --- a/apollo-router/Cargo.toml +++ b/apollo-router/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "apollo-router" -version = "1.46.0" +version = "1.47.0-rc.0" authors = ["Apollo Graph, Inc. "] repository = "https://github.com/apollographql/router/" documentation = "https://docs.rs/apollo-router" diff --git a/dockerfiles/tracing/docker-compose.datadog.yml b/dockerfiles/tracing/docker-compose.datadog.yml index 79a6692a8a..2c84e1098f 100644 --- a/dockerfiles/tracing/docker-compose.datadog.yml +++ b/dockerfiles/tracing/docker-compose.datadog.yml @@ -3,7 +3,7 @@ services: apollo-router: container_name: apollo-router - image: ghcr.io/apollographql/router:v1.46.0 + image: ghcr.io/apollographql/router:v1.47.0-rc.0 volumes: - ./supergraph.graphql:/etc/config/supergraph.graphql - ./router/datadog.router.yaml:/etc/config/configuration.yaml diff --git a/dockerfiles/tracing/docker-compose.jaeger.yml b/dockerfiles/tracing/docker-compose.jaeger.yml index 8d047807cf..37b586cd77 100644 --- a/dockerfiles/tracing/docker-compose.jaeger.yml +++ b/dockerfiles/tracing/docker-compose.jaeger.yml @@ -4,7 +4,7 @@ services: apollo-router: container_name: apollo-router #build: ./router - image: ghcr.io/apollographql/router:v1.46.0 + image: ghcr.io/apollographql/router:v1.47.0-rc.0 volumes: - ./supergraph.graphql:/etc/config/supergraph.graphql - ./router/jaeger.router.yaml:/etc/config/configuration.yaml diff --git a/dockerfiles/tracing/docker-compose.zipkin.yml b/dockerfiles/tracing/docker-compose.zipkin.yml index 0e98fb085e..209a9641b7 100644 --- a/dockerfiles/tracing/docker-compose.zipkin.yml +++ b/dockerfiles/tracing/docker-compose.zipkin.yml @@ -4,7 +4,7 @@ services: apollo-router: container_name: apollo-router build: ./router - image: ghcr.io/apollographql/router:v1.46.0 + image: ghcr.io/apollographql/router:v1.47.0-rc.0 volumes: - ./supergraph.graphql:/etc/config/supergraph.graphql - ./router/zipkin.router.yaml:/etc/config/configuration.yaml diff --git a/helm/chart/router/Chart.yaml b/helm/chart/router/Chart.yaml index 756c9b6baf..48a8f3fd36 100644 --- a/helm/chart/router/Chart.yaml +++ b/helm/chart/router/Chart.yaml @@ -20,10 +20,10 @@ type: application # so it matches the shape of our release process and release automation. # By proxy of that decision, this version uses SemVer 2.0.0, though the prefix # of "v" is not included. -version: 1.46.0 +version: 1.47.0-rc.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v1.46.0" +appVersion: "v1.47.0-rc.0" diff --git a/helm/chart/router/README.md b/helm/chart/router/README.md index 77956fb709..326c79f324 100644 --- a/helm/chart/router/README.md +++ b/helm/chart/router/README.md @@ -2,7 +2,7 @@ [router](https://github.com/apollographql/router) Rust Graph Routing runtime for Apollo Federation -![Version: 1.46.0](https://img.shields.io/badge/Version-1.46.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.46.0](https://img.shields.io/badge/AppVersion-v1.46.0-informational?style=flat-square) +![Version: 1.47.0-rc.0](https://img.shields.io/badge/Version-1.47.0--rc.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.47.0-rc.0](https://img.shields.io/badge/AppVersion-v1.47.0--rc.0-informational?style=flat-square) ## Prerequisites @@ -11,7 +11,7 @@ ## Get Repo Info ```console -helm pull oci://ghcr.io/apollographql/helm-charts/router --version 1.46.0 +helm pull oci://ghcr.io/apollographql/helm-charts/router --version 1.47.0-rc.0 ``` ## Install Chart @@ -19,7 +19,7 @@ helm pull oci://ghcr.io/apollographql/helm-charts/router --version 1.46.0 **Important:** only helm3 is supported ```console -helm upgrade --install [RELEASE_NAME] oci://ghcr.io/apollographql/helm-charts/router --version 1.46.0 --values my-values.yaml +helm upgrade --install [RELEASE_NAME] oci://ghcr.io/apollographql/helm-charts/router --version 1.47.0-rc.0 --values my-values.yaml ``` _See [configuration](#configuration) below._ @@ -94,5 +94,3 @@ helm show values oci://ghcr.io/apollographql/helm-charts/router | topologySpreadConstraints | list | `[]` | Sets the [topology spread constraints](https://kubernetes.io/docs/concepts/scheduling-eviction/topology-spread-constraints/) for Deployment pods | | virtualservice.enabled | bool | `false` | | ----------------------------------------------- -Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1) diff --git a/licenses.html b/licenses.html index 79f5e66beb..240a1e91de 100644 --- a/licenses.html +++ b/licenses.html @@ -44,8 +44,8 @@

Third Party Licenses

Overview of licenses:

                                 Apache License
                            Version 2.0, January 2004
@@ -5294,7 +5292,6 @@ 
Used by:

                     
  • utf-8
    • 
                     
  • utf8parse
    • 
                     
  • wasm-streams
    • 
-                    
  • zerocopy
    • 
                 
                 
                                  Apache License
                         Version 2.0, January 2004
@@ -8226,7 +8223,6 @@ 
    Used by:
    
                     
  • bytes-utils
    • 
                     
  • cc
    • 
                     
  • cfg-if
    • 
-                    
  • ci_info
    • 
                     
  • cmake
    • 
                     
  • concurrent-queue
    • 
                     
  • const-random
    • 
@@ -8240,9 +8236,7 @@ 
    Used by:
    
                     
  • derivative
    • 
                     
  • derive_arbitrary
    • 
                     
  • either
    • 
-                    
  • envmnt
    • 
                     
  • equivalent
    • 
-                    
  • errno
    • 
                     
  • event-listener
    • 
                     
  • fastrand
    • 
                     
  • fastrand
    • 
@@ -8252,7 +8246,6 @@ 
    Used by:
    
                     
  • fnv
    • 
                     
  • form_urlencoded
    • 
                     
  • fraction
    • 
-                    
  • fsio
    • 
                     
  • futures-lite
    • 
                     
  • gimli
    • 
                     
  • git2
    • 
@@ -8294,6 +8287,7 @@ 
    Used by:
    
                     
  • mockall_derive
    • 
                     
  • multimap
    • 
                     
  • multimap
    • 
+                    
  • multimap
    • 
                     
  • num
    • 
                     
  • num-bigint
    • 
                     
  • num-bigint-dig
    • 
@@ -11506,54 +11500,6 @@ 
    Used by:
    
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-
    
-            
-            
  • 
-                
    Apache License 2.0
    
-                
    Used by:
    
-                
-                
    # Contributing
-
-## License
-
-Licensed under either of
-
- * Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
- * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
-
-at your option.
-
-### Contribution
-
-Unless you explicitly state otherwise, any contribution intentionally submitted
-for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any
-additional terms or conditions.
-
    
-            
    • 
-            
  • 
-                
    Apache License 2.0
    
-                
    Used by:
    
-                
-                
    ../../LICENSE-APACHE
    
-            
    • 
-            
  • 
-                
    Apache License 2.0
    
-                
    Used by:
    
-                
-                
    // Licensed under the Apache License, Version 2.0
-// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your option.
-// All files in the project carrying such notice may not be copied, modified, or distributed
-// except according to those terms.
 
    
             
    • 
             
  • 
@@ -12190,11 +12136,18 @@ 
    Used by:
    
                 
    Apache License 2.0
    
                 
    Used by:
    • - -
  • -

    Apache License 2.0

    -

    Used by:

    - - 
    Copyright 2023 The allocator-api2 project developers
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
    -
    • -
  • -

    Apache License 2.0

    -

    Used by:

    - - 
    Copyright [2022] [Bryn Cooke]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
    -
    • -
  • -

    Apache License 2.0

    -

    Used by:

    - - 
    Copyright [2023] [Bryn Cooke]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
    -
    • -
  • -

    Apache License 2.0

    -

    Used by:

    - - 
    Licensed under the Apache License, Version 2.0
-<LICENSE-APACHE or
-http://www.apache.org/licenses/LICENSE-2.0> or the MIT
-license <LICENSE-MIT or http://opensource.org/licenses/MIT>,
-at your option. All files in the project carrying such
-notice may not be copied, modified, or distributed except
-according to those terms.
-
    -
    • -
  • -

    Apache License 2.0

    -

    Used by:

    - - 
    MIT OR Apache-2.0
    -
    • -
  • -

    Apache License 2.0

    -

    Used by:

    - - 
    MIT OR Apache-2.0
-
    -
    • -
  • -

    Apache License 2.0

    -

    Used by:

    - - 
    MIT or Apache-2.0
-
    -
    • -
  • -

    Apache License 2.0

    -

    Used by:

    - - 
    The Apache License, Version 2.0 (Apache-2.0)
-
-Copyright 2015-2020 the fiat-crypto authors (see the AUTHORS file)
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -12607,151 +12431,6 @@ 
    Used by:
    
 LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
    -
    • -
  • -

    BSD 3-Clause "New" or "Revised" License

    -

    Used by:

    - - 
    Copyright (c) 2016-2019 Isis Agora Lovecruft, Henry de Valence. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-========================================================================
-
-Portions of curve25519-dalek were originally derived from Adam Langley's
-Go ed25519 implementation, found at <https://github.com/agl/ed25519/>,
-under the following licence:
-
-========================================================================
-
-Copyright (c) 2012 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
    -
    • -
  • -

    BSD 3-Clause "New" or "Revised" License

    -

    Used by:

    - - 
    Copyright (c) 2016-2021 isis agora lovecruft. All rights reserved.
-Copyright (c) 2016-2021 Henry de Valence. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-1. Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
-
-========================================================================
-
-Portions of curve25519-dalek were originally derived from Adam Langley's
-Go ed25519 implementation, found at <https://github.com/agl/ed25519/>,
-under the following licence:
-
-========================================================================
-
-Copyright (c) 2012 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  • @@ -12831,6 +12510,8 @@

    BSD 3-Clause "New" or "Revised" Licens

    Used by:

    Copyright (c) <year> <owner>. 
 
@@ -13265,11 +12946,15 @@ 
    Used by:
    
                 
    Elastic License 2.0
    
                 
    Used by:
    
                 
-                
    Elastic License 2.0
+                
    Copyright 2021 Apollo Graph, Inc.
+
+Source code in this repository is covered by (i) the Elastic License 2.0 or (ii) an MIT compatible license, in each case, as designated by a licensing file in a subdirectory or file header. The default throughout the repository is a license under the Elastic License 2.0, unless a file header or a licensing file in a subdirectory specifies another license.
 
-URL: https://www.elastic.co/licensing/elastic-license
+--------------------------------------------------------------------------------
+
+Elastic License 2.0
 
 ## Acceptance
 
@@ -13360,7 +13045,8 @@ 
    Used by:
    
 **use** means anything you do with the software requiring one of your licenses.
 
 **trademark** means trademarks, service marks, and similar rights.
-
    
+
+--------------------------------------------------------------------------------

  • ISC License

    @@ -13425,6 +13111,36 @@

    Used by:

    // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +
    • +
  • +

    ISC License

    +

    Used by:

    + + 
    // Copyright 2021 Brian Smith.
+//
+// Permission to use, copy, modify, and/or distribute this software for any
+// purpose with or without fee is hereby granted, provided that the above
+// copyright notice and this permission notice appear in all copies.
+//
+// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES
+// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
+// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+#[test]
+fn cert_without_extensions_test() {
+    // Check the certificate is valid with
+    // `openssl x509 -in cert_without_extensions.der -inform DER -text -noout`
+    const CERT_WITHOUT_EXTENSIONS_DER: &[u8] = include_bytes!("cert_without_extensions.der");
+
+    assert!(webpki::EndEntityCert::try_from(CERT_WITHOUT_EXTENSIONS_DER).is_ok());
+}
  • @@ -13494,7 +13210,6 @@

    ISC License

    Used by:

    ISC License:
 
@@ -14245,66 +13960,6 @@ 
    Used by:
    
 shall be included in all copies or substantial portions
 of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
    -
    • -
  • -

    MIT License

    -

    Used by:

    - - 
    Copyright (c) 2019 Carl Lerche
-
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
-Copyright (c) 2018 David Tolnay
-
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
 ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
 TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
@@ -14612,61 +14267,6 @@ 
    Used by:
    
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
 IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
-
    -
    • -
  • -

    MIT License

    -

    Used by:

    - - 
    Copyright (c) 2023 Tokio Contributors
-
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
-The MIT License (MIT)
-
-Copyright (c) 2019 Yoshua Wuyts
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
  • @@ -15214,6 +14814,8 @@

    Used by:

    MIT License

    Used by:

      +
    • async-stream
      • +
    • async-stream-impl
    • base64-simd
    • convert_case
    • crunchy
      • @@ -15229,6 +14831,7 @@

      Used by:

    • lazy-regex-proc_macros
    • number_prefix
    • serde_v8
      • +
    • tokio-macros
    • v8
    • valuable
    • void
      • @@ -15492,42 +15095,12 @@

      Used by:

      LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -
    • -

      MIT License

      -

      Used by:

      - - 
      The MIT License (MIT)
-
-Copyright (c) 2014 Mathijs van de Nes
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-

    • MIT License

      Used by:

      The MIT License (MIT)
 
@@ -16079,25 +15652,6 @@ 
      Used by:
      
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
-
      -
      • -
    • -

      MIT License

      -

      Used by:

      - - 
      This project is dual-licensed under the Unlicense and MIT licenses.
-
-You may use this code under the terms of either license.
    • @@ -16496,6 +16050,7 @@

      Mozilla Public License 2.0

      Used by:

      Mozilla Public License Version 2.0
 ==================================
@@ -16870,35 +16425,6 @@ 
      Used by:
      
 
   This Source Code Form is "Incompatible With Secondary Licenses", as
   defined by the Mozilla Public License, v. 2.0.
-
      -
      • -
    • -

      Mozilla Public License 2.0

      -

      Used by:

      - - 
      This packge contains a modified version of ca-bundle.crt:
-
-ca-bundle.crt -- Bundle of CA Root Certificates
-
-Certificate data from Mozilla as of: Thu Nov  3 19:04:19 2011#
-This is a bundle of X.509 certificates of public Certificate Authorities
-(CA). These were automatically extracted from Mozilla's root certificates
-file (certdata.txt).  This file can be found in the mozilla source tree:
-http://mxr.mozilla.org/mozilla/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1#
-It contains the certificates in PEM format and therefore
-can be directly used with curl / libcurl / php_curl, or with
-an Apache+mod_ssl webserver for SSL client authentication.
-Just configure this file as the SSLCACertificateFile.#
-
-***** BEGIN LICENSE BLOCK *****
-This Source Code Form is subject to the terms of the Mozilla Public License,
-v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain
-one at http://mozilla.org/MPL/2.0/.
-
-***** END LICENSE BLOCK *****
-@(#) $RCSfile: certdata.txt,v $ $Revision: 1.80 $ $Date: 2011/11/03 15:11:58 $
    • @@ -16970,26 +16496,50 @@

      Used by:

    UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
 
-Unicode Data Files include all data files under the directories http://www.unicode.org/Public/, http://www.unicode.org/reports/, http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/, and http://www.unicode.org/utility/trac/browser/.
-
-Unicode Data Files do not include PDF online code charts under the directory http://www.unicode.org/Public/.
+See Terms of Use <https://www.unicode.org/copyright.html>
+for definitions of Unicode Inc.’s Data Files and Software.
 
-Software includes any source code published in the Unicode Standard or under the directories http://www.unicode.org/Public/, http://www.unicode.org/reports/, http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/, and http://www.unicode.org/utility/trac/browser/.
-
-NOTICE TO USER: Carefully read the following legal agreement. BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"), YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE.
+NOTICE TO USER: Carefully read the following legal agreement.
+BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S
+DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"),
+YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
+TERMS AND CONDITIONS OF THIS AGREEMENT.
+IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE
+THE DATA FILES OR SOFTWARE.
 
 COPYRIGHT AND PERMISSION NOTICE
 
-Copyright © 1991-2016 Unicode, Inc. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any associated documentation (the "Data Files") or Unicode software and any associated documentation (the "Software") to deal in the Data Files or Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom the Data Files or Software are furnished to do so, provided that either
+Copyright © 1991-2022 Unicode, Inc. All rights reserved.
+Distributed under the Terms of Use in https://www.unicode.org/copyright.html.
 
-     (a) this copyright and permission notice appear with all copies of the Data Files or Software, or
-     (b) this copyright and permission notice appear in associated Documentation.
-
-THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE.
-
-Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Unicode data files and any associated documentation
+(the "Data Files") or Unicode software and any associated documentation
+(the "Software") to deal in the Data Files or Software
+without restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, and/or sell copies of
+the Data Files or Software, and to permit persons to whom the Data Files
+or Software are furnished to do so, provided that either
+(a) this copyright and permission notice appear with all copies
+of the Data Files or Software, or
+(b) this copyright and permission notice appear in associated
+Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT OF THIRD PARTY RIGHTS.
+IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder
+shall not be used in advertising or otherwise to promote the sale,
+use or other dealings in these Data Files or Software without prior
+written authorization of the copyright holder.
    • diff --git a/scripts/install.sh b/scripts/install.sh index dad2182d10..67eb29bb33 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -11,7 +11,7 @@ BINARY_DOWNLOAD_PREFIX="https://github.com/apollographql/router/releases/downloa # Router version defined in apollo-router's Cargo.toml # Note: Change this line manually during the release steps. -PACKAGE_VERSION="v1.46.0" +PACKAGE_VERSION="v1.47.0-rc.0" download_binary() { downloader --check From 82a1234d8ad3a99da8eee1fb8e72d8a68b159361 Mon Sep 17 00:00:00 2001 From: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com> Date: Thu, 16 May 2024 11:40:50 +0200 Subject: [PATCH 03/12] upgrade apollo-federation Signed-off-by: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com> --- Cargo.lock | 2 +- apollo-federation/Cargo.toml | 2 +- apollo-router/Cargo.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5cf7afc3a3..0ade345c48 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -220,7 +220,7 @@ dependencies = [ [[package]] name = "apollo-federation" -version = "0.0.11" +version = "1.46.0-rc.0" dependencies = [ "apollo-compiler", "derive_more", diff --git a/apollo-federation/Cargo.toml b/apollo-federation/Cargo.toml index 02b48dbfcd..75437d232e 100644 --- a/apollo-federation/Cargo.toml +++ b/apollo-federation/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "apollo-federation" -version = "0.0.11" +version = "1.46.0-rc.0" authors = ["The Apollo GraphQL Contributors"] edition = "2021" description = "Apollo Federation" diff --git a/apollo-router/Cargo.toml b/apollo-router/Cargo.toml index b729e4c117..0eac5098f9 100644 --- a/apollo-router/Cargo.toml +++ b/apollo-router/Cargo.toml @@ -68,7 +68,7 @@ askama = "0.12.1" access-json = "0.1.0" anyhow = "1.0.80" apollo-compiler.workspace = true -apollo-federation = { path = "../apollo-federation", version = "=0.0.11" } +apollo-federation = { path = "../apollo-federation", version = "=1.46.0-rc.0" } arc-swap = "1.6.0" async-channel = "1.9.0" async-compression = { version = "0.4.6", features = [ From 302a73c0e1521cfe4a90e84f0ac7d2a4eadb8ef8 Mon Sep 17 00:00:00 2001 From: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com> Date: Thu, 16 May 2024 11:43:33 +0200 Subject: [PATCH 04/12] upgrade apollo-federation Signed-off-by: Benjamin Coenen <5719034+bnjjj@users.noreply.github.com> --- Cargo.lock | 2 +- apollo-federation/Cargo.toml | 2 +- apollo-router/Cargo.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0ade345c48..374ff4dde1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -220,7 +220,7 @@ dependencies = [ [[package]] name = "apollo-federation" -version = "1.46.0-rc.0" +version = "1.47.0-rc.0" dependencies = [ "apollo-compiler", "derive_more", diff --git a/apollo-federation/Cargo.toml b/apollo-federation/Cargo.toml index 75437d232e..8cadb8b527 100644 --- a/apollo-federation/Cargo.toml +++ b/apollo-federation/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "apollo-federation" -version = "1.46.0-rc.0" +version = "1.47.0-rc.0" authors = ["The Apollo GraphQL Contributors"] edition = "2021" description = "Apollo Federation" diff --git a/apollo-router/Cargo.toml b/apollo-router/Cargo.toml index 0eac5098f9..12af530d70 100644 --- a/apollo-router/Cargo.toml +++ b/apollo-router/Cargo.toml @@ -68,7 +68,7 @@ askama = "0.12.1" access-json = "0.1.0" anyhow = "1.0.80" apollo-compiler.workspace = true -apollo-federation = { path = "../apollo-federation", version = "=1.46.0-rc.0" } +apollo-federation = { path = "../apollo-federation", version = "=1.47.0-rc.0" } arc-swap = "1.6.0" async-channel = "1.9.0" async-compression = { version = "0.4.6", features = [ From 52bbe1ad54a79904bdafc812dfe130290498eb83 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Thu, 16 May 2024 22:31:09 +0300 Subject: [PATCH 05/12] Remove v1.46.0 changelog hold-overs I have a theory for the Federation version bump changeset (it was renamed), but I'm not sure why these existed in this PR. --- .changesets/fix_tninesling_undo_auth_changes.md | 5 ----- .../maint_garypen_router_258_update_router_bridge.md | 7 ------- 2 files changed, 12 deletions(-) delete mode 100644 .changesets/fix_tninesling_undo_auth_changes.md delete mode 100644 .changesets/maint_garypen_router_258_update_router_bridge.md diff --git a/.changesets/fix_tninesling_undo_auth_changes.md b/.changesets/fix_tninesling_undo_auth_changes.md deleted file mode 100644 index df02b9a084..0000000000 --- a/.changesets/fix_tninesling_undo_auth_changes.md +++ /dev/null @@ -1,5 +0,0 @@ -### Use supergraph schema to extract auth info ([PR #5047](https://github.com/apollographql/router/pull/5047)) - -Use supergraph schema to extract auth info as auth information may not be available on the query planner's subgraph schemas. This undoes the auth changes made in #4975. - -By [@tninesling](https://github.com/tninesling) in https://github.com/apollographql/router/pull/5047 diff --git a/.changesets/maint_garypen_router_258_update_router_bridge.md b/.changesets/maint_garypen_router_258_update_router_bridge.md deleted file mode 100644 index 7c0d083f04..0000000000 --- a/.changesets/maint_garypen_router_258_update_router_bridge.md +++ /dev/null @@ -1,7 +0,0 @@ -### Update the version of the router-bridge ([PR #5064](https://github.com/apollographql/router/pull/5064)) - -Update our router-bridge version to pull in fixes. - -The router is now using: router-bridge = "=0.5.21+v2.7.5" - -By [@garypen](https://github.com/garypen) in https://github.com/apollographql/router/pull/5064 \ No newline at end of file From bae37fa274df906d95637999b5090fad25c79556 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 20 May 2024 09:54:47 +0300 Subject: [PATCH 06/12] Apply changeset suggestions from editorial review Co-authored-by: Bryn Cooke Co-authored-by: Edward Huang --- .changesets/fix_bryn_json_schema.md | 6 ++++-- .../fix_garypen_router_274_preserve_batch_contexts.md | 2 +- .changesets/fix_geal_input_enum_validation.md | 2 +- ...ip_dashes_from_trace_id_in_customtraceidpropagator.md | 9 +++++++-- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.changesets/fix_bryn_json_schema.md b/.changesets/fix_bryn_json_schema.md index efe8b62ff2..013b43b1fa 100644 --- a/.changesets/fix_bryn_json_schema.md +++ b/.changesets/fix_bryn_json_schema.md @@ -1,6 +1,8 @@ -### Make json schema small ([PR #5061](https://github.com/apollographql/router/pull/5061)) +### Reduce JSON schema size and Router memory footprint ([PR #5061](https://github.com/apollographql/router/pull/5061)) -The json schema for the router.yaml is reduced in size from approx 100k lines to just over 7k. +As we add more features to the Router the size of the JSON schema for the router configuration file continutes to grow. In particular, adding [conditionals to telemetry](https://github.com/apollographql/router/pull/4987) in v1.46.0 significantly increased this size of the schema. This has a noticeable impact on initial memory footprint, although it does not impact service of requests. + +The JSON schema for the router configuration file has been optimized from approximately 100k lines down to just over 7k. This reduces the startup time of the Router and a smaller schema is more friendly for code editors. diff --git a/.changesets/fix_garypen_router_274_preserve_batch_contexts.md b/.changesets/fix_garypen_router_274_preserve_batch_contexts.md index c48c669e72..ed74cd3ddd 100644 --- a/.changesets/fix_garypen_router_274_preserve_batch_contexts.md +++ b/.changesets/fix_garypen_router_274_preserve_batch_contexts.md @@ -1,6 +1,6 @@ ### Ensure that batch entry contexts are correctly preserved ([PR #5162](https://github.com/apollographql/router/pull/5162)) -Batch processing was not using contexts correctly. A representative context was chosen, the first item in a batch of items, and used to provide context functionality for all the generated responses. +Previously, the router didn't use contexts correctly when processing batches. A representative context was chosen (the first item in a batch of items) and used to provide context functionality for all the generated responses. The router now correctly preserves request contexts and uses them during response creation. diff --git a/.changesets/fix_geal_input_enum_validation.md b/.changesets/fix_geal_input_enum_validation.md index ebaf0beba1..d44ed2f2ee 100644 --- a/.changesets/fix_geal_input_enum_validation.md +++ b/.changesets/fix_geal_input_enum_validation.md @@ -1,5 +1,5 @@ ### Validate enum values in input variables ([Issue #4633](https://github.com/apollographql/router/issues/4633)) -The Router will now validate enum values provided in JSON variables. +The router now validates enum values provided in JSON variables. Invalid enum values result in `GRAPHQL_VALIDATION_FAILED` errors. By [@Geal](https://github.com/Geal) in https://github.com/apollographql/router/pull/4753 \ No newline at end of file diff --git a/.changesets/fix_strip_dashes_from_trace_id_in_customtraceidpropagator.md b/.changesets/fix_strip_dashes_from_trace_id_in_customtraceidpropagator.md index 06177234f5..d238999772 100644 --- a/.changesets/fix_strip_dashes_from_trace_id_in_customtraceidpropagator.md +++ b/.changesets/fix_strip_dashes_from_trace_id_in_customtraceidpropagator.md @@ -1,8 +1,13 @@ ### Strip dashes from trace_id in CustomTraceIdPropagator ([Issue #4892](https://github.com/apollographql/router/issues/4892)) -Trace ID in opentelemetry is represented as a 128 bit number. This is usually represented as a hex string without dashes and is based on w3c trace id format. -If for example, raw trace id from headers are represented by uuid4 and contains dashes, those dashes should be stripped so the raw trace id value can be parsed into a valid `trace_id`. +The router now strips dashes from trace IDs to ensure conformance with OpenTelemetry. + +In OpenTelemetry, trace IDs are 128-bit values represented as hex strings without dashes, and they're based on W3C's trace ID format. + +This has been applied within the router to `trace_id` in `CustomTraceIdPropagator`. + +Note, if raw trace IDs from headers are represented by uuid4 and contain dashes, the dashes should be stripped so that the raw trace ID value can be parsed into a valid `trace_id`. By [@kindermax](https://github.com/kindermax) in https://github.com/apollographql/router/pull/5071 \ No newline at end of file From f5721a92cbe4caf356c014bf217689246df8b6a7 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 20 May 2024 09:55:21 +0300 Subject: [PATCH 07/12] Apply changeset suggestions from editorial review Co-authored-by: Edward Huang --- .changesets/fix_bryn_internal_server_error.md | 6 +++--- .changesets/fix_geal_cache_key_qp_options.md | 15 ++++++++------- ...es_from_trace_id_in_customtraceidpropagator.md | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.changesets/fix_bryn_internal_server_error.md b/.changesets/fix_bryn_internal_server_error.md index cdd7ddcba1..17376de94e 100644 --- a/.changesets/fix_bryn_internal_server_error.md +++ b/.changesets/fix_bryn_internal_server_error.md @@ -1,6 +1,6 @@ -### 5xx Internal server error responses are structured errors ([PR #5159](https://github.com/apollographql/router/pull/5159)) +### 5xx internal server error responses returned as GraphQL structured errors ([PR #5159](https://github.com/apollographql/router/pull/5159)) -An internal server error (5xx class) which occurs as a result of an unexpected/unrecoverable disruption to the GraphQL request lifecycle execution (e.g., a coprocessor failure, etc.) will now result in a structured GraphQL error (i.e., `{"errors": [...]}`) being returned to the client rather than a plain-text error as was the case previously. +Previously, the router returned internal server errors (5xx class) as plaintext to clients. Now in this release, the router returns these 5xx errors as structured GraphQL (for example, `{"errors": [...]}`). -When these circumstances occur, the underling error message — which may be any number of internal disruptions — will still be logged at an `ERROR` level to the router logs for the administrator of the router to monitor and use for debugging purposes. +Internal server errors are returned upon unexpected or unrecoverable disruptions to the GraphQL request lifecycle execution. When these occur, the underlying error messages are logged at an `ERROR` level to the router's logs. By [@BrynCooke](https://github.com/BrynCooke) in https://github.com/apollographql/router/pull/5159 diff --git a/.changesets/fix_geal_cache_key_qp_options.md b/.changesets/fix_geal_cache_key_qp_options.md index 3a973f9d14..a27f45cd2b 100644 --- a/.changesets/fix_geal_cache_key_qp_options.md +++ b/.changesets/fix_geal_cache_key_qp_options.md @@ -1,23 +1,24 @@ ### Prevent query plan cache collision when planning options change ([Issue #5093](https://github.com/apollographql/router/issues/5093)) +The router's hashing algorithm has been updated to prevent cache collisions when the router's configuration changes. + > [!IMPORTANT] > If you have enabled [Distributed query plan caching](https://www.apollographql.com/docs/router/configuration/distributed-caching/#distributed-query-plan-caching), this release changes the hashing algorithm used for the cache keys. On account of this, you should anticipate additional cache regeneration cost when updating between these versions while the new hashing algorithm comes into service. -When query planning takes place there are a number of options such as: +The router supports multiple options that affect the generated query plans, including: * `defer_support` * `generate_query_fragments` * `experimental_reuse_query_fragments` * `experimental_type_conditioned_fetching` * `experimental_query_planner_mode` -that will affect the generated query plans. +If distributed query plan caching is enabled, changing any of these options results in different query plans being generated and cached. -If distributed query plan caching is also enabled, then changing any of these will result in different query plans being generated and entering the cache. +This could be problematic in the following scenarios: -This could cause issue in the following scenarios: -1. The Router configuration changes and a query plan is loaded from cache which is incompatible with the new configuration. -2. Routers with differing configuration are sharing the same cache causing them to cache and load incompatible query plans. +1. The router configuration changes and a query plan is loaded from cache which is incompatible with the new configuration. +2. Routers with different configurations share the same cache, which causes them to cache and load incompatible query plans. -Now a hash for the entire query planner configuration is included in the cache key to prevent this from happening. +To prevent these from happening, the router now creates a hash for the entire query planner configuration and includes it in the cache key. By [@Geal](https://github.com/Geal) in https://github.com/apollographql/router/pull/5100 diff --git a/.changesets/fix_strip_dashes_from_trace_id_in_customtraceidpropagator.md b/.changesets/fix_strip_dashes_from_trace_id_in_customtraceidpropagator.md index d238999772..23c3cd8d81 100644 --- a/.changesets/fix_strip_dashes_from_trace_id_in_customtraceidpropagator.md +++ b/.changesets/fix_strip_dashes_from_trace_id_in_customtraceidpropagator.md @@ -1,4 +1,4 @@ -### Strip dashes from trace_id in CustomTraceIdPropagator ([Issue #4892](https://github.com/apollographql/router/issues/4892)) +### Strip dashes from `trace_id` in `CustomTraceIdPropagator` ([Issue #4892](https://github.com/apollographql/router/issues/4892)) The router now strips dashes from trace IDs to ensure conformance with OpenTelemetry. From 6e10fa0b409d8b9f9f9ac3c3b82607d614174d20 Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 20 May 2024 09:55:52 +0300 Subject: [PATCH 08/12] Apply changeset suggestions from editorial review Co-authored-by: Edward Huang --- .changesets/feat_bnjjj_feat_chunk_resp_selector.md | 9 +++++---- .changesets/feat_bnjjj_fix_5042.md | 10 ++++++---- .changesets/feat_geal_open_busy_timer.md | 11 ++++++++--- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/.changesets/feat_bnjjj_feat_chunk_resp_selector.md b/.changesets/feat_bnjjj_feat_chunk_resp_selector.md index b0fbb3e87c..5416bc49d5 100644 --- a/.changesets/feat_bnjjj_feat_chunk_resp_selector.md +++ b/.changesets/feat_bnjjj_feat_chunk_resp_selector.md @@ -1,8 +1,9 @@ -### Add support of event responses and critical errors for selectors and instrument in telemetry ([Issue #5027](https://github.com/apollographql/router/issues/5027)) +### Support telemetry selectors with errors ([Issue #5027](https://github.com/apollographql/router/issues/5027)) -Giving the ability to compute new attributes everytime we receive a new event in supergraph response. Would be really helpful to create observability for subscriptions and defer. +The router now supports telemetry selectors that take into account the occurrence of errors. This capability enables you to create metrics, events, or span attributes that contain error messages. -I also added the support of `on_error` for selectors and especially `error` selector I added for every services. Which will let you create some metrics,events or span attributes containing error message. By adding this we will now have to ability to create a counter of request timed out for subgraphs for example: +For example, you can create a counter for the number of timed-out requests for subgraphs: + ```yaml telemetry: @@ -22,7 +23,7 @@ telemetry: - error: reason ``` -And thanks to the event support for selectors you'll be able to fetch data directly from the supergraph response body: +The router also can now compute new attributes upon receiving a new event in a supergraph response. With this capability, you can fetch data directly from the supergraph response body: ```yaml telemetry: diff --git a/.changesets/feat_bnjjj_fix_5042.md b/.changesets/feat_bnjjj_fix_5042.md index 88de555577..0572cbe0dd 100644 --- a/.changesets/feat_bnjjj_fix_5042.md +++ b/.changesets/feat_bnjjj_fix_5042.md @@ -1,8 +1,10 @@ -### Add support for response status_code to rhai ([Issue #5042](https://github.com/apollographql/router/issues/5042)) +### Add support for `status_code` response to Rhai ([Issue #5042](https://github.com/apollographql/router/issues/5042)) -Added support for `response.status_code` on `Response` interface in rhai. +The router now supports `response.status_code` on the `Response` interface in Rhai. -Convert response status code to a string. +Examples using the response status code: + +- Converting a response status code to a string: ```rhai if response.status_code.to_string() == "200" { @@ -10,7 +12,7 @@ if response.status_code.to_string() == "200" { } ``` -Also useful if you want to convert response status code to a number +- Converting a response status code to a number: ```rhai if parse_int(response.status_code.to_string()) == 200 { diff --git a/.changesets/feat_geal_open_busy_timer.md b/.changesets/feat_geal_open_busy_timer.md index 30d052bc45..aa36f10759 100644 --- a/.changesets/feat_geal_open_busy_timer.md +++ b/.changesets/feat_geal_open_busy_timer.md @@ -1,6 +1,11 @@ -### Make the busy timer public ([PR #4989](https://github.com/apollographql/router/pull/4989)) +### Expose busy timer APIs ([PR #4989](https://github.com/apollographql/router/pull/4989)) -the busy timer is used to measure the time spent working on a request outside of waiting for external calls like coprocessors and subgraph calls. It still includes the time spent waiting for other concurrent requests to be handled (wait time in the executor) to show the actual router overhead in the request handling. -This makes the busy timer API public to let native plugins use it when they do their own network calls. The affected methods are `Context::enter_active_request` and `Context::busy_time`. +The router supports public APIs that native plugins can use to control when the router's busy timer is run. + +The router's busy timer measures the time spent working on a request outside of waiting for external calls, like coprocessors and subgraph calls. It includes the time spent waiting for other concurrent requests to be handled (the wait time in the executor) to show the actual router overhead when handling requests. + +The public methods are `Context::enter_active_request` and `Context::busy_time`. The result is reported in the `apollo_router_processing_time` metric + +For details on using the APIs, see the documentation for [`enter_active_request`](https://www.apollographql.com/docs/router/customizations/native#enter_active_request). By [@Geal](https://github.com/Geal) in https://github.com/apollographql/router/pull/4989 \ No newline at end of file From 50f1f10b377b1c2dbb32d1836846ebb7a846b7fe Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 20 May 2024 09:56:05 +0300 Subject: [PATCH 09/12] Apply changeset suggestions from editorial review --- ...at_tninesling_telemetry_range_operators.md | 25 ------------------- 1 file changed, 25 deletions(-) diff --git a/.changesets/feat_tninesling_telemetry_range_operators.md b/.changesets/feat_tninesling_telemetry_range_operators.md index a201a65913..c91bcb7d71 100644 --- a/.changesets/feat_tninesling_telemetry_range_operators.md +++ b/.changesets/feat_tninesling_telemetry_range_operators.md @@ -2,29 +2,4 @@ Adds greater than and less than operators for telemetry conditions called `gt` and `lt`, respectively. The configuration for both takes two arguments as a list, similar to `eq`. The `gt` operator checks that the first argument is greater than the second, and, similarly, the `lt` operator checks that the first argument is less than the second.. Other conditions such as `gte`, `lte`, and `range` can all be made from combinations of `gt`, `lt`, `eq`, and `all`. - ---- - -**Checklist** - -Complete the checklist (and note appropriate exceptions) before the PR is marked ready-for-review. - -- [X] Changes are compatible[^1] -- [ ] Documentation[^2] completed -- [ ] Performance impact assessed and acceptable -- Tests added and passing[^3] - - [X] Unit Tests - - [ ] Integration Tests - - [ ] Manual Tests - -**Exceptions** - -*Note any exceptions here* - -**Notes** - -[^1]: It may be appropriate to bring upcoming changes to the attention of other (impacted) groups. Please endeavour to do this before seeking PR approval. The mechanism for doing this will vary considerably, so use your judgement as to how and when to do this. -[^2]: Configuration is an important part of many changes. Where applicable please try to document configuration examples. -[^3]: Tick whichever testing boxes are applicable. If you are adding Manual Tests, please document the manual testing (extensively) in the Exceptions. - By [@tninesling](https://github.com/tninesling) in https://github.com/apollographql/router/pull/5048 From ab7e4afd25cff0b0c04baee09e65e02b7fdba8df Mon Sep 17 00:00:00 2001 From: Jesse Rosenberger Date: Mon, 20 May 2024 09:56:24 +0300 Subject: [PATCH 10/12] Apply changeset suggestions from editorial review Co-authored-by: Edward Huang --- .changesets/feat_tninesling_telemetry_range_operators.md | 2 +- .changesets/fix_bnjjj_fix_custom_events_off.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.changesets/feat_tninesling_telemetry_range_operators.md b/.changesets/feat_tninesling_telemetry_range_operators.md index c91bcb7d71..ac6b1fc617 100644 --- a/.changesets/feat_tninesling_telemetry_range_operators.md +++ b/.changesets/feat_tninesling_telemetry_range_operators.md @@ -1,5 +1,5 @@ ### Add gt and lt operators for telemetry conditions ([PR #5048](https://github.com/apollographql/router/pull/5048)) -Adds greater than and less than operators for telemetry conditions called `gt` and `lt`, respectively. The configuration for both takes two arguments as a list, similar to `eq`. The `gt` operator checks that the first argument is greater than the second, and, similarly, the `lt` operator checks that the first argument is less than the second.. Other conditions such as `gte`, `lte`, and `range` can all be made from combinations of `gt`, `lt`, `eq`, and `all`. +The router supports greater than (`gt`) and less than (`lt`) operators for telemetry conditions. Similar to the `eq` operator, the configuration for both `gt` and `lt` takes two arguments as a list. The `gt` operator checks that the first argument is greater than the second, and the `lt` operator checks that the first argument is less than the second. Other conditions such as `gte`, `lte`, and `range` can be made from combinations of `gt`, `lt`, `eq`, and `all`. By [@tninesling](https://github.com/tninesling) in https://github.com/apollographql/router/pull/5048 diff --git a/.changesets/fix_bnjjj_fix_custom_events_off.md b/.changesets/fix_bnjjj_fix_custom_events_off.md index 8f12757a7c..b1b2849366 100644 --- a/.changesets/fix_bnjjj_fix_custom_events_off.md +++ b/.changesets/fix_bnjjj_fix_custom_events_off.md @@ -1,8 +1,8 @@ -### Do not create custom events in telemetry if level is off ([PR #5165](https://github.com/apollographql/router/pull/5165)) +### Custom telemetry events not created when logging is disabled ([PR #5165](https://github.com/apollographql/router/pull/5165)) -Don't create custom events and attributes if you set the level to `off` +The router has been fixed to not create custom telemetry events when the log level is set to `off`. -example of configuration: +An example configuration with `level` set to `off` for a custom event: ```yaml telemetry: From 20a38f3b8b893c82bf09c3e15ca7502e1bd67e9d Mon Sep 17 00:00:00 2001 From: Ivan Goncharov Date: Mon, 20 May 2024 18:27:37 +0300 Subject: [PATCH 11/12] merge back from main to bring docs changes back onto dev. (#5203) Co-authored-by: Coenen Benjamin --- docs/source/federation-version-support.mdx | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/docs/source/federation-version-support.mdx b/docs/source/federation-version-support.mdx index 44a7c65a72..7205400590 100644 --- a/docs/source/federation-version-support.mdx +++ b/docs/source/federation-version-support.mdx @@ -43,7 +43,15 @@ The table below shows which version of federation each router release is compile - v1.45.0 + v1.45.1 + + + 2.7.2 + + + + + ⚠️ v1.45.0 2.7.2 From 9349851715a28e3d82a07d9a020df3070768d892 Mon Sep 17 00:00:00 2001 From: Ivan Goncharov Date: Tue, 21 May 2024 12:29:19 +0300 Subject: [PATCH 12/12] prep release: v1.47.0 --- .../feat_bnjjj_feat_chunk_resp_selector.md | 46 -- .changesets/feat_bnjjj_fix_5042.md | 23 - .changesets/feat_geal_open_busy_timer.md | 11 - ...at_tninesling_telemetry_range_operators.md | 5 - .../fix_bnjjj_fix_custom_events_off.md | 26 - .changesets/fix_bryn_internal_server_error.md | 6 - .changesets/fix_bryn_json_schema.md | 9 - ...ypen_router_274_preserve_batch_contexts.md | 7 - .changesets/fix_geal_cache_key_qp_options.md | 24 - .changesets/fix_geal_input_enum_validation.md | 5 - ...rom_trace_id_in_customtraceidpropagator.md | 13 - CHANGELOG.md | 194 ++++++ Cargo.lock | 6 +- apollo-router-benchmarks/Cargo.toml | 2 +- apollo-router-scaffold/Cargo.toml | 2 +- .../templates/base/Cargo.toml | 2 +- .../templates/base/xtask/Cargo.toml | 2 +- apollo-router/Cargo.toml | 2 +- .../tracing/docker-compose.datadog.yml | 2 +- dockerfiles/tracing/docker-compose.jaeger.yml | 2 +- dockerfiles/tracing/docker-compose.zipkin.yml | 2 +- helm/chart/router/Chart.yaml | 4 +- helm/chart/router/README.md | 8 +- licenses.html | 630 +++++++++++++++--- scripts/install.sh | 2 +- 25 files changed, 757 insertions(+), 278 deletions(-) delete mode 100644 .changesets/feat_bnjjj_feat_chunk_resp_selector.md delete mode 100644 .changesets/feat_bnjjj_fix_5042.md delete mode 100644 .changesets/feat_geal_open_busy_timer.md delete mode 100644 .changesets/feat_tninesling_telemetry_range_operators.md delete mode 100644 .changesets/fix_bnjjj_fix_custom_events_off.md delete mode 100644 .changesets/fix_bryn_internal_server_error.md delete mode 100644 .changesets/fix_bryn_json_schema.md delete mode 100644 .changesets/fix_garypen_router_274_preserve_batch_contexts.md delete mode 100644 .changesets/fix_geal_cache_key_qp_options.md delete mode 100644 .changesets/fix_geal_input_enum_validation.md delete mode 100644 .changesets/fix_strip_dashes_from_trace_id_in_customtraceidpropagator.md diff --git a/.changesets/feat_bnjjj_feat_chunk_resp_selector.md b/.changesets/feat_bnjjj_feat_chunk_resp_selector.md deleted file mode 100644 index 5416bc49d5..0000000000 --- a/.changesets/feat_bnjjj_feat_chunk_resp_selector.md +++ /dev/null @@ -1,46 +0,0 @@ -### Support telemetry selectors with errors ([Issue #5027](https://github.com/apollographql/router/issues/5027)) - -The router now supports telemetry selectors that take into account the occurrence of errors. This capability enables you to create metrics, events, or span attributes that contain error messages. - -For example, you can create a counter for the number of timed-out requests for subgraphs: - - -```yaml -telemetry: - instrumentation: - instruments: - subgraph: - requests.timeout: - value: unit - type: counter - unit: request - description: "subgraph requests containing subgraph timeout" - attributes: - subgraph.name: true - condition: - eq: - - "request timed out" - - error: reason -``` - -The router also can now compute new attributes upon receiving a new event in a supergraph response. With this capability, you can fetch data directly from the supergraph response body: - -```yaml -telemetry: - instrumentation: - instruments: - acme.request.on_graphql_error: - value: event_unit - type: counter - unit: error - description: my description - condition: - eq: - - MY_ERROR_CODE - - response_errors: "$.[0].extensions.code" - attributes: - response_errors: - response_errors: "$.*" -``` - -By [@bnjjj](https://github.com/bnjjj) in https://github.com/apollographql/router/pull/5022 \ No newline at end of file diff --git a/.changesets/feat_bnjjj_fix_5042.md b/.changesets/feat_bnjjj_fix_5042.md deleted file mode 100644 index 0572cbe0dd..0000000000 --- a/.changesets/feat_bnjjj_fix_5042.md +++ /dev/null @@ -1,23 +0,0 @@ -### Add support for `status_code` response to Rhai ([Issue #5042](https://github.com/apollographql/router/issues/5042)) - -The router now supports `response.status_code` on the `Response` interface in Rhai. - -Examples using the response status code: - -- Converting a response status code to a string: - -```rhai -if response.status_code.to_string() == "200" { - print(`ok`); -} -``` - -- Converting a response status code to a number: - -```rhai -if parse_int(response.status_code.to_string()) == 200 { - print(`ok`); -} -``` - -By [@bnjjj](https://github.com/bnjjj) in https://github.com/apollographql/router/pull/5045 \ No newline at end of file diff --git a/.changesets/feat_geal_open_busy_timer.md b/.changesets/feat_geal_open_busy_timer.md deleted file mode 100644 index aa36f10759..0000000000 --- a/.changesets/feat_geal_open_busy_timer.md +++ /dev/null @@ -1,11 +0,0 @@ -### Expose busy timer APIs ([PR #4989](https://github.com/apollographql/router/pull/4989)) - -The router supports public APIs that native plugins can use to control when the router's busy timer is run. - -The router's busy timer measures the time spent working on a request outside of waiting for external calls, like coprocessors and subgraph calls. It includes the time spent waiting for other concurrent requests to be handled (the wait time in the executor) to show the actual router overhead when handling requests. - -The public methods are `Context::enter_active_request` and `Context::busy_time`. The result is reported in the `apollo_router_processing_time` metric - -For details on using the APIs, see the documentation for [`enter_active_request`](https://www.apollographql.com/docs/router/customizations/native#enter_active_request). - -By [@Geal](https://github.com/Geal) in https://github.com/apollographql/router/pull/4989 \ No newline at end of file diff --git a/.changesets/feat_tninesling_telemetry_range_operators.md b/.changesets/feat_tninesling_telemetry_range_operators.md deleted file mode 100644 index ac6b1fc617..0000000000 --- a/.changesets/feat_tninesling_telemetry_range_operators.md +++ /dev/null @@ -1,5 +0,0 @@ -### Add gt and lt operators for telemetry conditions ([PR #5048](https://github.com/apollographql/router/pull/5048)) - -The router supports greater than (`gt`) and less than (`lt`) operators for telemetry conditions. Similar to the `eq` operator, the configuration for both `gt` and `lt` takes two arguments as a list. The `gt` operator checks that the first argument is greater than the second, and the `lt` operator checks that the first argument is less than the second. Other conditions such as `gte`, `lte`, and `range` can be made from combinations of `gt`, `lt`, `eq`, and `all`. - -By [@tninesling](https://github.com/tninesling) in https://github.com/apollographql/router/pull/5048 diff --git a/.changesets/fix_bnjjj_fix_custom_events_off.md b/.changesets/fix_bnjjj_fix_custom_events_off.md deleted file mode 100644 index b1b2849366..0000000000 --- a/.changesets/fix_bnjjj_fix_custom_events_off.md +++ /dev/null @@ -1,26 +0,0 @@ -### Custom telemetry events not created when logging is disabled ([PR #5165](https://github.com/apollographql/router/pull/5165)) - -The router has been fixed to not create custom telemetry events when the log level is set to `off`. - -An example configuration with `level` set to `off` for a custom event: - -```yaml -telemetry: - instrumentation: - events: - router: - # Standard events - request: info - response: info - error: info - - # Custom events - my.disabled_request_event: - message: "my event message" - level: off # Disabled because we set the level to off - on: request - attributes: - http.request.body.size: true -``` - -By [@bnjjj](https://github.com/bnjjj) in https://github.com/apollographql/router/pull/5165 \ No newline at end of file diff --git a/.changesets/fix_bryn_internal_server_error.md b/.changesets/fix_bryn_internal_server_error.md deleted file mode 100644 index 17376de94e..0000000000 --- a/.changesets/fix_bryn_internal_server_error.md +++ /dev/null @@ -1,6 +0,0 @@ -### 5xx internal server error responses returned as GraphQL structured errors ([PR #5159](https://github.com/apollographql/router/pull/5159)) - -Previously, the router returned internal server errors (5xx class) as plaintext to clients. Now in this release, the router returns these 5xx errors as structured GraphQL (for example, `{"errors": [...]}`). - -Internal server errors are returned upon unexpected or unrecoverable disruptions to the GraphQL request lifecycle execution. When these occur, the underlying error messages are logged at an `ERROR` level to the router's logs. -By [@BrynCooke](https://github.com/BrynCooke) in https://github.com/apollographql/router/pull/5159 diff --git a/.changesets/fix_bryn_json_schema.md b/.changesets/fix_bryn_json_schema.md deleted file mode 100644 index 013b43b1fa..0000000000 --- a/.changesets/fix_bryn_json_schema.md +++ /dev/null @@ -1,9 +0,0 @@ -### Reduce JSON schema size and Router memory footprint ([PR #5061](https://github.com/apollographql/router/pull/5061)) - -As we add more features to the Router the size of the JSON schema for the router configuration file continutes to grow. In particular, adding [conditionals to telemetry](https://github.com/apollographql/router/pull/4987) in v1.46.0 significantly increased this size of the schema. This has a noticeable impact on initial memory footprint, although it does not impact service of requests. - -The JSON schema for the router configuration file has been optimized from approximately 100k lines down to just over 7k. - -This reduces the startup time of the Router and a smaller schema is more friendly for code editors. - -By [@BrynCooke](https://github.com/BrynCooke) in https://github.com/apollographql/router/pull/5061 diff --git a/.changesets/fix_garypen_router_274_preserve_batch_contexts.md b/.changesets/fix_garypen_router_274_preserve_batch_contexts.md deleted file mode 100644 index ed74cd3ddd..0000000000 --- a/.changesets/fix_garypen_router_274_preserve_batch_contexts.md +++ /dev/null @@ -1,7 +0,0 @@ -### Ensure that batch entry contexts are correctly preserved ([PR #5162](https://github.com/apollographql/router/pull/5162)) - -Previously, the router didn't use contexts correctly when processing batches. A representative context was chosen (the first item in a batch of items) and used to provide context functionality for all the generated responses. - -The router now correctly preserves request contexts and uses them during response creation. - -By [@garypen](https://github.com/garypen) in https://github.com/apollographql/router/pull/5162 \ No newline at end of file diff --git a/.changesets/fix_geal_cache_key_qp_options.md b/.changesets/fix_geal_cache_key_qp_options.md deleted file mode 100644 index a27f45cd2b..0000000000 --- a/.changesets/fix_geal_cache_key_qp_options.md +++ /dev/null @@ -1,24 +0,0 @@ -### Prevent query plan cache collision when planning options change ([Issue #5093](https://github.com/apollographql/router/issues/5093)) - -The router's hashing algorithm has been updated to prevent cache collisions when the router's configuration changes. - -> [!IMPORTANT] -> If you have enabled [Distributed query plan caching](https://www.apollographql.com/docs/router/configuration/distributed-caching/#distributed-query-plan-caching), this release changes the hashing algorithm used for the cache keys. On account of this, you should anticipate additional cache regeneration cost when updating between these versions while the new hashing algorithm comes into service. - -The router supports multiple options that affect the generated query plans, including: -* `defer_support` -* `generate_query_fragments` -* `experimental_reuse_query_fragments` -* `experimental_type_conditioned_fetching` -* `experimental_query_planner_mode` - -If distributed query plan caching is enabled, changing any of these options results in different query plans being generated and cached. - -This could be problematic in the following scenarios: - -1. The router configuration changes and a query plan is loaded from cache which is incompatible with the new configuration. -2. Routers with different configurations share the same cache, which causes them to cache and load incompatible query plans. - -To prevent these from happening, the router now creates a hash for the entire query planner configuration and includes it in the cache key. - -By [@Geal](https://github.com/Geal) in https://github.com/apollographql/router/pull/5100 diff --git a/.changesets/fix_geal_input_enum_validation.md b/.changesets/fix_geal_input_enum_validation.md deleted file mode 100644 index d44ed2f2ee..0000000000 --- a/.changesets/fix_geal_input_enum_validation.md +++ /dev/null @@ -1,5 +0,0 @@ -### Validate enum values in input variables ([Issue #4633](https://github.com/apollographql/router/issues/4633)) - -The router now validates enum values provided in JSON variables. Invalid enum values result in `GRAPHQL_VALIDATION_FAILED` errors. - -By [@Geal](https://github.com/Geal) in https://github.com/apollographql/router/pull/4753 \ No newline at end of file diff --git a/.changesets/fix_strip_dashes_from_trace_id_in_customtraceidpropagator.md b/.changesets/fix_strip_dashes_from_trace_id_in_customtraceidpropagator.md deleted file mode 100644 index 23c3cd8d81..0000000000 --- a/.changesets/fix_strip_dashes_from_trace_id_in_customtraceidpropagator.md +++ /dev/null @@ -1,13 +0,0 @@ -### Strip dashes from `trace_id` in `CustomTraceIdPropagator` ([Issue #4892](https://github.com/apollographql/router/issues/4892)) - - -The router now strips dashes from trace IDs to ensure conformance with OpenTelemetry. - -In OpenTelemetry, trace IDs are 128-bit values represented as hex strings without dashes, and they're based on W3C's trace ID format. - -This has been applied within the router to `trace_id` in `CustomTraceIdPropagator`. - -Note, if raw trace IDs from headers are represented by uuid4 and contain dashes, the dashes should be stripped so that the raw trace ID value can be parsed into a valid `trace_id`. - - -By [@kindermax](https://github.com/kindermax) in https://github.com/apollographql/router/pull/5071 \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index c26398ac2e..b8b6339055 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,200 @@ All notable changes to Router will be documented in this file. This project adheres to [Semantic Versioning v2.0.0](https://semver.org/spec/v2.0.0.html). +# [1.47.0] - 2024-05-21 + +## 🚀 Features + +### Support telemetry selectors with errors ([Issue #5027](https://github.com/apollographql/router/issues/5027)) + +The router now supports telemetry selectors that take into account the occurrence of errors. This capability enables you to create metrics, events, or span attributes that contain error messages. + +For example, you can create a counter for the number of timed-out requests for subgraphs: + + +```yaml +telemetry: + instrumentation: + instruments: + subgraph: + requests.timeout: + value: unit + type: counter + unit: request + description: "subgraph requests containing subgraph timeout" + attributes: + subgraph.name: true + condition: + eq: + - "request timed out" + - error: reason +``` + +The router also can now compute new attributes upon receiving a new event in a supergraph response. With this capability, you can fetch data directly from the supergraph response body: + +```yaml +telemetry: + instrumentation: + instruments: + acme.request.on_graphql_error: + value: event_unit + type: counter + unit: error + description: my description + condition: + eq: + - MY_ERROR_CODE + - response_errors: "$.[0].extensions.code" + attributes: + response_errors: + response_errors: "$.*" +``` + +By [@bnjjj](https://github.com/bnjjj) in https://github.com/apollographql/router/pull/5022 + +### Add support for `status_code` response to Rhai ([Issue #5042](https://github.com/apollographql/router/issues/5042)) + +The router now supports `response.status_code` on the `Response` interface in Rhai. + +Examples using the response status code: + +- Converting a response status code to a string: + +```rhai +if response.status_code.to_string() == "200" { + print(`ok`); +} +``` + +- Converting a response status code to a number: + +```rhai +if parse_int(response.status_code.to_string()) == 200 { + print(`ok`); +} +``` + +By [@bnjjj](https://github.com/bnjjj) in https://github.com/apollographql/router/pull/5045 + +### Add gt and lt operators for telemetry conditions ([PR #5048](https://github.com/apollographql/router/pull/5048)) + +The router supports greater than (`gt`) and less than (`lt`) operators for telemetry conditions. Similar to the `eq` operator, the configuration for both `gt` and `lt` takes two arguments as a list. The `gt` operator checks that the first argument is greater than the second, and the `lt` operator checks that the first argument is less than the second. Other conditions such as `gte`, `lte`, and `range` can be made from combinations of `gt`, `lt`, `eq`, and `all`. + +By [@tninesling](https://github.com/tninesling) in https://github.com/apollographql/router/pull/5048 + +### Expose busy timer APIs ([PR #4989](https://github.com/apollographql/router/pull/4989)) + +The router supports public APIs that native plugins can use to control when the router's busy timer is run. + +The router's busy timer measures the time spent working on a request outside of waiting for external calls, like coprocessors and subgraph calls. It includes the time spent waiting for other concurrent requests to be handled (the wait time in the executor) to show the actual router overhead when handling requests. + +The public methods are `Context::enter_active_request` and `Context::busy_time`. The result is reported in the `apollo_router_processing_time` metric + +For details on using the APIs, see the documentation for [`enter_active_request`](https://www.apollographql.com/docs/router/customizations/native#enter_active_request). + +By [@Geal](https://github.com/Geal) in https://github.com/apollographql/router/pull/4989 + +## 🐛 Fixes + +### Reduce JSON schema size and Router memory footprint ([PR #5061](https://github.com/apollographql/router/pull/5061)) + +As we add more features to the Router the size of the JSON schema for the router configuration file continutes to grow. In particular, adding [conditionals to telemetry](https://github.com/apollographql/router/pull/4987) in v1.46.0 significantly increased this size of the schema. This has a noticeable impact on initial memory footprint, although it does not impact service of requests. + +The JSON schema for the router configuration file has been optimized from approximately 100k lines down to just over 7k. + +This reduces the startup time of the Router and a smaller schema is more friendly for code editors. + +By [@BrynCooke](https://github.com/BrynCooke) in https://github.com/apollographql/router/pull/5061 + +### Prevent query plan cache collision when planning options change ([Issue #5093](https://github.com/apollographql/router/issues/5093)) + +The router's hashing algorithm has been updated to prevent cache collisions when the router's configuration changes. + +> [!IMPORTANT] +> If you have enabled [Distributed query plan caching](https://www.apollographql.com/docs/router/configuration/distributed-caching/#distributed-query-plan-caching), this release changes the hashing algorithm used for the cache keys. On account of this, you should anticipate additional cache regeneration cost when updating between these versions while the new hashing algorithm comes into service. + +The router supports multiple options that affect the generated query plans, including: +* `defer_support` +* `generate_query_fragments` +* `experimental_reuse_query_fragments` +* `experimental_type_conditioned_fetching` +* `experimental_query_planner_mode` + +If distributed query plan caching is enabled, changing any of these options results in different query plans being generated and cached. + +This could be problematic in the following scenarios: + +1. The router configuration changes and a query plan is loaded from cache which is incompatible with the new configuration. +2. Routers with different configurations share the same cache, which causes them to cache and load incompatible query plans. + +To prevent these from happening, the router now creates a hash for the entire query planner configuration and includes it in the cache key. + +By [@Geal](https://github.com/Geal) in https://github.com/apollographql/router/pull/5100 + +### 5xx internal server error responses returned as GraphQL structured errors ([PR #5159](https://github.com/apollographql/router/pull/5159)) + +Previously, the router returned internal server errors (5xx class) as plaintext to clients. Now in this release, the router returns these 5xx errors as structured GraphQL (for example, `{"errors": [...]}`). + +Internal server errors are returned upon unexpected or unrecoverable disruptions to the GraphQL request lifecycle execution. When these occur, the underlying error messages are logged at an `ERROR` level to the router's logs. +By [@BrynCooke](https://github.com/BrynCooke) in https://github.com/apollographql/router/pull/5159 + +### Custom telemetry events not created when logging is disabled ([PR #5165](https://github.com/apollographql/router/pull/5165)) + +The router has been fixed to not create custom telemetry events when the log level is set to `off`. + +An example configuration with `level` set to `off` for a custom event: + +```yaml +telemetry: + instrumentation: + events: + router: + # Standard events + request: info + response: info + error: info + + # Custom events + my.disabled_request_event: + message: "my event message" + level: off # Disabled because we set the level to off + on: request + attributes: + http.request.body.size: true +``` + +By [@bnjjj](https://github.com/bnjjj) in https://github.com/apollographql/router/pull/5165 + +### Ensure that batch entry contexts are correctly preserved ([PR #5162](https://github.com/apollographql/router/pull/5162)) + +Previously, the router didn't use contexts correctly when processing batches. A representative context was chosen (the first item in a batch of items) and used to provide context functionality for all the generated responses. + +The router now correctly preserves request contexts and uses them during response creation. + +By [@garypen](https://github.com/garypen) in https://github.com/apollographql/router/pull/5162 + +### Validate enum values in input variables ([Issue #4633](https://github.com/apollographql/router/issues/4633)) + +The router now validates enum values provided in JSON variables. Invalid enum values result in `GRAPHQL_VALIDATION_FAILED` errors. + +By [@Geal](https://github.com/Geal) in https://github.com/apollographql/router/pull/4753 + +### Strip dashes from `trace_id` in `CustomTraceIdPropagator` ([Issue #4892](https://github.com/apollographql/router/issues/4892)) + + +The router now strips dashes from trace IDs to ensure conformance with OpenTelemetry. + +In OpenTelemetry, trace IDs are 128-bit values represented as hex strings without dashes, and they're based on W3C's trace ID format. + +This has been applied within the router to `trace_id` in `CustomTraceIdPropagator`. + +Note, if raw trace IDs from headers are represented by uuid4 and contain dashes, the dashes should be stripped so that the raw trace ID value can be parsed into a valid `trace_id`. + + +By [@kindermax](https://github.com/kindermax) in https://github.com/apollographql/router/pull/5071 + + + # [1.46.0] - 2024-05-07 ## 🚀 Features diff --git a/Cargo.lock b/Cargo.lock index 374ff4dde1..ee02ef9533 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -262,7 +262,7 @@ dependencies = [ [[package]] name = "apollo-router" -version = "1.47.0-rc.0" +version = "1.47.0" dependencies = [ "access-json", "anyhow", @@ -424,7 +424,7 @@ dependencies = [ [[package]] name = "apollo-router-benchmarks" -version = "1.47.0-rc.0" +version = "1.47.0" dependencies = [ "apollo-parser", "apollo-router", @@ -440,7 +440,7 @@ dependencies = [ [[package]] name = "apollo-router-scaffold" -version = "1.47.0-rc.0" +version = "1.47.0" dependencies = [ "anyhow", "cargo-scaffold", diff --git a/apollo-router-benchmarks/Cargo.toml b/apollo-router-benchmarks/Cargo.toml index d4c3d4b960..62e409a105 100644 --- a/apollo-router-benchmarks/Cargo.toml +++ b/apollo-router-benchmarks/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "apollo-router-benchmarks" -version = "1.47.0-rc.0" +version = "1.47.0" authors = ["Apollo Graph, Inc. "] edition = "2021" license = "Elastic-2.0" diff --git a/apollo-router-scaffold/Cargo.toml b/apollo-router-scaffold/Cargo.toml index dcec91f271..353837020b 100644 --- a/apollo-router-scaffold/Cargo.toml +++ b/apollo-router-scaffold/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "apollo-router-scaffold" -version = "1.47.0-rc.0" +version = "1.47.0" authors = ["Apollo Graph, Inc. "] edition = "2021" license = "Elastic-2.0" diff --git a/apollo-router-scaffold/templates/base/Cargo.toml b/apollo-router-scaffold/templates/base/Cargo.toml index 7481f12b09..521a9198d7 100644 --- a/apollo-router-scaffold/templates/base/Cargo.toml +++ b/apollo-router-scaffold/templates/base/Cargo.toml @@ -22,7 +22,7 @@ apollo-router = { path ="{{integration_test}}apollo-router" } apollo-router = { git="https://github.com/apollographql/router.git", branch="{{branch}}" } {{else}} # Note if you update these dependencies then also update xtask/Cargo.toml -apollo-router = "1.47.0-rc.0" +apollo-router = "1.47.0" {{/if}} {{/if}} async-trait = "0.1.52" diff --git a/apollo-router-scaffold/templates/base/xtask/Cargo.toml b/apollo-router-scaffold/templates/base/xtask/Cargo.toml index 9372321512..39354e9139 100644 --- a/apollo-router-scaffold/templates/base/xtask/Cargo.toml +++ b/apollo-router-scaffold/templates/base/xtask/Cargo.toml @@ -13,7 +13,7 @@ apollo-router-scaffold = { path ="{{integration_test}}apollo-router-scaffold" } {{#if branch}} apollo-router-scaffold = { git="https://github.com/apollographql/router.git", branch="{{branch}}" } {{else}} -apollo-router-scaffold = { git = "https://github.com/apollographql/router.git", tag = "v1.47.0-rc.0" } +apollo-router-scaffold = { git = "https://github.com/apollographql/router.git", tag = "v1.47.0" } {{/if}} {{/if}} anyhow = "1.0.58" diff --git a/apollo-router/Cargo.toml b/apollo-router/Cargo.toml index 12af530d70..9e9df5d405 100644 --- a/apollo-router/Cargo.toml +++ b/apollo-router/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "apollo-router" -version = "1.47.0-rc.0" +version = "1.47.0" authors = ["Apollo Graph, Inc. "] repository = "https://github.com/apollographql/router/" documentation = "https://docs.rs/apollo-router" diff --git a/dockerfiles/tracing/docker-compose.datadog.yml b/dockerfiles/tracing/docker-compose.datadog.yml index 2c84e1098f..f90fff4010 100644 --- a/dockerfiles/tracing/docker-compose.datadog.yml +++ b/dockerfiles/tracing/docker-compose.datadog.yml @@ -3,7 +3,7 @@ services: apollo-router: container_name: apollo-router - image: ghcr.io/apollographql/router:v1.47.0-rc.0 + image: ghcr.io/apollographql/router:v1.47.0 volumes: - ./supergraph.graphql:/etc/config/supergraph.graphql - ./router/datadog.router.yaml:/etc/config/configuration.yaml diff --git a/dockerfiles/tracing/docker-compose.jaeger.yml b/dockerfiles/tracing/docker-compose.jaeger.yml index 37b586cd77..55605308eb 100644 --- a/dockerfiles/tracing/docker-compose.jaeger.yml +++ b/dockerfiles/tracing/docker-compose.jaeger.yml @@ -4,7 +4,7 @@ services: apollo-router: container_name: apollo-router #build: ./router - image: ghcr.io/apollographql/router:v1.47.0-rc.0 + image: ghcr.io/apollographql/router:v1.47.0 volumes: - ./supergraph.graphql:/etc/config/supergraph.graphql - ./router/jaeger.router.yaml:/etc/config/configuration.yaml diff --git a/dockerfiles/tracing/docker-compose.zipkin.yml b/dockerfiles/tracing/docker-compose.zipkin.yml index 209a9641b7..1689a4e9d4 100644 --- a/dockerfiles/tracing/docker-compose.zipkin.yml +++ b/dockerfiles/tracing/docker-compose.zipkin.yml @@ -4,7 +4,7 @@ services: apollo-router: container_name: apollo-router build: ./router - image: ghcr.io/apollographql/router:v1.47.0-rc.0 + image: ghcr.io/apollographql/router:v1.47.0 volumes: - ./supergraph.graphql:/etc/config/supergraph.graphql - ./router/zipkin.router.yaml:/etc/config/configuration.yaml diff --git a/helm/chart/router/Chart.yaml b/helm/chart/router/Chart.yaml index 48a8f3fd36..06b900da23 100644 --- a/helm/chart/router/Chart.yaml +++ b/helm/chart/router/Chart.yaml @@ -20,10 +20,10 @@ type: application # so it matches the shape of our release process and release automation. # By proxy of that decision, this version uses SemVer 2.0.0, though the prefix # of "v" is not included. -version: 1.47.0-rc.0 +version: 1.47.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "v1.47.0-rc.0" +appVersion: "v1.47.0" diff --git a/helm/chart/router/README.md b/helm/chart/router/README.md index 326c79f324..eed82179b9 100644 --- a/helm/chart/router/README.md +++ b/helm/chart/router/README.md @@ -2,7 +2,7 @@ [router](https://github.com/apollographql/router) Rust Graph Routing runtime for Apollo Federation -![Version: 1.47.0-rc.0](https://img.shields.io/badge/Version-1.47.0--rc.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.47.0-rc.0](https://img.shields.io/badge/AppVersion-v1.47.0--rc.0-informational?style=flat-square) +![Version: 1.47.0](https://img.shields.io/badge/Version-1.47.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.47.0](https://img.shields.io/badge/AppVersion-v1.47.0-informational?style=flat-square) ## Prerequisites @@ -11,7 +11,7 @@ ## Get Repo Info ```console -helm pull oci://ghcr.io/apollographql/helm-charts/router --version 1.47.0-rc.0 +helm pull oci://ghcr.io/apollographql/helm-charts/router --version 1.47.0 ``` ## Install Chart @@ -19,7 +19,7 @@ helm pull oci://ghcr.io/apollographql/helm-charts/router --version 1.47.0-rc.0 **Important:** only helm3 is supported ```console -helm upgrade --install [RELEASE_NAME] oci://ghcr.io/apollographql/helm-charts/router --version 1.47.0-rc.0 --values my-values.yaml +helm upgrade --install [RELEASE_NAME] oci://ghcr.io/apollographql/helm-charts/router --version 1.47.0 --values my-values.yaml ``` _See [configuration](#configuration) below._ @@ -94,3 +94,5 @@ helm show values oci://ghcr.io/apollographql/helm-charts/router | topologySpreadConstraints | list | `[]` | Sets the [topology spread constraints](https://kubernetes.io/docs/concepts/scheduling-eviction/topology-spread-constraints/) for Deployment pods | | virtualservice.enabled | bool | `false` | | +---------------------------------------------- +Autogenerated from chart metadata using [helm-docs v1.13.1](https://github.com/norwoodj/helm-docs/releases/v1.13.1) diff --git a/licenses.html b/licenses.html index 240a1e91de..9461358688 100644 --- a/licenses.html +++ b/licenses.html @@ -44,12 +44,12 @@

    Third Party Licenses

    Overview of licenses:

                                     Apache License
                            Version 2.0, January 2004
@@ -5292,6 +5294,7 @@ 
    Used by:
    
                     
  • utf-8
    • 
                     
  • utf8parse
    • 
                     
  • wasm-streams
    • 
+                    
  • zerocopy
    • 
                 
                 
                                  Apache License
                         Version 2.0, January 2004
@@ -8223,6 +8226,7 @@ 
    Used by:
    
                     
  • bytes-utils
    • 
                     
  • cc
    • 
                     
  • cfg-if
    • 
+                    
  • ci_info
    • 
                     
  • cmake
    • 
                     
  • concurrent-queue
    • 
                     
  • const-random
    • 
@@ -8236,6 +8240,7 @@ 
    Used by:
    
                     
  • derivative
    • 
                     
  • derive_arbitrary
    • 
                     
  • either
    • 
+                    
  • envmnt
    • 
                     
  • equivalent
    • 
                     
  • event-listener
    • 
                     
  • fastrand
    • 
@@ -8246,6 +8251,7 @@ 
    Used by:
    
                     
  • fnv
    • 
                     
  • form_urlencoded
    • 
                     
  • fraction
    • 
+                    
  • fsio
    • 
                     
  • futures-lite
    • 
                     
  • gimli
    • 
                     
  • git2
    • 
@@ -11500,6 +11506,54 @@ 
    Used by:
    
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
+
    
+            
+            
  • 
+                
    Apache License 2.0
    
+                
    Used by:
    
+                
+                
    # Contributing
+
+## License
+
+Licensed under either of
+
+ * Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
+ * MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
+
+at your option.
+
+### Contribution
+
+Unless you explicitly state otherwise, any contribution intentionally submitted
+for inclusion in the work by you, as defined in the Apache-2.0 license, shall be dual licensed as above, without any
+additional terms or conditions.
+
    
+            
    • 
+            
  • 
+                
    Apache License 2.0
    
+                
    Used by:
    
+                
+                
    ../../LICENSE-APACHE
    
+            
    • 
+            
  • 
+                
    Apache License 2.0
    
+                
    Used by:
    
+                
+                
    // Licensed under the Apache License, Version 2.0
+// <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your option.
+// All files in the project carrying such notice may not be copied, modified, or distributed
+// except according to those terms.
 
    
             
    • 
             
  • 
@@ -12136,18 +12190,11 @@ 
    Used by:
    
                 
    Apache License 2.0
    
                 
    Used by:
    • + +
  • +

    Apache License 2.0

    +

    Used by:

    + + 
    Copyright 2023 The allocator-api2 project developers
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
    +
    • +
  • +

    Apache License 2.0

    +

    Used by:

    + + 
    Copyright [2022] [Bryn Cooke]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
    +
    • +
  • +

    Apache License 2.0

    +

    Used by:

    + + 
    Copyright [2023] [Bryn Cooke]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
    +
    • +
  • +

    Apache License 2.0

    +

    Used by:

    + + 
    Licensed under the Apache License, Version 2.0
+<LICENSE-APACHE or
+http://www.apache.org/licenses/LICENSE-2.0> or the MIT
+license <LICENSE-MIT or http://opensource.org/licenses/MIT>,
+at your option. All files in the project carrying such
+notice may not be copied, modified, or distributed except
+according to those terms.
+
    +
    • +
  • +

    Apache License 2.0

    +

    Used by:

    + + 
    MIT OR Apache-2.0
    +
    • +
  • +

    Apache License 2.0

    +

    Used by:

    + + 
    MIT OR Apache-2.0
+
    +
    • +
  • +

    Apache License 2.0

    +

    Used by:

    + + 
    MIT or Apache-2.0
+
    +
    • +
  • +

    Apache License 2.0

    +

    Used by:

    + + 
    The Apache License, Version 2.0 (Apache-2.0)
+
+Copyright 2015-2020 the fiat-crypto authors (see the AUTHORS file)
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -12431,6 +12607,151 @@ 
    Used by:
    
 LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+
    +
    • +
  • +

    BSD 3-Clause "New" or "Revised" License

    +

    Used by:

    + + 
    Copyright (c) 2016-2019 Isis Agora Lovecruft, Henry de Valence. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+
+========================================================================
+
+Portions of curve25519-dalek were originally derived from Adam Langley's
+Go ed25519 implementation, found at <https://github.com/agl/ed25519/>,
+under the following licence:
+
+========================================================================
+
+Copyright (c) 2012 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
    +
    • +
  • +

    BSD 3-Clause "New" or "Revised" License

    +

    Used by:

    + + 
    Copyright (c) 2016-2021 isis agora lovecruft. All rights reserved.
+Copyright (c) 2016-2021 Henry de Valence. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+
+========================================================================
+
+Portions of curve25519-dalek were originally derived from Adam Langley's
+Go ed25519 implementation, found at <https://github.com/agl/ed25519/>,
+under the following licence:
+
+========================================================================
+
+Copyright (c) 2012 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  • @@ -12510,8 +12831,6 @@

    BSD 3-Clause "New" or "Revised" Licens

    Used by:

    Copyright (c) <year> <owner>. 
 
@@ -12844,6 +13163,9 @@ 
    Elastic License 2.0
    
                 
    Used by:
    
                 
                 
    Copyright 2021 Apollo Graph, Inc.
 
@@ -13111,36 +13433,6 @@ 
    Used by:
    
 // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
    
-
    • -
  • -

    ISC License

    -

    Used by:

    - - 
    // Copyright 2021 Brian Smith.
-//
-// Permission to use, copy, modify, and/or distribute this software for any
-// purpose with or without fee is hereby granted, provided that the above
-// copyright notice and this permission notice appear in all copies.
-//
-// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES
-// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
-// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-#[test]
-fn cert_without_extensions_test() {
-    // Check the certificate is valid with
-    // `openssl x509 -in cert_without_extensions.der -inform DER -text -noout`
-    const CERT_WITHOUT_EXTENSIONS_DER: &[u8] = include_bytes!("cert_without_extensions.der");
-
-    assert!(webpki::EndEntityCert::try_from(CERT_WITHOUT_EXTENSIONS_DER).is_ok());
-}
  • @@ -13210,6 +13502,7 @@

    ISC License

    Used by:

    ISC License:
 
@@ -13960,6 +14253,66 @@ 
    Used by:
    
 shall be included in all copies or substantial portions
 of the Software.
 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
    +
    • +
  • +

    MIT License

    +

    Used by:

    + + 
    Copyright (c) 2019 Carl Lerche
+
+Permission is hereby granted, free of charge, to any
+person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the
+Software without restriction, including without
+limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
+Copyright (c) 2018 David Tolnay
+
+Permission is hereby granted, free of charge, to any
+person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the
+Software without restriction, including without
+limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions
+of the Software.
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
 ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
 TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
@@ -14267,6 +14620,61 @@ 
    Used by:
    
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
 IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
+
    +
    • +
  • +

    MIT License

    +

    Used by:

    + + 
    Copyright (c) 2023 Tokio Contributors
+
+Permission is hereby granted, free of charge, to any
+person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the
+Software without restriction, including without
+limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
+The MIT License (MIT)
+
+Copyright (c) 2019 Yoshua Wuyts
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
  • @@ -14814,8 +15222,6 @@

    Used by:

    MIT License

    Used by:

      -
    • async-stream
      • -
    • async-stream-impl
    • base64-simd
    • convert_case
    • crunchy
      • @@ -14831,7 +15237,6 @@

      Used by:

    • lazy-regex-proc_macros
    • number_prefix
    • serde_v8
      • -
    • tokio-macros
    • v8
    • valuable
    • void
      • @@ -15100,6 +15505,36 @@

      Used by:

      MIT License

      Used by:

      + 
      The MIT License (MIT)
+
+Copyright (c) 2014 Mathijs van de Nes
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
      + +
    • +

      MIT License

      +

      Used by:

      + 
      The MIT License (MIT)
@@ -15652,6 +16087,25 @@ 
      Used by:
      
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
+
      +
      • +
    • +

      MIT License

      +

      Used by:

      + + 
      This project is dual-licensed under the Unlicense and MIT licenses.
+
+You may use this code under the terms of either license.
    • @@ -16050,7 +16504,6 @@

      Mozilla Public License 2.0

      Used by:

      Mozilla Public License Version 2.0
 ==================================
@@ -16425,6 +16878,35 @@ 
      Used by:
      
 
   This Source Code Form is "Incompatible With Secondary Licenses", as
   defined by the Mozilla Public License, v. 2.0.
+
      +
      • +
    • +

      Mozilla Public License 2.0

      +

      Used by:

      + + 
      This packge contains a modified version of ca-bundle.crt:
+
+ca-bundle.crt -- Bundle of CA Root Certificates
+
+Certificate data from Mozilla as of: Thu Nov  3 19:04:19 2011#
+This is a bundle of X.509 certificates of public Certificate Authorities
+(CA). These were automatically extracted from Mozilla's root certificates
+file (certdata.txt).  This file can be found in the mozilla source tree:
+http://mxr.mozilla.org/mozilla/source/security/nss/lib/ckfw/builtins/certdata.txt?raw=1#
+It contains the certificates in PEM format and therefore
+can be directly used with curl / libcurl / php_curl, or with
+an Apache+mod_ssl webserver for SSL client authentication.
+Just configure this file as the SSLCACertificateFile.#
+
+***** BEGIN LICENSE BLOCK *****
+This Source Code Form is subject to the terms of the Mozilla Public License,
+v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain
+one at http://mozilla.org/MPL/2.0/.
+
+***** END LICENSE BLOCK *****
+@(#) $RCSfile: certdata.txt,v $ $Revision: 1.80 $ $Date: 2011/11/03 15:11:58 $
    • @@ -16496,50 +16978,26 @@

      Used by:

    UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
 
-See Terms of Use <https://www.unicode.org/copyright.html>
-for definitions of Unicode Inc.’s Data Files and Software.
+Unicode Data Files include all data files under the directories http://www.unicode.org/Public/, http://www.unicode.org/reports/, http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/, and http://www.unicode.org/utility/trac/browser/.
+
+Unicode Data Files do not include PDF online code charts under the directory http://www.unicode.org/Public/.
 
-NOTICE TO USER: Carefully read the following legal agreement.
-BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S
-DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"),
-YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
-TERMS AND CONDITIONS OF THIS AGREEMENT.
-IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE
-THE DATA FILES OR SOFTWARE.
+Software includes any source code published in the Unicode Standard or under the directories http://www.unicode.org/Public/, http://www.unicode.org/reports/, http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/, and http://www.unicode.org/utility/trac/browser/.
+
+NOTICE TO USER: Carefully read the following legal agreement. BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"), YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE.
 
 COPYRIGHT AND PERMISSION NOTICE
 
-Copyright © 1991-2022 Unicode, Inc. All rights reserved.
-Distributed under the Terms of Use in https://www.unicode.org/copyright.html.
+Copyright © 1991-2016 Unicode, Inc. All rights reserved. Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Unicode data files and any associated documentation
-(the "Data Files") or Unicode software and any associated documentation
-(the "Software") to deal in the Data Files or Software
-without restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, and/or sell copies of
-the Data Files or Software, and to permit persons to whom the Data Files
-or Software are furnished to do so, provided that either
-(a) this copyright and permission notice appear with all copies
-of the Data Files or Software, or
-(b) this copyright and permission notice appear in associated
-Documentation.
-
-THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT OF THIRD PARTY RIGHTS.
-IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
-NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
-DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THE DATA FILES OR SOFTWARE.
-
-Except as contained in this notice, the name of a copyright holder
-shall not be used in advertising or otherwise to promote the sale,
-use or other dealings in these Data Files or Software without prior
-written authorization of the copyright holder.
+Permission is hereby granted, free of charge, to any person obtaining a copy of the Unicode data files and any associated documentation (the "Data Files") or Unicode software and any associated documentation (the "Software") to deal in the Data Files or Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Data Files or Software, and to permit persons to whom the Data Files or Software are furnished to do so, provided that either
+
+     (a) this copyright and permission notice appear with all copies of the Data Files or Software, or
+     (b) this copyright and permission notice appear in associated Documentation.
+
+THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall not be used in advertising or otherwise to promote the sale, use or other dealings in these Data Files or Software without prior written authorization of the copyright holder.
    • diff --git a/scripts/install.sh b/scripts/install.sh index 67eb29bb33..3b509ebc6b 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -11,7 +11,7 @@ BINARY_DOWNLOAD_PREFIX="https://github.com/apollographql/router/releases/downloa # Router version defined in apollo-router's Cargo.toml # Note: Change this line manually during the release steps. -PACKAGE_VERSION="v1.47.0-rc.0" +PACKAGE_VERSION="v1.47.0" download_binary() { downloader --check