From 15fedc9e2288ea6665f4209330849f61407d2801 Mon Sep 17 00:00:00 2001
From: Alex Hunt <alex.hunt@materialize.com>
Date: Tue, 31 Dec 2024 11:06:47 +0000
Subject: [PATCH 1/2] Disable many default features

Disable many default features, so we don't pull in workspace-hack in the
cloud repo when importing orchestratord.
---
 src/aws-secrets-controller/Cargo.toml  |  6 +++---
 src/cloud-resources/Cargo.toml         |  2 +-
 src/lowertest/Cargo.toml               |  2 +-
 src/orchestrator-kubernetes/Cargo.toml |  8 ++++----
 src/orchestrator-process/Cargo.toml    |  6 +++---
 src/orchestrator-tracing/Cargo.toml    | 12 ++++++------
 src/persist-types/Cargo.toml           |  2 +-
 src/pgtz/Cargo.toml                    |  2 +-
 src/repr/Cargo.toml                    |  2 +-
 src/secrets/Cargo.toml                 |  4 ++--
 src/service/Cargo.toml                 | 14 +++++++-------
 src/sql-parser/Cargo.toml              |  2 +-
 src/tracing/Cargo.toml                 |  2 +-
 13 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/aws-secrets-controller/Cargo.toml b/src/aws-secrets-controller/Cargo.toml
