@@ -167,6 +167,8 @@ invalidFunctionDescriptionFilter = "Invalid function description filter"
 maxInt = "maxInt"
 invalidManifest = "Error in manifest for"
 jsonArrayNotSupported = "JSON array output format is only supported for `--all'"
+yes = "Yes"
+no = "No"
 
 [util]
 failedToConvertJsonToString = "Failed to convert JSON to string"
 
@@ -695,14 +695,14 @@ fn list_actions(dsc: &mut DscManager, action_name: &TypeNameFilter, format: Opti
             }
 
             let has_input = if action.invoke.input_schema.is_some() {
-                "Yes"
+                t!("subcommand.yes")
             } else {
-                "No"
+                t!("subcommand.no")
             };
             let has_output = if action.invoke.output_schema.is_some() {
-                "Yes"
+                t!("subcommand.yes")
             } else {
-                "No"
+                t!("subcommand.no")
             };
 
             let require_security_context = match &action.invoke.require_security_context {
 
@@ -37,6 +37,7 @@ pub struct Discovery {
     pub actions: DiscoveryActionCache,
     pub extensions: DiscoveryExtensionCache,
     pub refresh_cache: bool,
+    pub discovery_completed: bool,
 }
 
 impl Discovery {
@@ -53,6 +54,7 @@ impl Discovery {
             actions: DiscoveryActionCache::new(),
             extensions: DiscoveryExtensionCache::new(),
             refresh_cache: false,
+            discovery_completed: false,
         }
     }
 
@@ -130,7 +132,7 @@ impl Discovery {
     }
 
     pub fn find_resource(&mut self, filter: &DiscoveryFilter) -> Result<Option<DscResourceKind>, DscError> {
-        if self.refresh_cache || self.resources.is_empty() {
+        if self.refresh_cache || !self.discovery_completed {
             self.find_resources(std::slice::from_ref(filter), ProgressFormat::None)?;
         }
 
@@ -173,8 +175,7 @@ impl Discovery {
     ///
     /// * `required_resource_types` - The required resource types.
     pub fn find_resources(&mut self, required_resource_types: &[DiscoveryFilter], progress_format: ProgressFormat) -> Result<(), DscError> {
-        if !self.refresh_cache && !self.resources.is_empty() {
-            // If resources are already discovered, no need to re-discover.
+        if !self.refresh_cache && self.discovery_completed {
             return Ok(());
         }
 
@@ -203,6 +204,7 @@ impl Discovery {
                 self.extensions.extend(extensions);
             }
         }
+        self.discovery_completed = true;
         Ok(())
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@ pub struct Discovery {`
`37`	`37`	`pub actions: DiscoveryActionCache,`
`38`	`38`	`pub extensions: DiscoveryExtensionCache,`
`39`	`39`	`pub refresh_cache: bool,`
	`40`	`+ pub discovery_completed: bool,`
`40`	`41`	`}`
`41`	`42`
`42`	`43`	`impl Discovery {`
`@@ -53,6 +54,7 @@ impl Discovery {`
`53`	`54`	`actions: DiscoveryActionCache::new(),`
`54`	`55`	`extensions: DiscoveryExtensionCache::new(),`
`55`	`56`	`refresh_cache: false,`
	`57`	`+ discovery_completed: false,`
`56`	`58`	`}`
`57`	`59`	`}`
`58`	`60`
`@@ -130,7 +132,7 @@ impl Discovery {`
`130`	`132`	`}`
`131`	`133`
`132`	`134`	`pub fn find_resource(&mut self, filter: &DiscoveryFilter) -> Result<Option<DscResourceKind>, DscError> {`
`133`		`- if self.refresh_cache \|\| self.resources.is_empty() {`
	`135`	`+ if self.refresh_cache \|\| !self.discovery_completed {`
`134`	`136`	`self.find_resources(std::slice::from_ref(filter), ProgressFormat::None)?;`
`135`	`137`	`}`
`136`	`138`
`@@ -173,8 +175,7 @@ impl Discovery {`
`173`	`175`	`///`
`174`	`176`	/// * `required_resource_types` - The required resource types.
`175`	`177`	`pub fn find_resources(&mut self, required_resource_types: &[DiscoveryFilter], progress_format: ProgressFormat) -> Result<(), DscError> {`
`176`		`- if !self.refresh_cache && !self.resources.is_empty() {`
`177`		`- // If resources are already discovered, no need to re-discover.`
	`178`	`+ if !self.refresh_cache && self.discovery_completed {`
`178`	`179`	`return Ok(());`
`179`	`180`	`}`
`180`	`181`
`@@ -203,6 +204,7 @@ impl Discovery {`
`203`	`204`	`self.extensions.extend(extensions);`
`204`	`205`	`}`
`205`	`206`	`}`
	`207`	`+ self.discovery_completed = true;`
`206`	`208`	`Ok(())`
`207`	`209`	`}`
`208`	`210`	`}`