ruby-pwsh 0.10.1 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdcbcec4cceaa40f4fabaad50f9d7409382c14eb1a98a345af5770aa1ae78f31
-  data.tar.gz: 48f16a70a2305b398a9098d453ae743a6c2630a94cdc8d6716250e1e4ee83464
+  metadata.gz: adc4879de83f4b7756c10664ab59c44ab3b34e93e848ebedcefb049c969137f8
+  data.tar.gz: 7ffc7b8c36775a252075fe3c0bffbb60c8b2e287bcbec65d61c1594f6ff4522a
 SHA512:
-  metadata.gz: 7c19486fd5452d81c71e7939fddaa78c66972ddb425806fc894b1aeecf0cb94b917955d29245130095ee5c4c85d63f2ba12176b6ef8fe4ce7e6f9f653bb0224c
-  data.tar.gz: b12c1ab52269745152a29ce446876a3e06f3b9f9aab1d254157d8f93c6cccb1e7f997c118488229e22d8800a1a1a17af0557a8c0af2ea386d3e80e80c2f5bfd0
+  metadata.gz: 638fb1d09d7c0ec4fe29ee0473dba74cdbf2aa142a730eed6c43b0e472ec2f3a7452a87e18ff8c36a4dd95f0897ec8388d30357406481aea8772d409087183b7
+  data.tar.gz: d5de2cb597e68c7c911b36c1cd92cbfc50a13916570f744bc8674b138ed62c30cc728ac2dba8f50a2856e6915ceb48ceede851c6f11a91cf8cca1af2d6cdfe9c

data/README.md

@@ -74,47 +74,51 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 Steps to release an update to the gem and module include:
 
-1. Ensure that the release branch is up to date with the main:
+1. From main, checkout a new working branch for the release prep (where xyz is the appropriate version, sans periods):
    ```bash
-   git push upstream upstream/main:release --force
+   git checkout -b maint-release_prep_xyz
    ```
-1. Checkout a new working branch for the release prep (where xyz is the appropriate version, sans periods):
-   ```bash
-   git checkout -b maint/release/prep-xyz upstream/release
-   ```
-1. Update the version in `lib/pwsh/version.rb` and `metadata.json` to the appropriate version for the new release.
-1. Run the changelog update task (make sure to verify the changelog, correctly tagging PRs as needed):
+
+2. Update the version in `lib/pwsh/version.rb` and `metadata.json` to the appropriate version for the new release.
+
+3. Run the changelog update task (make sure to verify the changelog, correctly tagging PRs as needed):
    ```bash
    bundle exec rake changelog
    ```
-1. Commit your changes with a short, sensible commit message, like:
-   ```text
+
+   4. Commit your changes with a short, sensible commit message, like:
+   ```bash
    git add lib/pwsh/version.rb
    git add metadata.json
    git add CHANGELOG.md
    git commit -m '(MAINT) Prep for x.y.z release'
    ```
-1. Push your changes and submit a pull request for review _against the **release** branch_:
-   ```bash
-   git push -u origin maint/release/prep-xyz
-   ```
-1. Ensure tests pass and the code is merged to `release`.
-1. Grab the commit hash from the merge commit on release, use that as the tag for the version (replacing `x.y.z` with the appropriate version and  `commithash` with the relevant one), then push the tags to upstream:
+
+5. Push your changes and submit a pull request for review _against main:
    ```bash
-   bundle exec rake tag['x.y.z', 'commithash']
+   git push -u origin maint_release_prep_xyz
    ```
-1. Build the Ruby gem and publish:
+
+6. Ensure tests pass and the code is merged to `main`.
+
+7. Once the release_prep PR has been merged, checkout main and pull down the latests changes.
    ```bash
-   bundle exec rake build
-   bundle exec rake push['ruby-pwsh-x.y.z.gem']
+   git checkout main
+   git pull
    ```
-1. Verify that the correct version now exists on [RubyGems](https://rubygems.org/search?query=ruby-pwsh)
-1. Build the Puppet module:
+
+8. Assuming that the release_prep merge commit is at the HEAD of main we can simply create and push a tag as follows (replacing xyz with the appropriate version).
    ```bash
