kitchen-puppet 3.3.2 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0542ac99d127e21a163136f2b52b95f0e2d84335
-  data.tar.gz: ad2486099b5fe869218c222d9196e7d89c821cb2
+  metadata.gz: df14da642855ea0a839df2f8ad0cdc4792f8c2b9
+  data.tar.gz: aa9ae40146325dbbcd971fa3386d2ee2254964e1
 SHA512:
-  metadata.gz: e36d7314cccffb36e8a6c1a41e411326b6c59d45100745976164b16f93f519efdcf2dc31a572ae386f75147cf1ea0b4339ded5d71687eabacff880b49cee70b0
-  data.tar.gz: 6ca7dc799071b0d9155d1eb55a2a63e13cc3a58111c2b5e14c063e1200a2b88cb2324a0051669a3023d761636e622dc27225da59b57c3f98d7972a71e5cc61f0
+  metadata.gz: 84b81095921b8eb7468aff290085afb48be1b7f58d3f752934ede4d6d3f933717b9ef4dc96ba08c0839b05f1eb3595664b4728d4bc3a5ff6ac24402d1c9fbf74
+  data.tar.gz: a03e2f07fc71aab142738ccba3d90f7eab350be33a474a95b3d98ab6fc624a280a0ef8684eb559a5a843dbbe748c8197f2968aa506ba986c19304535769fe866

data/lib/kitchen-puppet/version.rb

@@ -2,6 +2,6 @@
 
 module Kitchen
   module Puppet
-    VERSION = '3.3.2'.freeze
+    VERSION = '3.4.0'.freeze
   end
 end

data/lib/kitchen/provisioner/puppet/r10k.rb

@@ -0,0 +1,73 @@
+# -*- encoding: utf-8 -*-
+
+#
+# Author:: Fletcher Nichol (<fnichol@nichol.ca>) Neill Turner (<neillwturner@gmail.com>) Dennis Lerch (<dennis.lerch@transporeon.com>)
+#
+# Copyright (C) 2018, Fletcher Nichol, Neill Turner, Dennis Lerch
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'kitchen/errors'
+require 'kitchen/logging'
+
+module Kitchen
+  module Provisioner
+    module Puppet
+      # Puppet module resolver that uses R10K and a Puppetfile to
+      # calculate # dependencies.
+      #
+      class R10K
+        include Logging
+
+        def initialize(puppetfile, path, logger = Kitchen.logger)
+          @puppetfile = puppetfile
+          @path = path
+          @logger = logger
+        end
+
+        def self.load!(logger = Kitchen.logger)
+          load_r10k!(logger)
+        end
+
+        def resolve
+          version = ::R10K::VERSION
+          info("Resolving module dependencies with R10K-Puppet #{version}...")
+          debug("Using Puppetfile from #{puppetfile}")
+
+          ::R10K::Git::Cache.settings[:cache_root] = '.r10k/git'
+          ::R10K::Forge::ModuleRelease.settings[:cache_root] = '.r10k/cache'
+
+          pf = ::R10K::Puppetfile.new(nil, path, puppetfile)
+          pf.load
+          pf.modules.map(&:sync)
+        end
+
+        attr_reader :puppetfile, :path, :logger
+
+        def self.load_r10k!(logger)
+          require 'r10k/puppetfile'
+
+          version = ::R10K::VERSION
+          logger.debug("R10K #{version} library loaded")
+        rescue LoadError => e
+          logger.fatal("The `r10k' gem is missing and must be installed" \
+            ' or cannot be properly activated. Run' \
+            ' `gem install r10k` or add the following to your' \
+            " Gemfile if you are using Bundler: `gem 'r10k'`.")
+          raise UserError,
+                "Could not load or activate R10K (#{e.message})"
+        end
+      end
+    end
+  end
+end

data/lib/kitchen/provisioner/puppet_apply.rb

@@ -24,7 +24,6 @@
 require 'uri'
 require 'json'
 require 'kitchen'
-require 'kitchen/provisioner/puppet/librarian'
 
 module Kitchen
   class Busser
@@ -59,6 +58,7 @@ module Kitchen
       default_config :require_puppet_repo, true
       default_config :require_chef_for_busser, true
       default_config :resolve_with_librarian_puppet, true
+      default_config :resolve_with_r10k, false
       default_config :puppet_environment, nil
       default_config :puppet_environment_config_path do |provisioner|
         provisioner.calculate_path('environment.conf')
@@ -165,6 +165,7 @@ module Kitchen
       default_config :puppet_detailed_exitcodes, nil
       default_config :facter_file, nil
       default_config :librarian_puppet_ssl_file, nil
+      default_config :r10k_ssl_file, nil
 
       default_config :hiera_eyaml, false
       default_config :hiera_eyaml_key_remote_path, '/etc/puppet/secure/keys'
