Rename satorictl => satori-storage-cli

Author: DanNixon

.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

Cargo.lock

@@ -8,8 +8,8 @@ members = [
 
   "agent",
   "archiver",
-  "ctl",
   "event-processor",
+  "storage-cli",
 
   "integration-tests",
 ]

Cargo.toml

@@ -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;};
       }
     );
 }

flake.nix

@@ -1,5 +1,5 @@
 [package]
-name = "satorictl"
+name = "satori-storage-cli"
 license.workspace = true
 version.workspace = true
 edition.workspace = true

ctl/Cargo.toml storage-cli/Cargo.toml

@@ -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"
       ];

ctl/default.nix storage-cli/default.nix

@@ -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!()),
     ]);