Skip to content

Upgrade to apollo-compiler@1.28.0 #7340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tninesling wants to merge 1 commit into from
Closed

Upgrade to apollo-compiler@1.28.0 #7340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,9 @@ checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f"

[[package]]
name = "apollo-compiler"
version = "1.27.0"
version = "1.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1bb8a0d8a54b31d8a9efcc25d4be3d949d823e8105a710861d6d4a4ef811b5f2"
checksum = "b3eb9f97e5cc573361cdeb65204fbb7c459c9a9d5a6bec48ee37355c642a06ad"
dependencies = [
"ahash",
"apollo-parser",
Expand All @@ -173,7 +173,7 @@ dependencies = [
"rowan",
"serde",
"serde_json_bytes",
"thiserror 1.0.69",
"thiserror 2.0.10",
"triomphe",
"typed-arena",
]
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ debug = 1
# Dependencies used in more than one place are specified here in order to keep versions in sync:
# https://doc.rust-lang.org/cargo/reference/workspaces.html#the-dependencies-table
[workspace.dependencies]
apollo-compiler = "1.27.0"
apollo-compiler = "1.28.0"
apollo-parser = "0.8.4"
apollo-smith = "0.15.0"
async-trait = "0.1.77"
Expand Down
43 changes: 20 additions & 23 deletions apollo-federation/src/schema/schema_upgrader.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,19 +217,15 @@ impl<'a> SchemaUpgrader<'a> {
for field in &referencers.object_fields.clone() {
let field_type = field.make_mut(&mut schema.schema)?.make_mut();

for directive in field_type.directives.0.iter_mut() {
if directive.name == directive_name {
for arg in directive.make_mut().arguments.iter_mut() {
if arg.name == "fields" {
if let Some(new_fields_string) =
Self::make_fields_string_if_not(&arg.value)?
{
*arg.make_mut().value.make_mut() =
Value::String(new_fields_string);
}
break;
}
for directive in field_type.directives.get_all_mut(directive_name) {
if let Some(fields) = directive
.make_mut()
.specified_argument_by_name_mut("fields")
{
if let Some(new_fields_string) = Self::make_fields_string_if_not(fields)? {
*fields.make_mut() = Value::String(new_fields_string);
}
break;
}
}
}
Expand All @@ -241,18 +237,19 @@ impl<'a> SchemaUpgrader<'a> {
for field in &referencers.object_types.clone() {
let field_type = field.make_mut(&mut schema.schema)?.make_mut();

for directive in field_type.directives.0.iter_mut() {
if directive.name == "key" {
for arg in directive.make_mut().arguments.iter_mut() {
if arg.name == "fields" {
if let Some(new_fields_string) =
Self::make_fields_string_if_not(&arg.value)?
{
*arg.make_mut().value.make_mut() = Value::String(new_fields_string);
}
break;
}
for directive in field_type
.directives
.iter_mut()
.filter(|d| d.name.as_str() == "key")
{
if let Some(fields) = directive
.make_mut()
.specified_argument_by_name_mut("fields")
{
if let Some(new_fields_string) = Self::make_fields_string_if_not(fields)? {
*fields.make_mut() = Value::String(new_fields_string);
}
break;
}
}
}
Expand Down