iotedge check update

edgelet/Cargo.toml

@@ -13,7 +13,6 @@ members = [
     "identity-client",
     "iotedge",
     "management",
-    "mini-sntp",
     "systemd",
 ]
 

edgelet/iotedge/Cargo.toml

@@ -37,6 +37,7 @@ url = "2"
 zip = "0.5.3"
 
 aziot-certd-config = { path = "../aziot/cert/aziot-certd-config" }
+aziot-check-common = { path = "../aziot/aziot/aziot-check-common" }
 aziot-identity-common = { path = "../aziot/identity/aziot-identity-common" }
 aziot-identityd-config = { path = "../aziot/identity/aziot-identityd-config" }
 aziot-keyd-config = { path = "../aziot/key/aziot-keyd-config" }
@@ -49,9 +50,9 @@ edgelet-http = { path = "../edgelet-http" }
 edgelet-http-mgmt = { path = "../edgelet-http-mgmt" }
 edgelet-utils = { path = "../edgelet-utils" }
 management = { path = "../management" }
-mini-sntp = { path = "../mini-sntp" }
 support-bundle = { path = "../support-bundle" }
 
+
 [target.'cfg(unix)'.dependencies]
 byte-unit = "3.0.3"
 libc = "0.2"
@@ -60,4 +61,3 @@ sysinfo = "0.14.10"
 [dev-dependencies]
 edgelet-test-utils = { path = "../edgelet-test-utils" }
 tempfile = "3.1.0"
-

edgelet/iotedge/src/check/checks/aziot_edged_version.rs

@@ -41,10 +41,6 @@ impl AziotEdgedVersion {
         let mut process = Command::new(&check.aziot_edged);
         process.arg("--version");
 
-        if cfg!(windows) {
-            process.env("IOTEDGE_RUN_AS_CONSOLE", "true");
-        }
-
         let output = process
             .output()
             .context("Could not spawn aziot-edged process")?;

edgelet/iotedge/src/check/checks/connect_management_uri.rs

@@ -81,12 +81,6 @@ impl ConnectManagementUri {
                 connect_management_uri.to_uds_file_path()
                 .context("Could not parse connect.management_uri: does not represent a valid file path")?;
 
-            // On Windows we mount the parent folder because we can't mount the socket files directly
-            #[cfg(windows)]
-            let socket_path =
-                socket_path.parent()
-                .ok_or_else(|| Context::new("Could not parse connect.management_uri: does not have a parent directory"))?;
-
             let socket_path =
                 socket_path.to_str()
                 .ok_or_else(|| Context::new("Could not parse connect.management_uri: file path is not valid utf-8"))?;

edgelet/iotedge/src/check/checks/container_engine_dns.rs

@@ -64,7 +64,7 @@ impl ContainerEngineDns {
             .context(MESSAGE)?;
         self.dns = daemon_config.dns.clone();
 
-        if let Some(&[]) | None = daemon_config.dns.as_ref().map(std::ops::Deref::deref) {
+        if daemon_config.dns.map_or(true, |e| e.is_empty()) {
             return Ok(CheckResult::Warning(Context::new(MESSAGE).into()));
         }
 

edgelet/iotedge/src/check/checks/container_engine_installed.rs

@@ -65,21 +65,9 @@ impl ContainerEngineInstalled {
                 );
 
                 if let Some(message) = message {
-                    #[cfg(unix)]
-                    {
-                        if message.contains("Got permission denied") {
-                            error_message += "\nYou might need to run this command as root.";
-                            return Ok(CheckResult::Fatal(err.context(error_message).into()));
-                        }
-                    }
-
-                    #[cfg(windows)]
-                    {
-                        if message.contains("Access is denied") {
-                            error_message +=
-                                "\nYou might need to run this command as Administrator.";
-                            return Ok(CheckResult::Fatal(err.context(error_message).into()));
-                        }
+                    if message.contains("Got permission denied") {
+                        error_message += "\nYou might need to run this command as root.";
+                        return Ok(CheckResult::Fatal(err.context(error_message).into()));
                     }
                 }
 

edgelet/iotedge/src/check/checks/container_engine_ipv6.rs

@@ -55,10 +55,10 @@ impl ContainerEngineIPv6 {
         let daemon_config_file = match daemon_config_file {
             Ok(daemon_config_file) => daemon_config_file,
             Err(err) => {
-                if is_edge_ipv6_configured {
-                    return Err(err.context(MESSAGE).into());
+                return if is_edge_ipv6_configured {
+                    Err(err.context(MESSAGE).into())
                 } else {
-                    return Ok(CheckResult::Ignored);
+                    Ok(CheckResult::Ignored)
                 }
             }
         };
@@ -72,11 +72,12 @@ impl ContainerEngineIPv6 {
             .context(MESSAGE)?;
         self.actual_use_ipv6 = daemon_config.ipv6;
 
-        match (daemon_config.ipv6.unwrap_or_default(), is_edge_ipv6_configured) {
-            (true, _) if cfg!(windows) => Err(Context::new("IPv6 container network configuration is not supported for the Windows operating system.").into()),
-            (true, _) => Ok(CheckResult::Ok),
-            (false, true) => Err(Context::new(MESSAGE).into()),
-            (false, false) => Ok(CheckResult::Ignored),
+        if daemon_config.ipv6.unwrap_or_default() {
+            Ok(CheckResult::Ok)
+        } else if is_edge_ipv6_configured {
+            Err(Context::new(MESSAGE).into())
+        } else {
+            Ok(CheckResult::Ignored)
         }
     }
 }

edgelet/iotedge/src/check/checks/container_engine_is_moby.rs

@@ -38,22 +38,6 @@ impl ContainerEngineIsMoby {
                 return Ok(CheckResult::Skipped);
             };
 
-        #[cfg(windows)]
-        {
-            let settings = if let Some(settings) = &check.settings {
-                settings
-            } else {
-                return Ok(CheckResult::Skipped);
-            };
-
-            let moby_runtime_uri = settings.moby_runtime().uri().to_string();
-            self.moby_runtime_uri = Some(moby_runtime_uri.clone());
-
-            if moby_runtime_uri != "npipe://./pipe/iotedge_moby_engine" {
-                return Ok(CheckResult::Warning(Context::new(MESSAGE).into()));
-            }
-        }
-
         let docker_server_major_version = docker_server_version
             .split('.')
             .next()