vagrant-dsc 1.0.10 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7a7b684574c26b5bcf147def321de8149691c22
-  data.tar.gz: 74830fc81b58b8b334a6023d6354580f29b995eb
+  metadata.gz: bb46c21c9dad5ddf2db40a8a841534d6f05a11e1
+  data.tar.gz: cc3926215945aa34552386b308336b6a59e664bb
 SHA512:
-  metadata.gz: b13745414a9573bcb4d18f2175a17fecd952d4e8359d0b370d2b1e0c6af580a6697cb3c5a54692d109123954e8f1119b2aa46f7ea7ff5a3dcd258df4edc73172
-  data.tar.gz: 7eb8afd365a96f8932ef9d00979a264972eeb22124a60cf01a98da23cab8725d6848cf9b4077f63e8ead2706abc4e5e6e97de4f1475e48b83fe86537b16b16a8
+  metadata.gz: 8405032a7b4fd7aa23daed69c33e378e0523cb855145dd2468bd0e8ec49eabba932ad1823ac6996927be042091a7e2083664c94d6c5e02d6f2202ae2f3867576
+  data.tar.gz: 80a245e2d999405d4f6843eb65c39727dc627929f1c905ccf5785eca6fb23f0f82b19370d0b397e998014ad3a2872762ebfe37e331bde0b83a74c8fe36245155

data/.gitignore

@@ -21,4 +21,5 @@ tmp
 *.a
 mkmf.log
 .vagrant
-.idea
+.idea
+bin/

data/.vscode/launch.json

@@ -0,0 +1,15 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Launch Tests",
+            "type": "Ruby",
+            "request": "launch",
+            "cwd": "${workspaceRoot}",
+            "program": "${workspaceRoot}/bin/rake",
+            "args": [
+                "spec"
+            ]
+        }
+    ]
+}

data/README.md

@@ -64,6 +64,14 @@ In your Vagrantfile, add the following plugin and configure to your needs:
     # @return [Array] Set of relative module paths.
     dsc.module_path = ["manifests", "modules"]
 
+    # Set of modules that should installed from the [PowerShell Gallery](https://www.powershellgallery.com/)
+    #
+    # Requires Powershell 5 or PowerShellGet on box installed
+    #
+    # These modules are downloaded and installed when provisong. 
+    # If module is allready installed no update is done.
+    dsc.module_install = ["xNetworking", "xComputerManagement"]
+
     # The type of synced folders to use when sharing the data
     # required for the provisioner to work properly.
     #
@@ -144,6 +152,16 @@ bundle exec vagrant up
 
 There is a test Vagrant DSC setup in `./development` that is a good example of a simple acceptance test.
 
