cli: Rename --json-fd to --progress-fd

The format is not as important as what the option *does*. There's
multiple things that can be JSON, but this is specifically
about dynamic progress information.

Signed-off-by: Colin Walters <[email protected]>

Author: cgwalters

lib/src/cli.rs

@@ -38,15 +38,15 @@ pub(crate) struct ProgressOptions {
     /// Interactive progress will be written to this file descriptor as "JSON lines"
     /// format, where each value is separated by a newline.
     #[clap(long)]
-    pub(crate) json_fd: Option<RawProgressFd>,
+    pub(crate) progress_fd: Option<RawProgressFd>,
 }
 
 impl TryFrom<ProgressOptions> for ProgressWriter {
     type Error = anyhow::Error;
 
     fn try_from(value: ProgressOptions) -> Result<Self> {
         let r = value
-            .json_fd
+            .progress_fd
             .map(TryInto::try_into)
             .transpose()?
             .unwrap_or_default();

tests/booted/test-image-pushpull-upgrade.nu

@@ -60,7 +60,7 @@ RUN echo test content > /usr/share/blah.txt
     try { systemctl kill test-cat-progress }
     systemd-run -u test-cat-progress -- /bin/bash -c $"exec cat ($progress_fifo) > ($progress_json)"
     # nushell doesn't do fd passing right now either, so run via bash
-    bash -c $"bootc switch --json-fd 3 --transport containers-storage localhost/bootc-derived 3>($progress_fifo)"
+    bash -c $"bootc switch --progress-fd 3 --transport containers-storage localhost/bootc-derived 3>($progress_fifo)"
     # Now, let's do some checking of the progress json
     let progress = open --raw $progress_json | from json -o
     sanity_check_switch_progress_json $progress