Rename satorictl => satori-storage-cli

DanNixon · Jan 29, 2025 · e02a385 · e02a385
1 parent e068fe1
commit e02a385
Show file tree

Hide file tree

Showing 25 changed files with 29 additions and 29 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -60,8 +60,8 @@ jobs:
         package:
           - satori-agent
           - satori-archiver
-          - satorictl
           - satori-event-processor
+          - satori-storage-cli
 
     steps:
       - uses: actions/checkout@v4

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,8 +8,8 @@ members = [
 
   "agent",
   "archiver",
-  "ctl",
   "event-processor",
+  "storage-cli",
 
   "integration-tests",
 ]

diff --git a/flake.nix b/flake.nix
@@ -69,8 +69,8 @@
         packages =
           import ./agent {inherit pkgs rustPlatform version gitRevision nativeBuildInputs buildInputs;}
           // import ./archiver {inherit pkgs rustPlatform version gitRevision nativeBuildInputs buildInputs;}
-          // import ./ctl {inherit pkgs rustPlatform version gitRevision nativeBuildInputs buildInputs;}
-          // import ./event-processor {inherit pkgs rustPlatform version gitRevision nativeBuildInputs buildInputs;};
+          // import ./event-processor {inherit pkgs rustPlatform version gitRevision nativeBuildInputs buildInputs;}
+          // import ./storage-cli {inherit pkgs rustPlatform version gitRevision nativeBuildInputs buildInputs;};
       }
     );
 }
diff --git a/ctl/Cargo.toml → storage-cli/Cargo.toml b/ctl/Cargo.toml → storage-cli/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "satorictl"
+name = "satori-storage-cli"
 license.workspace = true
 version.workspace = true
 edition.workspace = true

