puppet 5.5.22-x64-mingw32 → 6.0.0-x64-mingw32

data/lib/puppet/module_tool.rb

@@ -131,8 +131,6 @@ module Puppet
       # Note: environment will have expanded the path
       options[:target_dir] = face_environment.full_modulepath.first
 
-      # Default false to retain backward compatibility with SemanticPuppet 0.1.4
-      options[:strict_semver] = false unless options.include?(:strict_semver)
     end
 
     # Given a hash of options, we should discover or create a
@@ -165,16 +163,15 @@ module Puppet
     # @param where [String] a description of the thing we're parsing the
     #        dependency expression for
     # @param dep [Hash] the dependency description to parse
-    # @param strict_semver [Boolean] set to `false` to relax range semantics to include pre-releases
     # @return [Array(String, SemanticPuppet::VersionRange, String)] a tuple of the
     #         dependent module's name, the version range dependency, and the
     #         unparsed range expression.
-    def self.parse_module_dependency(where, dep, strict_semver = true)
+    def self.parse_module_dependency(where, dep)
       dep_name = dep['name'].tr('/', '-')
       range = dep['version_requirement'] || '>= 0.0.0'
 
       begin
-        parsed_range = Module.parse_range(range, strict_semver)
+        parsed_range = Module.parse_range(range)
       rescue ArgumentError => e
         Puppet.debug "Error in #{where} parsing dependency #{dep_name} (#{e.message}); using empty range."
         parsed_range = SemanticPuppet::VersionRange::EMPTY_RANGE

data/lib/puppet/module_tool/applications.rb

@@ -3,7 +3,6 @@ require 'puppet/module_tool'
 module Puppet::ModuleTool
   module Applications
     require 'puppet/module_tool/applications/application'
-    require 'puppet/module_tool/applications/builder'
     require 'puppet/module_tool/applications/checksummer'
     require 'puppet/module_tool/applications/installer'
     require 'puppet/module_tool/applications/searcher'

data/lib/puppet/module_tool/applications/application.rb

@@ -49,7 +49,7 @@ module Puppet::ModuleTool
           File.open(metadata_path) do |f|
             begin
               @metadata.update(Puppet::Util::Json.load(f))
-            rescue Puppet::Util::Json::ParserError => ex
+            rescue Puppet::Util::Json::ParseError => ex
               raise ArgumentError, _("Could not parse JSON %{metadata_path}") % { metadata_path: metadata_path }, ex.backtrace
             end
           end

data/lib/puppet/module_tool/applications/installer.rb

@@ -25,7 +25,6 @@ module Puppet::ModuleTool
         @ignore_dependencies = forced? || options[:ignore_dependencies]
         @name                = name
         @install_dir         = install_dir
-        @strict_semver       = !!options[:strict_semver]
 
         Puppet::Forge::Cache.clean
 
@@ -63,7 +62,7 @@ module Puppet::ModuleTool
         begin
           if installed_module = installed_modules[name]
             unless forced?
-              if Puppet::Module.parse_range(version, @strict_semver).include? installed_module.version
+              if Puppet::Module.parse_range(version).include? installed_module.version
                 results[:result] = :noop
                 results[:version] = installed_module.version
                 return results
@@ -107,7 +106,7 @@ module Puppet::ModuleTool
               # locking it to upgrades within the same major version.
               installed_range = ">=#{version} #{version.major}.x"
               graph.add_constraint('installed', mod, installed_range) do |node|
-                Puppet::Module.parse_range(installed_range, @strict_semver).include? node.version
+                Puppet::Module.parse_range(installed_range).include? node.version
               end
 
               release.mod.dependencies.each do |dep|
@@ -115,7 +114,7 @@ module Puppet::ModuleTool
 
                 range = dep['version_requirement']
                 graph.add_constraint("#{mod} constraint", dep_name, range) do |node|
-                  Puppet::Module.parse_range(range, @strict_semver).include? node.version
+                  Puppet::Module.parse_range(range).include? node.version
                 end
               end
             end
@@ -189,12 +188,12 @@ module Puppet::ModuleTool
       private
 
       def module_repository
-        @repo ||= Puppet::Forge.new(Puppet[:module_repository], @strict_semver)
+        @repo ||= Puppet::Forge.new(Puppet[:module_repository])
       end
 
       def local_tarball_source
         @tarball_source ||= begin
-          Puppet::ModuleTool::LocalTarball.new(@name, @strict_semver)
+          Puppet::ModuleTool::LocalTarball.new(@name)
         rescue Puppet::Module::Error => e
           raise InvalidModuleError.new(@name, :action => @action, :error  => e)
         end
@@ -209,7 +208,7 @@ module Puppet::ModuleTool
       end
 
       def build_single_module_graph(name, version)
-        range = Puppet::Module.parse_range(version, @strict_semver)
+        range = Puppet::Module.parse_range(version)
         graph = SemanticPuppet::Dependency::Graph.new(name => range)
         releases = SemanticPuppet::Dependency.fetch_releases(name)
         releases.each { |release| release.dependencies.clear }
@@ -304,7 +303,7 @@ module Puppet::ModuleTool
           @environment.modules_by_path[options[:target_dir]].each do |mod|
             if mod.has_metadata?
               metadata = {
-                :name    => mod.forge_name.tr('/', '-'),
+                :name    => mod.forge_name.gsub('/', '-'),
                 :version => mod.version
               }
               next if release[:module] == metadata[:name]

data/lib/puppet/module_tool/applications/uninstaller.rb

@@ -12,7 +12,6 @@ module Puppet::ModuleTool
         @suggestions = []
         @environment = options[:environment_instance]
         @ignore_changes = options[:force] || options[:ignore_changes]
-        @strict_semver  = !!options[:strict_semver]
       end
 
       def run
@@ -53,7 +52,7 @@ module Puppet::ModuleTool
 
       def find_installed_module
         @environment.modules_by_path.values.flatten.each do |mod|
-          mod_name = (mod.forge_name || mod.name).tr('/', '-')
+          mod_name = (mod.forge_name || mod.name).gsub('/', '-')
           if mod_name == @name
             @unfiltered << {
               :name    => mod_name,
@@ -61,7 +60,7 @@ module Puppet::ModuleTool
               :path    => mod.modulepath,
             }
             if @options[:version] && mod.version
-              next unless Puppet::Module.parse_range(@options[:version], @strict_semver).include?(SemanticPuppet::Version.parse(mod.version))
+              next unless Puppet::Module.parse_range(@options[:version]).include?(SemanticPuppet::Version.parse(mod.version))
             end
             @installed << mod
           elsif mod_name =~ /#{@name}/
@@ -102,7 +101,7 @@ module Puppet::ModuleTool
           if mod.has_metadata? && !changes.empty?
             raise LocalChangesError,
               :action            => :uninstall,
-              :module_name       => (mod.forge_name || mod.name).tr('/', '-'),
+              :module_name       => (mod.forge_name || mod.name).gsub('/', '-'),
               :requested_version => @options[:version],
               :installed_version => mod.version
           end
@@ -110,7 +109,7 @@ module Puppet::ModuleTool
 
         if !@options[:force] && !mod.required_by.empty?
           raise ModuleIsRequiredError,
-            :module_name       => (mod.forge_name || mod.name).tr('/', '-'),
+            :module_name       => (mod.forge_name || mod.name).gsub('/', '-'),
             :required_by       => mod.required_by,
             :requested_version => @options[:version],
             :installed_version => mod.version

data/lib/puppet/module_tool/applications/unpacker.rb

@@ -14,7 +14,7 @@ module Puppet::ModuleTool
       end
 
       def self.harmonize_ownership(source, target)
-        unless Puppet.features.microsoft_windows?
+        unless Puppet::Util::Platform.windows?
           source = Pathname.new(source) unless source.respond_to?(:stat)
           target = Pathname.new(target) unless target.respond_to?(:stat)
 

data/lib/puppet/module_tool/applications/upgrader.rb

