Merge branch 'trunk' into py-support-ipv6-only-systems

Author: cgoldberg

rust/Cargo.Bazel.lock

@@ -1,5 +1,5 @@
 {
-  "checksum": "290231306cab8466f1e5b66975756c04983bf1fc0e7b1b79b49b5c84302187b5",
+  "checksum": "3443a528dae365d640563b82268f94dba99df686c6987390747e5c418c61b238",
   "crates": {
     "addr2line 0.21.0": {
       "name": "addr2line",

rust/src/config.rs

@@ -18,10 +18,10 @@
 use crate::config::OS::{LINUX, MACOS, WINDOWS};
 use crate::shell::run_shell_command_by_os;
 use crate::{
-    default_cache_folder, format_one_arg, path_to_string, Command, ENV_PROCESSOR_ARCHITECTURE,
-    REQUEST_TIMEOUT_SEC, UNAME_COMMAND,
+    default_cache_folder, format_one_arg, path_to_string, Command, ARCH_ARM7L,
+    ENV_PROCESSOR_ARCHITECTURE, REQUEST_TIMEOUT_SEC, UNAME_COMMAND,
 };
-use crate::{ARCH_AMD64, ARCH_ARM64, ARCH_X86, TTL_SEC};
+use crate::{ARCH_ARM64, ARCH_X64, ARCH_X86, TTL_SEC};
 use anyhow::anyhow;
 use anyhow::Error;
 use std::cell::RefCell;
@@ -88,7 +88,7 @@ impl ManagerConfig {
             } else if _architecture.contains("ARM") {
                 ARCH_ARM64.to_string()
             } else {
-                ARCH_AMD64.to_string()
+                ARCH_X64.to_string()
             }
         } else {
             let uname_a_command = Command::new_single(format_one_arg(UNAME_COMMAND, "a"));
@@ -181,14 +181,16 @@ pub enum ARCH {
     X32,
     X64,
     ARM64,
+    ARMV7,
 }
 
 impl ARCH {
     pub fn to_str_vector(&self) -> Vec<&str> {
         match self {
             ARCH::X32 => vec![ARCH_X86, "i386", "x32"],
-            ARCH::X64 => vec![ARCH_AMD64, "x86_64", "x64", "i686", "ia64"],
-            ARCH::ARM64 => vec![ARCH_ARM64, "aarch64", "arm", "arm64"],
+            ARCH::X64 => vec![ARCH_X64, "amd64", "x64", "i686", "ia64"],
+            ARCH::ARM64 => vec![ARCH_ARM64, "aarch64", "arm"],
+            ARCH::ARMV7 => vec![ARCH_ARM7L, "armv7l"],
         }
     }
 

rust/src/lib.rs

@@ -16,6 +16,7 @@
 // under the License.
 
 use crate::chrome::{ChromeManager, CHROMEDRIVER_NAME, CHROME_NAME};
+use crate::config::ARCH::{ARM64, ARMV7, X32, X64};
 use crate::config::OS::{MACOS, WINDOWS};
 use crate::config::{str_to_os, ManagerConfig};
 use crate::downloads::download_to_tmp_folder;
@@ -98,8 +99,10 @@ pub const ENV_LOCALAPPDATA: &str = "LOCALAPPDATA";
 pub const ENV_PROCESSOR_ARCHITECTURE: &str = "PROCESSOR_ARCHITECTURE";
 pub const ENV_X86: &str = " (x86)";
 pub const ARCH_X86: &str = "x86";
-pub const ARCH_AMD64: &str = "amd64";
+pub const ARCH_X64: &str = "x86_64";
 pub const ARCH_ARM64: &str = "arm64";
+pub const ARCH_ARM7L: &str = "arm7l";
+pub const ARCH_OTHER: &str = "other";
 pub const TTL_SEC: u64 = 3600;
 pub const UNAME_COMMAND: &str = "uname -{}";
 pub const ESCAPE_COMMAND: &str = r#"printf %q "{}""#;
@@ -897,7 +900,10 @@ pub trait SeleniumManager {
                 browser: self.get_browser_name().to_ascii_lowercase(),
                 browser_version: self.get_browser_version().to_ascii_lowercase(),
                 os: self.get_os().to_ascii_lowercase(),
-                arch: self.get_arch().to_ascii_lowercase(),
+                arch: self
+                    .get_normalized_arch()
+                    .unwrap_or(ARCH_OTHER)
+                    .to_ascii_lowercase(),
                 lang: self.get_language_binding().to_ascii_lowercase(),
                 selenium_version: self.get_selenium_version().to_ascii_lowercase(),
             };
@@ -1291,6 +1297,23 @@ pub trait SeleniumManager {
         self.get_config().arch.as_str()
     }
 
+    fn get_normalized_arch(&self) -> Result<&str, Error> {
+        let arch = self.get_arch();
+        if X32.is(arch) {
+            Ok(ARCH_X86)
+        } else if X64.is(arch) {
+            Ok(ARCH_X64)
+        } else if ARM64.is(arch) {
+            Ok(ARCH_ARM64)
+        } else if ARMV7.is(arch) {
+            Ok(ARCH_ARM7L)
+        } else {
+            let err_msg = format!("Unsupported architecture: {}", arch);
+            self.get_logger().warn(err_msg.clone());
+            Err(anyhow!(err_msg))
+        }
+    }
+
     fn set_arch(&mut self, arch: String) {
         if !arch.is_empty() {
             self.get_config_mut().arch = arch;