prep release: v1.52.1

apollographql · Aug 27, 2024 · 994aeab · 994aeab
1 parent 6c770bd
commit 994aeab
Show file tree

Hide file tree

Showing 15 changed files with 49 additions and 122 deletions.
diff --git a/Cargo.lock b/Cargo.lock
@@ -424,7 +424,7 @@ dependencies = [
 
 [[package]]
 name = "apollo-federation"
-version = "1.52.1-rc.1"
+version = "1.52.1"
 dependencies = [
  "apollo-compiler",
  "derive_more",
@@ -471,7 +471,7 @@ dependencies = [
 
 [[package]]
 name = "apollo-router"
-version = "1.52.1-rc.1"
+version = "1.52.1"
 dependencies = [
  "access-json",
  "ahash",
@@ -640,7 +640,7 @@ dependencies = [
 
 [[package]]
 name = "apollo-router-benchmarks"
-version = "1.52.1-rc.1"
+version = "1.52.1"
 dependencies = [
  "apollo-parser",
  "apollo-router",
@@ -656,7 +656,7 @@ dependencies = [
 
 [[package]]
 name = "apollo-router-scaffold"
-version = "1.52.1-rc.1"
+version = "1.52.1"
 dependencies = [
  "anyhow",
  "cargo-scaffold",

diff --git a/apollo-federation/Cargo.toml b/apollo-federation/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "apollo-federation"
-version = "1.52.1-rc.1"
+version = "1.52.1"
 authors = ["The Apollo GraphQL Contributors"]
 edition = "2021"
 description = "Apollo Federation"

diff --git a/apollo-router-benchmarks/Cargo.toml b/apollo-router-benchmarks/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "apollo-router-benchmarks"
-version = "1.52.1-rc.1"
+version = "1.52.1"
 authors = ["Apollo Graph, Inc. <[email protected]>"]
 edition = "2021"
 license = "Elastic-2.0"

diff --git a/apollo-router-scaffold/Cargo.toml b/apollo-router-scaffold/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "apollo-router-scaffold"
-version = "1.52.1-rc.1"
+version = "1.52.1"
 authors = ["Apollo Graph, Inc. <[email protected]>"]
 edition = "2021"
 license = "Elastic-2.0"

diff --git a/apollo-router-scaffold/templates/base/Cargo.template.toml b/apollo-router-scaffold/templates/base/Cargo.template.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.52.1-rc.1"
+apollo-router = "1.52.1"
 {{/if}}
 {{/if}}
 async-trait = "0.1.52"

diff --git a/apollo-router-scaffold/templates/base/xtask/Cargo.template.toml b/apollo-router-scaffold/templates/base/xtask/Cargo.template.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.52.1-rc.1" }
+apollo-router-scaffold = { git = "https://github.com/apollographql/router.git", tag = "v1.52.1" }
 {{/if}}
 {{/if}}
 anyhow = "1.0.58"

diff --git a/apollo-router/Cargo.toml b/apollo-router/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "apollo-router"
-version = "1.52.1-rc.1"
+version = "1.52.1"
 authors = ["Apollo Graph, Inc. <[email protected]>"]
 repository = "https://github.com/apollographql/router/"
 documentation = "https://docs.rs/apollo-router"
@@ -68,7 +68,7 @@ askama = "0.12.1"
 access-json = "0.1.0"
 anyhow = "1.0.86"
 apollo-compiler.workspace = true
-apollo-federation = { path = "../apollo-federation", version = "=1.52.1-rc.1" }
+apollo-federation = { path = "../apollo-federation", version = "=1.52.1" }
 arc-swap = "1.6.0"
 async-channel = "1.9.0"
 async-compression = { version = "0.4.6", features = [

diff --git 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.52.1-rc.1
+    image: ghcr.io/apollographql/router:v1.52.1
     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
@@ -4,7 +4,7 @@ services:
   apollo-router:
     container_name: apollo-router
     #build: ./router
-    image: ghcr.io/apollographql/router:v1.52.1-rc.1
+    image: ghcr.io/apollographql/router:v1.52.1
     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
@@ -4,7 +4,7 @@ services:
   apollo-router:
     container_name: apollo-router
     build: ./router
-    image: ghcr.io/apollographql/router:v1.52.1-rc.1
+    image: ghcr.io/apollographql/router:v1.52.1
     volumes:
       - ./supergraph.graphql:/etc/config/supergraph.graphql
       - ./router/zipkin.router.yaml:/etc/config/configuration.yaml

diff --git a/docs/source/federation-version-support.mdx b/docs/source/federation-version-support.mdx
@@ -37,7 +37,23 @@ The table below shows which version of federation each router release is compile
     <tbody>
     <tr>
         <td>
-            v1.49.1 and later (<a href="https://github.com/apollographql/router/releases">see latest releases</a>)
+            v1.53.0 and later (<a href="https://github.com/apollographql/router/releases">see latest releases</a>)
+        </td>
+        <td>
+            2.9.0
+        </td>
+    </tr>
+    <tr>
+        <td>
+            v1.52.1
+        </td>
+        <td>
+            2.8.5
+        </td>
+    </tr>
+    <tr>
+        <td>
+            v1.49.0 - v1.52.0
         </td>
         <td>
             2.8.1
@@ -53,7 +69,7 @@ The table below shows which version of federation each router release is compile
     </tr>
     <tr>
         <td>
-            v1.46.0 - v1.47.0        
+            v1.46.0 - v1.47.0
         </td>
         <td>
             2.7.5

diff --git 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.52.1-rc.1
+version: 1.52.1
 
 # 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.52.1-rc.1"
+appVersion: "v1.52.1"
diff --git 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.52.1-rc.1](https://img.shields.io/badge/Version-1.52.1--rc.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.52.1-rc.1](https://img.shields.io/badge/AppVersion-v1.52.1--rc.1-informational?style=flat-square)
+![Version: 1.52.1](https://img.shields.io/badge/Version-1.52.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.52.1](https://img.shields.io/badge/AppVersion-v1.52.1-informational?style=flat-square)
 
 ## Prerequisites
 
@@ -11,15 +11,15 @@
 ## Get Repo Info
 
 ```console
-helm pull oci://ghcr.io/apollographql/helm-charts/router --version 1.52.1-rc.1
+helm pull oci://ghcr.io/apollographql/helm-charts/router --version 1.52.1
 ```
 
 ## Install Chart
 
 **Important:** only helm3 is supported
 
 ```console
-helm upgrade --install [RELEASE_NAME] oci://ghcr.io/apollographql/helm-charts/router --version 1.52.1-rc.1 --values my-values.yaml
+helm upgrade --install [RELEASE_NAME] oci://ghcr.io/apollographql/helm-charts/router --version 1.52.1 --values my-values.yaml
 ```
 
 _See [configuration](#configuration) below._

diff --git a/licenses.html b/licenses.html
@@ -44,8 +44,8 @@ <h1>Third Party Licenses</h1>
 
         <h2>Overview of licenses:</h2>
         <ul class="licenses-overview">
-            <li><a href="#Apache-2.0">Apache License 2.0</a> (490)</li>
-            <li><a href="#MIT">MIT License</a> (165)</li>
+            <li><a href="#Apache-2.0">Apache License 2.0</a> (488)</li>
+            <li><a href="#MIT">MIT License</a> (163)</li>
             <li><a href="#BSD-3-Clause">BSD 3-Clause &quot;New&quot; or &quot;Revised&quot; License</a> (11)</li>
             <li><a href="#ISC">ISC License</a> (8)</li>
             <li><a href="#BSD-2-Clause">BSD 2-Clause &quot;Simplified&quot; License</a> (5)</li>
@@ -65,7 +65,6 @@ <h4>Used by:</h4>
                     <li><a href=" https://github.com/smithy-lang/smithy-rs ">aws-config</a></li>
                     <li><a href=" https://github.com/smithy-lang/smithy-rs ">aws-credential-types</a></li>
                     <li><a href=" https://github.com/smithy-lang/smithy-rs ">aws-runtime</a></li>
-                    <li><a href=" https://github.com/smithy-lang/smithy-rs ">aws-sigv4</a></li>
                     <li><a href=" https://github.com/smithy-lang/smithy-rs ">aws-smithy-async</a></li>
                     <li><a href=" https://github.com/smithy-lang/smithy-rs ">aws-smithy-http</a></li>
                     <li><a href=" https://github.com/smithy-lang/smithy-rs ">aws-smithy-json</a></li>
@@ -8643,7 +8642,6 @@ <h4>Used by:</h4>
                     <li><a href=" https://github.com/rust-lang/cc-rs ">cc</a></li>
                     <li><a href=" https://github.com/alexcrichton/cfg-if ">cfg-if</a></li>
                     <li><a href=" https://github.com/alexcrichton/cfg-if ">cfg-if</a></li>
-                    <li><a href=" https://github.com/sagiegurari/ci_info.git ">ci_info</a></li>
                     <li><a href=" https://github.com/rust-lang/cmake-rs ">cmake</a></li>
                     <li><a href=" https://github.com/smol-rs/concurrent-queue ">concurrent-queue</a></li>
                     <li><a href=" https://github.com/tkaitchuck/constrandom ">const-random</a></li>
@@ -11511,18 +11509,6 @@ <h4>Used by:</h4>
 additional terms or conditions.
 </pre>
             </li>
-            <li class="license">
-                <h3 id="Apache-2.0">Apache License 2.0</h3>
-                <h4>Used by:</h4>
-                <ul class="license-used-by">
-                    <li><a href=" https://github.com/apollographql/apollo-rs ">apollo-compiler</a></li>
-                    <li><a href=" https://github.com/apollographql/apollo-rs ">apollo-encoder</a></li>
-                    <li><a href=" https://github.com/apollographql/apollo-rs ">apollo-parser</a></li>
-                    <li><a href=" https://github.com/apollographql/apollo-rs ">apollo-smith</a></li>
-                    <li><a href=" https://github.com/apollographql/apollo-rs ">apollo-smith</a></li>
-                </ul>
-                <pre class="license-text">../../LICENSE-APACHE</pre>
-            </li>
             <li class="license">
                 <h3 id="Apache-2.0">Apache License 2.0</h3>
                 <h4>Used by:</h4>
@@ -12170,10 +12156,16 @@ <h4>Used by:</h4>
                 <h3 id="Apache-2.0">Apache License 2.0</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
+                    <li><a href=" https://github.com/apollographql/apollo-rs ">apollo-compiler</a></li>
+                    <li><a href=" https://github.com/apollographql/apollo-rs ">apollo-encoder</a></li>
+                    <li><a href=" https://github.com/apollographql/apollo-rs ">apollo-parser</a></li>
+                    <li><a href=" https://github.com/apollographql/apollo-rs ">apollo-smith</a></li>
+                    <li><a href=" https://github.com/apollographql/apollo-rs ">apollo-smith</a></li>
                     <li><a href=" https://github.com/async-graphql/async-graphql ">async-graphql-actix-web</a></li>
                     <li><a href=" https://github.com/async-graphql/async-graphql ">async-graphql-derive</a></li>
                     <li><a href=" https://github.com/async-graphql/async-graphql ">async-graphql-parser</a></li>
                     <li><a href=" https://github.com/async-graphql/async-graphql ">async-graphql-value</a></li>
+                    <li><a href=" https://github.com/BrynCooke/buildstructor ">buildstructor</a></li>
                     <li><a href=" https://github.com/nrc/proc-macro-rules ">deno-proc-macro-rules</a></li>
                     <li><a href=" https://github.com/nrc/proc-macro-rules ">deno-proc-macro-rules-macros</a></li>
                     <li><a href=" https://gitlab.com/kornelski/dunce ">dunce</a></li>
@@ -12293,27 +12285,6 @@ <h4>Used by:</h4>
 
     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 &quot;AS IS&quot; 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.
-</pre>
-            </li>
-            <li class="license">
-                <h3 id="Apache-2.0">Apache License 2.0</h3>
-                <h4>Used by:</h4>
-                <ul class="license-used-by">
-                    <li><a href=" https://github.com/BrynCooke/buildstructor ">buildstructor</a></li>
-                </ul>
-                <pre class="license-text">Copyright [2022] [Bryn Cooke]
-
-Licensed under the Apache License, Version 2.0 (the &quot;License&quot;);
-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 &quot;AS IS&quot; BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14088,66 +14059,6 @@ <h4>Used by:</h4>
 shall be included in all copies or substantial portions
 of the Software.
 
-THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, 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.
-</pre>
-            </li>
-            <li class="license">
-                <h3 id="MIT">MIT License</h3>
-                <h4>Used by:</h4>
-                <ul class="license-used-by">
-                    <li><a href=" https://github.com/tokio-rs/async-stream ">async-stream</a></li>
-                    <li><a href=" https://github.com/tokio-rs/async-stream ">async-stream-impl</a></li>
-                </ul>
-                <pre class="license-text">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 &quot;Software&quot;), 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 &quot;AS IS&quot;, 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 &quot;Software&quot;), 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 &quot;AS IS&quot;, WITHOUT WARRANTY OF
 ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
 TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
@@ -15154,6 +15065,8 @@ <h4>Used by:</h4>
                 <h3 id="MIT">MIT License</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
+                    <li><a href=" https://github.com/tokio-rs/async-stream ">async-stream</a></li>
+                    <li><a href=" https://github.com/tokio-rs/async-stream ">async-stream-impl</a></li>
                     <li><a href=" https://github.com/Nugine/simd ">base64-simd</a></li>
                     <li><a href=" https://github.com/rutrum/convert-case ">convert_case</a></li>
                     <li><a href=" https://github.com/rust-bakery/cookie-factory ">cookie-factory</a></li>
@@ -16087,8 +16000,6 @@ <h4>Used by:</h4>
                 <h3 id="MIT">MIT License</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
-                    <li><a href=" https://github.com/BurntSushi/aho-corasick ">aho-corasick</a></li>
-                    <li><a href=" https://github.com/BurntSushi/byteorder ">byteorder</a></li>
                     <li><a href=" https://github.com/BurntSushi/ripgrep/tree/master/crates/globset ">globset</a></li>
                     <li><a href=" https://github.com/BurntSushi/memchr ">memchr</a></li>
                     <li><a href=" https://github.com/BurntSushi/regex-automata ">regex-automata</a></li>
@@ -16497,6 +16408,7 @@ <h4>Used by:</h4>
                 <h3 id="MPL-2.0">Mozilla Public License 2.0</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
+                    <li><a href=" https://github.com/tredoe/ascii_utils ">ascii_utils</a></li>
                     <li><a href=" https://gitlab.com/fast_chemail/fast_chemail-rs ">fast_chemail</a></li>
                 </ul>
                 <pre class="license-text">Mozilla Public License Version 2.0
@@ -16879,7 +16791,6 @@ <h4>Used by:</h4>
                 <h3 id="MPL-2.0">Mozilla Public License 2.0</h3>
                 <h4>Used by:</h4>
                 <ul class="license-used-by">
-                    <li><a href=" https://github.com/tredoe/ascii_utils ">ascii_utils</a></li>
                     <li><a href=" https://github.com/soc/option-ext.git ">option-ext</a></li>
                 </ul>
                 <pre class="license-text">Mozilla Public License Version 2.0

diff --git 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.52.1-rc.1"
+PACKAGE_VERSION="v1.52.1"
 
 download_binary() {
     downloader --check