@@ -20,7 +20,6 @@ module Puppet::ModuleTool
         @name                = name
         @ignore_changes      = forced? || options[:ignore_changes]
         @ignore_dependencies = forced? || options[:ignore_dependencies]
-        @strict_semver       = !!options[:strict_semver]
 
         SemanticPuppet::Dependency.add_source(installed_modules_source)
         SemanticPuppet::Dependency.add_source(module_repository)
@@ -94,7 +93,7 @@ module Puppet::ModuleTool
           if available_versions.empty?
             raise NoCandidateReleasesError, results.merge(:module_name => name, :source => module_repository.host)
           elsif results[:requested_version] != :latest
-            requested = Puppet::Module.parse_range(results[:requested_version], @strict_semver)
+            requested = Puppet::Module.parse_range(results[:requested_version])
             unless available_versions.any? {|m| requested.include? m.version}
               raise NoCandidateReleasesError, results.merge(:module_name => name, :source => module_repository.host)
             end
@@ -123,7 +122,7 @@ module Puppet::ModuleTool
               # module, locking it to upgrades within the same major version.
               installed_range = ">=#{version} #{version.major}.x"
               graph.add_constraint('installed', installed_module, installed_range) do |node|
-                Puppet::Module.parse_range(installed_range, @strict_semver).include? node.version
+                Puppet::Module.parse_range(installed_range).include? node.version
               end
 
               release.mod.dependencies.each do |dep|
@@ -131,7 +130,7 @@ module Puppet::ModuleTool
 
                 range = dep['version_requirement']
                 graph.add_constraint("#{installed_module} constraint", dep_name, range) do |node|
-                  Puppet::Module.parse_range(range, @strict_semver).include? node.version
+                  Puppet::Module.parse_range(range).include? node.version
                 end
               end
             end
@@ -219,7 +218,7 @@ module Puppet::ModuleTool
 
       private
       def module_repository
-        @repo ||= Puppet::Forge.new(Puppet[:module_repository], @strict_semver)
+        @repo ||= Puppet::Forge.new(Puppet[:module_repository])
       end
 
       def installed_modules_source
@@ -231,7 +230,7 @@ module Puppet::ModuleTool
       end
 
       def build_single_module_graph(name, version)
-        range = Puppet::Module.parse_range(version, @strict_semver)
+        range = Puppet::Module.parse_range(version)
         graph = SemanticPuppet::Dependency::Graph.new(name => range)
         releases = SemanticPuppet::Dependency.fetch_releases(name)
         releases.each { |release| release.dependencies.clear }

data/lib/puppet/module_tool/installed_modules.rb

@@ -54,7 +54,7 @@ module Puppet::ModuleTool
     class ModuleRelease < SemanticPuppet::Dependency::ModuleRelease
       attr_reader :mod, :metadata
 
-      def initialize(source, mod, strict_semver = true)
+      def initialize(source, mod)
         @mod = mod
         @metadata = mod.metadata
         name = mod.forge_name.tr('/', '-')
@@ -70,7 +70,7 @@ module Puppet::ModuleTool
 
         if mod.dependencies
           mod.dependencies.each do |dependency|
-            results = Puppet::ModuleTool.parse_module_dependency(release, dependency, strict_semver)
+            results = Puppet::ModuleTool.parse_module_dependency(release, dependency)
             dep_name, parsed_range, range = results
 
             add_constraint('initialize', dep_name, range.to_s) do |node|

data/lib/puppet/module_tool/local_tarball.rb

@@ -8,11 +8,11 @@ module Puppet::ModuleTool
   class LocalTarball < SemanticPuppet::Dependency::Source
     attr_accessor :release
 
-    def initialize(filename, strict_semver = true)
+    def initialize(filename)
       unpack(filename, tmpdir)
       Puppet.debug "Unpacked local tarball to #{tmpdir}"
 
-      mod = Puppet::Module.new('tarball', tmpdir, nil, strict_semver)
+      mod = Puppet::Module.new('tarball', tmpdir, nil)
       @release = ModuleRelease.new(self, mod)
     end
 
