Skip to content

Commit

Permalink
Changes for next release (#581)
Browse files Browse the repository at this point in the history
Co-authored-by: Dylan Anthony <dylan@apollographql.com>
Co-authored-by: Lenny Burdette <lenny@apollographql.com>
  • Loading branch information
3 people authored Sep 23, 2024
1 parent 3d4dab7 commit c814e0e
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 21 deletions.
44 changes: 34 additions & 10 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 1 addition & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
[workspace]
members = [
"apollo-federation-types",
"apollo-composition",
"router-bridge",
]
members = ["apollo-federation-types", "apollo-composition", "router-bridge"]
resolver = "2"
4 changes: 3 additions & 1 deletion apollo-composition/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
8 changes: 4 additions & 4 deletions apollo-composition/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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 <opensource@apollographql.com>"]
Expand All @@ -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"
apollo-federation = "2.0.0-alpha.7"
apollo-federation-types = { version = "0.14.0", path = "../apollo-federation-types" }
either = "1.12.0"
8 changes: 7 additions & 1 deletion apollo-composition/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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()
}
Expand Down

0 comments on commit c814e0e

Please sign in to comment.