Merge branch 'main' into date_fix

Author: SteveL-MSFT

.pipelines/DSC-Official.yml

@@ -36,7 +36,7 @@ extends:
       WindowsHostVersion: 
         Disk: Large
         Version: 2022
-          Network: KS3 # this retricts network access to public upstream repositories
+        Network: KS1 # note that this property is sticky so commenting out will use the previous set one
 # Currently can't be used as some NPM pkgs like tree-sitter-cli reach out to GitHub to get the actual zip pkg
 #        Network: NetLock
     customTags: 'ES365AIMigrationTooling'
@@ -201,16 +201,20 @@ extends:
         dependsOn: BuildWin
         variables:
           ob_outputDirectory: '$(Build.ArtifactStagingDirectory)'
+          ob_sdl_tsa_configFile: '$(Build.SourcesDirectory)\DSC\.config\tsaoptions.json'
+          ob_sdl_sbom_enabled: true
+          ob_signing_setup_enabled: true
+          ob_sdl_codeql_compiled_enabled: true
         pool:
           type: windows
         steps:
+        - checkout: self
         - download: current
           artifact: drop_BuildAndSign_BuildWinx64
           patterns: '*.msix'
         - download: current
           artifact: drop_BuildAndSign_BuildWinarm64
           patterns: '*.msix'
-        - checkout: self
         - pwsh: |
             Set-Location "$(Build.SourcesDirectory)/DSC"
             $null = New-Item -ItemType Directory -Path "./bin/msix" -Force -ErrorAction Ignore
@@ -221,25 +225,6 @@ extends:
           displayName: 'Create msixbundle'
           condition: succeeded()
 
-      - job: PublishSigned
-        dependsOn: BuildWin
-        variables:
-          signOutPath: $[ dependencies.BuildWin.outputs['signOutPath.signOutPath'] ]
-          ob_sdl_tsa_configFile: $(Build.SourcesDirectory)\DSC\.config\tsaoptions.json
-          ob_outputDirectory: '$(Build.ArtifactStagingDirectory)'
-          ob_sdl_sbom_enabled: false
-          ob_signing_setup_enabled: false
-          ob_sdl_codeql_compiled_enabled: false
-        pool:
-          type: windows
-        steps:
-        - task: CopyFiles@2
-          displayName: "Copy Files for 'PublishPipelineArtifact@1' publish task"
-          inputs:
-            SourceFolder: $(signOutPath)
-            Contents: '**'
-            TargetFolder: $(Build.ArtifactStagingDirectory)/signed
-
       - job: BuildLinux
         dependsOn: SetPackageVersion
         variables:
@@ -382,12 +367,9 @@ extends:
 
     - stage: Release
       dependsOn: BuildAndSign
+      condition: ne(variables['Build.Reason'], 'Schedule')
       variables:
         PackageVersion: $[ dependencies.SetPackageVersion.outputs['Package.Version'] ]
-        ob_sdl_sbom_enabled: false
-        ob_signing_setup_enabled: false
-        ob_sdl_codeql_compiled_enabled: false
-        drop: $(Pipeline.Workspace)/drop_build_main
       jobs:
       - job: Validation
         displayName: Manual validation
@@ -407,10 +389,17 @@ extends:
         pool:
           type: windows
         variables:
-          ob_outputDirectory: '$(Build.SourcesDirectory)'
+          ob_outputDirectory: '$(Build.ArtifactStagingDirectory)'
+          ob_sdl_sbom_enabled: false
+          ob_signing_setup_enabled: false
+          ob_sdl_codeql_compiled_enabled: false
+          drop: $(Pipeline.Workspace)/drop_build_main
         steps:
         - download: current
           displayName: Download artifacts
+          patterns: |
+            '**/*.zip'
+            '**/*.tar.gz'
         - task: GitHubRelease@1
           displayName: Create GitHub release
           inputs:

dsc/Cargo.lock

@@ -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::invoke_result::{GetResult, ResourceGetResponse};
+use dsc_lib::dscresources::{resource_manifest::Kind, invoke_result::{GetResult, ResourceGetResponse}};
 use dsc_lib::dscerror::DscError;
 use tracing::{error, debug};
 
@@ -22,6 +22,11 @@ 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) {
@@ -59,6 +64,11 @@ 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) {
@@ -106,6 +116,10 @@ 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());
@@ -148,6 +162,10 @@ 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());
@@ -185,6 +203,10 @@ 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());
@@ -210,6 +232,11 @@ 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
@@ -236,6 +263,11 @@ 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/src/resource_command.rs

@@ -272,4 +272,40 @@ resources:
         $stderr = dsc config get -d $configFile 2>&1
         $stderr | Should -Match '.*?--path.*?'
     }
+
+    It 'Get operation on the adapter itself should fail' {
+        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' {
+        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' {
+        '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' {
+        'abc' | 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' {
+        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' {
+        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'
+    }
 }

dsc/tests/dsc_args.tests.ps1

@@ -29,7 +29,7 @@ if ($null -eq (Get-Command npm -ErrorAction Ignore)) {
     }
 }
 
-npm install
+npm ci --omit:optional --force --registry https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/powershell/npm/registry/
 
 #npm list tree-sitter-cli
 #if ($LASTEXITCODE -ne 0) {
@@ -46,10 +46,11 @@ if ($UpdatePackages) {
     rm ./package-lock.json
     rm -r ./node_modules
     npm cache clean --force
-    npm logout
-    vsts-npm-auth -config .npmrc -F -V
-    npm install --force --verbose --registry https://pkgs.dev.azure.com/mseng/_packaging/OneESD-DevOps/npm/registry/
+    # npm logout
+    # vsts-npm-auth -config .npmrc -F -V
+    npm install --omit:optional --force --verbose #--registry https://pkgs.dev.azure.com/powershell/PowerShell/_packaging/powershell/npm/registry/
 }
 
+Invoke-NativeCommand 'npx node-gyp configure'
 Invoke-NativeCommand 'npx tree-sitter generate --build'
 Invoke-NativeCommand 'npx tree-sitter test'