@@ -52,7 +52,7 @@ module Puppet::ModuleTool
 
         if mod.dependencies
           dependencies = mod.dependencies.map do |dep|
-            Puppet::ModuleTool.parse_module_dependency(release, dep, mod.strict_semver?)[0..1]
+            Puppet::ModuleTool.parse_module_dependency(release, dep)[0..1]
           end
           dependencies = Hash[dependencies]
         end

data/lib/puppet/module_tool/metadata.rb

@@ -1,4 +1,3 @@
-require 'puppet/util/methodhelper'
 require 'puppet/module_tool'
 require 'puppet/network/format_support'
 require 'uri'
@@ -103,7 +102,7 @@ module Puppet::ModuleTool
 
       contents = data.keys.map do |k|
         value = (Puppet::Util::Json.dump(data[k], :pretty => true) rescue data[k].to_json)
-        %Q("#{k}": #{value})
+        %Q("#{k.to_s}": #{value})
       end
 
       "{\n" + contents.join(",\n").gsub(/^/, '  ') + "\n}\n"

data/lib/puppet/module_tool/shared_behaviors.rb

@@ -8,12 +8,12 @@ module Puppet::ModuleTool::Shared
     @installed  = Hash.new { |h,k| h[k] = [] }
 
     @environment.modules_by_path.values.flatten.each do |mod|
-      mod_name = (mod.forge_name || mod.name).tr('/', '-')
+      mod_name = (mod.forge_name || mod.name).gsub('/', '-')
       @installed[mod_name] << mod
       d = @local["#{mod_name}@#{mod.version}"]
       (mod.dependencies || []).each do |hash|
         name, conditions = hash['name'], hash['version_requirement']
-        name = name.tr('/', '-')
+        name = name.gsub('/', '-')
         d[name] = conditions
         @conditions[name] << {
           :module => mod_name,
@@ -34,7 +34,7 @@ module Puppet::ModuleTool::Shared
     info = forge.remote_dependency_info(author, modname, @options[:version])
     info.each do |pair|
       mod_name, releases = pair
-      mod_name = mod_name.tr('/', '-')
+      mod_name = mod_name.gsub('/', '-')
       releases.each do |rel|
         semver = SemanticPuppet::Version.parse(rel['version']) rescue SemanticPuppet::Version::MIN
         @versions[mod_name] << { :vstring => rel['version'], :semver => semver }
@@ -42,7 +42,7 @@ module Puppet::ModuleTool::Shared
         @urls["#{mod_name}@#{rel['version']}"] = rel['file']
         d = @remote["#{mod_name}@#{rel['version']}"]
         (rel['dependencies'] || []).each do |name, conditions|
-          d[name.tr('/', '-')] = conditions
+          d[name.gsub('/', '-')] = conditions
         end
       end
     end
@@ -76,10 +76,10 @@ module Puppet::ModuleTool::Shared
       }
 
       if forced?
-        range = Puppet::Module.parse_range(@version, @strict_semver) rescue Puppet::Module.parse_range('>= 0.0.0', @strict_semver)
+        range = Puppet::Module.parse_range(@version) rescue Puppet::Module.parse_range('>= 0.0.0')
       else
         range = (@conditions[mod]).map do |r|
-          Puppet::Module.parse_range(r[:dependency], @strict_semver) rescue Puppet::Module.parse_range('>= 0.0.0', @strict_semver)
+          Puppet::Module.parse_range(r[:dependency]) rescue Puppet::Module.parse_range('>= 0.0.0')
         end.inject(&:&)
       end
 

data/lib/puppet/module_tool/tar/mini.rb

@@ -1,17 +1,7 @@
 class Puppet::ModuleTool::Tar::Mini
   def unpack(sourcefile, destdir, _)
     Zlib::GzipReader.open(sourcefile) do |reader|
-      # puppet doesn't have a hard dependency on minitar, so we
-      # can't be certain which version is installed. If it's 0.9
-      # or above then we can prevent minitar from fsync'ing each
-      # extracted file and directory, otherwise fallback to the
-      # old behavior
-      args = [reader, destdir, find_valid_files(reader)]
-      spec = Gem::Specification.find_by_name('minitar')
-      if spec && spec.version >= Gem::Version.new('0.9')
-        args << {:fsync => false}
-      end
-      Archive::Tar::Minitar.unpack(*args) do |action, name, stats|
+      Archive::Tar::Minitar.unpack(reader, destdir, find_valid_files(reader)) do |action, name, stats|
         case action
         when :dir
           validate_entry(destdir, name)
@@ -93,7 +83,7 @@ class Puppet::ModuleTool::Tar::Mini
   def find_valid_files(tarfile)
     Archive::Tar::Minitar.open(tarfile).collect do |entry|
       flag = entry.typeflag
-      if flag.nil? || flag =~ /[[:digit:]]/ && (0..7).cover?(flag.to_i)
+      if flag.nil? || flag =~ /[[:digit:]]/ && (0..7).include?(flag.to_i)
         entry.full_name
       else
         Puppet.debug "Invalid tar flag '#{flag}' will not be extracted: #{entry.name}"

data/lib/puppet/network/authconfig.rb

@@ -10,10 +10,6 @@ module Puppet
       Puppet::Network::HTTP::MASTER_URL_PREFIX
     end
 
-    def self.ca_url_prefix
-      Puppet::Network::HTTP::CA_URL_PREFIX
-    end
-
     def self.default_acl
       [
       # Master API V3
@@ -28,15 +24,6 @@ module Puppet
       { :acl => "#{master_url_prefix}/v3/file" },
 
       { :acl => "#{master_url_prefix}/v3/status", :method => [:find], :authenticated => true },
-
-      # CA API V1
-      { :acl => "#{ca_url_prefix}/v1/certificate_revocation_list/ca", :method => :find, :authenticated => true },
-
-      # These allow `auth any`, because if you can do them anonymously you
-      # should probably also be able to do them when trusted.
-      { :acl => "#{ca_url_prefix}/v1/certificate/ca", :method => :find, :authenticated => :any },
-      { :acl => "#{ca_url_prefix}/v1/certificate/", :method => :find, :authenticated => :any },
-      { :acl => "#{ca_url_prefix}/v1/certificate_request", :method => [:find, :save], :authenticated => :any },
       ]
     end
 

data/lib/puppet/network/format_support.rb

@@ -45,11 +45,9 @@ module Puppet::Network::FormatSupport
       end.sort do |a, b|
         # It's an inverse sort -- higher weight formats go first.
         b.weight <=> a.weight
-      end.collect do |f|
-        f.name
       end
 
-      result = put_preferred_format_first(result)
+      result = put_preferred_format_first(result).map(&:name)
 
       Puppet.debug "#{friendly_name} supports formats: #{result.join(' ')}"
 
@@ -76,13 +74,20 @@ module Puppet::Network::FormatSupport
     end
 
     def put_preferred_format_first(list)
-      preferred_format = Puppet.settings[:preferred_serialization_format].to_sym
-      if list.include?(preferred_format)
-        list.delete(preferred_format)
-        list.unshift(preferred_format)
+      preferred_format = Puppet.settings[:preferred_serialization_format].to_s
+
+      preferred = list.select { |format|
+        format.mime.end_with?(preferred_format)
+      }
+
+      if preferred.empty?
+        Puppet.debug "Value of 'preferred_serialization_format' (#{preferred_format}) is invalid for #{friendly_name}, using default (#{list.first.name})"
       else
-        Puppet.debug "Value of 'preferred_serialization_format' (#{preferred_format}) is invalid for #{friendly_name}, using default (#{list.first})"
+        list = preferred + list.reject { |format|
+          format.mime.end_with?(preferred_format)
+        }
       end
+
       list
     end
   end

data/lib/puppet/network/formats.rb

@@ -23,13 +23,25 @@ Puppet::Network::FormatHandler.create_serialized_formats(:msgpack, :weight => 20
 end
 
 Puppet::Network::FormatHandler.create_serialized_formats(:yaml) do
+  def allowed_yaml_classes
+    @allowed_yaml_classes ||= [
+      Puppet::Node::Facts,
+      Puppet::Node,
+      Puppet::Transaction::Report,
+      Puppet::Resource,
+      Puppet::Resource::Catalog
+    ]
+  end
+
   def intern(klass, text)
-    data = YAML.load(text)
+    data = Puppet::Util::Yaml.safe_load(text, allowed_yaml_classes)
     data_to_instance(klass, data)
+  rescue Puppet::Util::Yaml::YamlLoadError => e
+    raise Puppet::Network::FormatHandler::FormatError, _("Serialized YAML did not contain a valid instance of %{klass}: %{message}") % { klass: klass, message: e.message }
   end
 
   def intern_multiple(klass, text)
-    data = YAML.load(text)
+    data = Puppet::Util::Yaml.safe_load(text, allowed_yaml_classes)
     unless data.respond_to?(:collect)
       raise Puppet::Network::FormatHandler::FormatError, _("Serialized YAML did not contain a collection of instances when calling intern_multiple")
     end
@@ -37,6 +49,8 @@ Puppet::Network::FormatHandler.create_serialized_formats(:yaml) do
     data.collect do |datum|
       data_to_instance(klass, datum)
     end
+  rescue Puppet::Util::Yaml::YamlLoadError => e
+    raise Puppet::Network::FormatHandler::FormatError, _("Serialized YAML did not contain a valid instance of %{klass}: %{message}") % { klass: klass, message: e.message }
   end
 
   def data_to_instance(klass, data)
@@ -167,3 +181,80 @@ Puppet::Network::FormatHandler.create(:console,
     data.collect(&:render).join("\n")
   end
 end
+
+Puppet::Network::FormatHandler.create(:rich_data_json, mime: 'application/vnd.puppet.rich+json', charset: Encoding::UTF_8, weight: 30) do
+  def intern(klass, text)
+    Puppet.override({:rich_data => true}) do
+      data_to_instance(klass, Puppet::Util::Json.load(text))
+    end
+  end
+
+  def intern_multiple(klass, text)
+    Puppet.override({:rich_data => true}) do
+      Puppet::Util::Json.load(text).collect do |data|
+        data_to_instance(klass, data)
+      end
+    end
+  end
+
+  def render(instance)
+    Puppet.override({:rich_data => true}) do
+      instance.to_json
+    end
+  end
+
+  def render_multiple(instances)
+    Puppet.override({:rich_data => true}) do
+      Puppet::Util::Json.dump(instances)
+    end
+  end
+
+  def data_to_instance(klass, data)
+    Puppet.override({:rich_data => true}) do
+      return data if data.is_a?(klass)
+      klass.from_data_hash(data)
+    end
+  end
+
+  def supported?(klass)
+    klass == Puppet::Resource::Catalog &&
+      Puppet.lookup(:current_environment).rich_data?
+  end
+end
+
+Puppet::Network::FormatHandler.create_serialized_formats(:rich_data_msgpack, mime: "application/vnd.puppet.rich+msgpack", weight: 35) do
+  confine :feature => :msgpack
+
+  def intern(klass, text)
+    Puppet.override(rich_data: true) do
+      data = MessagePack.unpack(text)
+      return data if data.is_a?(klass)
+      klass.from_data_hash(data)
+    end
+  end
+
+  def intern_multiple(klass, text)
+    Puppet.override(rich_data: true) do
+      MessagePack.unpack(text).collect do |data|
+        klass.from_data_hash(data)
+      end
+    end
+  end
+
+  def render_multiple(instances)
+    Puppet.override(rich_data: true) do
+      instances.to_msgpack
+    end
+  end
+
+  def render(instance)
+    Puppet.override(rich_data: true) do
+      instance.to_msgpack
+    end
+  end
+
+  def supported?(klass)
+    klass == Puppet::Resource::Catalog &&
+      Puppet.lookup(:current_environment).rich_data?
+  end
+end