fix(apollo-router): EnumCount is defined multiple times from strum and strum_macros crates (copy #8698) (#8699)

Co-authored-by: Sylwester Rąpała <[email protected]>
Co-authored-by: Renée Kooi <[email protected]>

Author: 3 people

Cargo.lock

@@ -420,7 +420,6 @@ dependencies = [
  "similar",
  "static_assertions",
  "strum 0.27.2",
- "strum_macros 0.27.2",
  "sys-info",
  "sysinfo",
  "tempfile",
@@ -6505,6 +6504,9 @@ name = "strum"
 version = "0.27.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf"
+dependencies = [
+ "strum_macros 0.27.2",
+]
 
 [[package]]
 name = "strum_macros"

apollo-router/Cargo.toml

@@ -223,8 +223,7 @@ serde_regex = { version = "1.1.0" }
 serde_urlencoded = "0.7.1"
 serde_yaml = "0.8.26"
 static_assertions = "1.1.0"
-strum = "0.27.0"
-strum_macros = "0.27.0"
+strum = { version = "0.27.0", features = ["derive"] }
 sys-info = "0.9.1"
 sysinfo = { version = "0.37.0", features = [
     "system",

apollo-router/src/ageing_priority_queue.rs

@@ -3,7 +3,7 @@ use std::sync::atomic::Ordering;
 
 /// Items with higher priority value get handled sooner
 #[allow(unused)]
-#[derive(strum_macros::IntoStaticStr)]
+#[derive(strum::IntoStaticStr)]
 pub(crate) enum Priority {
     P1 = 1,
     P2,

apollo-router/src/compute_job/metrics.rs

@@ -8,7 +8,7 @@ use crate::plugins::telemetry::consts::OTEL_STATUS_CODE;
 use crate::plugins::telemetry::consts::OTEL_STATUS_CODE_ERROR;
 use crate::plugins::telemetry::consts::OTEL_STATUS_CODE_OK;
 
-#[derive(Copy, Clone, strum_macros::IntoStaticStr)]
+#[derive(Copy, Clone, strum::IntoStaticStr)]
 #[strum(serialize_all = "snake_case")]
 pub(super) enum Outcome {
     ExecutedOk,

apollo-router/src/compute_job/mod.rs

@@ -110,7 +110,7 @@ impl crate::graphql::IntoGraphQLErrors for ComputeBackPressureError {
     }
 }
 
-#[derive(Copy, Clone, Hash, Eq, PartialEq, Debug, strum_macros::IntoStaticStr)]
+#[derive(Copy, Clone, Hash, Eq, PartialEq, Debug, strum::IntoStaticStr)]
 #[strum(serialize_all = "snake_case")]
 pub(crate) enum ComputeJobType {
     QueryParsing,

apollo-router/src/metrics/aggregation.rs

@@ -28,10 +28,9 @@ use opentelemetry::metrics::UpDownCounter;
 use opentelemetry::metrics::noop::NoopMeterProvider;
 use opentelemetry_sdk::metrics::SdkMeterProvider;
 use parking_lot::Mutex;
+use strum::Display;
 use strum::EnumCount;
-use strum_macros::Display;
-use strum_macros::EnumCount;
-use strum_macros::EnumIter;
+use strum::EnumIter;
 
 use crate::metrics::filter::FilterMeterProvider;
 

apollo-router/src/services/external.rs

@@ -17,7 +17,7 @@ use schemars::JsonSchema;
 use serde::Deserialize;
 use serde::Serialize;
 use serde::de::DeserializeOwned;
-use strum_macros::Display;
+use strum::Display;
 use tower::BoxError;
 use tower::Service;
 use tracing::Instrument;

apollo-router/src/uplink/license_enforcement.rs

@@ -27,8 +27,8 @@ use serde::Deserializer;
 use serde::Serialize;
 use serde::de::Visitor;
 use serde_json::Value;
+use strum::EnumIter;
 use strum::IntoEnumIterator;
-use strum_macros::EnumIter;
 use thiserror::Error;
 
 use super::parsed_link_spec::ParsedLinkSpec;