kitchen-salt 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc4c23f9c2556d948694d9b5f16b05b8395eb714c3c963632466cf660c0da709
-  data.tar.gz: d0f705172f2a84be6b4ef074a9c11bab6d757fe871744b8fa061d28671a410a3
+  metadata.gz: f264baa2768e6d4a343d428d316da1fa467f365e012804d0184927bdf441efc3
+  data.tar.gz: 8a9608d00cdd30471567e3de85073515d8aab496610f6b7867bcb520f888bb85
 SHA512:
-  metadata.gz: 4cd2d5eca862930b06bf16a3ccca142b8fb43f3d059f8fb494b7f7838a78b1faf2480ee59ea21ac8c572c890a03e9335a0d4a48e08bef9380a6c66304ad5b266
-  data.tar.gz: 8698a541bb29198667965c251607c6426285deccb5c5bbf5378c8c019afc5064a525e5c941f84bbafbcb94a372df40ddf9e94d082ca1270cc5df87c52ce0798f
+  metadata.gz: 8ca9f7b27528e62f990a791083606c657a070a856063eef2cc632dfc82ce0c00d0a2a87fd3d46b36b687b165b39f28daafe023e521c5920b4afa79972cac8448
+  data.tar.gz: 3c9ea1fbd395c1ee5dc4df1f6899ff980e29477e2ffab63f8395745350834eed1db09d83f566356f5e071df097f1e102884634c3b7df2619cd5ef547e210d136

data/lib/kitchen/provisioner/formula-fetch.sh