+### Visual Studio Code
+
+You can run the test from Visual Studio Code. This needs the binstubs from bundler. Run
+```
+bundler install --binstubs
+```
+to get them.
+
+After this you can run the tests with F5.
+
 ## Contributing
 
 1. Fork it ( https://github.com/[my-github-username]/vagrant-dsc/fork )

data/appveyor.yml

@@ -1,6 +1,7 @@
 install:
   - set PATH=C:\Ruby22\bin;%PATH%
-  - bundle install
+  - gem install bundler -v 1.12.5
+  - bundle _1.12.5_ install  
 
 build: off
 
@@ -10,4 +11,4 @@ before_test:
   - bundle -v
 
 test_script:
-  - bundle exec rake spec
+  - bundle _1.12.5_ exec rake spec

data/development/web/Vagrantfile

@@ -17,7 +17,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   # Every Vagrant virtual environment requires a box to build off of.
   config.vm.box = "mfellows/windows2012r2"
-  config.vm.box_version = "1.0.0"
+  config.vm.box_version = "1.0.1"
 
 
   hostname = "vagrantdsc.local"

data/lib/vagrant-dsc/config.rb

@@ -61,6 +61,9 @@ module VagrantPlugins
       # Temporary working directory on the guest machine.
       attr_accessor :temp_dir
 
+      # Modules to install
+      attr_accessor :module_install
+
       # Fully qualified path to the configuration file.
       #
       # Do not override this.
@@ -83,6 +86,7 @@ module VagrantPlugins
         @configuration_params     = {}
         @synced_folder_type       = UNSET_VALUE
         @temp_dir                 = UNSET_VALUE
+        @module_install           = UNSET_VALUE
         @logger = Log4r::Logger.new("vagrant::vagrant_dsc")
       end
 
@@ -99,6 +103,7 @@ module VagrantPlugins
         @module_path              = nil if @module_path == UNSET_VALUE
         @synced_folder_type       = nil if @synced_folder_type == UNSET_VALUE
         @temp_dir                 = nil if @temp_dir == UNSET_VALUE
+        @module_install           = nil if @module_install == UNSET_VALUE
         @mof_path                 = nil if @mof_path == UNSET_VALUE
         @configuration_name       = File.basename(@configuration_file, File.extname(@configuration_file)) if @configuration_name == UNSET_VALUE
         @manifests_path           = File.dirname(@configuration_file) if @manifests_path == UNSET_VALUE

data/lib/vagrant-dsc/locales/en.yml

@@ -40,3 +40,6 @@ en:
         "Absolute 'module_path' not allowed. Please provide a path relative to your Vagrantfile."
       failure_status: |-
         "DSC Status is \"Failure\"."
+
+    winRMAuthorizationError_recover: |-
+      The Host disconnect the active connection. Try to wait for the completion of DSC.

data/lib/vagrant-dsc/provisioner.rb

@@ -1,6 +1,5 @@
 require "log4r"
 require 'erb'
-require "vagrant/util/powershell"
 
 module VagrantPlugins
   module DSC
@@ -99,15 +98,21 @@ module VagrantPlugins
 
         write_dsc_runner_script(generate_dsc_runner_script)
 
-        run_dsc_apply
-
+        begin
+          run_dsc_apply
+        rescue VagrantPlugins::CommunicatorWinRM::Errors::AuthenticationFailed
+          # when install set a domain controller windows kills the active connection with a AuthenticationFailed.
+          # The DSC job is still running and new connections are possible, so try to wait 
+          @machine.ui.info(I18n.t("vagrant_dsc.winRMAuthorizationError_recover"))
+        end
+        
         wait_for_dsc_completion
       end
 
       # Waits for the completion of the dsc configuration if dsc needs reboots. This currntly only works for WMF5 and needs wait_for_reboot
       def wait_for_dsc_completion
-        return if Vagrant::Util::PowerShell.version.to_i < 5 || !@machine.guest.capability?(:wait_for_reboot)
-
+        powershell_version = get_guest_powershell_version
+        return if powershell_version.to_i < 5 || !@machine.guest.capability?(:wait_for_reboot)
         dsc_running = true
 
         while dsc_running
@@ -130,6 +135,11 @@ module VagrantPlugins
         end
       end
 
+      def get_guest_powershell_version
+        version = @machine.communicate.shell.powershell("$PSVersionTable.PSVersion.Major")
+        return version[:data][0][:stdout]
+      end
+
       def get_lcm_state
         state = @machine.communicate.shell.powershell("(Get-DscLocalConfigurationManager).LCMState")
         return state[:data][0][:stdout]
@@ -211,6 +221,7 @@ module VagrantPlugins
             configuration_name: @config.configuration_name,
             manifests_path: @config.manifests_path,
             temp_path: @config.temp_dir,
+            module_install: @config.module_install.nil? ? "" : @config.module_install.join(";"),
             parameters: @config.configuration_params.map { |k,v| "#{k}" + (!v.nil? ? " \"#{v}\"": '') }.join(" ")
         })
       end

data/lib/vagrant-dsc/templates/runner.ps1.erb

@@ -15,6 +15,15 @@ $env:PSModulePath="$absoluteModulePaths;${env:PSModulePath}"
 ("<%= options[:module_paths] %>".Split(";") | ForEach-Object { gci -Recurse  $_ | ForEach-Object { Unblock-File  $_.FullName} })
 <% end %>
 
