@@ -200,7 +200,7 @@ impl ResourceDiscovery for CommandDiscovery {
200
200
fn discover ( & mut self , kind : & DiscoveryKind , filter : & str ) -> Result < ( ) , DscError > {
201
201
info ! ( "{}" , t!( "discovery.commandDiscovery.discoverResources" , kind = kind : { : ?} , filter = filter) ) ;
202
202
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
204
204
if * kind == DiscoveryKind :: Resource {
205
205
self . discover ( & DiscoveryKind :: Extension , "*" ) ?;
206
206
}
@@ -287,6 +287,7 @@ impl ResourceDiscovery for CommandDiscovery {
287
287
trace ! ( "{}" , t!( "discovery.commandDiscovery.adapterFound" , adapter = resource. type_name) ) ;
288
288
insert_resource ( & mut adapters, & resource, true ) ;
289
289
}
290
+ // also make sure to add adapters as a resource as well
290
291
trace ! ( "{}" , t!( "discovery.commandDiscovery.resourceFound" , resource = resource. type_name) ) ;
291
292
insert_resource ( & mut resources, & resource, true ) ;
292
293
}
@@ -562,7 +563,6 @@ impl ResourceDiscovery for CommandDiscovery {
562
563
563
564
// 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
564
565
fn 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) ;
566
566
if let Some ( resource_versions) = resources. get_mut ( & resource. type_name ) {
567
567
debug ! ( "Resource '{}' already exists, checking versions" , resource. type_name) ;
568
568
// 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:
571
571
let resource_instance_version = match Version :: parse ( & resource_instance. version ) {
572
572
Ok ( v) => v,
573
573
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) ;
576
574
continue ;
577
575
} ,
578
576
} ;
579
577
let resource_version = match Version :: parse ( & resource. version ) {
580
578
Ok ( v) => v,
581
579
Err ( err) => {
582
- // write as info since PowerShell resources tend to have invalid semver
583
- info ! ( "Resource '{}' has invalid version: {err}" , resource. type_name) ;
584
580
continue ;
585
581
} ,
586
582
} ;
0 commit comments