index 6356c95cc2b71..4c062564d555f 100644
--- a/src/aws-secrets-controller/Cargo.toml
+++ b/src/aws-secrets-controller/Cargo.toml
@@ -20,9 +20,9 @@ aws-credential-types = { version = "1.1.1", features = ["hardcoded-credentials"]
 aws-sdk-secretsmanager = { version = "1.20.0", default-features = false, features = ["rt-tokio"] }
 aws-types = "1.1.1"
 futures = { version = "0.3.25" }
-mz-aws-util = { path = "../aws-util" }
-mz-secrets = { path = "../secrets" }
-mz-repr = { path = "../repr" }
+mz-aws-util = { path = "../aws-util", default-features = false }
+mz-secrets = { path = "../secrets", default-features = false }
+mz-repr = { path = "../repr", default-features = false }
 workspace-hack = { version = "0.0.0", path = "../workspace-hack", optional = true }
 tracing = "0.1.37"
 uuid = "1.7.0"
diff --git a/src/cloud-resources/Cargo.toml b/src/cloud-resources/Cargo.toml
index ec228f36e33c6..526b0683278d6 100644
--- a/src/cloud-resources/Cargo.toml
+++ b/src/cloud-resources/Cargo.toml
@@ -26,7 +26,7 @@ uuid = { version = "1.2", features = ["serde", "v4"] }
 workspace-hack = { version = "0.0.0", path = "../workspace-hack", optional = true }
 
 async-trait = { version = "0.1.83", optional = true }
-mz-repr = { path = "../repr", optional = true }
+mz-repr = { path = "../repr", default-features = false, optional = true }
 
 [features]
 default = ["workspace-hack", "vpc-endpoints"]
diff --git a/src/lowertest/Cargo.toml b/src/lowertest/Cargo.toml
index 528e3161fd189..7326d3c9595c9 100644
--- a/src/lowertest/Cargo.toml
+++ b/src/lowertest/Cargo.toml
@@ -10,7 +10,7 @@ publish = false
 workspace = true
 
 [dependencies]
-mz-lowertest-derive = { path = "../lowertest-derive" }
+mz-lowertest-derive = { path = "../lowertest-derive", default-features = false }
 mz-ore = { path = "../ore", features = ["test"], default-features = false }
 proc-macro2 = "1.0.60"
 serde = { version = "1.0.152", features = ["derive"] }
diff --git a/src/orchestrator-kubernetes/Cargo.toml b/src/orchestrator-kubernetes/Cargo.toml
index b9eb00abb45c3..8ab1241a60683 100644
--- a/src/orchestrator-kubernetes/Cargo.toml
+++ b/src/orchestrator-kubernetes/Cargo.toml
@@ -17,11 +17,11 @@ clap = { version = "3.2.24", features = ["derive"] }
 fail = { version = "0.5.1", features = ["failpoints"] }
 futures = "0.3.25"
 maplit = "1.0.2"
-mz-cloud-resources = { path = "../cloud-resources" }
-mz-orchestrator = { path = "../orchestrator" }
+mz-cloud-resources = { path = "../cloud-resources", default-features = false }
+mz-orchestrator = { path = "../orchestrator", default-features = false }
 mz-ore = { path = "../ore", default-features = false, features = ["async"]  }
-mz-secrets = { path = "../secrets" }
-mz-repr = { path = "../repr" }
+mz-secrets = { path = "../secrets", default-features = false }
+mz-repr = { path = "../repr", default-features = false }
 k8s-openapi = { version = "0.22.0", features = ["v1_29"] }
 kube = { version = "0.92.1", default-features = false, features = ["client", "runtime", "ws"] }
 serde = { version = "1.0.152", features = ["derive"] }
diff --git a/src/orchestrator-process/Cargo.toml b/src/orchestrator-process/Cargo.toml
index 066b33c09f4b0..f4b81ae2f5804 100644
--- a/src/orchestrator-process/Cargo.toml
+++ b/src/orchestrator-process/Cargo.toml
@@ -19,10 +19,10 @@ hex = "0.4.3"
 itertools = "0.12.1"
 libc = "0.2.138"
 maplit = "1.0.2"
-mz-orchestrator = { path = "../orchestrator" }
+mz-orchestrator = { path = "../orchestrator", default-features = false }
 mz-ore = { path = "../ore", default-features = false, features = ["async", "network"] }
-mz-repr = { path = "../repr" }
-mz-secrets = { path = "../secrets" }
+mz-repr = { path = "../repr", default-features = false }
+mz-secrets = { path = "../secrets", default-features = false }
 nix = "0.26.1"
 serde = "1.0.147"
 serde_json = "1.0.125"
diff --git a/src/orchestrator-tracing/Cargo.toml b/src/orchestrator-tracing/Cargo.toml
index b395acd1fd2fb..c374008ca00a2 100644
--- a/src/orchestrator-tracing/Cargo.toml
+++ b/src/orchestrator-tracing/Cargo.toml
@@ -17,12 +17,12 @@ derivative = "2.2.0"
 futures-core = "0.3.21"
 http = "1.1.0"
 humantime = { version = "2.1.0" }
-mz-build-info = { path = "../build-info" }
-mz-orchestrator = { path = "../orchestrator" }
+mz-build-info = { path = "../build-info", default-features = false }
+mz-orchestrator = { path = "../orchestrator", default-features = false }
 mz-ore = { path = "../ore", default-features = false, features = ["tracing_", "cli", "test"] }
-mz-repr = { path = "../repr", optional = true }
-mz-service = { path = "../service" }
-mz-tracing = { path = "../tracing" }
+mz-repr = { path = "../repr", default-features = false, optional = true }
+mz-service = { path = "../service", default-features = false }
+mz-tracing = { path = "../tracing", default-features = false }
 sentry-tracing = { version = "0.29.1" }
 tracing = { version = "0.1.37" }
 tracing-capture = { version = "0.1.0", optional = true }
@@ -32,7 +32,7 @@ opentelemetry_sdk = { version = "0.24.1", features = ["rt-tokio"] }
 workspace-hack = { version = "0.0.0", path = "../workspace-hack", optional = true }
 
 [dev-dependencies]
-mz-ore = { path = "../ore", features = ["network", "test"] }
+mz-ore = { path = "../ore", default-features = false, features = ["network", "test"] }
 
 [features]
 default = ["tokio-console", "workspace-hack"]
diff --git a/src/persist-types/Cargo.toml b/src/persist-types/Cargo.toml
index fad17bc855322..4df08b521a805 100644
--- a/src/persist-types/Cargo.toml
+++ b/src/persist-types/Cargo.toml
@@ -14,7 +14,7 @@ workspace = true
 [dependencies]
 anyhow = { version = "1.0.66", features = ["backtrace"] }
 arrow = { version = "53.3.0", default-features = false }
-bytes = "1.3.0"
+bytes = { version = "1.3.0", features = ["serde"] }
 chrono = { version = "0.4.35", default-features = false, features = ["std"] }
 hex = "0.4.3"
 itertools = "0.12.1"
diff --git a/src/pgtz/Cargo.toml b/src/pgtz/Cargo.toml
index 063ac4d8b6ea9..e31ac0a557f6b 100644
--- a/src/pgtz/Cargo.toml
+++ b/src/pgtz/Cargo.toml
@@ -12,7 +12,7 @@ workspace = true
 [dependencies]
 chrono = { version = "0.4.35", default-features = false, features = ["serde", "std"] }
 chrono-tz = { version = "0.8.1", features = ["serde", "case-insensitive"] }
-mz-lowertest = { path = "../lowertest" }
+mz-lowertest = { path = "../lowertest", default-features = false }
 mz-ore = { path = "../ore", features = ["test"], default-features = false }
 mz-proto = { path = "../proto", features = ["chrono"], default-features = false }
 phf = { version = "0.11.1", default-features = false }
diff --git a/src/repr/Cargo.toml b/src/repr/Cargo.toml
index 35f778baa9794..9b34c853d0e35 100644
--- a/src/repr/Cargo.toml
+++ b/src/repr/Cargo.toml
@@ -41,7 +41,7 @@ enum-kinds = "0.5.1"
 flatcontainer = "0.5.0"
 hex = "0.4.3"
 itertools = "0.12.1"
-mz-lowertest = { path = "../lowertest" }
+mz-lowertest = { path = "../lowertest", default-features = false }
 mz-ore = { path = "../ore", features = [
     "bytes_",
     "flatcontainer",
diff --git a/src/secrets/Cargo.toml b/src/secrets/Cargo.toml
index fbd76ff185726..ac23f18b8b132 100644
--- a/src/secrets/Cargo.toml
+++ b/src/secrets/Cargo.toml
@@ -12,12 +12,12 @@ workspace = true
 [dependencies]
 anyhow = "1.0.66"
 async-trait = "0.1.83"
-mz-repr = { path = "../repr" }
+mz-repr = { path = "../repr", default-features = false }
 tracing = "0.1.37"
 workspace-hack = { version = "0.0.0", path = "../workspace-hack", optional = true }
 
 [dev-dependencies]
-mz-ore = { path = "../ore" }
+mz-ore = { path = "../ore", default-features = false }
 tokio = { version = "1.38.0", features = ["macros", "rt"] }
 
 [features]
diff --git a/src/service/Cargo.toml b/src/service/Cargo.toml
index 2aec4f043cbc0..1e3a3a0ce532e 100644
--- a/src/service/Cargo.toml
+++ b/src/service/Cargo.toml
@@ -19,13 +19,13 @@ futures = "0.3.25"
 http = "1.1.0"
 hyper-util = "0.1.6"
 itertools = "0.12.1"
-mz-aws-secrets-controller = { path = "../aws-secrets-controller" }
-mz-build-info = { path = "../build-info" }
-mz-proto = { path = "../proto" }
-mz-repr = { path = "../repr" }
-mz-secrets = { path = "../secrets" }
-mz-orchestrator-process = { path = "../orchestrator-process" }
-mz-orchestrator-kubernetes = { path = "../orchestrator-kubernetes" }
+mz-aws-secrets-controller = { path = "../aws-secrets-controller", default-features = false }
+mz-build-info = { path = "../build-info", default-features = false }
+mz-proto = { path = "../proto", default-features = false }
+mz-repr = { path = "../repr", default-features = false }
+mz-secrets = { path = "../secrets", default-features = false }
+mz-orchestrator-process = { path = "../orchestrator-process", default-features = false }
+mz-orchestrator-kubernetes = { path = "../orchestrator-kubernetes", default-features = false }
 mz-ore = { path = "../ore", default-features = false }
 os_info = "3.5.1"
 prometheus = { version = "0.13.3", default-features = false }
diff --git a/src/sql-parser/Cargo.toml b/src/sql-parser/Cargo.toml
index 09f25d17279b0..1a747f7fa2fe1 100644
--- a/src/sql-parser/Cargo.toml
+++ b/src/sql-parser/Cargo.toml
@@ -28,7 +28,7 @@ workspace-hack = { version = "0.0.0", path = "../workspace-hack", optional = tru
 
 [dev-dependencies]
 mz-ore = { path = "../ore", default-features = false, features = ["test"] }
-mz-sql-parser = { path = ".", features = ["test"] }
+mz-sql-parser = { path = ".", default-features = false, features = ["test"] }
 
 [build-dependencies]
 anyhow = "1.0.66"
diff --git a/src/tracing/Cargo.toml b/src/tracing/Cargo.toml
index 310ee64e2f34a..7e0c6fa790b82 100644
--- a/src/tracing/Cargo.toml
+++ b/src/tracing/Cargo.toml
@@ -12,7 +12,7 @@ workspace = true
 [dependencies]
 anyhow = "1.0.66"
 mz-ore = { path = "../ore", default-features = false, features = ["test", "tracing_"] }
-mz-proto = { path = "../proto" }
+mz-proto = { path = "../proto", default-features = false }
 prost = { version = "0.13.2", features = ["no-recursion-limit"] }
 proptest = { version = "1.6.0", default-features = false, features = ["std"] }
 serde = { version = "1.0.152", features = ["derive"] }

From 1c633e3f3d8321389b478509683f2fe759d4b4e9 Mon Sep 17 00:00:00 2001
From: Alex Hunt <alex.hunt@materialize.com>
Date: Tue, 31 Dec 2024 16:40:10 +0000
Subject: [PATCH 2/2] orchestrator-kubernetes enable vpc-endpoints feature on
 cloud-resources

---
 src/orchestrator-kubernetes/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/orchestrator-kubernetes/Cargo.toml b/src/orchestrator-kubernetes/Cargo.toml
index 8ab1241a60683..4096db3763540 100644
--- a/src/orchestrator-kubernetes/Cargo.toml
+++ b/src/orchestrator-kubernetes/Cargo.toml
@@ -17,7 +17,7 @@ clap = { version = "3.2.24", features = ["derive"] }
 fail = { version = "0.5.1", features = ["failpoints"] }
 futures = "0.3.25"
 maplit = "1.0.2"
-mz-cloud-resources = { path = "../cloud-resources", default-features = false }
+mz-cloud-resources = { path = "../cloud-resources", default-features = false, features = ["vpc-endpoints"] }
 mz-orchestrator = { path = "../orchestrator", default-features = false }
 mz-ore = { path = "../ore", default-features = false, features = ["async"]  }
 mz-secrets = { path = "../secrets", default-features = false }