+<% if !options[:module_install].empty?  %>
+Write-Host "Ensure Modules"
+if ((Get-PSRepository -Name PSGallery).InstallationPolicy -ne "Trusted") {
+    Set-PSRepository -Name PSGallery -InstallationPolicy "Trusted"
+}
+# Install-Modules only installs if the module is not installed
+"<%= options[:module_install] %>".Split(";") | foreach { Install-Module $_ }
+<% end %>
+
 $script = $(Join-Path "<%= options[:temp_path] %>" "<%= options[:configuration_file_path] %>" -Resolve)
 echo "PSModulePath Configured: ${env:PSModulePath}"
 echo ""

data/lib/vagrant-dsc/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Dsc
-    VERSION = "1.0.10"
+    VERSION = "1.1.0"
   end
 end

data/spec/provisioner/provisioner_spec.rb

@@ -219,13 +219,40 @@ describe VagrantPlugins::DSC::Provisioner do
       subject.provision
     end
 
+    it "should try to recover if AuthenticationFailed" do
+      allow(communicator).to receive(:sudo)
+      allow(communicator).to receive(:test)
+      allow(communicator).to receive(:upload)
+      allow(subject).to receive(:verify_shared_folders).and_return(true)
+      allow(subject).to receive(:verify_dsc).and_return(true)
+      allow(subject).to receive(:run_dsc_apply).and_raise(VagrantPlugins::CommunicatorWinRM::Errors::AuthenticationFailed)
+      allow(guest).to receive(:capability?).with(:wait_for_reboot).and_return(true)
+      allow(guest).to receive(:capability).with(:wait_for_reboot)
+      expect(subject).to receive(:wait_for_dsc_completion)
+
+      subject.provision
+    end
+
+    it "should not try to recover from other exceptions" do
+      allow(communicator).to receive(:sudo)
+      allow(communicator).to receive(:test)
+      allow(communicator).to receive(:upload)
+      allow(subject).to receive(:verify_shared_folders).and_return(true)
+      allow(subject).to receive(:verify_dsc).and_return(true)
+      allow(guest).to receive(:capability?).with(:wait_for_reboot).and_return(true)
+      allow(guest).to receive(:capability).with(:wait_for_reboot)
+      allow(subject).to receive(:run_dsc_apply).and_raise()
+
+      expect{ subject.provision }.to raise_error(RuntimeError)
+    end
+
     it "should wait for pending reboot" do
       allow_any_instance_of(Object).to receive(:sleep)
       allow(guest).to receive(:capability?).with(:wait_for_reboot).and_return(true)
       allow(communicator).to receive(:shell).and_return(shell)
       allow(subject).to receive(:get_lcm_state).and_return("PendingReboot", "Busy", "Sucess")
       allow(subject).to receive(:get_configuration_status).and_return("Sucess")
-      allow(Vagrant::Util::PowerShell).to receive(:version).and_return("5")
+      allow(subject).to receive(:get_guest_powershell_version).and_return("5")
       expect(guest).to receive(:capability).with(:wait_for_reboot)
 
       subject.wait_for_dsc_completion
@@ -237,7 +264,7 @@ describe VagrantPlugins::DSC::Provisioner do
       allow(communicator).to receive(:shell).and_return(shell)
       allow(subject).to receive(:get_lcm_state).and_return("PendingReboot", "Busy", "PendingReboot", "Busy", "Idle")
       allow(subject).to receive(:get_configuration_status).and_return("Success")
-      allow(Vagrant::Util::PowerShell).to receive(:version).and_return("5")
+      allow(subject).to receive(:get_guest_powershell_version).and_return("5")
       expect(guest).to receive(:capability).twice.with(:wait_for_reboot)
 
       subject.wait_for_dsc_completion
@@ -250,12 +277,28 @@ describe VagrantPlugins::DSC::Provisioner do
       allow(guest).to receive(:capability).with(:wait_for_reboot)
       allow(subject).to receive(:get_lcm_state).and_return("PendingReboot", "Busy", "PendingConfiguration")
       allow(subject).to receive(:get_configuration_status).and_return("Failure")
-      allow(Vagrant::Util::PowerShell).to receive(:version).and_return("5")
+      allow(subject).to receive(:get_guest_powershell_version).and_return("5")
       expect(subject).to receive(:show_dsc_failure_message)
 
       subject.wait_for_dsc_completion
     end
 
