chore: Split tui into lib and bin (#947)

gtema · web-flow · commit 0e1ed46d1f79 · 2025-02-02T19:05:04.000+01:00
diff --git a/Dockerfile b/Dockerfile
@@ -22,6 +22,8 @@ COPY xtask/Cargo.toml /usr/src/openstack/xtask/
 COPY fuzz/Cargo.toml /usr/src/openstack/fuzz/
 RUN mkdir -p openstack/openstack_cli/src/bin && touch openstack/openstack_cli/src/lib.rs &&\
     cp openstack/src/main.rs openstack/openstack_cli/src/bin/osc.rs &&\
+    mkdir -p openstack/openstack_tui/src/bin && touch openstack/openstack_tui/src/lib.rs &&\
+    cp openstack/src/main.rs openstack/openstack_tui/src/bin/ostui.rs &&\
     mkdir -p openstack/openstack_sdk/src && touch openstack/openstack_sdk/src/lib.rs &&\
     mkdir -p openstack/structable_derive/src && touch openstack/structable_derive/src/lib.rs &&\
     mkdir -p /usr/src/openstack/xtask/src && touch openstack/xtask/src/lib.rs &&\
@@ -49,7 +51,7 @@ COPY . /usr/src/openstack/
 RUN touch openstack_sdk/src/lib.rs && touch openstack_cli/src/bin/osc.rs && touch openstack_cli/src/lib.rs && touch structable_derive/src/lib.rs
 
 # This is the actual application build.
-RUN cargo build --target x86_64-unknown-linux-musl --release -p openstack_cli
+RUN cargo build --target x86_64-unknown-linux-musl --release --bin osc
 
 ################
 ##### Runtime
diff --git a/openstack_cli/src/object_store/v1/account/set.rs b/openstack_cli/src/object_store/v1/account/set.rs
@@ -96,7 +96,7 @@ impl AccountCommand {
             .path_segments()
             .expect("Object Store endpoint must not point to a bare domain")
             .filter(|x| !x.is_empty())
-            .last();
+            .next_back();
         if let Some(account) = account {
             ep_builder.account(account);
         }
diff --git a/openstack_cli/src/object_store/v1/account/show.rs b/openstack_cli/src/object_store/v1/account/show.rs
@@ -81,7 +81,7 @@ impl AccountCommand {
             .path_segments()
             .expect("Object Store endpoint must not point to a bare domain")
             .filter(|x| !x.is_empty())
-            .last();
+            .next_back();
         if let Some(account) = account {
             ep_builder.account(account);
         }
diff --git a/openstack_cli/src/object_store/v1/container/create.rs b/openstack_cli/src/object_store/v1/container/create.rs
@@ -81,7 +81,7 @@ impl ContainerCommand {
             .path_segments()
             .expect("Object Store endpoint must not point to a bare domain")
             .filter(|x| !x.is_empty())
-            .last();
+            .next_back();
         if let Some(account) = account {
             ep_builder.account(account);
         }
diff --git a/openstack_cli/src/object_store/v1/container/delete.rs b/openstack_cli/src/object_store/v1/container/delete.rs
@@ -79,7 +79,7 @@ impl ContainerCommand {
             .path_segments()
             .expect("Object Store endpoint must not point to a bare domain")
             .filter(|x| !x.is_empty())
-            .last();
+            .next_back();
         if let Some(account) = account {
             ep_builder.account(account);
         }
diff --git a/openstack_cli/src/object_store/v1/container/list.rs b/openstack_cli/src/object_store/v1/container/list.rs
@@ -129,7 +129,7 @@ impl ContainersCommand {
             .path_segments()
             .expect("Object Store endpoint must not point to a bare domain")
             .filter(|x| !x.is_empty())
-            .last();
+            .next_back();
         if let Some(account) = account {
             ep_builder.account(account);
         }
diff --git a/openstack_cli/src/object_store/v1/container/prune.rs b/openstack_cli/src/object_store/v1/container/prune.rs
@@ -64,7 +64,7 @@ impl ContainerCommand {
             .path_segments()
             .expect("Object Store endpoint must not point to a bare domain")
             .filter(|x| !x.is_empty())
-            .last()
+            .next_back()
             .expect("Object Store endpoint must end with project id");
         client
             .object_store_container_prune_async(account, &self.container, self.prefix.as_ref())
diff --git a/openstack_cli/src/object_store/v1/container/set.rs b/openstack_cli/src/object_store/v1/container/set.rs
@@ -80,7 +80,7 @@ impl ContainerCommand {
             .path_segments()
             .expect("Object Store endpoint must not point to a bare domain")
             .filter(|x| !x.is_empty())
-            .last();
+            .next_back();
         if let Some(account) = account {
             ep_builder.account(account);
         }
diff --git a/openstack_cli/src/object_store/v1/container/show.rs b/openstack_cli/src/object_store/v1/container/show.rs
@@ -83,7 +83,7 @@ impl ContainerCommand {
             .path_segments()
             .expect("Object Store endpoint must not point to a bare domain")
             .filter(|x| !x.is_empty())
-            .last();
+            .next_back();
         if let Some(account) = account {
             ep_builder.account(account);
         }
diff --git a/openstack_cli/src/object_store/v1/object/delete.rs b/openstack_cli/src/object_store/v1/object/delete.rs
@@ -100,7 +100,7 @@ impl ObjectCommand {
             .path_segments()
             .expect("Object Store endpoint must not point to a bare domain")
             .filter(|x| !x.is_empty())
-            .last();
+            .next_back();
         if let Some(account) = account {
             ep_builder.account(account);
         }
diff --git a/openstack_cli/src/object_store/v1/object/download.rs b/openstack_cli/src/object_store/v1/object/download.rs
@@ -121,7 +121,7 @@ impl ObjectCommand {
             .path_segments()
             .expect("Object Store endpoint must not point to a bare domain")
             .filter(|x| !x.is_empty())
-            .last();
+            .next_back();
         if let Some(account) = account {
             ep_builder.account(account);
         }
diff --git a/openstack_cli/src/object_store/v1/object/list.rs b/openstack_cli/src/object_store/v1/object/list.rs
@@ -159,7 +159,7 @@ impl ObjectsCommand {
             .path_segments()
             .expect("Object Store endpoint must not point to a bare domain")
             .filter(|x| !x.is_empty())
-            .last();
+            .next_back();
         if let Some(account) = account {
             ep_builder.account(account);
         }
diff --git a/openstack_cli/src/object_store/v1/object/show.rs b/openstack_cli/src/object_store/v1/object/show.rs
@@ -119,7 +119,7 @@ impl ObjectCommand {
             .path_segments()
             .expect("Object Store endpoint must not point to a bare domain")
             .filter(|x| !x.is_empty())
-            .last();
+            .next_back();
         if let Some(account) = account {
             ep_builder.account(account);
         }
diff --git a/openstack_cli/src/object_store/v1/object/upload.rs b/openstack_cli/src/object_store/v1/object/upload.rs
@@ -148,7 +148,7 @@ impl ObjectCommand {
             .path_segments()
             .expect("Object Store endpoint must not point to a bare domain")
             .filter(|x| !x.is_empty())
-            .last();
+            .next_back();
         if let Some(account) = account {
             ep_builder.account(account);
         }
diff --git a/openstack_tui/Cargo.toml b/openstack_tui/Cargo.toml
@@ -11,9 +11,12 @@ homepage.workspace = true
 repository.workspace = true
 rust-version = "1.80" # MSRV
 
+[lib]
+bench = false
+
 [[bin]]
 name = "ostui"
-path = "src/main.rs"
+path = "src/bin/ostui.rs"
 
 [dependencies]
 clap = { workspace = true, features = ["cargo", "derive", "env", "wrap_help", "unicode", "string", "unstable-styles"] }
diff --git a/openstack_tui/src/bin/ostui.rs b/openstack_tui/src/bin/ostui.rs
@@ -13,26 +13,14 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use clap::Parser;
-use cli::Cli;
 use eyre::Result;
 
-use crate::{
+use openstack_tui::{
     app::App,
+    cli::Cli,
     utils::{initialize_logging, initialize_panic_handler},
 };
 
-pub mod action;
-pub mod app;
-pub mod cli;
-mod cloud_worker;
-pub mod components;
-pub mod config;
-mod error;
-pub mod mode;
-pub mod tui;
-pub mod utils;
-pub mod widgets;
-
 async fn tokio_main() -> Result<()> {
     initialize_logging()?;
 
diff --git a/openstack_tui/src/cloud_worker/compute/v2/server/get_console_output.rs b/openstack_tui/src/cloud_worker/compute/v2/server/get_console_output.rs
@@ -62,7 +62,7 @@ impl TryFrom<&OsGetConsoleOutput>
     fn try_from(value: &OsGetConsoleOutput) -> Result<Self, Self::Error> {
         let mut ep_builder = Self::default();
         if let Some(val) = &value.length {
-            ep_builder.length((*val));
+            ep_builder.length(*val);
         }
         Ok(ep_builder)
     }
diff --git a/openstack_tui/src/lib.rs b/openstack_tui/src/lib.rs
@@ -0,0 +1,27 @@
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// SPDX-License-Identifier: Apache-2.0
+
+// #![deny(dead_code, unused_imports, unused_mut)]
+
+pub(crate) mod action;
+pub mod app;
+pub mod cli;
+pub(crate) mod cloud_worker;
+pub(crate) mod components;
+pub(crate) mod config;
+pub(crate) mod error;
+pub(crate) mod mode;
+pub(crate) mod tui;
+pub mod utils;
+pub(crate) mod widgets;

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ impl AccountCommand {`
`96`	`96`	`.path_segments()`
`97`	`97`	`.expect("Object Store endpoint must not point to a bare domain")`
`98`	`98`	`.filter(\|x\| !x.is_empty())`
`99`		`- .last();`
	`99`	`+ .next_back();`
`100`	`100`	`if let Some(account) = account {`
`101`	`101`	`ep_builder.account(account);`
`102`	`102`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ impl AccountCommand {`
`81`	`81`	`.path_segments()`
`82`	`82`	`.expect("Object Store endpoint must not point to a bare domain")`
`83`	`83`	`.filter(\|x\| !x.is_empty())`
`84`		`- .last();`
	`84`	`+ .next_back();`
`85`	`85`	`if let Some(account) = account {`
`86`	`86`	`ep_builder.account(account);`
`87`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ impl ContainerCommand {`
`81`	`81`	`.path_segments()`
`82`	`82`	`.expect("Object Store endpoint must not point to a bare domain")`
`83`	`83`	`.filter(\|x\| !x.is_empty())`
`84`		`- .last();`
	`84`	`+ .next_back();`
`85`	`85`	`if let Some(account) = account {`
`86`	`86`	`ep_builder.account(account);`
`87`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ impl ContainerCommand {`
`79`	`79`	`.path_segments()`
`80`	`80`	`.expect("Object Store endpoint must not point to a bare domain")`
`81`	`81`	`.filter(\|x\| !x.is_empty())`
`82`		`- .last();`
	`82`	`+ .next_back();`
`83`	`83`	`if let Some(account) = account {`
`84`	`84`	`ep_builder.account(account);`
`85`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ impl ContainersCommand {`
`129`	`129`	`.path_segments()`
`130`	`130`	`.expect("Object Store endpoint must not point to a bare domain")`
`131`	`131`	`.filter(\|x\| !x.is_empty())`
`132`		`- .last();`
	`132`	`+ .next_back();`
`133`	`133`	`if let Some(account) = account {`
`134`	`134`	`ep_builder.account(account);`
`135`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ impl ContainerCommand {`
`80`	`80`	`.path_segments()`
`81`	`81`	`.expect("Object Store endpoint must not point to a bare domain")`
`82`	`82`	`.filter(\|x\| !x.is_empty())`
`83`		`- .last();`
	`83`	`+ .next_back();`
`84`	`84`	`if let Some(account) = account {`
`85`	`85`	`ep_builder.account(account);`
`86`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ impl ContainerCommand {`
`83`	`83`	`.path_segments()`
`84`	`84`	`.expect("Object Store endpoint must not point to a bare domain")`
`85`	`85`	`.filter(\|x\| !x.is_empty())`
`86`		`- .last();`
	`86`	`+ .next_back();`
`87`	`87`	`if let Some(account) = account {`
`88`	`88`	`ep_builder.account(account);`
`89`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ impl ObjectCommand {`
`100`	`100`	`.path_segments()`
`101`	`101`	`.expect("Object Store endpoint must not point to a bare domain")`
`102`	`102`	`.filter(\|x\| !x.is_empty())`
`103`		`- .last();`
	`103`	`+ .next_back();`
`104`	`104`	`if let Some(account) = account {`
`105`	`105`	`ep_builder.account(account);`
`106`	`106`	`}`