fix(downloader): multiservice discovery should filter boundary nodes …

…based on target name (#219)

* fixing downloader

* removing extra println

rs/ic-observability/multiservice-discovery-shared/src/contracts/mod.rs

@@ -4,4 +4,5 @@ pub mod target;
 pub trait DataContract {
     fn get_name(&self) -> String;
     fn get_id(&self) -> String;
+    fn get_target_name(&self) -> String;
 }

rs/ic-observability/multiservice-discovery-shared/src/contracts/sns.rs

@@ -47,4 +47,8 @@ impl DataContract for Sns {
     fn get_id(&self) -> String {
         self.root_canister_id.to_string()
     }
+
+    fn get_target_name(&self) -> String {
+        self.name.to_string()
+    }
 }

rs/ic-observability/multiservice-discovery-shared/src/contracts/target.rs

@@ -36,6 +36,10 @@ impl DataContract for TargetDto {
     fn get_id(&self) -> String {
         self.node_id.to_string()
     }
+
+    fn get_target_name(&self) -> String {
+        self.name.to_string()
+    }
 }
 
 pub fn map_to_target_dto(

rs/ic-observability/multiservice-discovery-shared/src/filters/node_regex_id_filter.rs

@@ -23,7 +23,7 @@ impl NodeIDRegexFilter {
 impl TargetGroupFilter for NodeIDRegexFilter {
     fn filter(&self, target_group: &dyn DataContract) -> bool {
         if target_group.get_id() == self.bn_principal_placeholder.to_string() {
-            return self.regex.is_match(&target_group.get_name().to_string());
+            return self.regex.is_match(&target_group.get_target_name().to_string());
         }
 
         self.regex.is_match(&target_group.get_id())