[forge] clean up forge deployer interfaces

aptos-labs · Sep 16, 2024 · 02dad86 · 02dad86
1 parent d5192eb
commit 02dad86
Show file tree

Hide file tree

Showing 3 changed files with 122 additions and 110 deletions.
diff --git a/testsuite/forge-cli/src/main.rs b/testsuite/forge-cli/src/main.rs
@@ -432,16 +432,12 @@ fn main() -> Result<()> {
             OperatorCommand::Create(create) => {
                 let kube_client = runtime.block_on(create_k8s_client())?;
                 let era = generate_new_era();
-                let values = ForgeDeployerValues {
-                    profile: DEFAULT_FORGE_DEPLOYER_PROFILE.to_string(),
+                let config = ForgeDeployerConfig::new(
+                    DEFAULT_FORGE_DEPLOYER_PROFILE.to_string(),
                     era,
-                    namespace: create.namespace,
-                    indexer_grpc_values: None,
-                    indexer_processor_values: None,
-                };
-                let forge_deployer_manager =
-                    ForgeDeployerManager::from_k8s_client(kube_client, values);
-                runtime.block_on(forge_deployer_manager.ensure_namespace_prepared())?;
+                    create.namespace,
+                );
+                let forge_deployer_manager = ForgeDeployerManager::new(kube_client, config);
                 // NOTE: this is generally not going to run from within the cluster, do not perform any operations
                 // that might require internal DNS resolution to work, such as txn emission directly against the node service IPs.
                 runtime.block_on(forge_deployer_manager.start(ForgeDeployerType::Testnet))?;

diff --git a/testsuite/forge/src/backend/k8s/mod.rs b/testsuite/forge/src/backend/k8s/mod.rs
@@ -20,7 +20,7 @@ mod stateful_set;
 mod swarm;
 
 use super::{
-    ForgeDeployerManager, ForgeDeployerType, ForgeDeployerValues, DEFAULT_FORGE_DEPLOYER_PROFILE,
+    ForgeDeployerConfig, ForgeDeployerManager, ForgeDeployerType, DEFAULT_FORGE_DEPLOYER_PROFILE,
 };
 use aptos_sdk::crypto::ed25519::ED25519_PRIVATE_KEY_LENGTH;
 pub use cluster_helper::*;
@@ -185,18 +185,14 @@ impl Factory for K8sFactory {
             // add an indexer too!
             if self.enable_indexer {
                 // NOTE: by default, use a deploy profile and no additional configuration values
-                let values = ForgeDeployerValues {
-                    profile: DEFAULT_FORGE_DEPLOYER_PROFILE.to_string(),
-                    era: new_era.clone().expect("Era not set in created testnet"),
-                    namespace: self.kube_namespace.clone(),
-                    indexer_grpc_values: None,
-                    indexer_processor_values: None,
-                };
-
-                let forge_deployer_manager =
-                    ForgeDeployerManager::from_k8s_client(kube_client.clone(), values);
-
-                forge_deployer_manager.ensure_namespace_prepared().await?;
+                let config = ForgeDeployerConfig::new(
+                    DEFAULT_FORGE_DEPLOYER_PROFILE.to_string(),
+                    new_era.clone().expect("Era not set in created testnet"),
+                    self.kube_namespace.clone(),
+                );
+
+                let forge_deployer_manager = ForgeDeployerManager::new(kube_client.clone(), config);
+
                 forge_deployer_manager
                     .start(ForgeDeployerType::Indexer)
                     .await?;