puppet 7.23.0 → 7.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2cebc83ce870dd49429c7c62f0d4ee850b1189b6e68b4b248bd18c71bcb48e3
-  data.tar.gz: feb5ec780ef14ab47c4b9d2cef6e94500b9e7e060a73488953628d269fe0e37d
+  metadata.gz: 7f612935e7227f22090b17a09b8028ebb922a058dc07e178b488d15fc7a4752e
+  data.tar.gz: e40ee61974f8f663f5b0323afc43bd3af34379ea36b1fb5bb5d281ee3ec5ecaf
 SHA512:
-  metadata.gz: 681dd23ca2309ade2fb71f1ac0605b8460e57e9638bf18b2064386d7d99134dfdc098122985b3b767bc30554f5fb4cf0c46d5a81582c6529d6333c5d65ef0e78
-  data.tar.gz: e0769d478bfd77310eefc6d66fbaf65332498a4b84ace9b02eefc10373073c324129d78c8a9d3d223f776e701809b6406992510a434c5960937da1f9dfd6322c
+  metadata.gz: 7860cc4f8c678d7665ae576f1bd955fb2a95cc353a8c8881ca09a50dd073832a1060b4e65deac289f8886583a3c702507c7b45de783f9563c7176e12e915b07a
+  data.tar.gz: 46263dbea786c3cc662a16a030a623d037dfaf4da1fde47cb55e1fec7960f8272c79ea3cda1e7cee16e77f776e64c36296f06e092356e1975b5706dbae094be6

data/CODEOWNERS

@@ -1,11 +1,11 @@
 # defaults
-* @puppetlabs/phoenix @puppetlabs/puppetserver-maintainers
+* @puppetlabs/phoenix
 
 # PAL
 /lib/puppet/pal @puppetlabs/bolt
 
 # puppet module
-/lib/puppet/application/module.rb @puppetlabs/pdk
-/lib/puppet/face/module @puppetlabs/pdk
-/lib/puppet/forge @puppetlabs/pdk
-/lib/puppet/module_tool @puppetlabs/pdk
+/lib/puppet/application/module.rb @puppetlabs/modules
+/lib/puppet/face/module @puppetlabs/modules
+/lib/puppet/forge @puppetlabs/modules
+/lib/puppet/module_tool @puppetlabs/modules

data/Gemfile

@@ -46,8 +46,8 @@ group(:test) do
   gem 'webrick', '~> 1.7', require: false if RUBY_VERSION.to_f >= 3.0
   gem 'yard', require: false
 
-  gem 'rubocop', '~> 0.49', require: false, platforms: [:ruby]
-  gem 'rubocop-i18n', '~> 1.2.0', require: false, platforms: [:ruby]
+  gem 'rubocop', '1.28.0', require: false, platforms: [:ruby]
+  gem 'rubocop-i18n', '~> 3.0', require: false, platforms: [:ruby]
 end
 
 group(:development, optional: true) do

data/Gemfile.lock

@@ -1,12 +1,12 @@
 GIT
   remote: https://github.com/puppetlabs/packaging
-  revision: f723ffb6df1216eb6cec0c81c0bec349b4fad506
+  revision: 87a3396077f06e2341ad19e6fcd15f7c14ec02f9
   branch: 1.0.x
   specs:
-    packaging (0.108.1.6.gf723ffb)
+    packaging (0)
       apt_stage_artifacts
       artifactory (~> 3)
-      csv (= 3.1.5)
+      csv (>= 3.1.5)
       google-cloud-storage
       googleauth
       rake (>= 12.3)
@@ -15,9 +15,9 @@ GIT
 PATH
   remote: .
   specs:
-    puppet (7.23.0)
+    puppet (7.25.0)
       CFPropertyList (~> 2.2)
-      concurrent-ruby (~> 1.0, < 1.2.0)
+      concurrent-ruby (~> 1.0)
       deep_merge (~> 1.0)
       facter (>= 2.4.0, < 5)
       fast_gettext (>= 1.1, < 3)
@@ -31,27 +31,27 @@ GEM
   remote: https://artifactory.delivery.puppetlabs.net/artifactory/api/gems/rubygems/
   specs:
     CFPropertyList (2.3.6)
-    addressable (2.8.1)
+    addressable (2.8.4)
       public_suffix (>= 2.0.2, < 6.0)
     apt_stage_artifacts (0.11.0)
       docopt
     artifactory (3.0.15)
     ast (2.4.2)
     coderay (1.1.3)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.2)
     crack (0.4.5)
       rexml
