[rust] Setup PROCESSOR_ARCHITECTURE env for Windows

Author: bonigarcia

.bazelrc

@@ -105,6 +105,7 @@ test --test_env=JRUBY_OPTS="--dev"
 
 test:windows --test_env=PATH
 test:windows --test_env=LOCALAPPDATA
+test:windows --test_env=PROCESSOR_ARCHITECTURE
 test:windows --test_env=PROGRAMFILES="C:\\Program Files"
 test:windows --test_env=PROGRAMFILES(X86)="C:\\Program Files (x86)"
 

rust/src/config.rs

@@ -18,7 +18,7 @@
 use crate::config::OS::{LINUX, MACOS, WINDOWS};
 use crate::shell::{run_powershell_command, run_shell_command_by_os};
 use crate::{
-    default_cache_folder, format_one_arg, path_to_string, Command, ENV_CPU_ARCHITECTURE,
+    default_cache_folder, format_one_arg, path_to_string, Command, ENV_PROCESSOR_ARCHITECTURE,
     REQUEST_TIMEOUT_SEC, UNAME_COMMAND,
 };
 use crate::{ARCH_AMD64, ARCH_ARM64, ARCH_X86, PS_GET_OS_COMMAND, TTL_SEC};
@@ -69,14 +69,14 @@ impl ManagerConfig {
 
         let self_os = OS;
         let self_arch = if WINDOWS.is(self_os) {
-            let mut cpu_arch = env::var(ENV_CPU_ARCHITECTURE).unwrap_or_default();
-            if cpu_arch.is_empty() {
+            let mut architecture = env::var(ENV_PROCESSOR_ARCHITECTURE).unwrap_or_default();
+            if architecture.is_empty() {
                 let get_os_command = Command::new_single(PS_GET_OS_COMMAND.to_string());
-                cpu_arch = run_powershell_command(get_os_command).unwrap_or_default();
+                architecture = run_powershell_command(get_os_command).unwrap_or_default();
             }
-            if cpu_arch.contains("32") {
+            if architecture.contains("32") {
                 ARCH_X86.to_string()
-            } else if cpu_arch.contains("ARM") {
+            } else if architecture.contains("ARM") {
                 ARCH_ARM64.to_string()
             } else {
                 ARCH_AMD64.to_string()

rust/src/lib.rs

@@ -95,12 +95,11 @@ pub const SINGLE_QUOTE: &str = "'";
 pub const ENV_PROGRAM_FILES: &str = "PROGRAMFILES";
 pub const ENV_PROGRAM_FILES_X86: &str = "PROGRAMFILES(X86)";
 pub const ENV_LOCALAPPDATA: &str = "LOCALAPPDATA";
-pub const ENV_CPU_ARCHITECTURE: &str = "PROCESSOR_ARCHITECTURE";
+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_ARM64: &str = "arm64";
-pub const ENV_PROCESSOR_ARCHITECTURE: &str = "PROCESSOR_ARCHITECTURE";
 pub const TTL_SEC: u64 = 3600;
 pub const UNAME_COMMAND: &str = "uname -{}";
 pub const ESCAPE_COMMAND: &str = r#"printf %q "{}""#;

rust/src/shell.rs

@@ -65,7 +65,7 @@ impl Command {
 }
 
 pub fn run_powershell_command_with_log(log: &Logger, command: Command) -> Result<String, Error> {
-    log.debug(format!("Running command: {}", command.display()));
+    log.debug(format!("Running ps command: {}", command.display()));
     let output = run_powershell_command(command)?;
     log.debug(format!("Output: {:?}", output));
     Ok(output)