kitchen-salt 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90801c5a0ac6861667789c0f422110363806d1f2
-  data.tar.gz: 352badb1b9702f53ecd314cfd5779b4bf7f3f361
+  metadata.gz: a46966eced8d8a45e75f0aea932a70a6cd20e047
+  data.tar.gz: 36024fd5cd393cc06230d00324cd5d49e9197d6a
 SHA512:
-  metadata.gz: a91546dd9201fb63503475db3d7aef5d0ccb97846db2e823888d09b3feb61d3f25c97be6178fa544c9bbb1d9a607bec5c21ca86702684ecdede0cb5c372dd1f8
-  data.tar.gz: ed3777689beef0dbfde59a821ea2a55f3e1e65e3bc99d9e5c7f67e9ba9a08914ba5c078973a82baebe289d1d1461510fdb33bf38755111e4d18d5e0cb3b475ec
+  metadata.gz: a5320882718483c44989b8a42c61cc9d7ba36ba82f4254fc117e52cbebe3d5965f5bd535a3fcd8dcc3559ff8520bf3d9d4a4671a3ada3d88f14af266b2a0006d
+  data.tar.gz: 4124bd733b736bec1d09c9df5ea9ae43c58532066514a2ddf4ffe4fe6dc7c844414f2530dc6fb35c298054b6152556b17511d50a3a4f582f9051370bcb67e20e

data/lib/kitchen-salt/util.rb

@@ -55,6 +55,12 @@ module Kitchen
         end
       end
 
+      def salt_call
+        return config[:salt_call_command] if config[:salt_call_command]
+        return 'c:\\salt\\salt-call.bat' if windows_os?
+        'salt-call'
+      end
+
       def write_raw_file(name, contents)
         FileUtils.mkdir_p(File.dirname(name))
         File.open(name, 'wb') do |file|

data/lib/kitchen-salt/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Salt
-    VERSION = '0.4.1'.freeze
+    VERSION = '0.5.0'.freeze
   end
 end

data/lib/kitchen/provisioner/install.erb

@@ -24,7 +24,7 @@ sh -c '
 #{Util.shell_helpers}
 
 # what version of salt is installed?
-command -v salt-call >/dev/null 2>&1 && SALT_VERSION=$(salt-call --version|cut -d " " -f 2)
+command -v #{salt_call} >/dev/null 2>&1 && SALT_VERSION=$(#{salt_call} --version|cut -d " " -f 2)
 command -v locale-gen >/dev/null 2>&1 && #{sudo('locale-gen')} en_US.UTF-8
 set +x
 export DEBIAN_FRONTEND=noninteractive
@@ -98,7 +98,7 @@ EOL
 fi
 
 # check again, now that an install of some form should have happened
-command -v salt-call >/dev/null 2>&1 && FULL_SALT_VERSION=$(salt-call --version|cut -d " " -f 2)
+command -v #{salt_call} >/dev/null 2>&1 && FULL_SALT_VERSION=$(#{salt_call} --version|cut -d " " -f 2)
 
 # extract short format of Salt version
 if [ ! -z "${FULL_SALT_VERSION}" ]

data/lib/kitchen/provisioner/install_win.erb

@@ -1,21 +1,22 @@
 <%=
 salt_install = config[:salt_install]
 salt_url = config[:salt_bootstrap_url]
-bootstrap_options = config[:salt_bootstrap_options]
 salt_version = config[:salt_version]
+bootstrap_options = config[:salt_bootstrap_options] % [salt_version]
 
 <<-POWERSHELL
-if (Test-Path c:\\salt\\salt-call.bat) {
-  $installed_version = $(c:\\salt\\salt-call.bat --version).split(' ')[1] 
+if (Test-Path #{salt_call}) {
+  $installed_version = $(#{salt_call} --version).split(' ')[1]
 }
 if (-Not $(Test-Path c:\\temp)) {
   New-Item -Path c:\\temp -itemtype directory
 }
 if (-Not $installed_version -And "#{salt_install}" -eq "bootstrap") {
+  [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
   (New-Object net.webclient).DownloadFile("#{salt_url}", "c:\\temp\\salt_bootstrap.ps1")
   #{sudo('powershell')} c:\\temp\\salt_bootstrap.ps1 #{bootstrap_options}
 }
-$FULL_SALT_VERSION = $(c:\\salt\\salt-call.bat --version).split(' ')[1]
+$FULL_SALT_VERSION = $(#{salt_call} --version).split(' ')[1]
 if ($FULL_SALT_VERSION) {
   $YEAR = $FULL_SALT_VERSION.split('.')[0]
   $MONTH = $FULL_SALT_VERSION.split('.')[1]

data/lib/kitchen/provisioner/salt_solo.rb

@@ -83,7 +83,8 @@ module Kitchen
         state_top_from_file: false,
         state_top: {},
         vendor_path: nil,
-        vendor_repo: {}
+        vendor_repo: {},
+        run_salt_call: true
       }.freeze
 
       WIN_DEFAULT_CONFIG = {
@@ -258,16 +259,14 @@ module Kitchen
 
         cmd = ''
         if windows_os?
-          salt_call = "c:\\salt\\salt-call.bat"
           salt_config_path = config[:salt_config]
           cmd << "(get-content #{os_join(config[:root_path], salt_config_path, 'minion')}) -replace '\\$env:TEMP', $env:TEMP | set-content #{os_join(config[:root_path], salt_config_path, 'minion')} ;"
         else
           # install/update dependencies
           cmd << sudo("chmod +x #{config[:root_path]}/*.sh;")
           cmd << sudo("#{config[:root_path]}/dependencies.sh;")
-          cmd << sudo("#{config[:root_path]}/gpgkey.sh;")
+          cmd << sudo("#{config[:root_path]}/gpgkey.sh;") if config[:gpg_key]
           salt_config_path = config[:salt_config]
-          salt_call = 'salt-call'
         end
         cmd << sudo("#{salt_call} --state-output=changes --config-dir=#{os_join(config[:root_path], salt_config_path)} state.highstate")
         cmd << " --log-level=#{config[:log_level]}" if config[:log_level]
@@ -286,6 +285,8 @@ module Kitchen
         debug("running driver #{name}")
         debug(diagnose)
 
+        return unless config[:run_salt_call]
+
         # config[:salt_version] can be 'latest' or 'x.y.z', 'YYYY.M.x' etc
         # error return codes are a mess in salt:
         #  https://github.com/saltstack/salt/pull/11337
@@ -453,7 +454,6 @@ module Kitchen
         instance_variables.each {|var| hash[var[1..-1]] = instance_variable_get(var) }
         hash.map{|k,v| [k.to_s.to_sym,v]}.to_h
       end
-
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-salt
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - SaltStack Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-23 00:00:00.000000000 Z
+date: 2019-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie