Add poll watcher support to spec watcher for M1

components/hab/src/command/studio/enter.rs

@@ -8,7 +8,8 @@ use crate::{common::ui::{UIWriter,
             BLDR_URL_ENVVAR,
             ORIGIN_ENVVAR};
 use habitat_common::cli_config::CliConfig;
-use habitat_core::AUTH_TOKEN_ENVVAR;
+use habitat_core::{package::target::PackageTarget,
+                   AUTH_TOKEN_ENVVAR};
 use same_file::is_same_file;
 use std::{env,
           ffi::OsString,
@@ -19,6 +20,7 @@ use std::{env,
 pub const ARTIFACT_PATH_ENVVAR: &str = "ARTIFACT_PATH";
 pub const CERT_PATH_ENVVAR: &str = "CERT_PATH";
 pub const SSL_CERT_FILE_ENVVAR: &str = "SSL_CERT_FILE";
+pub const STUDIO_HOST_ARCH_ENVVAR: &str = "HAB_STUDIO_SECRET_HAB_STUDIO_HOST_ARCH";
 
 const STUDIO_PACKAGE_IDENT: &str = "core/hab-studio";
 
@@ -42,6 +44,14 @@ fn set_env_var_from_config(env_var: &str, config_val: Option<String>, sensitive:
     }
 }
 
+//  Set the environment variable for the host architecture to be used in
+//  hab studio.  It must be set outside of studio and passed in through
+//  the environment variable defined in STUDIO_HOST_ARCH_ENVVAR.
+fn set_arch_env_var() {
+    env::set_var(STUDIO_HOST_ARCH_ENVVAR,
+                 format!("{}", PackageTarget::active_target()));
+}
+
 fn cache_ssl_cert_file(cert_file: &str, cert_cache_dir: &Path) -> Result<()> {
     let cert_path = Path::new(&cert_file);
 
@@ -74,6 +84,8 @@ pub async fn start(ui: &mut UI, args: &[OsString]) -> Result<()> {
                             config.origin.map(|o| o.to_string()),
                             Sensitivity::PrintValue);
 
+    set_arch_env_var();
+
     if config.ctl_secret.is_some() {
         ui.warn("Your Supervisor CtlGateway secret is not being copied to the Studio \
                  environment because the Studio's Supervisor is local. If you wish to contact a \

components/sup/src/manager.rs

@@ -9,6 +9,7 @@ mod self_updater;
 mod service_updater;
 mod spec_dir;
 mod spec_watcher;
+mod sup_watcher;
 pub(crate) mod sys;
 mod user_config_watcher;
 
@@ -691,6 +692,7 @@ impl Manager {
         spec_dir.migrate_specs();
 
         let spec_watcher = SpecWatcher::run(&spec_dir)?;
+        trace!("Created SpecWatcher");
 
         if let Some(config) = cfg.event_stream_config {
             // Collect the FQDN of the running machine