Fix fmt

infinyon · Sep 21, 2021 · 860dcbc · 860dcbc
1 parent efbca47
commit 860dcbc
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 20 deletions.
diff --git a/crates/fluvio-cluster/src/start/k8.rs b/crates/fluvio-cluster/src/start/k8.rs
@@ -703,7 +703,8 @@ impl ClusterInstaller {
         let cluster_config =
             FluvioConfig::new(address.clone()).with_tls(self.config.client_tls_policy.clone());
 
-        self.pb.set_message("Trying to connect to SC");
+        self.pb
+            .set_message(InstallProgressMessage::ConnectingSC.msg());
 
         let fluvio = match try_connect_to_sc(&cluster_config, &self.config.platform_version).await {
             Some(fluvio) => fluvio,
@@ -835,9 +836,11 @@ impl ClusterInstaller {
         debug!("Using helm install settings: {:#?}", &install_settings);
 
         if self.config.upgrade {
-            self.pb.set_message("Upgrading fluvio chart");
+            self.pb
+                .set_message(InstallProgressMessage::UpgradingChart.msg());
         } else {
-            self.pb.set_message("installing fluvio chart");
+            self.pb
+                .set_message(InstallProgressMessage::InstallingChart.msg());
         }
 
         let mut config = ChartConfig::app_builder()
@@ -1013,8 +1016,8 @@ impl ClusterInstaller {
                 .count();
 
             if self.config.spu_replicas as usize == ready_spu {
-                self.pb
-                    .println(InstallProgressMessage::SpuGroupLaunched(ready_spu as u16).msg());
+                self.pb.println(InstallProgressMessage::SpusConfirmed.msg());
+
                 return Ok(true);
             } else {
                 debug!(
@@ -1023,10 +1026,9 @@ impl ClusterInstaller {
                     attempt = i,
                     "Not all SPUs are ready. Waiting",
                 );
-                self.pb.println(format!(
-                    "{} of {} spu are ready, sleeping 10 seconds...",
-                    ready_spu, self.config.spu_replicas
-                ));
+                self.pb.set_message(
+                    InstallProgressMessage::WaitingForSPU(ready_spu, expected_spu).msg(),
+                );
                 sleep(Duration::from_secs(10)).await;
             }
         }
@@ -1142,12 +1144,7 @@ impl ClusterInstaller {
     async fn create_managed_spu_group(&self, fluvio: &Fluvio) -> Result<(), K8InstallError> {
         let name = self.config.group_name.clone();
         let admin = fluvio.admin().await;
-        self.pb
-            .println(InstallProgressMessage::CreatingManagedSpuGroup.msg());
-
-        self.pb.set_message("checking if spu group exists");
         let lists = admin.list::<SpuGroupSpec, _>(vec![]).await?;
-
         if lists.is_empty() {
             self.pb.set_message(format!(
                 "Trying to create managed {} spus",
@@ -1162,11 +1159,12 @@ impl ClusterInstaller {
 
             admin.create(name, false, spu_spec).await?;
 
-            self.pb
-                .set_message(format!("Creating SPUs"));
+            self.pb.println(
+                InstallProgressMessage::SpuGroupLaunched(self.config.spu_replicas as u16).msg(),
+            );
         } else {
             self.pb
-                .println(format!("SPU group: {} exists, skipping", lists[0].name));
+                .println(InstallProgressMessage::SpuGroupExists.msg());
         }
 
         // Wait for the SPU cluster to spin up

diff --git a/crates/fluvio-cluster/src/start/progress.rs b/crates/fluvio-cluster/src/start/progress.rs
@@ -7,13 +7,17 @@ pub(crate) enum InstallProgressMessage {
     PreFlightCheck,
     LaunchingSC,
     ScLaunched,
+    ConnectingSC,
     LaunchingSPUGroup(u16),
     StartSPU(u16, u16),
+    WaitingForSPU(usize, usize),
     SpuGroupLaunched(u16),
+    SpuGroupExists,
     AlreadyInstalled,
     InstallingFluvio,
+    InstallingChart,
+    UpgradingChart,
     ChartInstalled,
-    CreatingManagedSpuGroup,
     FoundSC(String),
     ConfirmingSpus,
     SpusConfirmed,
@@ -41,15 +45,28 @@ impl ProgressRenderedText for InstallProgressMessage {
             InstallProgressMessage::LaunchingSC => {
                 format!("🖥️  {}", "Starting SC server".bold())
             }
-            InstallProgressMessage::CreatingManagedSpuGroup => {
-                format!("🤖 {}", "Creating managed SPU group".bold())
+            InstallProgressMessage::SpuGroupExists => {
+                format!("{}", "🤖 SPU group exists, skipping".bold())
             }
             InstallProgressMessage::FoundSC(address) => {
                 format!("🔎 {} {}", "Found SC service addr:".bold(), address.bold())
             }
             InstallProgressMessage::ScLaunched => {
                 format!("🖥️  {}", "SC Launched".bold())
             }
+            InstallProgressMessage::InstallingChart => {
+                format!("{:>6} {}", "📊", "Installing Fluvio chart")
+            }
+            InstallProgressMessage::UpgradingChart => {
+                format!("{:>6} {}", "📊", "Upgrading Fluvio chart")
+            }
+            InstallProgressMessage::ConnectingSC => {
+                format!("🔗 {}", "Trying to connect to SC".bold())
+            }
+
+            InstallProgressMessage::WaitingForSPU(spu_num, total) => {
+                format!("{:>6} ({}/{})", "🤖 Waiting for SPU:", spu_num, total)
+            }
             InstallProgressMessage::LaunchingSPUGroup(spu_num) => {
                 format!("{} {}", "🤖 Launching SPU Group with:".bold(), spu_num)
             }