openvox 8.31.0 → 9.0.0.pre.alpha2

data/lib/puppet/resource/type.rb

@@ -34,13 +34,13 @@ class Puppet::Resource::Type
   EMPTY_ARRAY = [].freeze
 
   LOOKAROUND_OPERATORS = {
-    "(" => 'lp',
-    "?" => "qu",
-    "<" => "lt",
-    ">" => "gt",
-    "!" => "ex",
-    "=" => "eq",
-    ")" => 'rp'
+    "(" => 'LP',
+    "?" => "QU",
+    "<" => "LT",
+    ">" => "GT",
+    "!" => "EX",
+    "=" => "EQ",
+    ")" => 'RP'
   }.freeze
 
   attr_accessor :file, :line, :doc, :code, :parent, :resource_type_collection, :override
@@ -206,7 +206,7 @@ class Puppet::Resource::Type
 
   def name
     if type == :node && name_is_regex?
-      # Normalize lookaround regex pattern to a unique, lookup-safe lowercase string.
+      # Normalize lookarround regex patthern
       internal_name = @name.source.downcase.gsub(/\(\?[^)]*\)/) do |str|
         str.gsub(/./) { |ch| LOOKAROUND_OPERATORS[ch] || ch }
       end

data/lib/puppet/ssl/state_machine.rb

@@ -121,10 +121,6 @@ class Puppet::SSL::StateMachine
     rescue Puppet::HTTP::ResponseError => e
       if e.response.code == 304
         Puppet.info(_("CA certificate is unmodified, using existing CA certificate"))
-        # 304 confirms the local CA is current, so reset the TTL.
-        # Otherwise ca_last_update (backed by ca.pem mtime) never advances
-        # past the initial download and needs_refresh? triggers on every run.
-        @cert_provider.ca_last_update = Time.now
       else
         Puppet.info(_("Failed to refresh CA certificate, using existing CA certificate: %{message}") % { message: e.message })
       end
@@ -223,8 +219,6 @@ class Puppet::SSL::StateMachine
     rescue Puppet::HTTP::ResponseError => e
       if e.response.code == 304
         Puppet.info(_("CRL is unmodified, using existing CRL"))
-        # 304 confirms the local CRL is current, so reset the TTL.
-        @cert_provider.crl_last_update = Time.now
       else
         Puppet.info(_("Failed to refresh CRL, using existing CRL: %{message}") % { message: e.message })
       end

data/lib/puppet/type/file/ensure.rb

@@ -86,21 +86,12 @@ module Puppet
         raise Puppet::Error,
               "Cannot create #{@resource[:path]}; parent directory #{parent} does not exist"
       end
-      begin
-        if mode
-          Puppet::Util.withumask(0o00) do
-            Dir.mkdir(@resource[:path], symbolic_mode_to_int(mode, 0o755, true))
-          end
-        else
-          Dir.mkdir(@resource[:path])
+      if mode
+        Puppet::Util.withumask(0o00) do
+          Dir.mkdir(@resource[:path], symbolic_mode_to_int(mode, 0o755, true))
         end
-      rescue Errno::EEXIST
-        # Another process may have created the directory concurrently. If it
-        # really is a directory now, treat that as success.
-        #
-        # Directory mode, and other properties, will be checked and enforced by
-        # the call to `property_fix`.
-        raise unless Puppet::FileSystem.directory?(@resource[:path])
+      else
+        Dir.mkdir(@resource[:path])
       end
       @resource.send(:property_fix)
       return :directory_created

data/lib/puppet/util/json.rb

@@ -18,14 +18,6 @@ module Puppet::Util
 
     require 'json'
 
-    # Generator options equivalent to the `JSON::PRETTY_STATE_PROTOTYPE`
-    # that json 2.x provided and json 3 removed.
-    PRETTY_OPTIONS = { :indent => '  ', :space => ' ', :object_nl => "\n", :array_nl => "\n" }.freeze
-
-    # Generator options that json 3 rejects as unknown. `quirks_mode` has been
-    # a no-op since json 2.0, when quirks mode became the only mode.
-    OBSOLETE_DUMP_OPTIONS = [:quirks_mode].freeze
-
     # Load the content from a file as JSON if
     # contents are in valid format. This method does not
     # raise error but returns `nil` when invalid file is
@@ -49,20 +41,16 @@ module Puppet::Util
     def self.load(string, options = {})
       string = string.read if string.respond_to?(:read)
 
-      options = options.dup
       options[:symbolize_names] = true if options.delete(:symbolize_keys)
-      # json 3 only accepts parser options as keyword arguments
-      ::JSON.parse(string, **options)
+      ::JSON.parse(string, options)
     rescue JSON::ParserError => e
       raise Puppet::Util::Json::ParseError.build(e, string)
     end
 
     def self.dump(object, options = {})
       # Options is a state when we're being called recursively
-      unless options.is_a?(JSON::State)
-        options = options.dup
-        OBSOLETE_DUMP_OPTIONS.each { |key| options.delete(key) }
-        options.merge!(PRETTY_OPTIONS) if options.delete(:pretty)
+      if !options.is_a?(JSON::State) && options.delete(:pretty)
+        options.merge!(::JSON::PRETTY_STATE_PROTOTYPE.to_h)
       end
       object.to_json(options)
     end