address clippy, add resource testes

SteveL-MSFT · SteveL-MSFT · commit 056b18a1424c · 2025-08-24T12:47:06.000-07:00
diff --git a/dsc/src/subcommand.rs b/dsc/src/subcommand.rs
@@ -494,7 +494,7 @@ pub fn validate_config(config: &Configuration, progress_format: ProgressFormat)
         let Some(type_name) = resource_block["type"].as_str() else {
             return Err(DscError::Validation(t!("subcommand.resourceTypeNotSpecified").to_string()));
         };
-        resource_types.push(DiscoveryFilter::new(type_name.to_lowercase().to_string(), resource_block["api_version"].as_str().map(|s| s.to_string())));
+        resource_types.push(DiscoveryFilter::new(&type_name.to_lowercase(), resource_block["api_version"].as_str().map(std::string::ToString::to_string)));
     }
     dsc.find_resources(&resource_types, progress_format);
 
@@ -574,16 +574,16 @@ pub fn resource(subcommand: &ResourceSubCommand, progress_format: ProgressFormat
             list_resources(&mut dsc, resource_name.as_ref(), adapter_name.as_ref(), description.as_ref(), tags.as_ref(), output_format.as_ref(), progress_format);
         },
         ResourceSubCommand::Schema { resource , version, output_format } => {
-            dsc.find_resources(&[DiscoveryFilter::new(resource.clone(), version.clone())], progress_format);
+            dsc.find_resources(&[DiscoveryFilter::new(resource, version.clone())], progress_format);
             resource_command::schema(&mut dsc, resource, version.as_deref(), output_format.as_ref());
         },
         ResourceSubCommand::Export { resource, version, input, file, output_format } => {
-            dsc.find_resources(&[DiscoveryFilter::new(resource.clone(), version.clone())], progress_format);
+            dsc.find_resources(&[DiscoveryFilter::new(resource, version.clone())], progress_format);
             let parsed_input = get_input(input.as_ref(), file.as_ref(), false);
             resource_command::export(&mut dsc, resource, version.as_deref(), &parsed_input, output_format.as_ref());
         },
         ResourceSubCommand::Get { resource, version, input, file: path, all, output_format } => {
-            dsc.find_resources(&[DiscoveryFilter::new(resource.clone(), version.clone())], progress_format);
+            dsc.find_resources(&[DiscoveryFilter::new(resource, version.clone())], progress_format);
             if *all {
                 resource_command::get_all(&mut dsc, resource, version.as_deref(), output_format.as_ref());
             }
@@ -597,17 +597,17 @@ pub fn resource(subcommand: &ResourceSubCommand, progress_format: ProgressFormat
             }
         },
         ResourceSubCommand::Set { resource, version, input, file: path, output_format } => {
-            dsc.find_resources(&[DiscoveryFilter::new(resource.clone(), version.clone())], progress_format);
+            dsc.find_resources(&[DiscoveryFilter::new(resource, version.clone())], progress_format);
             let parsed_input = get_input(input.as_ref(), path.as_ref(), false);
             resource_command::set(&mut dsc, resource, version.as_deref(), &parsed_input, output_format.as_ref());
         },
         ResourceSubCommand::Test { resource, version, input, file: path, output_format } => {
-            dsc.find_resources(&[DiscoveryFilter::new(resource.clone(), version.clone())], progress_format);
+            dsc.find_resources(&[DiscoveryFilter::new(resource, version.clone())], progress_format);
             let parsed_input = get_input(input.as_ref(), path.as_ref(), false);
             resource_command::test(&mut dsc, resource, version.as_deref(), &parsed_input, output_format.as_ref());
         },
         ResourceSubCommand::Delete { resource, version, input, file: path } => {
-            dsc.find_resources(&[DiscoveryFilter::new(resource.clone(), version.clone())], progress_format);
+            dsc.find_resources(&[DiscoveryFilter::new(resource, version.clone())], progress_format);
             let parsed_input = get_input(input.as_ref(), path.as_ref(), false);
             resource_command::delete(&mut dsc, resource, version.as_deref(), &parsed_input);
         },
diff --git a/dsc/tests/dsc_resource_get.tests.ps1 b/dsc/tests/dsc_resource_get.tests.ps1
@@ -70,4 +70,10 @@ Describe 'resource get tests' {
         $out.bitness | Should -BeIn @('32', '64')
         $out.architecture | Should -BeIn @('x86', 'x86_64', 'arm64')
     }
+
+    It 'version works' {
+        $out = dsc resource get -r Test/Version --version 1.1.2 | ConvertFrom-Json
+        $LASTEXITCODE | Should -Be 0
+        $out.actualState.version | Should -BeExactly '1.1.2'
+    }
 }
