Release apollo-composition 0.1.4 (#589)

apollographql · Oct 1, 2024 · b82456b · b82456b
2 parents c814e0e + ce2a2fe
commit b82456b
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 32 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -133,7 +133,7 @@ jobs:
 executors:
   arm_macos: &arm_macos_executor
     macos:
-      xcode: "14.2"
+      xcode: "15.4.0"
     resource_class: macos.m1.medium.gen1
     environment:
       RUSTUP_TARGET: "aarch64-apple-darwin"
@@ -172,13 +172,9 @@ commands:
           condition:
             equal: [ *arm_macos_executor, << parameters.platform >> ]
           steps:
-            - run:
-                name: Skip homebrew update
-                command: echo "HOMEBREW_NO_AUTO_UPDATE=1" >> $BASH_ENV
             - run:
                 name: Install CMake
-                command: |
-                  brew install cmake
+                command: brew install cmake
 
       - install_rust_toolchain:
           platform: << parameters.platform >>

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/apollo-composition/CHANGELOG.md b/apollo-composition/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.1.4
+
+- Update to `apollo-federation` 2.0.0-preview.0
+
 ## 0.1.3
 
 - [#586](https://github.com/apollographql/federation-rs/pull/586) Make

diff --git a/apollo-composition/Cargo.toml b/apollo-composition/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "apollo-composition"
-version = "0.1.3"
+version = "0.1.4"
 license = "Elastic-2.0"
 edition = "2021"
 authors = ["Apollo Developers <[email protected]>"]
@@ -9,7 +9,7 @@ readme = "README.md"
 repository = "https://github.com/apollographql/federation-rs/"
 
 [dependencies]
-apollo-compiler = "1.0.0-beta.20"
-apollo-federation = "2.0.0-alpha.7"
+apollo-compiler = "1.0.0-beta.24"
+apollo-federation = "2.0.0-preview.0"
 apollo-federation-types = { version = "0.14.0", path = "../apollo-federation-types" }
 either = "1.12.0"
diff --git a/apollo-composition/src/lib.rs b/apollo-composition/src/lib.rs
@@ -1,5 +1,4 @@
 use apollo_compiler::parser::LineColumn;
-use apollo_compiler::Schema;
 use apollo_federation::sources::connect::expand::{expand_connectors, Connectors, ExpansionResult};
 use apollo_federation::sources::connect::validation::{
     validate, Code, Severity as ValidationSeverity,
@@ -71,23 +70,21 @@ pub trait HybridComposition {
         let subgraph_validation_errors = subgraph_definitions
             .iter()
             .flat_map(|subgraph| {
-                // TODO: Use parse_and_validate (adding in directives as needed)
-                // TODO: Handle schema errors rather than relying on JavaScript to catch it later
-                let schema = Schema::parse(&subgraph.sdl, &subgraph.name)
-                    .unwrap_or_else(|schema_with_errors| schema_with_errors.partial);
-                validate(schema).into_iter().map(|validation_error| Issue {
-                    code: transform_code(validation_error.code),
-                    message: validation_error.message,
-                    locations: validation_error
-                        .locations
-                        .into_iter()
-                        .map(|range| SubgraphLocation {
-                            subgraph: Some(subgraph.name.clone()),
-                            range: Some(range),
-                        })
-                        .collect(),
-                    severity: validation_error.code.severity().into(),
-                })
+                validate(&subgraph.sdl, &subgraph.name)
+                    .into_iter()
+                    .map(|validation_error| Issue {
+                        code: transform_code(validation_error.code),
+                        message: validation_error.message,
+                        locations: validation_error
+                            .locations
+                            .into_iter()
+                            .map(|range| SubgraphLocation {
+                                subgraph: Some(subgraph.name.clone()),
+                                range: Some(range),
+                            })
+                            .collect(),
+                        severity: validation_error.code.severity().into(),
+                    })
             })
             .collect::<Vec<_>>();