Skip to content

Commit 0932f54

Browse files
author
Andrew
committed
Feedback 1
1 parent 3790c30 commit 0932f54

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

dsc_lib/src/discovery/command_discovery.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use std::path::Path;
1515
pub struct CommandDiscovery {
1616
pub resources: BTreeMap<String, DscResource>,
1717
provider_resources: Vec<String>,
18-
initialization_messages: Vec<StreamMessage>,
18+
discovery_messages: Vec<StreamMessage>, // this will later be used to display only messages for resources used in specific operation
1919
initialized: bool,
2020
}
2121

@@ -24,7 +24,7 @@ impl CommandDiscovery {
2424
CommandDiscovery {
2525
resources: BTreeMap::new(),
2626
provider_resources: Vec::new(),
27-
initialization_messages: Vec::new(),
27+
discovery_messages: Vec::new(),
2828
initialized: false,
2929
}
3030
}
@@ -88,7 +88,7 @@ impl ResourceDiscovery for CommandDiscovery {
8888
{
8989
Ok((exit_code, stdout, stderr)) => (exit_code, stdout, stderr),
9090
Err(e) => {
91-
self.initialization_messages.push(StreamMessage::new_error(
91+
self.discovery_messages.push(StreamMessage::new_error(
9292
format!("Could not start {}: {}", list_command.executable, e),
9393
Some(provider_type_name.clone()),
9494
Some(provider_path.clone())));
@@ -98,7 +98,7 @@ impl ResourceDiscovery for CommandDiscovery {
9898
};
9999

100100
if exit_code != 0 {
101-
self.initialization_messages.push(StreamMessage::new_error(
101+
self.discovery_messages.push(StreamMessage::new_error(
102102
format!("Provider failed to list resources with exit code {exit_code}: {stderr}"),
103103
Some(provider_type_name.clone()),
104104
Some(provider_path.clone())));
@@ -108,7 +108,7 @@ impl ResourceDiscovery for CommandDiscovery {
108108
match serde_json::from_str::<DscResource>(line){
109109
Result::Ok(resource) => {
110110
if resource.requires.is_none() {
111-
self.initialization_messages.push(StreamMessage::new_error(
111+
self.discovery_messages.push(StreamMessage::new_error(
112112
DscError::MissingRequires(provider.clone(), resource.type_name.clone()).to_string(),
113113
Some(resource.type_name.clone()),
114114
Some(resource.path.clone())));
@@ -118,7 +118,7 @@ impl ResourceDiscovery for CommandDiscovery {
118118
self.resources.insert(resource.type_name.clone(), resource);
119119
},
120120
Result::Err(err) => {
121-
self.initialization_messages.push(StreamMessage::new_error(
121+
self.discovery_messages.push(StreamMessage::new_error(
122122
format!("Failed to parse resource: {line} -> {err}"),
123123
Some(provider_type_name.clone()),
124124
Some(provider_path.clone())));
@@ -134,7 +134,7 @@ impl ResourceDiscovery for CommandDiscovery {
134134
}
135135

136136
fn print_initialization_messages(&mut self, error_format:StreamMessageType, warning_format:StreamMessageType) -> Result<(), DscError>{
137-
for msg in &self.initialization_messages {
137+
for msg in &self.discovery_messages {
138138
msg.print(&error_format, &warning_format)?;
139139
}
140140

0 commit comments

Comments
 (0)