diff --git a/dsc/tests/dsc_resource_set.tests.ps1 b/dsc/tests/dsc_resource_set.tests.ps1
@@ -0,0 +1,17 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+Describe 'Invoke a resource set directly' {
+    It 'set returns proper error code if no input is provided' {
+        $out = dsc resource set -r Test/Version 2>&1
+        $LASTEXITCODE | Should -Be 1
+        $out | Should -BeLike '*ERROR*'
+    }
+
+     It 'version works' {
+        $out = dsc resource set -r Test/Version --version 1.1.2 --input '{"version":"1.1.2"}' | ConvertFrom-Json
+        $LASTEXITCODE | Should -Be 0
+        $out.afterState.version | Should -BeExactly '1.1.2'
+        $out.changedProperties | Should -BeNullOrEmpty
+    }
+}
diff --git a/dsc/tests/dsc_resource_test.tests.ps1 b/dsc/tests/dsc_resource_test.tests.ps1
@@ -26,4 +26,11 @@ Describe 'Invoke a resource test directly' {
         $LASTEXITCODE | Should -Be 1
         $out | Should -BeLike '*ERROR*'
     }
+
+     It 'version works' {
+        $out = dsc resource test -r Test/Version --version 1.1.2 --input '{"version":"1.1.2"}' | ConvertFrom-Json
+        $LASTEXITCODE | Should -Be 0
+        $out.actualState.version | Should -BeExactly '1.1.2'
+        $out.inDesiredState | Should -Be $true
+    }
 }
