resolve $upstream in diagnostics-image-name (see #4171)

Azure · Jan 22, 2021 · 61c1abb · 61c1abb
1 parent bb2e0a7
commit 61c1abb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/edgelet/edgelet-docker/src/settings.rs b/edgelet/edgelet-docker/src/settings.rs
@@ -25,7 +25,7 @@ pub const DEFAULTS: &str = include_str!("../config/unix/default.yaml");
 const EDGE_NETWORKID_KEY: &str = "NetworkId";
 
 const UNIX_SCHEME: &str = "unix";
-const UPSTREAM_PARENT_KEYWORD: &str = "$upstream";
+pub const UPSTREAM_PARENT_KEYWORD: &str = "$upstream";
 
 #[derive(Clone, Debug, serde_derive::Deserialize, serde_derive::Serialize)]
 pub struct MobyRuntime {

diff --git a/edgelet/iotedge/src/check/checks/well_formed_config.rs b/edgelet/iotedge/src/check/checks/well_formed_config.rs
@@ -2,7 +2,8 @@ use std::fs::File;
 
 use failure::{self, Fail};
 
-use edgelet_docker::Settings;
+use edgelet_core::RuntimeSettings;
+use edgelet_docker::{Settings, UPSTREAM_PARENT_KEYWORD};
 
 use crate::check::{checker::Checker, Check, CheckResult};
 
@@ -67,6 +68,15 @@ impl WellFormedConfig {
             }
         };
 
+        if let Some(parent_hostname) = settings.parent_hostname() {
+            if let Some(image_tail) = check
+                .diagnostics_image_name
+                .strip_prefix(UPSTREAM_PARENT_KEYWORD)
+            {
+                check.diagnostics_image_name = format!("{}{}", parent_hostname, image_tail);
+            }
+        }
+
         check.settings = Some(settings);
 
         Ok(CheckResult::Ok)