-    csv (3.1.5)
+    csv (3.2.6)
     declarative (0.0.20)
     deep_merge (1.2.2)
     diff-lcs (1.5.0)
     digest-crc (0.6.4)
       rake (>= 12.0.0, < 14.0.0)
     docopt (0.6.1)
-    facter (4.2.14)
+    facter (4.4.0)
       hocon (~> 1.3)
       thor (>= 1.0.1, < 2.0)
-    faraday (2.7.4)
+    faraday (2.7.6)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
@@ -64,7 +64,7 @@ GEM
       fast_gettext (~> 1.1.0)
       gettext (>= 3.0.2, < 3.3.0)
       locale
-    google-apis-core (0.10.0)
+    google-apis-core (0.11.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -73,8 +73,8 @@ GEM
       retriable (>= 2.0, < 4.a)
       rexml
       webrick
-    google-apis-iamcredentials_v1 (0.16.0)
-      google-apis-core (>= 0.9.1, < 2.a)
+    google-apis-iamcredentials_v1 (0.17.0)
+      google-apis-core (>= 0.11.0, < 2.a)
     google-apis-storage_v1 (0.19.0)
       google-apis-core (>= 0.9.0, < 2.a)
     google-cloud-core (1.6.0)
@@ -82,7 +82,7 @@ GEM
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.6.0)
       faraday (>= 0.17.3, < 3.0)
