Revert "Blocked non-list operations on adapters"

This reverts commit 6505b11.

Author: Andrew

dsc/src/resource_command.rs

@@ -5,7 +5,7 @@ use crate::args::OutputFormat;
 use crate::util::{EXIT_DSC_ERROR, EXIT_INVALID_ARGS, EXIT_JSON_ERROR, add_type_name_to_json, write_output};
 use dsc_lib::configure::config_doc::{Configuration, ExecutionKind};
 use dsc_lib::configure::add_resource_export_results_to_configuration;
-use dsc_lib::dscresources::{resource_manifest::Kind, invoke_result::{GetResult, ResourceGetResponse}};
+use dsc_lib::dscresources::invoke_result::{GetResult, ResourceGetResponse};
 use dsc_lib::dscerror::DscError;
 use tracing::{error, debug};
 
@@ -22,11 +22,6 @@ pub fn get(dsc: &DscManager, resource_type: &str, mut input: String, format: &Op
     };
 
     debug!("resource.type_name - {} implemented_as - {:?}", resource.type_name, resource.implemented_as);
-    if resource.kind == Kind::Adapter {
-        error!("Can not perform this operation on the adapter {} itself", resource.type_name);
-        exit(EXIT_DSC_ERROR);
-    }
-
     if let Some(requires) = &resource.require_adapter {
         input = add_type_name_to_json(input, resource.type_name.clone());
         if let Some(pr) = get_resource(dsc, requires) {
@@ -64,11 +59,6 @@ pub fn get_all(dsc: &DscManager, resource_type: &str, format: &Option<OutputForm
     };
 
     debug!("resource.type_name - {} implemented_as - {:?}", resource.type_name, resource.implemented_as);
-    if resource.kind == Kind::Adapter {
-        error!("Can not perform this operation on the adapter {} itself", resource.type_name);
-        exit(EXIT_DSC_ERROR);
-    }
-
     if let Some(requires) = &resource.require_adapter {
         input = add_type_name_to_json(input, resource.type_name.clone());
         if let Some(pr) = get_resource(dsc, requires) {
@@ -116,10 +106,6 @@ pub fn set(dsc: &DscManager, resource_type: &str, mut input: String, format: &Op
     };
 
     debug!("resource.type_name - {} implemented_as - {:?}", resource.type_name, resource.implemented_as);
-    if resource.kind == Kind::Adapter {
-        error!("Can not perform this operation on the adapter {} itself", resource.type_name);
-        exit(EXIT_DSC_ERROR);
-    }
 
     if let Some(requires) = &resource.require_adapter {
         input = add_type_name_to_json(input, resource.type_name.clone());
@@ -162,10 +148,6 @@ pub fn test(dsc: &DscManager, resource_type: &str, mut input: String, format: &O
     };
 
     debug!("resource.type_name - {} implemented_as - {:?}", resource.type_name, resource.implemented_as);
-    if resource.kind == Kind::Adapter {
-        error!("Can not perform this operation on the adapter {} itself", resource.type_name);
-        exit(EXIT_DSC_ERROR);
-    }
 
     if let Some(requires) = &resource.require_adapter {
         input = add_type_name_to_json(input, resource.type_name.clone());
@@ -203,10 +185,6 @@ pub fn delete(dsc: &DscManager, resource_type: &str, mut input: String) {
     };
 
     debug!("resource.type_name - {} implemented_as - {:?}", resource.type_name, resource.implemented_as);
-    if resource.kind == Kind::Adapter {
-        error!("Can not perform this operation on the adapter {} itself", resource.type_name);
-        exit(EXIT_DSC_ERROR);
-    }
 
     if let Some(requires) = &resource.require_adapter {
         input = add_type_name_to_json(input, resource.type_name.clone());
@@ -232,11 +210,6 @@ pub fn schema(dsc: &DscManager, resource_type: &str, format: &Option<OutputForma
         error!("{}", DscError::ResourceNotFound(resource_type.to_string()).to_string());
         return
     };
-    if resource.kind == Kind::Adapter {
-        error!("Can not perform this operation on the adapter {} itself", resource.type_name);
-        exit(EXIT_DSC_ERROR);
-    }
-
     match resource.schema() {
         Ok(json) => {
             // verify is json
@@ -263,11 +236,6 @@ pub fn export(dsc: &mut DscManager, resource_type: &str, format: &Option<OutputF
         return
     };
 
-    if dsc_resource.kind == Kind::Adapter {
-        error!("Can not perform this operation on the adapter {} itself", dsc_resource.type_name);
-        exit(EXIT_DSC_ERROR);
-    }
-
     let mut adapter_resource: Option<&DscResource> = None;
     if let Some(requires) = &dsc_resource.require_adapter {
         input = add_type_name_to_json(input, dsc_resource.type_name.clone());

dsc/tests/dsc_args.tests.ps1

@@ -272,40 +272,4 @@ resources:
         $stderr = dsc config get -d $configFile 2>&1
         $stderr | Should -Match '.*?--path.*?'
     }
-
-    It 'Get operation on the adapter itself should fail' -Tag 'z1' {
-        dsc resource get -r Microsoft.DSC/PowerShell 2> $TestDrive/tracing.txt
-        $LASTEXITCODE | Should -Be 2
-        "$TestDrive/tracing.txt" | Should -FileContentMatchExactly 'Can not perform this operation on the adapter'
-    }
-
-    It 'Get-all operation on the adapter itself should fail' -Tag 'z1' {
-        dsc resource get --all -r Microsoft.DSC/PowerShell 2> $TestDrive/tracing.txt
-        $LASTEXITCODE | Should -Be 2
-        "$TestDrive/tracing.txt" | Should -FileContentMatchExactly 'Can not perform this operation on the adapter'
-    }
-
-    It 'Set operation on the adapter itself should fail' -Tag 'z1' {
-        'abc' | dsc resource set -r Microsoft.DSC/PowerShell 2> $TestDrive/tracing.txt
-        $LASTEXITCODE | Should -Be 2
-        "$TestDrive/tracing.txt" | Should -FileContentMatchExactly 'Can not perform this operation on the adapter'
-    }
-
-    It 'Test operation on the adapter itself should fail' -Tag 'z1' {
-        dsc resource test -r Microsoft.DSC/PowerShell 2> $TestDrive/tracing.txt
-        $LASTEXITCODE | Should -Be 2
-        "$TestDrive/tracing.txt" | Should -FileContentMatchExactly 'Can not perform this operation on the adapter'
-    }
-
-    It 'Export operation on the adapter itself should fail' -Tag 'z1' {
-        dsc resource export -r Microsoft.DSC/PowerShell 2> $TestDrive/tracing.txt
-        $LASTEXITCODE | Should -Be 2
-        "$TestDrive/tracing.txt" | Should -FileContentMatchExactly 'Can not perform this operation on the adapter'
-    }
-
-    It 'Delete operation on the adapter itself should fail' -Tag 'z1' {
-        dsc resource delete -r Microsoft.DSC/PowerShell 2> $TestDrive/tracing.txt
-        $LASTEXITCODE | Should -Be 2
-        "$TestDrive/tracing.txt" | Should -FileContentMatchExactly 'Can not perform this operation on the adapter'
-    }
 }