diff --git a/dsc_lib/src/configure/mod.rs b/dsc_lib/src/configure/mod.rs
@@ -855,7 +855,7 @@ impl Configurator {
         // create an array of DiscoveryFilter using the resource types and api_versions from the config
         let mut discovery_filter: Vec<DiscoveryFilter> = Vec::new();
         for resource in &config.resources {
-            let filter = DiscoveryFilter::new(resource.resource_type.clone(), resource.api_version.clone());
+            let filter = DiscoveryFilter::new(&resource.resource_type, resource.api_version.clone());
             if !discovery_filter.contains(&filter) {
                 discovery_filter.push(filter);
             }
diff --git a/dsc_lib/src/discovery/command_discovery.rs b/dsc_lib/src/discovery/command_discovery.rs
@@ -476,12 +476,12 @@ impl ResourceDiscovery for CommandDiscovery {
             required_resources.insert(filter.clone(), false);
         }
 
-        for filter in required_resource_types.iter() {
+        for filter in required_resource_types {
             if let Some(resources) = self.resources.get(filter.resource_type()) {
-                for resource in resources.iter() {
+                for resource in resources {
                     if let Some(required_version) = filter.version() {
                         if let Ok(resource_version) = Version::parse(&resource.version) {
-                            if let Ok(version_req) = VersionReq::parse(&required_version) {
+                            if let Ok(version_req) = VersionReq::parse(required_version) {
                                 if version_req.matches(&resource_version) {
                                     found_resources.entry(filter.resource_type().to_string()).or_default().push(resource.clone());
                                     required_resources.insert(filter.clone(), true);
@@ -505,7 +505,7 @@ impl ResourceDiscovery for CommandDiscovery {
                 }
             } else {
                 let version = match &filter.version() {
-                    Some(v) => v.to_string(),
+                    Some(v) => (*v).to_string(),
                     None => String::new(),
                 };
                 return Err(DscError::ResourceNotFound(filter.resource_type().to_string(), version));
@@ -522,14 +522,14 @@ impl ResourceDiscovery for CommandDiscovery {
 
         // now go through the adapters, this is for implicit adapters so version can't be specified so use latest version
         for adapter_name in self.adapters.clone().keys() {
-            self.discover_adapted_resources("*", &adapter_name)?;
+            self.discover_adapted_resources("*", adapter_name)?;
             add_resources_to_lookup_table(&self.adapted_resources);
-            for filter in required_resource_types.iter() {
+            for filter in required_resource_types {
                 if let Some(adapted_resources) = self.adapted_resources.get(filter.resource_type()) {
                     for resource in adapted_resources.iter().rev() {
                         if let Some(required_version) = filter.version() {
                             if let Ok(resource_version) = Version::parse(&resource.version) {
-                                if let Ok(version_req) = VersionReq::parse(&required_version) {
+                                if let Ok(version_req) = VersionReq::parse(required_version) {
                                     if version_req.matches(&resource_version) {
                                         found_resources.entry(filter.resource_type().to_string()).or_default().push(resource.clone());
                                         required_resources.insert(filter.clone(), true);
diff --git a/dsc_lib/src/discovery/discovery_trait.rs b/dsc_lib/src/discovery/discovery_trait.rs
@@ -18,11 +18,12 @@ pub struct DiscoveryFilter {
 }
 
 impl DiscoveryFilter {
-    pub fn new(resource_type: String, version: Option<String>) -> Self {
+    #[must_use]
+    pub fn new(resource_type: &str, version: Option<String>) -> Self {
         // The semver crate uses caret (meaning compatible) by default instead of exact if not specified
         // If the first character is a number, then we prefix with =
         let version = match version {
-            Some(v) if v.chars().next().map_or(false, |c| c.is_ascii_digit()) => Some(format!("={v}")),
+            Some(v) if v.chars().next().is_some_and(|c| c.is_ascii_digit()) => Some(format!("={v}")),
             other => other,
         };
         Self {
@@ -31,10 +32,12 @@ impl DiscoveryFilter {
         }
     }
 
+    #[must_use]
     pub fn resource_type(&self) -> &str {
         &self.resource_type
     }
 
+    #[must_use]
     pub fn version(&self) -> Option<&String> {
         self.version.as_ref()
     }
diff --git a/dsc_lib/src/discovery/mod.rs b/dsc_lib/src/discovery/mod.rs
@@ -89,7 +89,7 @@ impl Discovery {
     #[must_use]
     pub fn find_resource(&mut self, type_name: &str, version_string: Option<&str>) -> Option<&DscResource> {
         if self.resources.is_empty() {
-            let discovery_filter = DiscoveryFilter::new(type_name.to_string(), version_string.map(|v| v.to_string()));
+            let discovery_filter = DiscoveryFilter::new(type_name, version_string.map(std::string::ToString::to_string));
             self.find_resources(&[discovery_filter], ProgressFormat::None);
         }
 
@@ -98,7 +98,7 @@ impl Discovery {
             if let Some(version) = version_string {
                 // The semver crate uses caret (meaning compatible) by default instead of exact if not specified
                 // If the first character is a number, then we prefix with =
-                let version = if version.chars().next().map_or(false, |c| c.is_ascii_digit()) {
+                let version = if version.chars().next().is_some_and(|c| c.is_ascii_digit()) {
                     format!("={version}")
                 } else {
                     version.to_string()

Original file line number	Diff line number	Diff line change
`@@ -70,4 +70,10 @@ Describe 'resource get tests' {`
`70`	`70`	`$out.bitness \| Should -BeIn @('32', '64')`
`71`	`71`	`$out.architecture \| Should -BeIn @('x86', 'x86_64', 'arm64')`
`72`	`72`	`}`
	`73`	`+`
	`74`	`+ It 'version works' {`
	`75`	`+ $out = dsc resource get -r Test/Version --version 1.1.2 \| ConvertFrom-Json`
	`76`	`+ $LASTEXITCODE \| Should -Be 0`
	`77`	`+ $out.actualState.version \| Should -BeExactly '1.1.2'`
	`78`	`+ }`
`73`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,4 +26,11 @@ Describe 'Invoke a resource test directly' {`
`26`	`26`	`$LASTEXITCODE \| Should -Be 1`
`27`	`27`	`$out \| Should -BeLike 'ERROR'`
`28`	`28`	`}`
	`29`	`+`
	`30`	`+ It 'version works' {`
	`31`	`+ $out = dsc resource test -r Test/Version --version 1.1.2 --input '{"version":"1.1.2"}' \| ConvertFrom-Json`
	`32`	`+ $LASTEXITCODE \| Should -Be 0`
	`33`	`+ $out.actualState.version \| Should -BeExactly '1.1.2'`
	`34`	`+ $out.inDesiredState \| Should -Be $true`
	`35`	`+ }`
`29`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -855,7 +855,7 @@ impl Configurator {`
`855`	`855`	`// create an array of DiscoveryFilter using the resource types and api_versions from the config`
`856`	`856`	`let mut discovery_filter: Vec<DiscoveryFilter> = Vec::new();`
`857`	`857`	`for resource in &config.resources {`
`858`		`- let filter = DiscoveryFilter::new(resource.resource_type.clone(), resource.api_version.clone());`
	`858`	`+ let filter = DiscoveryFilter::new(&resource.resource_type, resource.api_version.clone());`
`859`	`859`	`if !discovery_filter.contains(&filter) {`
`860`	`860`	`discovery_filter.push(filter);`
`861`	`861`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,11 +18,12 @@ pub struct DiscoveryFilter {`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`impl DiscoveryFilter {`
`21`		`- pub fn new(resource_type: String, version: Option<String>) -> Self {`
	`21`	`+ #[must_use]`
	`22`	`+ pub fn new(resource_type: &str, version: Option<String>) -> Self {`
`22`	`23`	`// The semver crate uses caret (meaning compatible) by default instead of exact if not specified`
`23`	`24`	`// If the first character is a number, then we prefix with =`
`24`	`25`	`let version = match version {`
`25`		`- Some(v) if v.chars().next().map_or(false, \|c\| c.is_ascii_digit()) => Some(format!("={v}")),`
	`26`	`+ Some(v) if v.chars().next().is_some_and(\|c\| c.is_ascii_digit()) => Some(format!("={v}")),`
`26`	`27`	`other => other,`
`27`	`28`	`};`
`28`	`29`	`Self {`
`@@ -31,10 +32,12 @@ impl DiscoveryFilter {`
`31`	`32`	`}`
`32`	`33`	`}`
`33`	`34`
	`35`	`+ #[must_use]`
`34`	`36`	`pub fn resource_type(&self) -> &str {`
`35`	`37`	`&self.resource_type`
`36`	`38`	`}`
`37`	`39`
	`40`	`+ #[must_use]`
`38`	`41`	`pub fn version(&self) -> Option<&String> {`
`39`	`42`	`self.version.as_ref()`
`40`	`43`	`}`