From c814e0e9554df1ba6d11d109249f8d7ae2eeaf37 Mon Sep 17 00:00:00 2001 From: Matthew Hawkins Date: Mon, 23 Sep 2024 14:26:14 -0600 Subject: [PATCH] Changes for next release (#581) Co-authored-by: Dylan Anthony Co-authored-by: Lenny Burdette --- Cargo.lock | 44 +++++++++++++++++++++++++-------- Cargo.toml | 6 +---- apollo-composition/CHANGELOG.md | 4 ++- apollo-composition/Cargo.toml | 8 +++--- apollo-composition/src/lib.rs | 8 +++++- 5 files changed, 49 insertions(+), 21 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2b737a495..31faf66ca 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -59,9 +59,9 @@ checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" [[package]] name = "apollo-compiler" -version = "1.0.0-beta.22" +version = "1.0.0-beta.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6feccaf8fab00732a73dd3a40e4aaa7a1106ceef3c0bfbc591c4e0ba27e07774" +checksum = "875f39060728ac3e775fc3fe5421225d6df92c4d5155a9524cdb198f05006d36" dependencies = [ "ahash", "apollo-parser", @@ -78,7 +78,7 @@ dependencies = [ [[package]] name = "apollo-composition" -version = "0.1.2" +version = "0.1.3" dependencies = [ "apollo-compiler", "apollo-federation", @@ -88,9 +88,9 @@ dependencies = [ [[package]] name = "apollo-federation" -version = "2.0.0-alpha.6" +version = "2.0.0-alpha.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ca57e70fa00d8c0f8f01152dd79c648313e78b06c9cf455c4c49bba3a2b1e4" +checksum = "b327840a1c216f7a1e6ac1a4fee347a9dee4fe7e3db94f5f9756337f5754969c" dependencies = [ "apollo-compiler", "derive_more", @@ -101,12 +101,13 @@ dependencies = [ "lazy_static", "multimap", "nom", + "nom_locate", "petgraph", "serde", "serde_json", "serde_json_bytes", "strum 0.26.2", - "strum_macros 0.26.2", + "strum_macros 0.26.4", "thiserror", "time", "tracing", @@ -268,6 +269,12 @@ version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +[[package]] +name = "bytecount" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce" + [[package]] name = "byteorder" version = "1.4.3" @@ -1022,6 +1029,12 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" version = "0.1.19" @@ -1348,6 +1361,17 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "nom_locate" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e3c83c053b0713da60c5b8de47fe8e494fe3ece5267b2f23090a07a053ba8f3" +dependencies = [ + "bytecount", + "memchr", + "nom", +] + [[package]] name = "nu-ansi-term" version = "0.46.0" @@ -2187,7 +2211,7 @@ version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad8d03b598d3d0fff69bf533ee3ef19b8eeb342729596df84bcc7e1f96ec4059" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "rustversion", @@ -2196,11 +2220,11 @@ dependencies = [ [[package]] name = "strum_macros" -version = "0.26.2" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck", + "heck 0.5.0", "proc-macro2", "quote", "rustversion", diff --git a/Cargo.toml b/Cargo.toml index 383ac9345..7065b4c47 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,3 @@ [workspace] -members = [ - "apollo-federation-types", - "apollo-composition", - "router-bridge", -] +members = ["apollo-federation-types", "apollo-composition", "router-bridge"] resolver = "2" diff --git a/apollo-composition/CHANGELOG.md b/apollo-composition/CHANGELOG.md index 356286dba..238bb8103 100644 --- a/apollo-composition/CHANGELOG.md +++ b/apollo-composition/CHANGELOG.md @@ -1,10 +1,12 @@ # Changelog -## vNEXT +## 0.1.3 - [#586](https://github.com/apollographql/federation-rs/pull/586) Make `SubgraphLocation.subgraph` an `Option`. For now, composition errors can have no attributed subgraph. +- [#583](https://github.com/apollographql/federation-rs/pull/583) Remove + connectors warning. ## 0.1.2 diff --git a/apollo-composition/Cargo.toml b/apollo-composition/Cargo.toml index bdf237bc0..7d0249457 100644 --- a/apollo-composition/Cargo.toml +++ b/apollo-composition/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "apollo-composition" -version = "0.1.2" +version = "0.1.3" license = "Elastic-2.0" edition = "2021" authors = ["Apollo Developers "] @@ -10,6 +10,6 @@ repository = "https://github.com/apollographql/federation-rs/" [dependencies] apollo-compiler = "1.0.0-beta.20" -apollo-federation = "2.0.0-alpha.6" -apollo-federation-types = { version="0.14.0", path = "../apollo-federation-types" } -either = "1.12.0" \ No newline at end of file +apollo-federation = "2.0.0-alpha.7" +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 index ddcc1668e..0e71d3d10 100644 --- a/apollo-composition/src/lib.rs +++ b/apollo-composition/src/lib.rs @@ -193,7 +193,7 @@ fn transform_code(code: Code) -> String { Code::DuplicateSourceName => "DUPLICATE_SOURCE_NAME", Code::InvalidSourceName => "INVALID_SOURCE_NAME", Code::EmptySourceName => "EMPTY_SOURCE_NAME", - Code::SourceScheme => "SOURCE_SCHEME", + Code::InvalidUrlScheme => "INVALID_URL_SCHEME", Code::SourceNameMismatch => "SOURCE_NAME_MISMATCH", Code::SubscriptionInConnectors => "SUBSCRIPTION_IN_CONNECTORS", Code::InvalidUrl => "INVALID_URL", @@ -205,6 +205,7 @@ fn transform_code(code: Code) -> String { Code::MultipleHttpMethods => "MULTIPLE_HTTP_METHODS", Code::MissingHttpMethod => "MISSING_HTTP_METHOD", Code::EntityNotOnRootQuery => "ENTITY_NOT_ON_ROOT_QUERY", + Code::EntityResolverArgumentMismatch => "ENTITY_RESOLVER_ARGUMENT_MISMATCH", Code::EntityTypeInvalid => "ENTITY_TYPE_INVALID", Code::InvalidJsonSelection => "INVALID_JSON_SELECTION", Code::CircularReference => "CIRCULAR_REFERENCE", @@ -221,6 +222,11 @@ fn transform_code(code: Code) -> String { Code::GroupSelectionRequiredForObject => "GROUP_SELECTION_REQUIRED_FOR_OBJECT", Code::UnresolvedField => "CONNECTORS_UNRESOLVED_FIELD", Code::FieldWithArguments => "CONNECTORS_FIELD_WITH_ARGUMENTS", + Code::InvalidStarSelection => "INVALID_STAR_SELECTION", + Code::UndefinedArgument => "UNDEFINED_ARGUMENT", + Code::UndefinedField => "UNDEFINED_FIELD", + Code::UnsupportedVariableType => "UNSUPPORTED_VARIABLE_TYPE", + Code::NullablePathVariable => "NULLABLE_PATH_VARIABLE", } .to_string() }