Add a 'rustfmt' feature to crates that use gRPC (#1041)

Sometimes we need to be able to read generated code. The linkerd2-proxy-api's 'rustfmt' feature flag makes this behavior optional. This change adds this feature flag to the linkerd crates that depend on linkerd2-proxy-api.
linkerd · Jun 10, 2021 · aabd5a5 · aabd5a5
1 parent 8119772
commit aabd5a5
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
@@ -713,9 +713,7 @@ dependencies = [
  "linkerd-trace-context",
  "linkerd-tracing",
  "linkerd-transport-header",
- "linkerd2-proxy-api",
  "pin-project",
- "prost-types",
  "regex",
  "serde_json",
  "thiserror",

diff --git a/linkerd/app/core/Cargo.toml b/linkerd/app/core/Cargo.toml
@@ -42,7 +42,6 @@ linkerd-metrics = { path = "../../metrics" }
 linkerd-transport-header = { path = "../../transport-header" }
 linkerd-opencensus = { path = "../../opencensus" }
 linkerd-proxy-core = { path = "../../proxy/core" }
-linkerd2-proxy-api = { git = "https://github.com/linkerd/linkerd2-proxy-api", branch = "main" }
 linkerd-proxy-api-resolve = { path = "../../proxy/api-resolve" }
 linkerd-proxy-discover = { path = "../../proxy/discover" }
 linkerd-proxy-identity = { path = "../../proxy/identity" }
@@ -83,7 +82,3 @@ features = [
 
 [target.'cfg(target_os = "linux")'.dependencies]
 linkerd-system = { path = "../../system" }
-
-[dev-dependencies]
-linkerd2-proxy-api = { git = "https://github.com/linkerd/linkerd2-proxy-api", branch = "main", features = ["arbitrary"] }
-prost-types = "0.7.0"
diff --git a/linkerd/app/inbound/fuzz/Cargo.lock b/linkerd/app/inbound/fuzz/Cargo.lock
@@ -620,7 +620,6 @@ dependencies = [
  "linkerd-trace-context",
  "linkerd-tracing",
  "linkerd-transport-header",
- "linkerd2-proxy-api",
  "pin-project",
  "regex",
  "serde_json",

diff --git a/linkerd/app/integration/Cargo.toml b/linkerd/app/integration/Cargo.toml
@@ -13,8 +13,8 @@ a dedicated crate to help the compiler cache dependencies properly.
 """
 
 [features]
-# Disable to skip certain tests that should not be run on CI.
-flaky_tests = []
+flaky_tests = [] # Disable to skip certain tests that should not be run on CI.
+rustfmt = ["linkerd2-proxy-api/rustfmt"]
 
 [dependencies]
 bytes = "1"

diff --git a/linkerd/proxy/api-resolve/Cargo.toml b/linkerd/proxy/api-resolve/Cargo.toml
@@ -9,6 +9,9 @@ description = """
 Implements the Resolve trait using the proxy's gRPC API
 """
 
+[features]
+rustfmt = ["linkerd2-proxy-api/rustfmt"]
+
 [dependencies]
 async-stream = "0.3"
 futures = { version = "0.3", default-features = false }

diff --git a/linkerd/proxy/identity/Cargo.toml b/linkerd/proxy/identity/Cargo.toml
@@ -6,6 +6,9 @@ license = "Apache-2.0"
 edition = "2018"
 publish = false
 
+[features]
+rustfmt = ["linkerd2-proxy-api/rustfmt"]
+
 [dependencies]
 futures = { version = "0.3", default-features = false }
 linkerd2-proxy-api = { git = "https://github.com/linkerd/linkerd2-proxy-api", branch = "main", features = ["identity", "client"] }

diff --git a/linkerd/proxy/tap/Cargo.toml b/linkerd/proxy/tap/Cargo.toml
@@ -6,6 +6,9 @@ license = "Apache-2.0"
 edition = "2018"
 publish = false
 
+[features]
+rustfmt = ["linkerd2-proxy-api/rustfmt"]
+
 [dependencies]
 http = "0.2"
 hyper = { version = "0.14.2", features = ["http1", "http2"] }

diff --git a/linkerd/service-profiles/Cargo.toml b/linkerd/service-profiles/Cargo.toml
@@ -9,6 +9,9 @@ description = """
 Implements client layers for Linkerd ServiceProfiles.
 """
 
+[features]
+rustfmt = ["linkerd2-proxy-api/rustfmt"]
+
 [dependencies]
 bytes = "1"
 futures = { version = "0.3", default-features = false }