@@ -42,15 +42,15 @@ function fetchGitFormula() {
         if ! [[ "${FETCHED[*]}" =~ $name ]]; then # dependency not yet fetched
           echo "Fetching: $name"
           if test -e "$GIT_FORMULAS_PATH/$name"; then
-              pushd "$GIT_FORMULAS_PATH/$name" &>/dev/null
+              pushd "$GIT_FORMULAS_PATH/$name" &>/dev/null || exit
               test ! -e .git || git pull -r
-              popd &>/dev/null
+              popd &>/dev/null || exit
           else
               echo "git clone $source $GIT_FORMULAS_PATH/$name -b $branch"
               git clone "$source" "$GIT_FORMULAS_PATH/$name" -b "$branch"
           fi
           # install dependencies
-          FETCHED+=($name)
+          FETCHED+=("$name")
           if [ -e "$GIT_FORMULAS_PATH/$name/metadata.yml" ]; then
             fetchDependencies "$GIT_FORMULAS_PATH/$name/metadata.yml"
           fi

data/lib/kitchen/provisioner/install.erb

@@ -40,7 +40,12 @@ then
 elif [ -z "${SALT_VERSION}" -a "#{salt_install}" = "pip" ]
 then
   echo "Make sure setuptools and pip are new enough"
-  #{sudo(salt_pip_bin)} install "setuptools>=30" "pip>=9"
+  export REQUIREMENTS_FILE=$(mktemp)
+  echo "setuptools >=30,<54.* ; python_version < '3.6'" > $REQUIREMENTS_FILE
+  echo "setuptools >=30,!=50.*,!=51.*,!=52.*; python_version >= '3.6'" > $REQUIREMENTS_FILE
+  echo "pip >=9,<21.0.0 ; python_version < '3.6'" >> $REQUIREMENTS_FILE
+  echo "pip >=9 ; python_version >= '3.6'" >> $REQUIREMENTS_FILE
+  #{sudo(salt_pip_bin)} install -r $REQUIREMENTS_FILE
   echo #{sudo(salt_pip_bin)} #{salt_pip_install_command} #{salt_pip_pkg}
   #{sudo(salt_pip_bin)} #{salt_pip_install_command} #{salt_pip_pkg}
 elif [ -z "${SALT_VERSION}" -a "#{salt_install}" = "apt" ]

data/lib/kitchen/provisioner/install_win.erb

@@ -5,7 +5,7 @@ salt_version = config[:salt_version]
 bootstrap_options = config[:salt_bootstrap_options] % [salt_version]
 
 <<-POWERSHELL
-if (Test-Path #{salt_call}) {
+if (Get-Command #{salt_call}) {
   $installed_version = $(#{salt_call} --version).split(' ')[1]
 }
 if (-Not $(Test-Path c:\\temp)) {
@@ -15,6 +15,7 @@ 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}
+  $env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine")
 }
 $FULL_SALT_VERSION = $(#{salt_call} --version).split(' ')[1]
 if ($FULL_SALT_VERSION) {

data/lib/kitchen/provisioner/minion.erb

@@ -9,7 +9,7 @@ file_roots:
    - <%= os_join(config[:root_path], config[:salt_spm_root], 'salt') %>
 
 pillar_roots:
- <%= config[:salt_env] %>:
+ <%= config[:pillar_env] || config[:salt_env] %>:
    - <%= os_join(config[:root_path], config[:salt_pillar_root]) %>
    - <%= os_join(config[:root_path], config[:salt_spm_root], 'pillar') %>
 

data/lib/kitchen/provisioner/salt_solo.rb

@@ -47,18 +47,19 @@ module Kitchen
         is_file_root: false,
         local_salt_root: nil,
         omnibus_cachier: false,
+        pillar_env: nil,
         pillars_from_directories: [],
         pip_bin: 'pip',
         pip_editable: false,
         pip_extra_index_url: [],
-        pip_index_url: 'https://pypi.python.org/simple/',
+        pip_index_url: 'https://pypi.org/simple/',
         pip_pkg: 'salt==%s',
         remote_states: nil,
         require_chef: true,
-        salt_apt_repo_key: 'https://repo.saltstack.com/apt/ubuntu/16.04/amd64/latest/SALTSTACK-GPG-KEY.pub',
-        salt_apt_repo: 'https://repo.saltstack.com/apt/ubuntu/16.04/amd64/',
+        salt_apt_repo_key: 'https://repo.saltproject.io/apt/ubuntu/16.04/amd64/latest/SALTSTACK-GPG-KEY.pub',
+        salt_apt_repo: 'https://repo.saltproject.io/apt/ubuntu/16.04/amd64',
         salt_bootstrap_options: '',
-        salt_bootstrap_url: 'https://bootstrap.saltstack.com',
+        salt_bootstrap_url: 'https://bootstrap.saltproject.io',
         salt_config: '/etc/salt',
         salt_copy_filter: [],
         salt_env: 'base',
@@ -76,10 +77,10 @@ module Kitchen
         salt_spm_root: '/srv/spm',
         salt_state_top: '/srv/salt/top.sls',
         salt_version: 'latest',
-        salt_yum_repo_key: 'https://repo.saltstack.com/yum/redhat/$releasever/$basearch/archive/%s/SALTSTACK-GPG-KEY.pub',
-        salt_yum_repo_latest: 'https://repo.saltstack.com/yum/redhat/salt-repo-latest-2.el7.noarch.rpm',
-        salt_yum_repo: 'https://repo.saltstack.com/yum/redhat/$releasever/$basearch/archive/%s',
-        salt_yum_rpm_key: 'https://repo.saltstack.com/yum/redhat/7/x86_64/archive/%s/SALTSTACK-GPG-KEY.pub',
+        salt_yum_repo_key: 'https://repo.saltproject.io/yum/redhat/$releasever/$basearch/archive/%s/SALTSTACK-GPG-KEY.pub',
+        salt_yum_repo_latest: 'https://repo.saltproject.io/yum/redhat/salt-repo-latest-2.el7.noarch.rpm',
+        salt_yum_repo: 'https://repo.saltproject.io/yum/redhat/$releasever/$basearch/archive/%s',
+        salt_yum_rpm_key: 'https://repo.saltproject.io/yum/redhat/7/x86_64/archive/%s/SALTSTACK-GPG-KEY.pub',
         state_collection: false,
         state_top_from_file: false,
         state_top: {},
@@ -90,7 +91,7 @@ module Kitchen
 
       WIN_DEFAULT_CONFIG = {
         chef_bootstrap_url: 'https://omnitruck.chef.io/install.ps1',
-        salt_bootstrap_url: 'https://raw.githubusercontent.com/saltstack/salt-bootstrap/develop/bootstrap-salt.ps1'
+        salt_bootstrap_url: 'https://winbootstrap.saltproject.io/develop'
       }.freeze
 
       # salt-call version that supports the undocumented --retcode-passthrough command
@@ -139,8 +140,13 @@ module Kitchen
         # if salt_verison is set, bootstrap is being used & bootstrap_options is empty,
         # set the bootstrap_options string to git install the requested version
         if (salt_version != 'latest') && (config[:salt_install] == 'bootstrap') && config[:salt_bootstrap_options].empty?
-          debug("Using bootstrap git to install #{salt_version}")
-          config[:salt_bootstrap_options] = "-P git v#{salt_version}"
+          if windows_os?
+            debug("Using bootstrap to install #{salt_version}")
+            config[:salt_bootstrap_options] = "-version #{salt_version}"
+          else
+            debug("Using bootstrap git to install #{salt_version}")
+            config[:salt_bootstrap_options] = "-P git v#{salt_version}"
+          end
         end
 
         install_template = if windows_os?
@@ -276,7 +282,15 @@ module Kitchen
         if config[:pre_salt_command]
           cmd << "#{config[:pre_salt_command]} && "
         end
-        cmd << sudo("#{salt_call} --state-output=changes --config-dir=#{os_join(config[:root_path], salt_config_path)} state.highstate")
+        cmd << sudo("#{salt_call}")
+        state_output = config[:salt_minion_extra_config][:state_output]
+        if state_output
+          cmd << " --state-output=#{state_output}"
+        else
+          cmd << " --state-output=changes"
+        end
+        cmd << " --config-dir=#{os_join(config[:root_path], salt_config_path)}"
+        cmd << " state.highstate"
         cmd << " --log-level=#{config[:log_level]}" if config[:log_level]
         cmd << " --id=#{config[:salt_minion_id]}" if config[:salt_minion_id]
         cmd << " test=#{config[:dry_run]}" if config[:dry_run]
@@ -413,6 +427,13 @@ module Kitchen
       end
 
       def prepare_dependencies
+        # Dependency scripts are bash scripts only
+        # Copying them clobbers the kitchen temp directory
+        # with a file named `kitchen`. If adding Windows
+        # support for dependencies, relocate into a
+        # sub-directory
+        return if windows_os?
+
         # upload scripts
         sandbox_scripts_path = File.join(sandbox_path, config[:salt_config], 'scripts')
         info("Preparing scripts into #{config[:salt_config]}/scripts")

data/lib/kitchen/verifier/nox.rb

@@ -15,28 +15,27 @@ module Kitchen
       default_config :tests, []
       default_config :save, {}
       default_config :windows, nil
+      default_config :windows do |verifier|
+        verifier.windows_os? ? true : false
+      end
       default_config :verbose, false
       default_config :run_destructive, false
       default_config :runtests, false
       default_config :coverage, false
       default_config :junitxml, false
       default_config :from_filenames, []
+      default_config :from_filenames_basename, "changed-files-list.txt"
+      default_config :from_filenames_path, false
       default_config :enable_filenames, false
       default_config :passthrough_opts, []
       default_config :output_columns, 120
       default_config :sysinfo, true
       default_config :sys_stats, false
       default_config :environment_vars, {}
+      default_config :zip_windows_artifacts, false
 
       def call(state)
-        if config[:windows].nil?
-          # Since windows is not set, lets try and guess since kitchen actually knows this infomation
-          if instance.platform.os_type == 'windows'
-            config[:windows] = true
-          else
-            config[:windows] = false
-          end
-        end
+        create_sandbox
         debug("Detected platform for instance #{instance.name}: #{instance.platform.os_type}. Config's windows setting value: #{config[:windows]}")
         if (ENV['ONLY_DOWNLOAD_ARTEFACTS'] || '') == '1'
           only_download_artefacts = true
@@ -57,16 +56,32 @@ module Kitchen
           info("[#{name}] Only downloading artefacts from instance #{instance.name} with state=#{state}")
         else
           info("[#{name}] Verify on instance #{instance.name} with state=#{state}")
+          if ENV['NOX_ENABLE_FROM_FILENAMES']
+            config[:enable_filenames] = true
+          end
+
+          if config[:enable_filenames] and ENV['CHANGE_TARGET'] and ENV['BRANCH_NAME'] and ENV['FORCE_FULL'] != 'true'
+            require 'git'
+            repo = Git.open(Dir.pwd)
+            config[:from_filenames] = repo.diff("origin/#{ENV['CHANGE_TARGET']}",
+                                                "origin/#{ENV['BRANCH_NAME']}").name_status.keys.select{|file| file.end_with?('.py')}
+            debug("Populating `from_filenames` with: #{config[:from_filenames]}")
+            if config[:windows] && config[:from_filenames].any?
+              # On windows, if the changed files list is too big, it will error.
+              # Let's then pass an absolute path to a text file which contains the list of changed
+              # files, one per line.
+              config[:from_filenames_path] = File.join(sandbox_path, config[:from_filenames_basename])
+              from_filenames_contents = "#{config[:from_filenames].join('\n')}"
+              File.open(config[:from_filenames_path], "w") { |f| f.write from_filenames_contents }
+              info("Created #{config[:from_filenames_path]} with contents:\n#{from_filenames_contents}")
+            end
+          end
         end
         root_path = (config[:windows] ? '%TEMP%\\kitchen' : '/tmp/kitchen')
         if ENV['KITCHEN_TESTS']
           ENV['KITCHEN_TESTS'].split(' ').each{|test| config[:tests].push(test)}
         end
 
-        if ENV['NOX_ENABLE_FROM_FILENAMES']
-          config[:enable_filenames] = true
-        end
-
         if ENV['NOX_PASSTHROUGH_OPTS']
           ENV['NOX_PASSTHROUGH_OPTS'].split(' ').each{|opt| config[:passthrough_opts].push(opt)}
         end
@@ -107,13 +122,6 @@ module Kitchen
           sys_stats = ''
         end
 
-        if config[:enable_filenames] and ENV['CHANGE_TARGET'] and ENV['BRANCH_NAME'] and ENV['FORCE_FULL'] != 'true'
-          require 'git'
-          repo = Git.open(Dir.pwd)
-          config[:from_filenames] = repo.diff("origin/#{ENV['CHANGE_TARGET']}",
-                                              "origin/#{ENV['BRANCH_NAME']}").name_status.keys.select{|file| file.end_with?('.py')}
-        end
-
         if config[:junitxml]
           junitxml = File.join(root_path, config[:testingdir], 'artifacts', 'xml-unittests-output')
           if noxenv.include? "pytest"
@@ -136,6 +144,7 @@ module Kitchen
         command = [
           'nox',
           "-f #{File.join(root_path, config[:testingdir], 'noxfile.py')}",
+          (config[:windows] ? "--envdir=C:\\Windows\\Temp\\nox" : ""),
           (config[:windows] ? "-e #{noxenv}" : "-e '#{noxenv}'"),
           '--',
           "--output-columns=#{config[:output_columns]}",
@@ -149,11 +158,19 @@ module Kitchen
 
         if tests.nil? || tests.empty?
           # If we're not targetting specific tests...
-          extra_command = [
-            (config[:from_filenames].any? ? "--from-filenames=#{config[:from_filenames].join(',')}" : ''),
-            (config[:windows] ? "--names-file=#{root_path}\\testing\\tests\\whitelist.txt" : ''),
-          ].join(' ')
-          command = "#{command} #{extra_command}"
+          extra_command = []
+          if config[:windows]
+            extra_command.push("--names-file=#{root_path}\\testing\\tests\\whitelist.txt")
+            if config[:from_filenames_path]
+                # Add the required command flag for the tests runner
+                extra_command.push("--from-filenames=#{root_path}\\testing\\#{config[:from_filenames_basename]}")
+            end
+          else
+            if config[:from_filenames].any?
+              extra_command.push("--from-filenames=#{config[:from_filenames].join(',')}")
+            end
+          end
+          command = "#{command} #{extra_command.join(' ')}"
         else
           command = "#{command} #{tests}"
         end
@@ -166,6 +183,9 @@ module Kitchen
         # the one from config
         environment_vars.merge!(config[:environment_vars])
 
+        # Strip trailing whitespace
+        command = command.rstrip
+
         if config[:windows]
           command = "cmd.exe /c --% \"#{command}\" 2>&1"
         end
@@ -193,13 +213,31 @@ module Kitchen
               end
             end
             if not only_download_artefacts
+              if config[:from_filenames_path]
+                upload_file_path = "$env:KitchenTestingDir\\#{config[:from_filenames_basename]}"
+                info("Uploading #{config[:from_filenames_path]} to #{upload_file_path} on #{instance.to_str}")
+                conn.upload(config[:from_filenames_path], "#{upload_file_path}")
+              end
               info("Running Command: #{command}")
               conn.execute(sudo(command))
             end
           ensure
             if not dont_download_artefacts
               save.each do |remote, local|
-                unless config[:windows]
+                if config[:windows]
+                  if config[:zip_windows_artifacts]
+                    begin
+                      conn.execute("7z.exe a #{remote}artifacts.zip #{remote}")
+                    rescue => e
+                      begin
+                        info("7z.exe failed, attempting zip with powershell Compress-Archive")
+                        conn.execute("powershell Compress-Archive #{remote} #{remote}artifacts.zip -Force")
+                      rescue => e2
+                        error("Failed to create zip: #{e2}")
+                      end
+                    end
+                  end
+                else
                   begin
                     conn.execute(sudo("chmod -R +r #{remote}"))
                   rescue => e
@@ -208,7 +246,15 @@ module Kitchen
                 end
                 begin
                   info("Copying #{remote} to #{local}")
-                  conn.download(remote, local)
+                  if config[:windows]
+                    if config[:zip_windows_artifacts]
+                      conn.download(remote + "artifacts.zip", local + "/artifacts.zip")
+                      system('unzip -o artifacts.zip')
+                      system('rm artifacts.zip')
+                    end
+                  else
+                    conn.download(remote, local)
+                  end
                 rescue => e
                   error("Failed to copy #{remote} to #{local} :: #{e}")
                 end
@@ -221,6 +267,8 @@ module Kitchen
         else
           debug("[#{name}] Verify completed.")
         end
+      ensure
+        cleanup_sandbox
       end
     end
   end

data/lib/kitchen-salt/states.rb

@@ -20,6 +20,9 @@ module Kitchen
           # load a top.sls from disk
           if config[:local_salt_root].nil?
             top_file = 'top.sls'
+            unless config[:state_collection].nil?
+              top_file = File.join(config[:state_collection], top_file)
+            end
           else
             top_file = File.join(config[:local_salt_root], 'salt/top.sls')
           end
@@ -77,7 +80,7 @@ module Kitchen
         cp_r_with_filter(File.join(path, formula), formula_dir, config[:salt_copy_filter])
 
         # copy across the _modules etc directories for python implementation
-        %w(_modules _states _grains _renderers _returners).each do |extrapath|
+        %w(_modules _states _grains _renderers _returners _runners _utils).each do |extrapath|
           prepare_formula_dir(path, extrapath)
         end
       end
@@ -96,6 +99,9 @@ module Kitchen
 
         if config[:local_salt_root].nil?
           states_location = config[:kitchen_root]
+          unless config[:state_collection].nil?
+            states_location = File.join(states_location, config[:state_collection])
+          end
         else
           states_location = File.join(config[:local_salt_root], 'salt')
         end

data/lib/kitchen-salt/util.rb

@@ -57,7 +57,6 @@ module Kitchen
 
       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
 

data/lib/kitchen-salt/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Salt
-    VERSION = '0.6.3'.freeze
+    VERSION = '0.6.4'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-salt
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - SaltStack Inc
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-16 00:00:00.000000000 Z
+date: 2022-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -166,7 +166,7 @@ homepage: https://github.com/saltstack/kitchen-salt
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -182,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: salt provisioner for test-kitchen
 test_files: []