+    it "should not get the lcm state if powershell version is 4" do
+      allow(guest).to receive(:capability?).with(:wait_for_reboot).and_return(true)
+      allow(communicator).to receive(:shell).and_return(shell)
+      allow(subject).to receive(:get_guest_powershell_version).and_return("4")
+      expect(subject).to_not receive(:get_lcm_state)
+
+      subject.wait_for_dsc_completion
+    end
+
+    it "should get the guest powershell version" do
+      allow(communicator).to receive(:shell).and_return(shell)
+      expect(shell).to receive(:powershell).with("$PSVersionTable.PSVersion.Major").and_return({:data => [{:stdout => "4"}]})
+      
+      expect(subject.get_guest_powershell_version).to eq("4")
+    end
+
     it "should get the lcm state" do
       allow(communicator).to receive(:shell).and_return(shell)
       expect(shell).to receive(:powershell).with("(Get-DscLocalConfigurationManager).LCMState").and_return({:data => [{:stdout => "LCMState"}]})
@@ -347,6 +390,7 @@ echo \"Adding to path: $absoluteModulePaths\"
 $env:PSModulePath=\"$absoluteModulePaths;${env:PSModulePath}\"
 (\"/tmp/vagrant-dsc-1/modules-0;/tmp/vagrant-dsc-1/modules-1\".Split(\";\") | ForEach-Object { gci -Recurse  $_ | ForEach-Object { Unblock-File  $_.FullName} })
 
+
 $script = $(Join-Path \"/tmp/vagrant-dsc-1\" \"manifests/MyWebsite.ps1\" -Resolve)
 echo \"PSModulePath Configured: ${env:PSModulePath}\"
 echo \"\"
@@ -390,6 +434,7 @@ echo \"Adding to path: $absoluteModulePaths\"
 $env:PSModulePath=\"$absoluteModulePaths;${env:PSModulePath}\"
 (\"/tmp/vagrant-dsc-1/modules-0;/tmp/vagrant-dsc-1/modules-1\".Split(\";\") | ForEach-Object { gci -Recurse  $_ | ForEach-Object { Unblock-File  $_.FullName} })
 
+
 $script = $(Join-Path \"/tmp/vagrant-dsc-1\" \"../manifests/MyWebsite.ps1\" -Resolve)
 echo \"PSModulePath Configured: ${env:PSModulePath}\"
 echo \"\"
@@ -432,6 +477,7 @@ echo \"Adding to path: $absoluteModulePaths\"
 $env:PSModulePath=\"$absoluteModulePaths;${env:PSModulePath}\"
 (\"/tmp/vagrant-dsc-1/modules-0;/tmp/vagrant-dsc-1/modules-1\".Split(\";\") | ForEach-Object { gci -Recurse  $_ | ForEach-Object { Unblock-File  $_.FullName} })
 
+
 $script = $(Join-Path \"/tmp/vagrant-dsc-1\" \"manifests/MyWebsite.ps1\" -Resolve)
 echo \"PSModulePath Configured: ${env:PSModulePath}\"
 echo \"\"
@@ -472,6 +518,7 @@ echo \"Adding to path: $absoluteModulePaths\"
 $env:PSModulePath=\"$absoluteModulePaths;${env:PSModulePath}\"
 (\"/tmp/vagrant-dsc-1/modules-0;/tmp/vagrant-dsc-1/modules-1\".Split(\";\") | ForEach-Object { gci -Recurse  $_ | ForEach-Object { Unblock-File  $_.FullName} })
 
+
 $script = $(Join-Path \"/tmp/vagrant-dsc-1\" \"manifests/MyWebsite.ps1\" -Resolve)
 echo \"PSModulePath Configured: ${env:PSModulePath}\"
 echo \"\"
@@ -515,6 +562,7 @@ echo \"Adding to path: $absoluteModulePaths\"
 $env:PSModulePath=\"$absoluteModulePaths;${env:PSModulePath}\"
 (\"/tmp/vagrant-dsc-1/modules-0;/tmp/vagrant-dsc-1/modules-1\".Split(\";\") | ForEach-Object { gci -Recurse  $_ | ForEach-Object { Unblock-File  $_.FullName} })
 
+
 $script = $(Join-Path \"/tmp/vagrant-dsc-1\" \"manifests/MyWebsite.ps1\" -Resolve)
 echo \"PSModulePath Configured: ${env:PSModulePath}\"
 echo \"\"
@@ -568,6 +616,7 @@ echo \"Adding to path: $absoluteModulePaths\"
 $env:PSModulePath=\"$absoluteModulePaths;${env:PSModulePath}\"
 (\"/tmp/vagrant-dsc-1/modules-0;/tmp/vagrant-dsc-1/modules-1\".Split(\";\") | ForEach-Object { gci -Recurse  $_ | ForEach-Object { Unblock-File  $_.FullName} })
 
+
 $script = $(Join-Path \"/tmp/vagrant-dsc-1\" \"manifests/MyWebsite.ps1\" -Resolve)
 echo \"PSModulePath Configured: ${env:PSModulePath}\"
 echo \"\"
@@ -582,6 +631,55 @@ $StagingPath = $(Join-Path \"/tmp/vagrant-dsc-1\" \"staging\")
 $Config = $(iex (Get-Content (Join-Path \"/tmp/vagrant-dsc-1\" \"manifests/MyConfig.psd1\" -Resolve) | Out-String))
 MyWebsite -OutputPath $StagingPath  -ConfigurationData $Config
 
+# Start a DSC Configuration run
+Start-DscConfiguration -Force -Wait -Verbose -Path $StagingPath
+del $StagingPath\\*.mof
+"
+
+        expect(script).to eq(expect_script)
+      end
+    end
+
+    context "with module_install" do
+      it "should generate a valid powershell command" do
+        root_config.module_install = ["xNetworking", "xSQLServer"]
+
+        script = subject.generate_dsc_runner_script
+        expect_script = "#
+# DSC Runner.
+#
+# Bootstraps the DSC environment, sets up configuration data
+# and runs the DSC Configuration.
+#
+#
+
+# Set the local PowerShell Module environment path
+$absoluteModulePaths = [string]::Join(\";\", (\"/tmp/vagrant-dsc-1/modules-0;/tmp/vagrant-dsc-1/modules-1\".Split(\";\") | ForEach-Object { $_ | Resolve-Path }))
+
+echo \"Adding to path: $absoluteModulePaths\"
+$env:PSModulePath=\"$absoluteModulePaths;${env:PSModulePath}\"
+(\"/tmp/vagrant-dsc-1/modules-0;/tmp/vagrant-dsc-1/modules-1\".Split(\";\") | ForEach-Object { gci -Recurse  $_ | ForEach-Object { Unblock-File  $_.FullName} })
+
+Write-Host \"Ensure Modules\"
+if ((Get-PSRepository -Name PSGallery).InstallationPolicy -ne \"Trusted\") {
+    Set-PSRepository -Name PSGallery -InstallationPolicy \"Trusted\"
+}
+# Install-Modules only installs if the module is not installed
+\"xNetworking;xSQLServer\".Split(\";\") | foreach { Install-Module $_ }
+
+$script = $(Join-Path \"/tmp/vagrant-dsc-1\" \"manifests/MyWebsite.ps1\" -Resolve)
+echo \"PSModulePath Configured: ${env:PSModulePath}\"
+echo \"\"
+echo \"Running Configuration file: ${script}\"
+
+# Generate the MOF file, only if a MOF path not already provided.
+# Import the Manifest
+. $script
+
+cd \"/tmp/vagrant-dsc-1\"
+$StagingPath = $(Join-Path \"/tmp/vagrant-dsc-1\" \"staging\")
+MyWebsite -OutputPath $StagingPath 
+
 # Start a DSC Configuration run
 Start-DscConfiguration -Force -Wait -Verbose -Path $StagingPath
 del $StagingPath\\*.mof

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-dsc
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.1.0
 platform: ruby
 authors:
 - Matt Fellows
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-27 00:00:00.000000000 Z
+date: 2016-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -104,6 +104,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- ".vscode/launch.json"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -152,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: DSC Provisioner for Vagrant