@@ -758,9 +759,16 @@ module Kitchen
 
       def load_needed_dependencies!
         return unless File.exist?(puppetfile)
-        return unless config[:resolve_with_librarian_puppet]
-        debug("Puppetfile found at #{puppetfile}, loading Librarian-Puppet")
-        Puppet::Librarian.load!(logger)
+        return unless config[:resolve_with_librarian_puppet] || config[:resolve_with_r10k]
+        if config[:resolve_with_librarian_puppet]
+          require 'kitchen/provisioner/puppet/librarian'
+          debug("Puppetfile found at #{puppetfile}, loading Librarian-Puppet")
+          Puppet::Librarian.load!(logger)
+        elsif config[:resolve_with_r10k]
+          require 'kitchen/provisioner/puppet/r10k'
+          debug("Puppetfile found at #{puppetfile}, loading R10K")
+          Puppet::R10K.load!(logger)
+        end
       end
 
       def tmpmodules_dir
@@ -900,6 +908,10 @@ module Kitchen
         config[:librarian_puppet_ssl_file]
       end
 
+      def r10k_ssl_file
+        config[:r10k_puppet_ssl_file] || config[:librarian_puppet_ssl_file]
+      end
+
       def puppet_cmd
         return '& "C:\Program Files\Puppet Labs\Puppet\bin\puppet"' if powershell?
 
@@ -1259,6 +1271,7 @@ module Kitchen
 
         FileUtils.mkdir_p(tmpmodules_dir)
         resolve_with_librarian if File.exist?(puppetfile) && config[:resolve_with_librarian_puppet]
+        resolve_with_r10k if File.exist?(puppetfile) && config[:resolve_with_r10k] && !config[:resolve_with_librarian_puppet]
         modules_to_copy = {}
 
         # If root dir (.) is a module, add it for copying
@@ -1408,6 +1421,7 @@ module Kitchen
       end
 
       def resolve_with_librarian
+        require 'kitchen/provisioner/puppet/librarian'
         Kitchen.mutex.synchronize do
           ENV['SSL_CERT_FILE'] = librarian_puppet_ssl_file if librarian_puppet_ssl_file
           Puppet::Librarian.new(puppetfile, tmpmodules_dir, logger).resolve
@@ -1415,6 +1429,15 @@ module Kitchen
         end
       end
 
+      def resolve_with_r10k
+        require 'kitchen/provisioner/puppet/r10k'
+        Kitchen.mutex.synchronize do
+          ENV['SSL_CERT_FILE'] = r10k_ssl_file if r10k_ssl_file
+          Puppet::R10K.new(puppetfile, tmpmodules_dir, logger).resolve
+          ENV['SSL_CERT_FILE'] = '' if r10k_ssl_file
+        end
+      end
+
       def cp_command
         return 'cp -force' if powershell?
         'cp'

data/provisioner_options.md

@@ -59,6 +59,7 @@ ignore_spec_fixtures | false | don't copy spec/fixtures to avoid problems with s
 install_custom_facts| false | Install custom facts to yaml file at "/tmp/kitchen/facter/kitchen.rb"
 install_hiera | false | Installs `hiera-puppet` package. Not needed for puppet > 3.x.x
 librarian_puppet_ssl_file | nil | ssl certificate file for librarian-puppet
+r10k_ssl_file | nil | ssl certificate file for r10k
 manifest | puppet parses every .pp file in the manifests_path directory and its subdirectories | manifest(s) for puppet apply to run. If set to a file like 'site.pp' it will use the file in the mainfests_path.
 manifests_path | 'mainfests' | puppet repo manifests directory
 max_retries| 1 | maximum number of retry attempts of converge command
@@ -110,6 +111,7 @@ require_puppet_collections | true | Set if using puppet collections install (Pup
 require_puppet_omnibus | false | Set if using omnibus puppet install
 require_puppet_repo | true | Set if using a puppet install from yum or apt repo
 resolve_with_librarian_puppet | true | Use librarian_puppet to resolve modules if a Puppetfile is found
+resolve_with_r10k | true | Use r10k to resolve modules if a Puppetfile is found
 retry_on_exit_code| [] | Array of exit codes to retry converge command against
 update_package_repos| true| update OS repository metadata
 wait_for_retry| 30 | number of seconds to wait before retrying converge command

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-puppet
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.4.0
 platform: ruby
 authors:
 - Neill Turner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-31 00:00:00.000000000 Z
+date: 2018-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
@@ -57,6 +57,7 @@ files:
 - kitchen-puppet.gemspec
 - lib/kitchen-puppet/version.rb
 - lib/kitchen/provisioner/puppet/librarian.rb
+- lib/kitchen/provisioner/puppet/r10k.rb
 - lib/kitchen/provisioner/puppet_agent.rb
 - lib/kitchen/provisioner/puppet_apply.rb
 - lib/kitchen/provisioner/puppet_bolt.rb