diff --git a/ctl/default.nix → storage-cli/default.nix b/ctl/default.nix → storage-cli/default.nix
@@ -6,8 +6,8 @@
   buildInputs,
   nativeBuildInputs,
 }: rec {
-  satorictl = rustPlatform.buildRustPackage {
-    pname = "satorictl";
+  satori-storage-cli = rustPlatform.buildRustPackage {
+    pname = "satori-storage-cli";
     version = version;
 
     src = ./..;
@@ -16,16 +16,16 @@
     nativeBuildInputs = nativeBuildInputs;
     buildInputs = buildInputs;
 
-    cargoBuildFlags = ["--package satorictl"];
+    cargoBuildFlags = ["--package satori-storage-cli"];
 
     GIT_REVISION = gitRevision;
 
     # No need to do tests here, testing should have already been done earlier in CI pipeline
     doCheck = false;
   };
 
-  satorictl-container-image = pkgs.dockerTools.buildImage {
-    name = "satorictl";
+  satori-storage-cli-container-image = pkgs.dockerTools.buildImage {
+    name = "satori-storage-cli";
     tag = "latest";
     created = "now";
 
@@ -36,7 +36,7 @@
     };
 
     config = {
-      Entrypoint = ["${pkgs.tini}/bin/tini" "--" "${satorictl}/bin/satorictl"];
+      Entrypoint = ["${pkgs.tini}/bin/tini" "--" "${satori-storage-cli}/bin/satori-storage-cli"];
       Env = [
         "SSL_CERT_FILE=${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"
       ];

diff --git a/ctl/src/cli/delete_event.rs → storage-cli/src/cli/delete_event.rs b/ctl/src/cli/delete_event.rs → storage-cli/src/cli/delete_event.rs
diff --git a/ctl/src/cli/delete_segment.rs → storage-cli/src/cli/delete_segment.rs b/ctl/src/cli/delete_segment.rs → storage-cli/src/cli/delete_segment.rs
diff --git a/ctl/src/cli/explore/app/mod.rs → storage-cli/src/cli/explore/app/mod.rs b/ctl/src/cli/explore/app/mod.rs → storage-cli/src/cli/explore/app/mod.rs
@@ -200,7 +200,7 @@ fn render_event_info_pane<B: Backend>(f: &mut Frame<B>, app: &mut App, area: Rec
 
 fn render_app_info_pane<B: Backend>(f: &mut Frame<B>, _: &mut App, area: Rect) {
     let title = Line::from(vec![
-        Span::styled("satorictl", Style::default().add_modifier(Modifier::BOLD)),
+        Span::styled("Satori storage explorer", Style::default().add_modifier(Modifier::BOLD)),
         Span::raw(" "),
         Span::raw(satori_common::version!()),
     ]);

diff --git a/...src/cli/explore/app/panels/camera_list.rs → ...src/cli/explore/app/panels/camera_list.rs b/...src/cli/explore/app/panels/camera_list.rs → ...src/cli/explore/app/panels/camera_list.rs
diff --git a/ctl/src/cli/explore/app/panels/event_list.rs → .../src/cli/explore/app/panels/event_list.rs b/ctl/src/cli/explore/app/panels/event_list.rs → .../src/cli/explore/app/panels/event_list.rs
diff --git a/ctl/src/cli/explore/app/panels/mod.rs → ...age-cli/src/cli/explore/app/panels/mod.rs b/ctl/src/cli/explore/app/panels/mod.rs → ...age-cli/src/cli/explore/app/panels/mod.rs
diff --git a/...rc/cli/explore/app/panels/trigger_list.rs → ...rc/cli/explore/app/panels/trigger_list.rs b/...rc/cli/explore/app/panels/trigger_list.rs → ...rc/cli/explore/app/panels/trigger_list.rs
diff --git a/ctl/src/cli/explore/mod.rs → storage-cli/src/cli/explore/mod.rs b/ctl/src/cli/explore/mod.rs → storage-cli/src/cli/explore/mod.rs
diff --git a/ctl/src/cli/explore/table_scroll.rs → storage-cli/src/cli/explore/table_scroll.rs b/ctl/src/cli/explore/table_scroll.rs → storage-cli/src/cli/explore/table_scroll.rs
diff --git a/ctl/src/cli/export_video.rs → storage-cli/src/cli/export_video.rs b/ctl/src/cli/export_video.rs → storage-cli/src/cli/export_video.rs
diff --git a/ctl/src/cli/get_event.rs → storage-cli/src/cli/get_event.rs b/ctl/src/cli/get_event.rs → storage-cli/src/cli/get_event.rs
diff --git a/ctl/src/cli/get_segment.rs → storage-cli/src/cli/get_segment.rs b/ctl/src/cli/get_segment.rs → storage-cli/src/cli/get_segment.rs
diff --git a/ctl/src/cli/list_cameras.rs → storage-cli/src/cli/list_cameras.rs b/ctl/src/cli/list_cameras.rs → storage-cli/src/cli/list_cameras.rs
diff --git a/ctl/src/cli/list_events.rs → storage-cli/src/cli/list_events.rs b/ctl/src/cli/list_events.rs → storage-cli/src/cli/list_events.rs
diff --git a/ctl/src/cli/list_segments.rs → storage-cli/src/cli/list_segments.rs b/ctl/src/cli/list_segments.rs → storage-cli/src/cli/list_segments.rs
diff --git a/ctl/src/cli/mod.rs → storage-cli/src/cli/mod.rs b/ctl/src/cli/mod.rs → storage-cli/src/cli/mod.rs
diff --git a/ctl/src/cli/prune_events.rs → storage-cli/src/cli/prune_events.rs b/ctl/src/cli/prune_events.rs → storage-cli/src/cli/prune_events.rs
diff --git a/ctl/src/cli/prune_segments.rs → storage-cli/src/cli/prune_segments.rs b/ctl/src/cli/prune_segments.rs → storage-cli/src/cli/prune_segments.rs
diff --git a/ctl/src/main.rs → storage-cli/src/main.rs b/ctl/src/main.rs → storage-cli/src/main.rs