[Merged by Bors] - fix: install.sh, fluvio install/update, add arch/target overrides

crates/fluvio-cli/src/install/plugins.rs

@@ -1,3 +1,4 @@
+use std::str::FromStr;
 use clap::Parser;
 use tracing::debug;
 use anyhow::Result;
@@ -49,7 +50,7 @@ pub struct InstallOpt {
     #[arg(long, hide_short_help = true)]
     pub channel: Option<String>,
 
-    /// When this flag is provided, use the hub. Dev-only
+    /// override default target arch determination
     #[arg(long, hide_short_help = true)]
     pub target: Option<String>,
 }
@@ -144,7 +145,14 @@ impl InstallOpt {
     }
 
     async fn install_plugin(&self, agent: &HttpAgent) -> Result<()> {
-        let target = fluvio_index::package_target()?;
+        let target = if let Some(user_override) = &self.target {
+            fluvio_index::Target::from_str(&user_override.to_string())?
+        } else {
+            // need to analyze to if we can make CURRENT_PLATFORM
+            // the default instead of PACKAGE_TARGET, keep
+            // each use the same for now
+            fluvio_index::package_target()?
+        };
 
         // If a version is given in the package ID, use it. Otherwise, use latest
         let id = match self

crates/fluvio-cli/src/install/update.rs

@@ -1,4 +1,5 @@
 use std::path::{Path, PathBuf};
+use std::str::FromStr;
 
 use clap::Parser;
 use tracing::{debug, instrument};
@@ -32,6 +33,10 @@ pub struct UpdateOpt {
     // pub develop_fluvio_channel: bool,
     /// (Optional) the name of one or more plugins to update
     plugins: Vec<PackageId>,
+
+    /// override default target arch determination
+    #[arg(long, hide_short_help = true)]
+    pub target: Option<String>,
 }
 
 impl UpdateOpt {
@@ -90,7 +95,15 @@ impl UpdateOpt {
 
     #[instrument(skip(self, agent))]
     async fn update_fluvio_cli(&self, agent: &HttpAgent) -> Result<()> {
-        let target = fluvio_index::package_target()?;
+        let target = if let Some(user_override) = &self.target {
+            fluvio_index::Target::from_str(&user_override.to_string())?
+        } else {
+            // need to analyze to if we can make CURRENT_PLATFORM
+            // the default instead of PACKAGE_TARGET, keep
+            // each use the same for now
+            fluvio_index::package_target()?
+        };
+
         let id: PackageId = FLUVIO_CLI_PACKAGE_ID.parse()?;
         debug!(%target, %id, "Fluvio CLI updating self:");
 

crates/fluvio-cli/src/version.rs

@@ -1,6 +1,7 @@
 use sha2::{Digest, Sha256};
 use clap::Parser;
 use anyhow::Result;
+use current_platform::CURRENT_PLATFORM;
 
 use fluvio::Fluvio;
 use fluvio::config::ConfigFile;
@@ -20,6 +21,7 @@ impl VersionOpt {
         };
 
         self.print("Fluvio CLI", crate::VERSION.trim());
+        self.print("Fluvio CLI Arch", CURRENT_PLATFORM);
 
         if let Some(sha) = self.format_cli_sha() {
             self.print("Fluvio CLI SHA256", &sha);
@@ -29,6 +31,7 @@ impl VersionOpt {
         }
         let platform = self.format_platform_version(target).await;
         self.print("Fluvio Platform", &platform);
+
         self.print("Git Commit", env!("GIT_HASH"));
         if let Some(os_info) = os_info() {
             self.print("OS Details", &os_info);

install.sh

@@ -21,6 +21,7 @@ readonly FLUVIO_EXTENSIONS="${HOME}/.fluvio/extensions"
 
 # Ensure that this target is supported and matches the
 # naming convention of known platform releases in the registry
+# A number of short aliases are also supported for use with FLUVIO_ARCH
 #
 # @param $1: The target triple of this architecture
 # @return: Status 0 if the architecture is supported, exit if not
@@ -37,6 +38,10 @@ normalize_target() {
             echo "aarch64-unknown-linux-musl"
             return 0
             ;;
+        armv7)
+            echo "armv7-unknown-linux-gnueabihf"
+            return 0
+            ;;
     esac
 
     echo "${_target}"
@@ -140,7 +145,7 @@ verify_checksum() {
 remind_path() {
     say "💡 You'll need to add '~/.fluvio/bin/' to your PATH variable"
     say "    You can run the following to set your PATH on shell startup:"
-    
+
     # shellcheck disable=SC2016,SC2155
     local bash_hint="$(tput bold)"'echo '\''export PATH="${HOME}/.fluvio/bin:${PATH}"'\'' >> ~/.bashrc'"$(tput sgr0)"
     # shellcheck disable=SC2016,SC2155
@@ -281,6 +286,11 @@ get_architecture() {
     _cputype="$(uname -m)"
     _clibtype="gnu"
 
+    if [ -n "$FLUVIO_ARCH" ]; then
+        RETVAL="$FLUVIO_ARCH"
+        return 0
+    fi
+
     if [ "$_ostype" = Linux ]; then
         if [ "$(uname -o)" = Android ]; then
             _ostype=Android
@@ -549,7 +559,7 @@ main() {
         fi
 
         local _install_file="${FLUVIO_BIN}/fluvio-${VERSION}"
-    else 
+    else
         # If we installed a specific version, place extension in that dir
         # Ex. fluvio-0.x.y
         local _install_file="${FLUVIO_BIN}/fluvio-${_version}"