From c3eddbda76be473c2993fa85cacca0f7f28c7b4f Mon Sep 17 00:00:00 2001 From: Shiyas Mohammed Date: Mon, 22 Dec 2025 11:38:34 +0530 Subject: [PATCH] refactor(config): rename config crate to amp-config --- Cargo.lock | 46 +++++++++---------- crates/bin/ampd/Cargo.toml | 2 +- crates/bin/ampd/src/controller_cmd.rs | 4 +- crates/bin/ampd/src/main.rs | 4 +- crates/bin/ampd/src/migrate_cmd.rs | 2 +- crates/bin/ampd/src/server_cmd.rs | 4 +- crates/bin/ampd/src/solo_cmd.rs | 4 +- crates/bin/ampd/src/worker_cmd.rs | 4 +- crates/config/Cargo.toml | 2 +- crates/core/monitoring/src/logging.rs | 2 +- crates/services/admin-api/Cargo.toml | 2 +- crates/services/admin-api/src/ctx.rs | 2 +- crates/services/controller/Cargo.toml | 2 +- crates/services/controller/src/config.rs | 2 +- crates/services/worker/Cargo.toml | 2 +- crates/services/worker/src/config.rs | 2 +- tests/Cargo.toml | 2 +- tests/src/main.rs | 2 +- tests/src/testlib/ctx.rs | 2 +- .../src/testlib/fixtures/daemon_controller.rs | 4 +- tests/src/testlib/fixtures/daemon_server.rs | 4 +- tests/src/testlib/fixtures/daemon_worker.rs | 4 +- 22 files changed, 52 insertions(+), 52 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 098a7440a..d4c53e597 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -28,10 +28,10 @@ checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" name = "admin-api" version = "0.1.0" dependencies = [ + "amp-config", "async-trait", "axum 0.8.7", "common", - "config", "datafusion", "dataset-store", "datasets-common", @@ -921,6 +921,24 @@ dependencies = [ "uuid", ] +[[package]] +name = "amp-config" +version = "0.1.0" +dependencies = [ + "amp-object-store", + "common", + "datafusion", + "dump", + "figment", + "fs-err", + "metadata-db", + "metadata-db-postgres", + "monitoring", + "serde", + "thiserror 2.0.17", + "tokio", +] + [[package]] name = "amp-object-store" version = "0.1.0" @@ -992,10 +1010,10 @@ dependencies = [ name = "ampd" version = "0.1.0" dependencies = [ + "amp-config", "amp-object-store", "clap", "common", - "config", "console-subscriber", "controller", "dataset-store", @@ -2687,24 +2705,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "config" -version = "0.1.0" -dependencies = [ - "amp-object-store", - "common", - "datafusion", - "dump", - "figment", - "fs-err", - "metadata-db", - "metadata-db-postgres", - "monitoring", - "serde", - "thiserror 2.0.17", - "tokio", -] - [[package]] name = "console" version = "0.15.11" @@ -2845,10 +2845,10 @@ name = "controller" version = "0.1.0" dependencies = [ "admin-api", + "amp-config", "async-trait", "axum 0.8.7", "common", - "config", "dataset-store", "datasets-common", "dump", @@ -11882,6 +11882,7 @@ version = "0.1.0" dependencies = [ "alloy", "amp-client", + "amp-config", "amp-object-store", "ampctl", "arrow-flight", @@ -11889,7 +11890,6 @@ dependencies = [ "clap", "color-backtrace", "common", - "config", "controller", "ctor", "dataset-store", @@ -13591,10 +13591,10 @@ checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59" name = "worker" version = "0.1.0" dependencies = [ + "amp-config", "backon", "chrono", "common", - "config", "dataset-store", "datasets-common", "dump", diff --git a/crates/bin/ampd/Cargo.toml b/crates/bin/ampd/Cargo.toml index 5f4357427..181737a53 100644 --- a/crates/bin/ampd/Cargo.toml +++ b/crates/bin/ampd/Cargo.toml @@ -17,7 +17,7 @@ snmalloc = ["dep:snmalloc-rs"] amp-object-store = { path = "../../core/object-store" } clap.workspace = true common = { path = "../../core/common" } -config = { path = "../../config" } +amp-config = { path = "../../config" } console-subscriber = { version = "0.4.1", default-features = false, optional = true } controller = { path = "../../services/controller" } dataset-store = { path = "../../core/dataset-store" } diff --git a/crates/bin/ampd/src/controller_cmd.rs b/crates/bin/ampd/src/controller_cmd.rs index 481e5b74e..09715e7cf 100644 --- a/crates/bin/ampd/src/controller_cmd.rs +++ b/crates/bin/ampd/src/controller_cmd.rs @@ -1,8 +1,8 @@ use std::{net::SocketAddr, sync::Arc}; +use amp_config::Config as CommonConfig; use amp_object_store::ObjectStoreCreationError; use common::{BoxError, store::Store}; -use config::Config as CommonConfig; use controller::config::Config; use dataset_store::{ DatasetStore, manifests::DatasetManifestsStore, providers::ProviderConfigsStore, @@ -69,7 +69,7 @@ pub enum Error { /// This occurs when the controller cannot establish a connection to the /// PostgreSQL metadata database. #[error("Failed to connect to metadata database: {0}")] - MetadataDbConnection(#[source] Box), + MetadataDbConnection(#[source] Box), /// Failed to create data store /// diff --git a/crates/bin/ampd/src/main.rs b/crates/bin/ampd/src/main.rs index a4e0e933c..8275e4015 100644 --- a/crates/bin/ampd/src/main.rs +++ b/crates/bin/ampd/src/main.rs @@ -1,5 +1,5 @@ +use amp_config::Config; use common::BoxError; -use config::Config; mod controller_cmd; mod migrate_cmd; @@ -167,7 +167,7 @@ async fn load_config( }; // Gather build info from environment variables set by vergen - let build_info = config::BuildInfo { + let build_info = amp_config::BuildInfo { version: env!("VERGEN_GIT_DESCRIBE").to_string(), commit_sha: env!("VERGEN_GIT_SHA").to_string(), commit_timestamp: env!("VERGEN_GIT_COMMIT_TIMESTAMP").to_string(), diff --git a/crates/bin/ampd/src/migrate_cmd.rs b/crates/bin/ampd/src/migrate_cmd.rs index b7b80ccb0..d68f786d4 100644 --- a/crates/bin/ampd/src/migrate_cmd.rs +++ b/crates/bin/ampd/src/migrate_cmd.rs @@ -1,4 +1,4 @@ -use config::Config; +use amp_config::Config; pub async fn run(config: Config) -> Result<(), Error> { let url = config diff --git a/crates/bin/ampd/src/server_cmd.rs b/crates/bin/ampd/src/server_cmd.rs index f0dac29b3..faa1f85ee 100644 --- a/crates/bin/ampd/src/server_cmd.rs +++ b/crates/bin/ampd/src/server_cmd.rs @@ -1,8 +1,8 @@ use std::sync::Arc; +use amp_config::{Addrs, Config as CommonConfig}; use amp_object_store::ObjectStoreCreationError; use common::{BoxError, store::Store}; -use config::{Addrs, Config as CommonConfig}; use dataset_store::{ DatasetStore, manifests::DatasetManifestsStore, providers::ProviderConfigsStore, }; @@ -102,7 +102,7 @@ pub enum Error { /// This occurs when the server cannot establish a connection to the /// PostgreSQL metadata database. #[error("Failed to connect to metadata database: {0}")] - MetadataDbConnection(#[source] Box), + MetadataDbConnection(#[source] Box), /// Failed to create data store /// diff --git a/crates/bin/ampd/src/solo_cmd.rs b/crates/bin/ampd/src/solo_cmd.rs index cc384937e..aad064708 100644 --- a/crates/bin/ampd/src/solo_cmd.rs +++ b/crates/bin/ampd/src/solo_cmd.rs @@ -1,8 +1,8 @@ use std::{future::Future, pin::Pin, sync::Arc}; +use amp_config::Config as CommonConfig; use amp_object_store::ObjectStoreCreationError; use common::{BoxError, store::Store}; -use config::Config as CommonConfig; use dataset_store::{ DatasetStore, manifests::DatasetManifestsStore, providers::ProviderConfigsStore, }; @@ -137,7 +137,7 @@ pub enum Error { /// This occurs when the solo command cannot establish a connection to the /// PostgreSQL metadata database. #[error("Failed to connect to metadata database: {0}")] - MetadataDbConnection(#[source] Box), + MetadataDbConnection(#[source] Box), /// Failed to create data store /// diff --git a/crates/bin/ampd/src/worker_cmd.rs b/crates/bin/ampd/src/worker_cmd.rs index 467bed5e7..20fc86a43 100644 --- a/crates/bin/ampd/src/worker_cmd.rs +++ b/crates/bin/ampd/src/worker_cmd.rs @@ -1,6 +1,6 @@ +use amp_config::Config; use amp_object_store::ObjectStoreCreationError; use common::store::Store; -use config::Config; use dataset_store::{ DatasetStore, manifests::DatasetManifestsStore, providers::ProviderConfigsStore, }; @@ -64,7 +64,7 @@ pub enum Error { /// This occurs when the worker cannot establish a connection to the /// PostgreSQL metadata database. #[error("Failed to connect to metadata database: {0}")] - MetadataDbConnection(#[source] Box), + MetadataDbConnection(#[source] Box), /// Failed to create data store /// diff --git a/crates/config/Cargo.toml b/crates/config/Cargo.toml index 68cba935f..04042a672 100644 --- a/crates/config/Cargo.toml +++ b/crates/config/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "config" +name = "amp-config" edition.workspace = true version.workspace = true license-file.workspace = true diff --git a/crates/core/monitoring/src/logging.rs b/crates/core/monitoring/src/logging.rs index 8be5faa25..a675d3c19 100644 --- a/crates/core/monitoring/src/logging.rs +++ b/crates/core/monitoring/src/logging.rs @@ -66,6 +66,7 @@ const AMP_CRATES: &[&str] = &[ "admin_api", "admin_client", "amp_client", + "amp_config", "amp_object_store", "ampcc", "ampctl", @@ -75,7 +76,6 @@ const AMP_CRATES: &[&str] = &[ "arrow_to_postgres", "auth_http", "common", - "config", "controller", "dataset_store", "datasets_common", diff --git a/crates/services/admin-api/Cargo.toml b/crates/services/admin-api/Cargo.toml index 7f13dfa7d..925aacfb5 100644 --- a/crates/services/admin-api/Cargo.toml +++ b/crates/services/admin-api/Cargo.toml @@ -8,7 +8,7 @@ edition.workspace = true async-trait.workspace = true axum.workspace = true common = { path = "../../core/common" } -config = { path = "../../config" } +amp-config = { path = "../../config" } datafusion.workspace = true dataset-store = { path = "../../core/dataset-store" } datasets-common = { path = "../../core/datasets-common" } diff --git a/crates/services/admin-api/src/ctx.rs b/crates/services/admin-api/src/ctx.rs index 7d2370589..a4373d0db 100644 --- a/crates/services/admin-api/src/ctx.rs +++ b/crates/services/admin-api/src/ctx.rs @@ -1,8 +1,8 @@ //! Service context use std::sync::Arc; +use amp_config::BuildInfo; use common::store::Store; -use config::BuildInfo; use dataset_store::DatasetStore; use metadata_db::MetadataDb; diff --git a/crates/services/controller/Cargo.toml b/crates/services/controller/Cargo.toml index 0de814c5e..f3b47237e 100644 --- a/crates/services/controller/Cargo.toml +++ b/crates/services/controller/Cargo.toml @@ -9,7 +9,7 @@ admin-api = { path = "../admin-api" } async-trait.workspace = true axum.workspace = true common = { path = "../../core/common" } -config = { path = "../../config" } +amp-config = { path = "../../config" } dataset-store = { version = "0.1.0", path = "../../core/dataset-store" } datasets-common = { version = "0.1.0", path = "../../core/datasets-common" } dump = { version = "0.1.0", path = "../../core/dump" } diff --git a/crates/services/controller/src/config.rs b/crates/services/controller/src/config.rs index 9ffe1754d..b23d0611a 100644 --- a/crates/services/controller/src/config.rs +++ b/crates/services/controller/src/config.rs @@ -1,4 +1,4 @@ -use config::BuildInfo; +use amp_config::BuildInfo; /// Controller-specific configuration /// diff --git a/crates/services/worker/Cargo.toml b/crates/services/worker/Cargo.toml index 7ad435eaa..aa7db0811 100644 --- a/crates/services/worker/Cargo.toml +++ b/crates/services/worker/Cargo.toml @@ -8,7 +8,7 @@ license-file.workspace = true backon.workspace = true chrono.workspace = true common = { path = "../../core/common" } -config = { path = "../../config" } +amp-config = { path = "../../config" } dataset-store = { path = "../../core/dataset-store" } datasets-common = { path = "../../core/datasets-common" } dump = { path = "../../core/dump" } diff --git a/crates/services/worker/src/config.rs b/crates/services/worker/src/config.rs index 883ddb8e3..3d690c6ba 100644 --- a/crates/services/worker/src/config.rs +++ b/crates/services/worker/src/config.rs @@ -1,6 +1,6 @@ use std::{path::PathBuf, time::Duration}; -use config::ParquetConfig; +use amp_config::ParquetConfig; use crate::info::WorkerInfo; diff --git a/tests/Cargo.toml b/tests/Cargo.toml index b218d1196..892e6d0e8 100644 --- a/tests/Cargo.toml +++ b/tests/Cargo.toml @@ -22,7 +22,7 @@ color-backtrace = { version = "0.7.1", default-features = false, features = [ "use-btparse-crate", ] } common = { path = "../crates/core/common" } -config = { path = "../crates/config" } +amp-config = { path = "../crates/config" } controller = { path = "../crates/services/controller" } ctor = "0.5.0" dataset-store = { path = "../crates/core/dataset-store" } diff --git a/tests/src/main.rs b/tests/src/main.rs index 19910c314..e04ceb293 100644 --- a/tests/src/main.rs +++ b/tests/src/main.rs @@ -47,9 +47,9 @@ use std::{path::PathBuf, sync::Arc}; +use amp_config::Config; use clap::Parser; use common::{BoxError, Store}; -use config::Config; use dataset_store::{ DatasetStore, dataset_and_dependencies, manifests::DatasetManifestsStore, providers::ProviderConfigsStore, diff --git a/tests/src/testlib/ctx.rs b/tests/src/testlib/ctx.rs index 2d75bec4f..eb7118c26 100644 --- a/tests/src/testlib/ctx.rs +++ b/tests/src/testlib/ctx.rs @@ -29,8 +29,8 @@ use std::{collections::BTreeSet, path::Path, sync::Arc}; +use amp_config::Config; use common::{BoxError, store::Store}; -use config::Config; use datasets_common::reference::Reference; use worker::node_id::NodeId; diff --git a/tests/src/testlib/fixtures/daemon_controller.rs b/tests/src/testlib/fixtures/daemon_controller.rs index 421d02a69..7647f100b 100644 --- a/tests/src/testlib/fixtures/daemon_controller.rs +++ b/tests/src/testlib/fixtures/daemon_controller.rs @@ -31,7 +31,7 @@ impl DaemonController { /// Starts a Amp controller with the provided configuration and metadata database. /// The controller will be automatically shut down when the fixture is dropped. pub async fn new( - config: Arc, + config: Arc, metadata_db: metadata_db::MetadataDb, data_store: Store, dataset_store: dataset_store::DatasetStore, @@ -99,7 +99,7 @@ impl Drop for DaemonController { } /// Convert common config to controller config -fn controller_config_from_common(config: &config::Config) -> Config { +fn controller_config_from_common(config: &_config::Config) -> Config { Config { build_info: config.build_info.clone(), } diff --git a/tests/src/testlib/fixtures/daemon_server.rs b/tests/src/testlib/fixtures/daemon_server.rs index 571da8ec3..074c07c75 100644 --- a/tests/src/testlib/fixtures/daemon_server.rs +++ b/tests/src/testlib/fixtures/daemon_server.rs @@ -36,7 +36,7 @@ impl DaemonServer { /// use the `DaemonController` fixture. /// The server will be automatically shut down when the fixture is dropped. pub async fn new( - config: Arc, + config: Arc, metadb: MetadataDb, data_store: Store, dataset_store: DatasetStore, @@ -144,7 +144,7 @@ impl Drop for DaemonServer { } /// Convert config::Config to server::config::Config -fn server_config_from_common(config: &config::Config) -> Config { +fn server_config_from_common(config: &_config::Config) -> Config { Config { server_microbatch_max_interval: config.server_microbatch_max_interval, keep_alive_interval: config.keep_alive_interval, diff --git a/tests/src/testlib/fixtures/daemon_worker.rs b/tests/src/testlib/fixtures/daemon_worker.rs index f48a7e3de..da095329f 100644 --- a/tests/src/testlib/fixtures/daemon_worker.rs +++ b/tests/src/testlib/fixtures/daemon_worker.rs @@ -34,7 +34,7 @@ impl DaemonWorker { /// Starts a Amp worker with the provided configuration, metadata database, and worker ID. /// The worker will be automatically shut down when the fixture is dropped. pub async fn new( - config: Arc, + config: Arc, metadata_db: MetadataDb, data_store: Store, dataset_store: DatasetStore, @@ -102,7 +102,7 @@ impl Drop for DaemonWorker { } /// Convert config::Config to worker::config::Config for tests -fn worker_config_from_common(config: &config::Config) -> Config { +fn worker_config_from_common(config: &_config::Config) -> Config { Config { microbatch_max_interval: config.microbatch_max_interval, poll_interval: config.poll_interval,