Skip to content

Commit 2c24b5b

Browse files
committed
fix i18n issue and removed early exit to allow discovering adapted resources
1 parent 3504d19 commit 2c24b5b

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

dsc_lib/locales/en-us.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ foundResourceWithVersion = "Found matching resource '%{resource}' version %{vers
102102
invalidRequiredVersion = "Invalid required version '%{version}' for resource '%{resource}'"
103103
foundNonAdapterResources = "Found %{count} non-adapter resources"
104104
foundAdaptedResourceWithVersion = "Found adapted resource '%{resource}' with version %{version}"
105+
invalidVersionForResource = "Invalid version '%{version}' for resource '%{resource}'"
105106

106107
[dscresources.commandResource]
107108
invokeGet = "Invoking get for '%{resource}'"
@@ -527,7 +528,6 @@ validSchemaUrisAre = "Valid schema URIs are"
527528
extension = "Extension"
528529
unsupportedCapability = "does not support capability"
529530
setting = "Setting"
530-
invalidRequiredVersion = "Invalid required version"
531531

532532
[progress]
533533
failedToSerialize = "Failed to serialize progress JSON: %{json}"

dsc_lib/src/discovery/command_discovery.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -503,12 +503,6 @@ impl ResourceDiscovery for CommandDiscovery {
503503
}
504504
}
505505
}
506-
} else {
507-
let version = match &filter.version() {
508-
Some(v) => (*v).to_string(),
509-
None => String::new(),
510-
};
511-
return Err(DscError::ResourceNotFound(filter.resource_type().to_string(), version));
512506
}
513507
if required_resources.values().all(|&v| v) {
514508
return Ok(found_resources);

0 commit comments

Comments
 (0)