-   bundle exec rake build_module
+   git tag -a xyx -m "Release xyz"
+   git push --follow-tags
    ```
-1. Publish the updated module version (found in the `pkg` folder) to [the Forge](https://forge.puppet.com/puppetlabs/pwshlib).
-1. Submit the [mergeback PR from the release branch to main](https://github.com/puppetlabs/ruby-pwsh/compare/main...release).
+
+9. Execute the publish workflow. This will:
+   - Create a GitHub release
+   - Build and publish the Gem
+   - Build and publish the Puppet module
+
+10. Finally check that the expected versions are present on rubygems.org and the Forge.
 
 ## Known Issues
 

data/lib/puppet/provider/dsc_base_provider/dsc_base_provider.rb

@@ -79,6 +79,9 @@ class Puppet::Provider::DscBaseProvider
             end
             downcased_result = recursively_downcase(canonicalized)
             downcased_resource = recursively_downcase(r)
+            # Ensure that metaparameters are preserved when we canonicalize the resource.
+            metaparams = downcased_resource.select { |key, _value| Puppet::Type.metaparam?(key) }
+            canonicalized.merge!(metaparams) unless metaparams.nil?
             downcased_result.each do |key, value|
               # Canonicalize to the manifest value unless the downcased strings match and the attribute is not an enum:
               # - When the values don't match at all, the manifest value is desired;

data/lib/pwsh/version.rb

@@ -2,5 +2,5 @@
 
 module Pwsh
   # The version of the ruby-pwsh gem
-  VERSION = '0.10.1'
+  VERSION = '0.10.3'
 end

data/lib/pwsh.rb

@@ -406,7 +406,7 @@ Invoke-PowerShellUserCode @params
     #
     # @return[String] Unique string representing the manager instance.
     def self.instance_key(cmd, args, options)
-      cmd + args.join(' ') + options[:debug].to_s
+      cmd + args.join(' ') + options.to_s
     end
 
     # Return whether or not a particular stream is valid and readable

data/lib/templates/init.ps1

@@ -35,8 +35,18 @@ $global:ourFunctions = @'
 function Reset-ProcessEnvironmentVariables {
   param($CachedEnvironmentVariables)
 
+  # When Protected Event Logging and PowerShell Script Block logging are enabled together
+  # the SystemRoot environment variable is a requirement. If it is removed as part of this purge
+  # it causes the PowerShell process to crash, therefore breaking the pipe between Ruby and the
+  # remote PowerShell session.
+  # The least descructive way to avoid this is to filter out SystemRoot when pulling our current list
+  # of environment variables. Then we can continue safely with the removal.
+  $CurrentEnvironmentVariables = Get-ChildItem -Path Env:\* |
+    Where-Object {$_.Name -ne "SystemRoot"}
+
   # Delete existing environment variables
-  Remove-Item -Path Env:\* -ErrorAction SilentlyContinue -WarningAction SilentlyContinue -Recurse
+  $CurrentEnvironmentVariables |
+    ForEach-Object -Process { Remove-Item -Path "ENV:\$($_.Name)" -ErrorAction SilentlyContinue -WarningAction SilentlyContinue -Recurse }
 
   # Re-add the cached environment variables
   $CachedEnvironmentVariables |

data/spec/acceptance/dsc/basic.rb

@@ -0,0 +1,205 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'ruby-pwsh'
+require 'securerandom'
+
+powershell = Pwsh::Manager.instance(Pwsh::Manager.powershell_path, Pwsh::Manager.powershell_args)
+module_path = File.expand_path('../../fixtures/modules', File.dirname(__FILE__))
+powershellget_path = File.expand_path('powershellget/lib/puppet_x/powershellget/dsc_resources/PowerShellGet', module_path)
+local_user = ['dsc', SecureRandom.uuid.slice(0, 7)].join('_')
+local_pw = SecureRandom.uuid
+
+def execute_reset_command(reset_command)
+  manager = Pwsh::Manager.instance(Pwsh::Manager.powershell_path, Pwsh::Manager.powershell_args)
+  result = manager.execute(reset_command)
+  raise result[:errormessage] unless result[:errormessage].nil?
+end
+
+RSpec.describe 'DSC Acceptance: Basic' do
+  let(:puppet_apply) do
+    "bundle exec puppet apply --modulepath #{module_path} --detailed-exitcodes --debug --trace"
+  end
+  let(:command) { "#{puppet_apply} -e \"#{manifest}\"" }
+
+  context 'Updating' do
+    let(:manifest) do
+      # This very awkward pattern is because we're not writing
+      # manifest files and need to pass them directly to puppet apply.
+      [
+        "dsc_psrepository { 'Trust PSGallery':",
+        "dsc_name => 'PSGallery',",
+        "dsc_ensure => 'Present',",
+        "dsc_installationpolicy => 'Trusted'",
+        '}'
+      ].join(' ')
+    end
+
+    before(:all) do
+      reset_command = <<~RESET_COMMAND
+        $ErrorActionPreference = 'Stop'
+        Import-Module PowerShellGet
+        $ResetParameters = @{
+          Name = 'PSRepository'
+          ModuleName = '#{powershellget_path}'
+          Method = 'Set'
+          Property = @{
+            Name = 'PSGallery'
+            Ensure = 'Present'
+            InstallationPolicy = 'Untrusted'
+          }
+        }
+        Invoke-DscResource @ResetParameters | ConvertTo-Json -Compress
+      RESET_COMMAND
+      execute_reset_command(reset_command)
+    end
+
+    it 'applies idempotently' do
+      first_run_result = powershell.execute(command)
+      expect(first_run_result[:exitcode]).to be(2)
+      expect(first_run_result[:native_stdout]).to match(/dsc_installationpolicy changed 'Untrusted' to 'Trusted'/)
+      expect(first_run_result[:native_stdout]).to match(/Updating: Finished/)
+      expect(first_run_result[:native_stdout]).to match(/Applied catalog/)
+      second_run_result = powershell.execute(command)
+      expect(second_run_result[:exitcode]).to be(0)
+    end
+  end
+  context 'Creating' do
+    let(:manifest) do
+      [
+        "dsc_psmodule { 'Install BurntToast':",
+        "dsc_name => 'BurntToast',",
+        "dsc_ensure => 'Present',",
+        '}'
+      ].join(' ')
+    end
+
+    before(:all) do
+      reset_command = <<~RESET_COMMAND
+        $ErrorActionPreference = 'Stop'
+        Import-Module PowerShellGet
+        Get-InstalledModule -Name BurntToast -ErrorAction SilentlyContinue |
+          Uninstall-Module -Force
+      RESET_COMMAND
+      execute_reset_command(reset_command)
+    end
+
+    it 'applies idempotently' do
+      first_run_result = powershell.execute(command)
+      expect(first_run_result[:exitcode]).to be(2)
+      expect(first_run_result[:native_stdout]).to match(/dsc_ensure changed 'Absent' to 'Present'/)
+      expect(first_run_result[:native_stdout]).to match(/Creating: Finished/)
+      expect(first_run_result[:native_stdout]).to match(/Applied catalog/)
+      second_run_result = powershell.execute(command)
+      expect(second_run_result[:exitcode]).to be(0)
+    end
+  end
+
+  context 'Deleting' do
+    let(:manifest) do
+      [
+        "dsc_psmodule { 'Install BurntToast':",
+        "dsc_name => 'BurntToast',",
+        "dsc_ensure => 'Absent',",
+        '}'
+      ].join(' ')
+    end
+
+    before(:all) do
+      reset_command = <<~RESET_COMMAND
+        $ErrorActionPreference = 'Stop'
+        Import-Module PowerShellGet
+        $Installed = Get-InstalledModule -Name BurntToast -ErrorAction SilentlyContinue
+        If($null -eq $Installed) {
+          Install-Module -Name BurntToast -Scope AllUsers -Force
+        }
+      RESET_COMMAND
+      execute_reset_command(reset_command)
+    end
+
+    it 'applies idempotently' do
+      first_run_result = powershell.execute(command)
+      expect(first_run_result[:exitcode]).to be(2)
+      expect(first_run_result[:native_stdout]).to match(/dsc_ensure changed 'Present' to 'Absent'/)
+      expect(first_run_result[:native_stdout]).to match(/Deleting: Finished/)
+      expect(first_run_result[:native_stdout]).to match(/Applied catalog/)
+      second_run_result = powershell.execute(command)
+      expect(second_run_result[:exitcode]).to be(0)
+    end
+  end
+  context 'PSDscRunAsCredential' do
+    before(:all) do
+      prep_command = <<~PREP_USER.strip
+        $ErrorActionPreference = 'Stop'
+        $User = Get-LocalUser -Name #{local_user} -ErrorAction SilentlyContinue
+        If ($null -eq $User) {
+          $Secure = ConvertTo-SecureString -String '#{local_pw}' -AsPlainText -Force
+          $User = New-LocalUser -Name #{local_user} -Password $Secure -Verbose
+        }
+        If ($User.Name -notin (Get-LocalGroupMember -Group Administrators).Name) {
+          Add-LocalGroupMember -Group Administrators -Member $User -Verbose
+        }
+        Get-LocalGroupMember -Group Administrators |
+          Where-Object Name -match '#{local_user}'
+      PREP_USER
+      execute_reset_command(prep_command)
+    end
+    after(:all) do
+      cleanup_command = <<~CLEANUP_USER.strip
+        Remove-LocalUser -Name #{local_user} -ErrorAction Stop
+      CLEANUP_USER
+      execute_reset_command(cleanup_command)
+    end
+
+    context 'with a valid credential' do
+      let(:manifest) do
+        [
+          "dsc_psrepository { 'Trust PSGallery':",
+          "dsc_name => 'PSGallery',",
+          "dsc_ensure => 'Present',",
+          "dsc_installationpolicy => 'Trusted',",
+          'dsc_psdscrunascredential => {',
+          "'user' => '#{local_user}',",
+          "'password' => Sensitive('#{local_pw}')",
+          '}',
+          '}'
+        ].join(' ')
+      end
+
+      it 'applies idempotently without leaking secrets' do
+        first_run_result = powershell.execute(command)
+        expect(first_run_result[:exitcode]).to be(2)
+        expect(first_run_result[:native_stdout]).to match(/dsc_installationpolicy changed 'Untrusted' to 'Trusted'/)
+        expect(first_run_result[:native_stdout]).to match(/Updating: Finished/)
+        expect(first_run_result[:native_stdout]).to match(/Applied catalog/)
+        expect(first_run_result[:native_stdout]).to match(/'#<Sensitive \[value redacted\]>'/)
+        expect(first_run_result[:native_stdout]).not_to match(local_pw)
+        second_run_result = powershell.execute(command)
+        expect(second_run_result[:exitcode]).to be(0)
+      end
+    end
+    context 'with an invalid credential' do
+      let(:manifest) do
+        [
+          "dsc_psrepository { 'Trust PSGallery':",
+          "dsc_name => 'PSGallery',",
+          "dsc_ensure => 'Present',",
+          "dsc_installationpolicy => 'Trusted',",
+          'dsc_psdscrunascredential => {',
+          "'user' => 'definitely_do_not_exist_here',",
+          "'password' => Sensitive('#{local_pw}')",
+          '}',
+          '}'
+        ].join(' ')
+      end
+
+      it 'errors loudly without leaking secrets' do
+        first_run_result = powershell.execute(command)
+        expect(first_run_result[:exitcode]).to be(4)
+        expect(first_run_result[:stderr].first).to match(/dsc_psrepository: The user name or password is incorrect/)
+        expect(first_run_result[:native_stdout]).to match(/'#<Sensitive \[value redacted\]>'/)
+        expect(first_run_result[:native_stdout]).not_to match(local_pw)
+      end
+    end
+  end
+end

data/spec/acceptance/dsc/cim_instances.rb

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+# TODO: Test against mcollera/AccessControlDsc for CIM instance behavior
+# 1. Make sure valid nested CIM instances can be passed to Invoke-DscResource
+# 2. Make sure nested CIM instances can be read back from Invoke-DscResource
+
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'ruby-pwsh'
+
+# Needs to be declared here so it is usable in before and it blocks alike
+test_manifest = File.expand_path('../../fixtures/test.pp', File.dirname(__FILE__))
+fixtures_path = File.expand_path('../../fixtures', File.dirname(__FILE__))
+
+def execute_reset_command(reset_command)
+  manager = Pwsh::Manager.instance(Pwsh::Manager.powershell_path, Pwsh::Manager.powershell_args)
+  result = manager.execute(reset_command)
+  raise result[:errormessage] unless result[:errormessage].nil?
+end
+
+RSpec.describe 'DSC Acceptance: Complex' do
+  let(:powershell) { Pwsh::Manager.instance(Pwsh::Manager.powershell_path, Pwsh::Manager.powershell_args) }
+  let(:module_path) { File.expand_path('../../fixtures/modules', File.dirname(__FILE__)) }
+  let(:puppet_apply) do
+    "bundle exec puppet apply #{test_manifest} --modulepath #{module_path} --detailed-exitcodes --trace"
+  end
+
+  context 'Managing the access control list of a folder' do
+    before(:each) do
+      reset_command = <<~RESET_COMMAND
+        $TestFolderPath = Join-Path -Path "#{fixtures_path}" -Childpath access_control
+        # Delete the test folder if it exists (to clear access control modifications)
+        If (Test-Path -Path $TestFolderPath -PathType Container) {
+          Remove-Item $TestFolderPath -Recurse -Force
+        }
+        # Create the test folder
+        New-Item $TestFolderPath -ItemType Directory
+      RESET_COMMAND
+      execute_reset_command(reset_command)
+    end
+
+    it 'applies idempotently' do
+      content = <<~MANIFEST.strip
+        $test_folder_path = "#{fixtures_path}/access_control"
+        # Configure access to the test folder
+        dsc_ntfsaccessentry {'Test':
+          dsc_path              => $test_folder_path,
+          dsc_accesscontrollist => [
+            {
+              principal          => 'Everyone',
+              forceprincipal     => true,
+              accesscontrolentry => [
+                {
+                  accesscontroltype => 'Allow',
+                  filesystemrights  => ['FullControl'],
+                  inheritance       => 'This folder and files',
+                  ensure            => 'Present',
+                  cim_instance_type => 'NTFSAccessControlEntry',
+                }
+              ]
+            }
+          ]
+        }
+      MANIFEST
+      File.open(test_manifest, 'w') { |file| file.write(content) }
+      # Apply the test manifest
+      first_run_result = powershell.execute(puppet_apply)
+      expect(first_run_result[:exitcode]).to be(2)
+      # Access Control Set
+      expect(first_run_result[:native_stdout]).to match(/dsc_accesscontrollist: dsc_accesscontrollist changed/)
+      expect(first_run_result[:native_stdout]).to match(%r{dsc_ntfsaccessentry\[{:name=>"Test", :dsc_path=>".+/spec/fixtures/access_control"}\]: Updating: Finished})
+      expect(first_run_result[:stderr]).not_to match(/Error/)
+      expect(first_run_result[:stderr]).not_to match(/Warning: Provider returned data that does not match the Type Schema/)
+      expect(first_run_result[:stderr]).not_to match(/Value type mismatch/)
+      # Run finished
+      expect(first_run_result[:native_stdout]).to match(/Applied catalog/)
+      # Second run is idempotent
+      second_run_result = powershell.execute(puppet_apply)
+      expect(second_run_result[:exitcode]).to be(0)
+    end
+  end
+end

data/spec/acceptance/dsc/class.rb

@@ -0,0 +1,129 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'ruby-pwsh'
+
+powershell = Pwsh::Manager.instance(Pwsh::Manager.powershell_path, Pwsh::Manager.powershell_args)
+module_path = File.expand_path('../../fixtures/modules', File.dirname(__FILE__))
+psrc_path = File.expand_path('../../fixtures/example.psrc', File.dirname(__FILE__))
+
+def execute_reset_command(reset_command)
+  manager = Pwsh::Manager.instance(Pwsh::Manager.powershell_path, Pwsh::Manager.powershell_args)
+  result = manager.execute(reset_command)
+  raise result[:errormessage] unless result[:errormessage].nil?
+end
+
+RSpec.describe 'DSC Acceptance: Class-Based Resource' do
+  let(:puppet_apply) do
+    "bundle exec puppet apply --modulepath #{module_path} --detailed-exitcodes --debug --trace"
+  end
+  let(:command) { "#{puppet_apply} -e \"#{manifest}\"" }
+
+  context 'Creating' do
+    let(:manifest) do
+      # This very awkward pattern is because we're not writing
+      # manifest files and need to pass them directly to puppet apply.
+      [
+        "dsc_jearolecapabilities { 'ExampleRoleCapability':",
+        "dsc_ensure      => 'Present',",
+        "dsc_path        => '#{psrc_path}',",
+        "dsc_description => 'Example role capability file'",
+        '}'
+      ].join(' ')
+    end
+
+    before(:each) do
+      reset_command = <<~RESET_COMMAND
+        $PsrcPath = '#{psrc_path}'
+        # Delete the test PSRC fixture if it exists
+        If (Test-Path -Path $PsrcPath -PathType Leaf) {
+          Remove-Item $PsrcPath -Force
+        }
+      RESET_COMMAND
+      execute_reset_command(reset_command)
+    end
+
+    it 'applies idempotently' do
+      first_run_result = powershell.execute(command)
+      expect(first_run_result[:exitcode]).to be(2)
+      expect(first_run_result[:native_stdout]).to match(//)
+      expect(first_run_result[:native_stdout]).to match(/dsc_description changed  to 'Example role capability file'/)
+      expect(first_run_result[:native_stdout]).to match(/Creating: Finished/)
+      expect(first_run_result[:native_stdout]).to match(/Applied catalog/)
+      second_run_result = powershell.execute(command)
+      expect(second_run_result[:exitcode]).to be(0)
+    end
+  end
+
+  context 'Updating' do
+    let(:manifest) do
+      # This very awkward pattern is because we're not writing
+      # manifest files and need to pass them directly to puppet apply.
+      [
+        "dsc_jearolecapabilities { 'ExampleRoleCapability':",
+        "dsc_ensure      => 'Present',",
+        "dsc_path        => '#{psrc_path}',",
+        "dsc_description => 'Updated role capability file'",
+        '}'
+      ].join(' ')
+    end
+
+    before(:each) do
+      reset_command = <<~RESET_COMMAND
+        $PsrcPath = '#{psrc_path}'
+        # Delete the test PSRC fixture if it exists
+        If (Test-Path -Path $PsrcPath -PathType Leaf) {
+          Remove-Item $PsrcPath -Force
+        }
+        # Create the test PSRC fixture
+        New-Item $PsrcPath -ItemType File -Value "@{'Description' = 'Example role capability file'}"
+      RESET_COMMAND
+      execute_reset_command(reset_command)
+    end
+
+    it 'applies idempotently' do
+      first_run_result = powershell.execute(command)
+      expect(first_run_result[:exitcode]).to be(2)
+      expect(first_run_result[:native_stdout]).to match(/dsc_description changed 'Example role capability file' to 'Updated role capability file'/)
+      expect(first_run_result[:native_stdout]).to match(/Updating: Finished/)
+      expect(first_run_result[:native_stdout]).to match(/Applied catalog/)
+      second_run_result = powershell.execute(command)
+      expect(second_run_result[:exitcode]).to be(0)
+    end
+  end
+
+  context 'Deleting' do
+    let(:manifest) do
+      # This very awkward pattern is because we're not writing
+      # manifest files and need to pass them directly to puppet apply.
+      [
+        "dsc_jearolecapabilities { 'ExampleRoleCapability':",
+        "dsc_ensure      => 'Absent',",
+        "dsc_path        => '#{psrc_path}'",
+        '}'
+      ].join(' ')
+    end
+
+    before(:each) do
+      reset_command = <<~RESET_COMMAND
+        $PsrcPath = '#{psrc_path}'
+        # Delete the test PSRC fixture if it exists
+        If (!(Test-Path -Path $PsrcPath -PathType Leaf)) {
+          # Create the test PSRC fixture
+          New-Item $PsrcPath -ItemType File -Value "@{'Description' = 'Updated'}"
+        }
+      RESET_COMMAND
+      execute_reset_command(reset_command)
+    end
+
+    it 'applies idempotently' do
+      first_run_result = powershell.execute(command)
+      expect(first_run_result[:exitcode]).to be(2)
+      expect(first_run_result[:native_stdout]).to match(/dsc_ensure changed 'Present' to 'Absent'/)
+      expect(first_run_result[:native_stdout]).to match(/Deleting: Finished/)
+      expect(first_run_result[:native_stdout]).to match(/Applied catalog/)
+      second_run_result = powershell.execute(command)
+      expect(second_run_result[:exitcode]).to be(0)
+    end
+  end
+end