@@ -200,7 +200,7 @@ impl ResourceDiscovery for CommandDiscovery {
200200 fn discover ( & mut self , kind : & DiscoveryKind , filter : & str ) -> Result < ( ) , DscError > {
201201 info ! ( "{}" , t!( "discovery.commandDiscovery.discoverResources" , kind = kind : { : ?} , filter = filter) ) ;
202202
203- // if kind is DscResource and DSC_RESOURCE_PATH is not defined , we need to discover extensions first
203+ // if kind is DscResource, we need to discover extensions first
204204 if * kind == DiscoveryKind :: Resource {
205205 self . discover ( & DiscoveryKind :: Extension , "*" ) ?;
206206 }
@@ -287,6 +287,7 @@ impl ResourceDiscovery for CommandDiscovery {
287287 trace ! ( "{}" , t!( "discovery.commandDiscovery.adapterFound" , adapter = resource. type_name) ) ;
288288 insert_resource ( & mut adapters, & resource, true ) ;
289289 }
290+ // also make sure to add adapters as a resource as well
290291 trace ! ( "{}" , t!( "discovery.commandDiscovery.resourceFound" , resource = resource. type_name) ) ;
291292 insert_resource ( & mut resources, & resource, true ) ;
292293 }
@@ -562,7 +563,6 @@ impl ResourceDiscovery for CommandDiscovery {
562563
563564// TODO: This should be a BTreeMap of the resource name and a BTreeMap of the version and DscResource, this keeps it version sorted more efficiently
564565fn insert_resource ( resources : & mut BTreeMap < String , Vec < DscResource > > , resource : & DscResource , skip_duplicate_version : bool ) {
565- debug ! ( "Inserting resource: {} version {} from {}" , resource. type_name, resource. version, resource. directory) ;
566566 if let Some ( resource_versions) = resources. get_mut ( & resource. type_name ) {
567567 debug ! ( "Resource '{}' already exists, checking versions" , resource. type_name) ;
568568 // compare the resource versions and insert newest to oldest using semver
@@ -571,16 +571,12 @@ fn insert_resource(resources: &mut BTreeMap<String, Vec<DscResource>>, resource:
571571 let resource_instance_version = match Version :: parse ( & resource_instance. version ) {
572572 Ok ( v) => v,
573573 Err ( err) => {
574- // write as info since PowerShell resources tend to have invalid semver
575- info ! ( "Resource '{}' has invalid version: {err}" , resource_instance. type_name) ;
576574 continue ;
577575 } ,
578576 } ;
579577 let resource_version = match Version :: parse ( & resource. version ) {
580578 Ok ( v) => v,
581579 Err ( err) => {
582- // write as info since PowerShell resources tend to have invalid semver
583- info ! ( "Resource '{}' has invalid version: {err}" , resource. type_name) ;
584580 continue ;
585581 } ,
586582 } ;
0 commit comments