upstream(indexer): Rework config and cli arguments

crates/iota-graphql-rpc/src/data/pg.rs

@@ -204,7 +204,7 @@ mod tests {
     use diesel::QueryDsl;
     use iota_framework::BuiltInFramework;
     use iota_indexer::{
-        db::{get_pool_connection, new_connection_pool, reset_database},
+        db::{ConnectionPoolConfig, get_pool_connection, new_connection_pool, reset_database},
         models::objects::StoredObject,
         schema::objects,
         types::IndexedObject,
@@ -216,11 +216,11 @@ mod tests {
     #[test]
     fn test_query_cost() {
         let connection_config = ConnectionConfig::default();
-        let pool = new_connection_pool(
-            &connection_config.db_url,
-            Some(connection_config.db_pool_size),
-        )
-        .unwrap();
+        let connection_pool_config = ConnectionPoolConfig {
+            pool_size: connection_config.db_pool_size,
+            ..Default::default()
+        };
+        let pool = new_connection_pool(&connection_config.db_url, &connection_pool_config).unwrap();
         let mut conn = get_pool_connection(&pool).unwrap();
         reset_database(&mut conn).unwrap();
 

crates/iota-graphql-rpc/src/test_infra/cluster.rs

@@ -5,7 +5,7 @@
 use std::{net::SocketAddr, path::PathBuf, sync::Arc, time::Duration};
 
 use iota_graphql_rpc_client::simple_client::SimpleClient;
-pub use iota_indexer::handlers::objects_snapshot_handler::SnapshotLagConfig;
+pub use iota_indexer::config::SnapshotLagConfig;
 use iota_indexer::{
     errors::IndexerError,
     store::{PgIndexerStore, indexer_store::IndexerStore},

crates/iota-indexer/Cargo.toml

@@ -15,7 +15,7 @@ backoff.workspace = true
 bcs.workspace = true
 cached.workspace = true
 chrono.workspace = true
-clap.workspace = true
+clap = { workspace = true, features = ["env"] }
 diesel = { workspace = true, features = ["chrono", "r2d2", "serde_json", "postgres"] }
 diesel_migrations = "2.2.0"
 downcast = "0.11.0"

crates/iota-indexer/README.md

@@ -63,13 +63,22 @@ To run the indexer as a standalone service with an existing fullnode, follow the
 
 ```sh
 # Change the RPC_CLIENT_URL to http://0.0.0.0:9000 to run indexer against local validator & fullnode
+
+# Old CLI
 cargo run --bin iota-indexer -- --db-url "postgres://postgres:postgrespw@localhost/iota_indexer" --rpc-client-url "https://api.devnet.iota.cafe:443" --fullnode-sync-worker --reset-db
+
+# New CLI
+cargo run --bin iota-indexer -- --db-url "postgres://postgres:postgrespw@localhost/iota_indexer" indexer --rpc-client-url "https://api.devnet.iota.cafe:443"  --reset-db
 ```
 
 - to run indexer as a reader which exposes a JSON RPC service with following [APIs](https://docs.iota.org/iota-api-ref).
 
-```
+```sh
+# Old CLI
 cargo run --bin iota-indexer -- --db-url "postgres://postgres:postgrespw@localhost/iota_indexer" --rpc-client-url "https://api.devnet.iota.cafe:443" --rpc-server-worker
+
+# New CLI
+cargo run --bin iota-indexer -- --db-url "postgres://postgres:postgrespw@localhost/iota_indexer" json-rpc-service --rpc-client-url "https://api.devnet.iota.cafe:443"
 ```
 
 More available flags can be found in this [file](https://github.com/iotaledger/iota/blob/develop/crates/iota-indexer/src/lib.rs).
@@ -82,6 +91,22 @@ To wipe the database, make sure you are in the `iota/crates/iota-indexer` direct
 diesel database reset --database-url="postgres://postgres:postgrespw@localhost/iota_indexer"
 ```
 
+### CLI Reference
+
+The IOTA Indexer is currently transitioning from the old CLI to a new one.
+While both versions are still supported, the old CLI will be deprecated in the future.
+Users are encouraged to start using the new CLI.
+
+To view help information for each version:
+
+```sh
+# Old CLI
+cargo run --bin iota-indexer -- help-deprecated
+
+# New CLI
+cargo run --bin iota-indexer -- help
+```
+
 ### Running tests
 
 To run the tests, a running postgres instance is required.