-    google-cloud-errors (1.3.0)
+    google-cloud-errors (1.3.1)
     google-cloud-storage (1.44.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
@@ -91,7 +91,7 @@ GEM
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (1.3.0)
+    googleauth (1.5.2)
       faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
       memoist (~> 0.16)
@@ -99,46 +99,46 @@ GEM
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
     hashdiff (1.0.1)
-    hiera (3.11.0)
-    hiera-eyaml (3.3.0)
+    hiera (3.12.0)
+    hiera-eyaml (3.4.0)
       highline
       optimist
     highline (2.1.0)
-    hocon (1.3.1)
+    hocon (1.4.0)
     hpricot (0.8.6)
     httpclient (2.8.3)
     json-schema (2.8.1)
       addressable (>= 2.4)
-    jwt (2.7.0)
+    jwt (2.7.1)
     locale (2.1.3)
     memoist (0.16.2)
     memory_profiler (1.0.1)
     method_source (1.0.0)
     mini_mime (1.1.2)
     minitar (0.9)
-    msgpack (1.6.0)
+    msgpack (1.7.1)
     multi_json (1.15.0)
     mustache (1.1.1)
     optimist (3.0.1)
     os (1.1.4)
-    parallel (1.22.1)
-    parser (2.7.2.0)
+    parallel (1.23.0)
+    parser (3.2.2.3)
       ast (~> 2.4.1)
-    powerpack (0.1.3)
+      racc
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (5.0.1)
     puppet-resource_api (1.8.14)
       hocon (>= 1.0)
-    puppetserver-ca (2.4.0)
+    puppetserver-ca (2.6.0)
       facter (>= 2.0.1, < 5)
     racc (1.5.2)
-    rainbow (2.2.2)
-      rake
+    rainbow (3.1.1)
     rake (13.0.6)
     rdiscount (2.2.7)
     rdoc (6.3.3)
+    regexp_parser (2.8.1)
     release-metrics (1.1.0)
       csv
       docopt
@@ -156,50 +156,53 @@ GEM
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.1)
+    rspec-core (3.12.2)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.2)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.12.3)
+    rspec-mocks (3.12.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (0.49.1)
+    rubocop (1.28.0)
       parallel (~> 1.10)
-      parser (>= 2.3.3.1, < 3.0)
-      powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+      parser (>= 3.1.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.17.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    rubocop-i18n (1.2.0)
-      rubocop (~> 0.49.0)
-    ruby-prof (1.5.0)
-    ruby-progressbar (1.11.0)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.29.0)
+      parser (>= 3.2.1.0)
+    rubocop-i18n (3.0.0)
+      rubocop (~> 1.0)
+    ruby-prof (1.6.3)
+    ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
     scanf (1.0.0)
-    semantic_puppet (1.0.4)
+    semantic_puppet (1.1.0)
     signet (0.17.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
     text (1.3.1)
-    thor (1.2.1)
+    thor (1.2.2)
     trailblazer-option (0.1.2)
     uber (0.1.0)
-    unicode-display_width (1.8.0)
+    unicode-display_width (2.4.2)
     vcr (5.1.0)
     webmock (3.18.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    webrick (1.7.0)
-    yard (0.9.28)
-      webrick (~> 1.7.0)
+    webrick (1.8.1)
+    yard (0.9.34)
 
 PLATFORMS
   x86_64-linux
@@ -226,8 +229,8 @@ DEPENDENCIES
   rspec (~> 3.1)
   rspec-expectations (~> 3.9, != 3.9.3)
   rspec-its (~> 1.1)
-  rubocop (~> 0.49)
-  rubocop-i18n (~> 1.2.0)
+  rubocop (= 1.28.0)
+  rubocop-i18n (~> 3.0)
   ruby-prof (>= 0.16.0)
   semantic_puppet (~> 1.0)
   vcr (~> 5.0)
@@ -235,4 +238,4 @@ DEPENDENCIES
   yard
 
 BUNDLED WITH
-   2.3.22
+   2.4.12

data/ext/project_data.yaml

@@ -25,7 +25,7 @@ gem_runtime_dependencies:
   locale: '~> 2.1'
   multi_json: '~> 1.10'
   puppet-resource_api: '~>1.5'
-  concurrent-ruby: ["~> 1.0", "< 1.2.0"]
+  concurrent-ruby: "~> 1.0"
   deep_merge: '~> 1.0'
   scanf: '~> 1.0'
 gem_rdoc_options:

data/lib/puppet/application/face_base.rb

@@ -27,7 +27,8 @@ class Puppet::Application::FaceBase < Puppet::Application
     exit(0)
   end
 
-  attr_accessor :face, :action, :type, :arguments, :render_as
+  attr_reader :render_as
+  attr_accessor :face, :action, :type, :arguments
 
   def render_as=(format)
     @render_as = Puppet::Network::FormatHandler.format(format)

data/lib/puppet/defaults.rb

@@ -421,6 +421,19 @@ module Puppet
         <https://puppet.com/docs/puppet/latest/environments_about.html>",
       :type    => :path,
     },
+    :report_configured_environmentpath => {
+      :type     => :boolean,
+      :default  => true,
+      :desc     => <<-'EOT'
+      When versioned_environment_dirs is `true` Puppet will readlink the environmentpath
+      when constructing the environment's modulepath. The full readlinked path is referred
+      to as the "resolved path" and the configured path potentially containing symlinks is
+      the "configured path". When reporting where resources come from users may choose
+      between the configured or resolved path.
+
+      When set to false, the resolved paths are reported instead of the configured paths.
+    EOT
+    },
     :use_last_environment => {
       :type     => :boolean,
       :default  => true,
@@ -1698,6 +1711,15 @@ EOT
       can be guaranteed to support this format, but it will be used for all
       classes that support it.",
     },
+    :allow_pson_serialization => {
+      :default    => true,
+      :type       => :boolean,
+      :desc       => "Whether when unable to serialize to JSON or other formats,
+        Puppet falls back to PSON. This option affects both puppetserver's
+        configuration management service responses and when the agent saves its
+        cached catalog. This option is useful in preventing the loss of data because
+        rich data cannot be serialized via PSON.",
+    },
     :agent_catalog_run_lockfile => {
       :default    => "$statedir/agent_catalog_run.lock",
       :type       => :string, # (#2888) Ensure this file is not added to the settings catalog.

data/lib/puppet/environments.rb

@@ -243,6 +243,15 @@ module Puppet::Environments
         setting_values.interpolate(:manifest),
         setting_values.interpolate(:config_version)
       )
+
+      configured_path = File.join(@environment_dir, name.to_s)
+      env.configured_path = configured_path
+      if Puppet.settings[:report_configured_environmentpath]
+        env.resolved_path = validated_directory(configured_path)
+      else
+        env.resolved_path = configured_path
+      end
+
       env
     end
 

data/lib/puppet/functions/each.rb

@@ -116,10 +116,9 @@ Puppet::Functions.create_function(:each) do
   end
 
   def foreach_Hash_1(hash)
-    enumerator = hash.each_pair
     begin
-      hash.size.times do
-        yield(enumerator.next)
+      hash.each_pair do |pair|
+        yield(pair)
       end
     rescue StopIteration
     end
@@ -128,10 +127,9 @@ Puppet::Functions.create_function(:each) do
   end
 
   def foreach_Hash_2(hash)
-    enumerator = hash.each_pair
     begin
-      hash.size.times do
-        yield(*enumerator.next)
+      hash.each_pair do |pair|
+        yield(*pair)
       end
     rescue StopIteration
     end
@@ -141,10 +139,12 @@ Puppet::Functions.create_function(:each) do
 
   def foreach_Enumerable_1(enumerable)
     enum = Puppet::Pops::Types::Iterable.asserted_iterable(self, enumerable)
-      begin
-        loop { yield(enum.next) }
-      rescue StopIteration
+    begin
+      enum.each do |value|
+        yield value
       end
+    rescue StopIteration
+    end
     # produces the receiver
     enumerable
   end
@@ -155,10 +155,8 @@ Puppet::Functions.create_function(:each) do
       enum.each { |entry| yield(*entry) }
     else
       begin
-        index = 0
-        loop do
-          yield(index, enum.next)
-          index += 1
+        enum.each_with_index do |value, index|
+          yield(index, value)
         end
       rescue StopIteration
       end

data/lib/puppet/functions/filter.rb

@@ -109,11 +109,8 @@ Puppet::Functions.create_function(:filter) do
     result = []
     enum = Puppet::Pops::Types::Iterable.asserted_iterable(self, enumerable)
     begin
-      loop do
-        it = enum.next
-        if yield(it)
-          result << it
-        end
+      enum.each do |value|
+        result << value if yield(value)
       end
     rescue StopIteration
     end
@@ -124,18 +121,13 @@ Puppet::Functions.create_function(:filter) do
     enum = Puppet::Pops::Types::Iterable.asserted_iterable(self, enumerable)
     if enum.hash_style?
       result = {}
-      enum.each { |k, v| result[k] = v if yield(k, v) }
+      enum.each {| k, v| result[k] = v if yield(k, v) }
       result
     else
       result = []
       begin
-        index = 0
-        loop do
-          it = enum.next
-          if yield(index, it)
-            result << it
-          end
-          index += 1
+        enum.each_with_index do |value, index|
+          result << value if yield(index, value)
         end
       rescue StopIteration
       end

data/lib/puppet/functions/map.rb

@@ -90,7 +90,7 @@ Puppet::Functions.create_function(:map) do
   def map_Hash_1(hash)
     result = []
     begin
-      hash.map {|x, y| result << yield([x, y]) }
+      hash.each {|x, y| result << yield([x, y]) }
     rescue StopIteration
     end
     result
@@ -99,7 +99,7 @@ Puppet::Functions.create_function(:map) do
   def map_Hash_2(hash)
     result = []
     begin
-      hash.map {|x, y| result << yield(x, y) }
+      hash.each {|x, y| result << yield(x, y) }
     rescue StopIteration
     end
     result
@@ -109,7 +109,9 @@ Puppet::Functions.create_function(:map) do
     result = []
     enum = Puppet::Pops::Types::Iterable.asserted_iterable(self, enumerable)
     begin
-      loop { result << yield(enum.next) }
+      enum.each do |val|
+        result << yield(val)
+      end
     rescue StopIteration
     end
     result
@@ -122,14 +124,11 @@ Puppet::Functions.create_function(:map) do
     else
       result = []
       begin
-        index = 0
-        loop do
-          result << yield(index, enum.next)
-          index = index + 1
+        enum.each_with_index do |val, index|
+          result << yield(index, val)
         end
       rescue StopIteration
       end
-
       result
     end
   end

data/lib/puppet/indirector/catalog/json.rb

@@ -18,9 +18,14 @@ class Puppet::Resource::Catalog::Json < Puppet::Indirector::JSON
   def to_json(object)
     object.render(json_format)
   rescue Puppet::Network::FormatHandler::FormatError => err
-    Puppet.info(_("Unable to serialize catalog to json, retrying with pson"))
-    Puppet.log_exception(err, err.message, level: :debug)
-    object.render('pson').force_encoding(Encoding::BINARY)
+    if Puppet[:allow_pson_serialization]
+      Puppet.info(_("Unable to serialize catalog to json, retrying with pson. PSON is deprecated and will be removed in a future release"))
+      Puppet.log_exception(err, err.message, level: :debug)
+      object.render('pson').force_encoding(Encoding::BINARY)
+    else
+      Puppet.info(_("Unable to serialize catalog to json, no other acceptable format"))
+      Puppet.log_exception(err, err.message, level: :err)
+    end
   end
 
   private

data/lib/puppet/interface/action.rb

@@ -141,7 +141,7 @@ class Puppet::Interface::Action
 
   # @api private
   # @return [Symbol]
-  attr_accessor :render_as
+  attr_reader :render_as
   def render_as=(value)
     @render_as = value.to_sym
   end
@@ -216,11 +216,11 @@ class Puppet::Interface::Action
 
   # The arity of the action
   # @return [Integer]
-  attr_reader   :positional_arg_count
+  attr_reader :positional_arg_count
 
   # The block that is executed when the action is invoked
   # @return [block]
-  attr_accessor :when_invoked
+  attr_reader :when_invoked
   def when_invoked=(block)
 
     internal_name = "#{@name} implementation, required on Ruby 1.8".to_sym

data/lib/puppet/interface/documentation.rb

@@ -266,7 +266,7 @@ class Puppet::Interface
     #   owners.
     # @return [String] Comma-separated list of copyright owners
     # @api private
-    attr_accessor :copyright_owner
+    attr_reader :copyright_owner
     def copyright_owner=(value)
       case value
       when String then @copyright_owner = value
@@ -283,7 +283,7 @@ class Puppet::Interface
     #   copyright year or years.
     # @return [String]
     # @api private
-    attr_accessor :copyright_years
+    attr_reader :copyright_years
     def copyright_years=(value)
       years = munge_copyright_year value
       years = (years.is_a?(Array) ? years : [years]).

data/lib/puppet/interface/option.rb

@@ -132,8 +132,7 @@ class Puppet::Interface::Option
     @default and @default.call
   end
 
-  attr_reader   :parent, :name, :aliases, :optparse
-  attr_accessor :required
+  attr_reader :parent, :name, :aliases, :optparse, :required
   def required=(value)
     if has_default?
       raise ArgumentError, _("%{name} can't be optional and have a default value") % { name: self }
@@ -141,7 +140,7 @@ class Puppet::Interface::Option
     @required = value
   end
 
-  attr_accessor :before_action
+  attr_reader :before_action
   def before_action=(proc)
     unless proc.is_a? Proc
       #TRANSLATORS 'proc' is a Ruby block of code
@@ -152,7 +151,7 @@ class Puppet::Interface::Option
       @parent.__send__(:__add_method, __decoration_name(:before), proc)
   end
 
-  attr_accessor :after_action
+  attr_reader :after_action
   def after_action=(proc)
     unless proc.is_a? Proc
       #TRANSLATORS 'proc' is a Ruby block of code

data/lib/puppet/module/plan.rb

@@ -104,7 +104,7 @@ class Puppet::Module
       end
     end
 
-    attr_reader :name, :module, :metadata_file, :metadata
+    attr_reader :name, :module, :metadata_file
 
     # file paths must be relative to the modules plan directory
     def initialize(pup_module, plan_name, plan_files)

data/lib/puppet/module/task.rb

@@ -215,7 +215,7 @@ class Puppet::Module
       end
     end
 
-    attr_reader :name, :module, :metadata_file, :metadata
+    attr_reader :name, :module, :metadata_file
 
     # file paths must be relative to the modules task directory
     def initialize(pup_module, task_name,  module_executables, metadata_file = nil)

data/lib/puppet/module.rb

@@ -62,7 +62,7 @@ class Puppet::Module
     SemanticPuppet::VersionRange.parse(range)
   end
 
-  attr_reader :name, :environment, :path, :metadata, :tasks, :plans
+  attr_reader :name, :environment, :path, :metadata
   attr_writer :environment
 
   attr_accessor :dependencies, :forge_name

data/lib/puppet/network/http/api/indirected_routes.rb

@@ -124,7 +124,7 @@ class Puppet::Network::HTTP::API::IndirectedRoutes
 
     rendered_result = result
 
-    rendered_format = first_response_formatter_for(indirection.model, request) do |format|
+    rendered_format = first_response_formatter_for(indirection.model, request, key) do |format|
       if result.respond_to?(:render)
         Puppet::Util::Profiler.profile(_("Rendered result in %{format}") % { format: format }, [:http, :v3_render, format]) do
           rendered_result = result.render(format)
@@ -157,7 +157,7 @@ class Puppet::Network::HTTP::API::IndirectedRoutes
 
     rendered_result = nil
 
-    rendered_format = first_response_formatter_for(indirection.model, request) do |format|
+    rendered_format = first_response_formatter_for(indirection.model, request, key) do |format|
       rendered_result = indirection.model.render_multiple(format, result)
     end
 
@@ -185,14 +185,20 @@ class Puppet::Network::HTTP::API::IndirectedRoutes
 
   # Return the first response formatter that didn't cause the yielded
   # block to raise a FormatError.
-  def first_response_formatter_for(model, request, &block)
+  def first_response_formatter_for(model, request, key, &block)
     formats = accepted_response_formatters_for(model, request)
     formatter = formats.find do |format|
       begin
         yield format
         true
       rescue Puppet::Network::FormatHandler::FormatError => err
-        Puppet.log_exception(err, err.message, level: :debug)
+        msg = _("Failed to serialize %{model} for '%{key}': %{detail}") %
+        {model: model, key: key, detail: err}
+        if Puppet[:allow_pson_serialization]
+          Puppet.warning(msg)
+        else
+          raise Puppet::Network::FormatHandler::FormatError.new(msg)
+        end
         false
       end
     end